No OneTemporary
Actions

Size

437 KB

Referenced Files

None

Subscribers

None

View Options

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

	diff --git a/conf/default.conf.php b/conf/default.conf.php
	index f97b4bfc79..5f00978e2d 100644
	--- a/conf/default.conf.php
	+++ b/conf/default.conf.php
	@@ -1,1358 +1,1365 @@
	<?php

	return array(

	// The root URI which Phabricator is installed on.
	// Example: "http://phabricator.example.com/"
	'phabricator.base-uri' => null,

	// If you have multiple environments, provide the production environment URI
	// here so that emails, etc., generated in development/sandbox environments
	// contain the right links.
	'phabricator.production-uri' => null,

	// Setting this to 'true' will invoke a special setup mode which helps guide
	// you through setting up Phabricator.
	'phabricator.setup' => false,

	// -- IMPORTANT! Security! -------------------------------------------------- //

	// IMPORTANT: By default, Phabricator serves files from the same domain the
	// application lives on. This is convenient but not secure: it creates a large
	// class of vulnerabilities which can not be generally mitigated.
	//
	// To avoid this, you should configure a second domain in the same way you
	// have the primary domain configured (e.g., point it at the same machine and
	// set up the same vhost rules) and provide it here. For instance, if your
	// primary install is on "http://www.phabricator-example.com/", you could
	// configure "http://www.phabricator-files.com/" and specify the entire
	// domain (with protocol) here. This will enforce that files are
	// served only from the alternate domain. Ideally, you should use a
	// completely separate domain name rather than just a different subdomain.
	//
	// It is STRONGLY RECOMMENDED that you configure this. Your install is NOT
	// SECURE unless you do so.
	'security.alternate-file-domain' => null,

	// Default key for HMAC digests where the key is not important (i.e., the
	// hash itself is secret). You can change this if you want (to any other
	// string), but doing so will break existing sessions and CSRF tokens.
	'security.hmac-key' => '[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw',

	// If the web server responds to both HTTP and HTTPS requests but you want
	// users to connect with only HTTPS, you can set this to true to make
	// Phabricator redirect HTTP requests to HTTPS.
	//
	// Normally, you should just configure your server not to accept HTTP traffic,
	// but this setting may be useful if you originally used HTTP and have now
	// switched to HTTPS but don't want to break old links, or if your webserver
	// sits behind a load balancer which terminates HTTPS connections and you
	// can not reasonably configure more granular behavior there.
	//
	// NOTE: Phabricator determines if a request is HTTPS or not by examining the
	// PHP $_SERVER['HTTPS'] variable. If you run Apache/mod_php this will
	// probably be set correctly for you automatically, but if you run Phabricator
	// as CGI/FCGI (e.g., through nginx or lighttpd), you need to configure your
	// web server so that it passes the value correctly based on the connection
	// type. Alternatively, you can add a PHP snippet to the top of this
	// configuration file to directly set $_SERVER['HTTPS'] to the correct value.
	'security.require-https' => false,


	// -- Internationalization -------------------------------------------------- //

	// This allows customizing texts used in Phabricator. The class must extend
	// PhabricatorTranslation.
	'translation.provider' => 'PhabricatorEnglishTranslation',

	// You can use 'translation.override' if you don't want to create a full
	// translation to give users an option for switching to it and you just want
	// to override some strings in the default translation.
	'translation.override' => array(),


	// -- Access Policies ------------------------------------------------------- //

	// Phabricator allows you to set the visibility of objects (like repositories
	// and source code) to "Public", which means anyone on the internet can see
	// them, even without being logged in. This is great for open source, but
	// some installs may never want to make anything public, so this policy is
	// disabled by default. You can enable it here, which will let you set the
	// policy for objects to "Public". With this option disabled, the most open
	// policy is "All Users", which means users must be logged in to view things.
	'policy.allow-public' => false,


	// -- Logging --------------------------------------------------------------- //

	// To enable the Phabricator access log, specify a path here. The Phabricator
	// access log can provide more detailed information about Phabricator access
	// than normal HTTP access logs (for instance, it can show logged-in users,
	// controllers, and other application data). If not set, no log will be
	// written.
	//
	// Make sure the PHP process can write to the log!
	'log.access.path' => null,

	// Format for the access log. If not set, the default format will be used:
	//
	// "[%D]\t%h\t%u\t%M\t%C\t%m\t%U\t%c\t%T"
	//
	// Available variables are:
	//
	// - %c The HTTP response code.
	// - %C The controller which handled the request.
	// - %D The request date.
	// - %e Epoch timestamp.
	// - %h The webserver's host name.
	// - %p The PID of the server process.
	// - %R The HTTP referrer.
	// - %r The remote IP.
	// - %T The request duration, in microseconds.
	// - %U The request path.
	// - %u The logged-in user, if one is logged in.
	// - %M The HTTP method.
	// - %m For conduit, the Conduit method which was invoked.
	//
	// If a variable isn't available (for example, %m appears in the file format
	// but the request is not a Conduit request), it will be rendered as "-".
	//
	// Note that the default format is subject to change in the future, so if you
	// rely on the log's format, specify it explicitly.
	'log.access.format' => null,


	// -- DarkConsole ----------------------------------------------------------- //

	// DarkConsole is a administrative debugging/profiling tool built into
	// Phabricator. You can leave it disabled unless you're developing against
	// Phabricator.

	// Determines whether or not DarkConsole is available. DarkConsole exposes
	// some data like queries and stack traces, so you should be careful about
	// turning it on in production (although users can not normally see it, even
	// if the deployment configuration enables it).
	'darkconsole.enabled' => false,

	// Always enable DarkConsole, even for logged out users. This potentially
	// exposes sensitive information to users, so make sure untrusted users can
	// not access an install running in this mode. You should definitely leave
	// this off in production. It is only really useful for using DarkConsole
	// utilities to debug or profile logged-out pages. You must set
	// 'darkconsole.enabled' to use this option.
	'darkconsole.always-on' => false,


	// Allows you to mask certain configuration values from appearing in the
	// "Config" tab of DarkConsole.
	'darkconsole.config-mask' => array(
	'mysql.pass',
	'amazon-ses.secret-key',
	'amazon-s3.secret-key',
	'sendgrid.api-key',
	'recaptcha.private-key',
	'phabricator.csrf-key',
	'facebook.application-secret',
	'github.application-secret',
	'google.application-secret',
	'phabricator.application-secret',
	'disqus.application-secret',
	'phabricator.mail-key',
	'security.hmac-key',
	'ldap.anonymous-user-password',
	),


	// -- MySQL --------------------------------------------------------------- //

	// Class providing database configuration. It must implement
	// DatabaseConfigurationProvider.
	'mysql.configuration-provider' => 'DefaultDatabaseConfigurationProvider',

	// The username to use when connecting to MySQL.
	'mysql.user' => 'root',

	// The password to use when connecting to MySQL.
	'mysql.pass' => '',

	// The MySQL server to connect to. If you want to connect to a different
	// port than the default (which is 3306), specify it in the hostname
	// (e.g., db.example.com:1234).
	'mysql.host' => 'localhost',

	// The number of times to try reconnecting to the MySQL database
	'mysql.connection-retries' => 3,

	// Phabricator supports PHP extensions MySQL and MySQLi. It is possible to
	// implement also other access mechanism (e.g. PDO_MySQL). The class must
	// extend AphrontMySQLDatabaseConnectionBase.
	'mysql.implementation' => 'AphrontMySQLDatabaseConnection',


	// -- Notifications --------------------------------------------------------- //

	// Set this to true to enable real-time notifications. You must also run a
	// notification server for this to work. Consult the documentation in
	// "Notifications User Guide: Setup and Configuration" for instructions.
	'notification.enabled' => false,

	// Client port for the realtime server to listen on, and for realtime clients
	// to connect to. Use "localhost" if you are running the notification server
	// on the same host as the web server.
	'notification.client-uri' => 'http://localhost:22280/',

	// URI and port for the notification root server.
	'notification.server-uri' => 'http://localhost:22281/',

	// The server must be started as root so it can bind to privileged ports, but
	// if you specify a user here it will drop permissions after binding.
	'notification.user' => null,

	// Location where the server should log to.
	'notification.log' => '/var/log/aphlict.log',

	// PID file to use.
	'notification.pidfile' => '/var/run/aphlict.pid',

	// Enable this option to get additional debug output in the browser.
	'notification.debug' => false,


	// -- Email ----------------------------------------------------------------- //

	// Some Phabricator tools send email notifications, e.g. when Differential
	// revisions are updated or Maniphest tasks are changed. These options allow
	// you to configure how email is delivered.

	// You can test your mail setup by going to "MetaMTA" in the web interface,
	// clicking "Send New Message", and then composing a message.

	// Default address to send mail "From".
	'metamta.default-address' => 'noreply@example.com',

	// Domain used to generate Message-IDs.
	'metamta.domain' => 'example.com',

	// When a message is sent to multiple recipients (for example, several
	// reviewers on a code review), Phabricator can either deliver one email to
	// everyone (e.g., "To: alincoln, usgrant, htaft") or separate emails to each
	// user (e.g., "To: alincoln", "To: usgrant", "To: htaft"). The major
	// advantages and disadvantages of each approach are:
	//
	// - One mail to everyone:
	// - Recipients can see To/Cc at a glance.
	// - If you use mailing lists, you won't get duplicate mail if you're
	// a normal recipient and also Cc'd on a mailing list.
	// - Getting threading to work properly is harder, and probably requires
	// making mail less useful by turning off options.
	// - Sometimes people will "Reply All" and everyone will get two mails,
	// one from the user and one from Phabricator turning their mail into
	// a comment.
	// - Not supported with a private reply-to address.
	// - Mails are sent in the server default translation.
	// - One mail to each user:
	// - Recipients need to look in the mail body to see To/Cc.
	// - If you use mailing lists, recipients may sometimes get duplicate
	// mail.
	// - Getting threading to work properly is easier, and threading settings
	// can be customzied by each user.
	// - "Reply All" no longer spams all other users.
	// - Required if private reply-to addresses are configured.
	// - Mails are sent in the language of user preference.
	//
	// In the code, splitting one outbound email into one-per-recipient is
	// sometimes referred to as "multiplexing".
	'metamta.one-mail-per-recipient' => true,

	// When sending a message that has no To recipient (i.e. all recipients
	// are CC'd, for example when multiplexing mail), set the To field to the
	// following value. If no value is set, messages with no To will have
	// their CCs upgraded to To.
	'metamta.placeholder-to-recipient' => null,

	// When a user takes an action which generates an email notification (like
	// commenting on a Differential revision), Phabricator can either send that
	// mail "From" the user's email address (like "alincoln@logcabin.com") or
	// "From" the 'metamta.default-address' address. The user experience is
	// generally better if Phabricator uses the user's real address as the "From"
	// since the messages are easier to organize when they appear in mail clients,
	// but this will only work if the server is authorized to send email on behalf
	// of the "From" domain. Practically, this means:
	// - If you are doing an install for Example Corp and all the users will
	// have corporate @corp.example.com addresses and any hosts Phabricator
	// is running on are authorized to send email from corp.example.com,
	// you can enable this to make the user experience a little better.
	// - If you are doing an install for an open source project and your
	// users will be registering via Facebook and using personal email
	// addresses, you MUST NOT enable this or virtually all of your outgoing
	// email will vanish into SFP blackholes.
	// - If your install is anything else, you're much safer leaving this
	// off since the risk in turning it on is that your outgoing mail will
	// mostly never arrive.
	'metamta.can-send-as-user' => false,


	// Adapter class to use to transmit mail to the MTA. The default uses
	// PHPMailerLite, which will invoke "sendmail". This is appropriate
	// if sendmail actually works on your host, but if you haven't configured mail
	// it may not be so great. You can also use Amazon SES, by changing this to
	// 'PhabricatorMailImplementationAmazonSESAdapter', signing up for SES, and
	// filling in your 'amazon-ses.access-key' and 'amazon-ses.secret-key' below.
	'metamta.mail-adapter' =>
	'PhabricatorMailImplementationPHPMailerLiteAdapter',

	// When email is sent, try to hand it off to the MTA immediately instead of
	// queueing it for delivery by the daemons. If you are running the Phabricator
	// daemons with "phd start", you should disable this to provide a (sometimes
	// substantial) performance boost. It's on by default to make setup and
	// configuration a little easier.
	'metamta.send-immediately' => true,

	// When email is sent, what format should Phabricator use for user's
	// email addresses? Valid values are:
	// - 'short' - 'gwashington <gwashington@example.com>'
	// - 'real' - 'George Washington <gwashington@example.com>'
	// - 'full' - 'gwashington (George Washington) <gwashington@example.com>'
	// The default is 'full'.
	'metamta.user-address-format' => 'full',

	// If you're using PHPMailer to send email, provide the mailer and options
	// here. PHPMailer is a superior to PHPMailerLite and provides more mailers.
	// You need it when you want to use SMTP instead of sendmail as the mailer.
	'phpmailer.mailer' => 'smtp',
	'phpmailer.smtp-host' => '',
	'phpmailer.smtp-port' => 25,

	// Set following if your smtp server requires authentication.
	'phpmailer.smtp-user' => null,
	'phpmailer.smtp-password' => null,

	// If you're using Amazon SES to send email, provide your AWS access key
	// and AWS secret key here. To set up Amazon SES with Phabricator, you need
	// to:
	// - Make sure 'metamta.mail-adapter' is set to:
	// "PhabricatorMailImplementationAmazonSESAdapter"
	// - Make sure 'metamta.can-send-as-user' is false.
	// - Make sure 'metamta.default-address' is configured to something sensible.
	// - Make sure 'metamta.default-address' is a validated SES "From" address.
	'amazon-ses.access-key' => null,
	'amazon-ses.secret-key' => null,

	// If you're using Sendgrid to send email, provide your access credentials
	// here. This will use the REST API. You can also use Sendgrid as a normal
	// SMTP service.
	'sendgrid.api-user' => null,
	'sendgrid.api-key' => null,

	// You can configure a reply handler domain so that email sent from Maniphest
	// will have a special "Reply To" address like "T123+82+af19f@example.com"
	// that allows recipients to reply by email and interact with tasks. For
	// instructions on configurating reply handlers, see the article
	// "Configuring Inbound Email" in the Phabricator documentation. By default,
	// this is set to 'null' and Phabricator will use a generic 'noreply@' address
	// or the address of the acting user instead of a special reply handler
	// address (see 'metamta.default-address'). If you set a domain here,
	// Phabricator will begin generating private reply handler addresses. See
	// also 'metamta.maniphest.reply-handler' to further configure behavior.
	// This key should be set to the domain part after the @, like "example.com".
	'metamta.maniphest.reply-handler-domain' => null,

	// You can follow the instructions in "Configuring Inbound Email" in the
	// Phabricator documentation and set 'metamta.maniphest.reply-handler-domain'
	// to support updating Maniphest tasks by email. If you want more advanced
	// customization than this provides, you can override the reply handler
	// class with an implementation of your own. This will allow you to do things
	// like have a single public reply handler or change how private reply
	// handlers are generated and validated.
	//
	// This key should be set to a loadable subclass of
	// PhabricatorMailReplyHandler.
	'metamta.maniphest.reply-handler' => 'ManiphestReplyHandler',

	// If you don't want phabricator to take up an entire domain
	// (or subdomain for that matter), you can use this and set a common
	// prefix for mail sent by phabricator. It will make use of the fact that
	// a mail-address such as phabricator+D123+1hjk213h@example.com will be
	// delivered to the phabricator users mailbox.
	// Set this to the left part of the email address and it well get
	// prepended to all outgoing mail. If you want to use e.g.
	// 'phabricator@example.com' this should be set to 'phabricator'.
	'metamta.single-reply-handler-prefix' => null,

	// Prefix prepended to mail sent by Maniphest. You can change this to
	// distinguish between testing and development installs, for example.
	'metamta.maniphest.subject-prefix' => '[Maniphest]',

	- // See 'metamta.pholio.reply-handler-domain'. This does the same thing, but
	+ // See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
	// affects Pholio.
	'metamta.pholio.reply-handler-domain' => null,

	// Prefix prepended to mail sent by Pholio.
	'metamta.pholio.subject-prefix' => '[Pholio]',

	+ // See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
	+ // affects Macro.
	+ 'metamta.macro.reply-handler-domain' => null,
	+
	+ // Prefix prepended to mail sent by Macro.
	+ 'metamta.macro.subject-prefix' => '[Macro]',
	+
	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
	// but allows email replies via Differential.
	'metamta.differential.reply-handler-domain' => null,

	// See 'metamta.maniphest.reply-handler'. This does the same thing, but
	// affects Differential.
	'metamta.differential.reply-handler' => 'DifferentialReplyHandler',

	// Prefix prepended to mail sent by Differential.
	'metamta.differential.subject-prefix' => '[Differential]',

	// Set this to true if you want patches to be attached to mail from
	// Differential. This won't work if you are using SendGrid as your mail
	// adapter.
	'metamta.differential.attach-patches' => false,

	// To include patches in email bodies, set this to a positive integer. Patches
	// will be inlined if they are at most that many lines. For instance, a value
	// of 100 means "inline patches if they are no longer than 100 lines". By
	// default, patches are not inlined.
	'metamta.differential.inline-patches' => 0,

	// If you enable either of the options above, you can choose what format
	// patches are sent in. Valid options are 'unified' (like diff -u) or 'git'.
	'metamta.differential.patch-format' => 'unified',

	// Enables a different format for comments in differential emails.
	// Differential will create unified diffs around the comment, which
	// will give enough context for people who are only viewing the
	// reviews in email to understand what is going on. The context will
	// be created based on the range of the comment.
	'metamta.differential.unified-comment-context' => false,

	// Prefix prepended to mail sent by Diffusion.
	'metamta.diffusion.subject-prefix' => '[Diffusion]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
	// but allows email replies via Diffusion.
	'metamta.diffusion.reply-handler-domain' => null,

	// See 'metamta.maniphest.reply-handler'. This does the same thing, but
	// affects Diffusion.
	'metamta.diffusion.reply-handler' => 'PhabricatorAuditReplyHandler',

	// Set this to true if you want patches to be attached to commit notifications
	// from Diffusion. This won't work with SendGrid.
	'metamta.diffusion.attach-patches' => false,

	// To include patches in Diffusion email bodies, set this to a positive
	// integer. Patches will be inlined if they are at most that many lines.
	// By default, patches are not inlined.
	'metamta.diffusion.inline-patches' => 0,

	// If you've enabled attached patches or inline patches for commit emails, you
	// can establish a hard byte limit on their size. You should generally set
	// reasonable byte and time limits (defaults are 1MB and 60 seconds) to avoid
	// sending ridiculously enormous email for changes like "importing an external
	// library" or "accidentally committed this full-length movie as text".
	'metamta.diffusion.byte-limit' => 1024 * 1024,

	// If you've enabled attached patches or inline patches for commit emails, you
	// can establish a hard time limit on generating them.
	'metamta.diffusion.time-limit' => 60,

	// Prefix prepended to mail sent by Package.
	'metamta.package.subject-prefix' => '[Package]',

	// See 'metamta.maniphest.reply-handler'. This does similar thing for package
	// except that it only supports sending out mail and doesn't handle incoming
	// email.
	'metamta.package.reply-handler' => 'OwnersPackageReplyHandler',

	// By default, Phabricator generates unique reply-to addresses and sends a
	// separate email to each recipient when you enable reply handling. This is
	// more secure than using "From" to establish user identity, but can mean
	// users may receive multiple emails when they are on mailing lists. Instead,
	// you can use a single, non-unique reply to address and authenticate users
	// based on the "From" address by setting this to 'true'. This trades away
	// a little bit of security for convenience, but it's reasonable in many
	// installs. Object interactions are still protected using hashes in the
	// single public email address, so objects can not be replied to blindly.
	'metamta.public-replies' => false,

	// You can configure an email address like "bugs@phabricator.example.com"
	// which will automatically create Maniphest tasks when users send email
	// to it. This relies on the "From" address to authenticate users, so it is
	// is not completely secure. To set this up, enter a complete email
	// address like "bugs@phabricator.example.com" and then configure mail to
	// that address so it routed to Phabricator (if you've already configured
	// reply handlers, you're probably already done). See "Configuring Inbound
	// Email" in the documentation for more information.
	'metamta.maniphest.public-create-email' => null,

	// If you enable 'metamta.public-replies', Phabricator uses "From" to
	// authenticate users. You can additionally enable this setting to try to
	// authenticate with 'Reply-To'. Note that this is completely spoofable and
	// insecure (any user can set any 'Reply-To' address) but depending on the
	// nature of your install or other deliverability conditions this might be
	// okay. Generally, you can't do much more by spoofing Reply-To than be
	// annoying (you can write but not read content). But, you know, this is
	// still COMPLETELY INSECURE.
	'metamta.insecure-auth-with-reply-to' => false,

	// If you enable 'metamta.maniphest.public-create-email' and create an
	// email address like "bugs@phabricator.example.com", it will default to
	// rejecting mail which doesn't come from a known user. However, you might
	// want to let anyone send email to this address; to do so, set a default
	// author here (a Phabricator username). A typical use of this might be to
	// create a "System Agent" user called "bugs" and use that name here. If you
	// specify a valid username, mail will always be accepted and used to create
	// a task, even if the sender is not a system user. The original email
	// address will be stored in an 'From Email' field on the task.
	'metamta.maniphest.default-public-author' => null,

	// You can disable the Herald hints in email if users prefer smaller messages.
	// These are the links under the headers "MANAGE HERALD RULES" and
	// "WHY DID I GET THIS EMAIL?". If you set this to true, they will not appear
	// in any mail. Users can still navigate to the links via the web interface.
	'metamta.herald.show-hints' => true,

	// You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
	// smaller messages. The actions themselves will still work properly.
	'metamta.reply.show-hints' => true,

	// You can disable the "To:" and "Cc:" footers in mail if users prefer
	// smaller messages.
	'metamta.recipients.show-hints' => true,

	// If this option is enabled, Phabricator will add a "Precedence: bulk"
	// header to transactional mail (e.g., Differential, Maniphest and Herald
	// notifications). This may improve the behavior of some auto-responder
	// software and prevent it from replying. However, it may also cause
	// deliverability issues -- notably, you currently can not send this header
	// via Amazon SES, and enabling this option with SES will prevent delivery
	// of any affected mail.
	'metamta.precedence-bulk' => false,

	// Mail.app on OS X Lion won't respect threading headers unless the subject
	// is prefixed with "Re:". If you enable this option, Phabricator will add
	// "Re:" to the subject line of all mail which is expected to thread. If
	// you've set 'metamta.one-mail-per-recipient', users can override this
	// setting in their preferences.
	'metamta.re-prefix' => false,

	// If true, allow MetaMTA to change mail subjects to put text like
	// '[Accepted]' and '[Commented]' in them. This makes subjects more useful,
	// but might break threading on some clients. If you've set
	// 'metamta.one-mail-per-recipient', users can override this setting in their
	// preferences.
	'metamta.vary-subjects' => true,


	// -- Auth ------------------------------------------------------------------ //

	// Can users login with a username/password, or by following the link from
	// a password reset email? You can disable this and configure one or more
	// OAuth providers instead.
	'auth.password-auth-enabled' => true,

	// Maximum number of simultaneous web sessions each user is permitted to have.
	// Setting this to "1" will prevent a user from logging in on more than one
	// browser at the same time.
	'auth.sessions.web' => 5,

	// Maximum number of simultaneous Conduit sessions each user is permitted
	// to have.
	'auth.sessions.conduit' => 5,

	// Set this true to enable the Settings -> SSH Public Keys panel, which will
	// allow users to associated SSH public keys with their accounts. This is only
	// really useful if you're setting up services over SSH and want to use
	// Phabricator for authentication; in most situations you can leave this
	// disabled.
	'auth.sshkeys.enabled' => false,

	// If true, email addresses must be verified (by clicking a link in an
	// email) before a user can login. By default, verification is optional
	// unless 'auth.email-domains' is nonempty (see below).
	'auth.require-email-verification' => false,

	// You can restrict allowed email addresses to certain domains (like
	// "yourcompany.com") by setting a list of allowed domains here. Users will
	// only be allowed to register using email addresses at one of the domains,
	// and will only be able to add new email addresses for these domains. If
	// you configure this, it implies 'auth.require-email-verification'.
	//
	// To configure email domains, set a list of domains like this:
	//
	// array(
	// 'yourcompany.com',
	// 'yourcompany.co.uk',
	// )
	//
	// You should omit the "@" from domains. Note that the domain must match
	// exactly. If you allow "yourcompany.com", that permits "joe@yourcompany.com"
	// but rejects "joe@mail.yourcompany.com".
	'auth.email-domains' => array(),

	// You can provide an arbitrary block of HTML here, which will appear on the
	// login screen. Normally, you'd use this to provide login or registration
	// instructions to users.
	'auth.login-message' => null,


	// -- Accounts -------------------------------------------------------------- //

	// Is basic account information (email, real name, profile picture) editable?
	// If you set up Phabricator to automatically synchronize account information
	// from some other authoritative system, you can disable this to ensure
	// information remains consistent across both systems.
	'account.editable' => true,

	// When users set or reset a password, it must have at least this many
	// characters.
	'account.minimum-password-length' => 8,


	// -- Facebook OAuth -------------------------------------------------------- //

	// Can users use Facebook credentials to login to Phabricator?
	'facebook.auth-enabled' => false,

	// Can users use Facebook credentials to create new Phabricator accounts?
	'facebook.registration-enabled' => true,

	// Are Facebook accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'facebook.auth-permanent' => false,

	// The Facebook "Application ID" to use for Facebook API access.
	'facebook.application-id' => null,

	// The Facebook "Application Secret" to use for Facebook API access.
	'facebook.application-secret' => null,

	// Should Phabricator reject requests made by users with
	// Secure Browsing disabled?
	'facebook.require-https-auth' => false,

	// -- GitHub OAuth ---------------------------------------------------------- //

	// Can users use GitHub credentials to login to Phabricator?
	'github.auth-enabled' => false,

	// Can users use GitHub credentials to create new Phabricator accounts?
	'github.registration-enabled' => true,

	// Are GitHub accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'github.auth-permanent' => false,

	// The GitHub "Client ID" to use for GitHub API access.
	'github.application-id' => null,

	// The GitHub "Secret" to use for GitHub API access.
	'github.application-secret' => null,


	// -- Google OAuth ---------------------------------------------------------- //

	// Can users use Google credentials to login to Phabricator?
	'google.auth-enabled' => false,

	// Can users use Google credentials to create new Phabricator accounts?
	'google.registration-enabled' => true,

	// Are Google accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'google.auth-permanent' => false,

	// The Google "Client ID" to use for Google API access.
	'google.application-id' => null,

	// The Google "Client Secret" to use for Google API access.
	'google.application-secret' => null,

	// -- LDAP Auth ----------------------------------------------------- //
	// Enable ldap auth
	'ldap.auth-enabled' => false,

	// The LDAP server hostname
	'ldap.hostname' => '',

	// The LDAP server port
	'ldap.port' => 389,

	// The LDAP base domain name
	'ldap.base_dn' => '',

	// The attribute to be regarded as 'username'. Has to be unique
	'ldap.search_attribute' => '',

	// Perform a search to find a user
	// Many LDAP installations do not have the username in the dn, if this is
	// true for you set this to true and configure the username_attribute below
	'ldap.search-first' => false,

	// The attribute to search for if you have to search for a user
	'ldap.username-attribute' => '',

	// The attribute(s) to be regarded as 'real name'.
	// If more then one attribute is supplied the values of the attributes in
	// the array will be joined
	'ldap.real_name_attributes' => array(),

	// A domain name to use when authenticating against Active Directory
	// (e.g. 'example.com')
	'ldap.activedirectory_domain' => '',

	// The LDAP version
	'ldap.version' => 3,

	// LDAP Referrals Option
	// Whether referrals should be followed by the client
	// Should be set to 0 if you use Windows 2003 AD
	'ldap.referrals' => 1,

	// The anonymous user name to use before searching a user.
	// Many LDAP installations require login even before searching a user, set
	// this option to enable it.
	'ldap.anonymous-user-name' => '',

	// The password of the LDAP anonymous user.
	'ldap.anonymous-user-password' => '',


	// -- Disqus OAuth ---------------------------------------------------------- //

	// Can users use Disqus credentials to login to Phabricator?
	'disqus.auth-enabled' => false,

	// Can users use Disqus credentials to create new Phabricator accounts?
	'disqus.registration-enabled' => true,

	// Are Disqus accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'disqus.auth-permanent' => false,

	// The Disqus "Client ID" to use for Disqus API access.
	'disqus.application-id' => null,

	// The Disqus "Client Secret" to use for Disqus API access.
	'disqus.application-secret' => null,


	// -- Phabricator OAuth ----------------------------------------------------- //

	// Meta-town -- Phabricator is itself an OAuth Provider
	// TODO -- T887 -- make this support multiple Phabricator instances!

	// The URI of the Phabricator instance to use as an OAuth server.
	'phabricator.oauth-uri' => null,

	// Can users use Phabricator credentials to login to Phabricator?
	'phabricator.auth-enabled' => false,

	// Can users use Phabricator credentials to create new Phabricator accounts?
	'phabricator.registration-enabled' => true,

	// Are Phabricator accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'phabricator.auth-permanent' => false,

	// The Phabricator "Client ID" to use for Phabricator API access.
	'phabricator.application-id' => null,

	// The Phabricator "Client Secret" to use for Phabricator API access.
	'phabricator.application-secret' => null,


	// -- Recaptcha ------------------------------------------------------------- //

	// Is Recaptcha enabled? If disabled, captchas will not appear. You should
	// enable Recaptcha if your install is public-facing, as it hinders
	// brute-force attacks.
	'recaptcha.enabled' => false,

	// Your Recaptcha public key, obtained from Recaptcha.
	'recaptcha.public-key' => null,

	// Your Recaptcha private key, obtained from Recaptcha.
	'recaptcha.private-key' => null,


	// -- Misc ------------------------------------------------------------------ //

	// This is hashed with other inputs to generate CSRF tokens. If you want, you
	// can change it to some other string which is unique to your install. This
	// will make your install more secure in a vague, mostly theoretical way. But
	// it will take you like 3 seconds of mashing on your keyboard to set it up so
	// you might as well.
	'phabricator.csrf-key' => '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3',

	// This is hashed with other inputs to generate mail tokens. If you want, you
	// can change it to some other string which is unique to your install. In
	// particular, you will want to do this if you accidentally send a bunch of
	// mail somewhere you shouldn't have, to invalidate all old reply-to
	// addresses.
	'phabricator.mail-key' => '5ce3e7e8787f6e40dfae861da315a5cdf1018f12',

	// Version string displayed in the footer. You can generate this value from
	// Git log or from the current date in the deploy with a script like this:
	//
	// git log -n1 --pretty=%h > version.txt
	//
	// You can then use this generated value like this:
	//
	// 'phabricator.version' =>
	// file_get_contents(dirname(__FILE__).'/version.txt'),
	'phabricator.version' => 'UNSTABLE',

	// PHP requires that you set a timezone in your php.ini before using date
	// functions, or it will emit a warning. If this isn't possible (for instance,
	// because you are using HPHP) you can set some valid constant for
	// date_default_timezone_set() here and Phabricator will set it on your
	// behalf, silencing the warning.
	'phabricator.timezone' => null,

	// When unhandled exceptions occur, stack traces are hidden by default.
	// You can enable traces for development to make it easier to debug problems.
	'phabricator.show-stack-traces' => false,

	// Shows an error callout if a page generated PHP errors, warnings or notices.
	// This makes it harder to miss problems while developing Phabricator.
	'phabricator.show-error-callout' => false,

	// When users write comments which have URIs, they'll be automatically linked
	// if the protocol appears in this set. This whitelist is primarily to prevent
	// security issues like javascript:// URIs.
	'uri.allowed-protocols' => array(
	'http' => true,
	'https' => true,
	),

	// Tokenizers are UI controls which let the user select other users, email
	// addresses, project names, etc., by typing the first few letters and having
	// the control autocomplete from a list. They can load their data in two ways:
	// either in a big chunk up front, or as the user types. By default, the data
	// is loaded in a big chunk. This is simpler and performs better for small
	// datasets. However, if you have a very large number of users or projects,
	// (in the ballpark of more than a thousand), loading all that data may become
	// slow enough that it's worthwhile to query on demand instead. This makes
	// the typeahead slightly less responsive but overall performance will be much
	// better if you have a ton of stuff. You can figure out which setting is
	// best for your install by changing this setting and then playing with a
	// user tokenizer (like the user selectors in Maniphest or Differential) and
	// seeing which setting loads faster and feels better.
	'tokenizer.ondemand' => false,

	// By default, Phabricator includes some silly nonsense in the UI, such as
	// a submit button called "Clowncopterize" in Differential and a call to
	// "Leap Into Action". If you'd prefer more traditional UI strings like
	// "Submit", you can set this flag to disable most of the jokes and easter
	// eggs.
	'phabricator.serious-business' => false,


	// -- Files ----------------------------------------------------------------- //

	// Lists which uploaded file types may be viewed in the browser. If a file
	// has a mime type which does not appear in this list, it will always be
	// downloaded instead of displayed. This is mainly a usability
	// consideration, since browsers tend to freak out when viewing enormous
	// binary files.
	//
	// The keys in this array are viewable mime types; the values are the mime
	// types they will be delivered as when they are viewed in the browser.
	//
	// IMPORTANT: Configure 'security.alternate-file-domain' above! Your install
	// is NOT safe if it is left unconfigured.
	'files.viewable-mime-types' => array(
	'image/jpeg' => 'image/jpeg',
	'image/jpg' => 'image/jpg',
	'image/png' => 'image/png',
	'image/gif' => 'image/gif',
	'text/plain' => 'text/plain; charset=utf-8',
	'text/x-diff' => 'text/plain; charset=utf-8',

	// ".ico" favicon files, which have mime type diversity. See:
	// http://en.wikipedia.org/wiki/ICO_(file_format)#MIME_type
	'image/x-ico' => 'image/x-icon',
	'image/x-icon' => 'image/x-icon',
	'image/vnd.microsoft.icon' => 'image/x-icon',
	),

	// List of mime types which can be used as the source for an <img /> tag.
	// This should be a subset of 'files.viewable-mime-types' and exclude files
	// like text.
	'files.image-mime-types' => array(
	'image/jpeg' => true,
	'image/jpg' => true,
	'image/png' => true,
	'image/gif' => true,
	'image/x-ico' => true,
	'image/x-icon' => true,
	'image/vnd.microsoft.icon' => true,
	),

	// -- Storage --------------------------------------------------------------- //

	// Phabricator allows users to upload files, and can keep them in various
	// storage engines. This section allows you to configure which engines
	// Phabricator will use, and how it will use them.

	// The largest filesize Phabricator will store in the MySQL BLOB storage
	// engine, which just uses a database table to store files. While this isn't a
	// best practice, it's really easy to set up. Set this to 0 to disable use of
	// the MySQL blob engine.
	'storage.mysql-engine.max-size' => 1000000,

	// Phabricator provides a local disk storage engine, which just writes files
	// to some directory on local disk. The webserver must have read/write
	// permissions on this directory. This is straightforward and suitable for
	// most installs, but will not scale past one web frontend unless the path
	// is actually an NFS mount, since you'll end up with some of the files
	// written to each web frontend and no way for them to share. To use the
	// local disk storage engine, specify the path to a directory here. To
	// disable it, specify null.
	'storage.local-disk.path' => null,

	// If you want to store files in Amazon S3, specify an AWS access and secret
	// key here and a bucket name below.
	'amazon-s3.access-key' => null,
	'amazon-s3.secret-key' => null,

	// To use a custom endpoint, specify it here. Normally, you do not need to
	// configure this.
	'amazon-s3.endpoint' => null,

	// Set this to a valid Amazon S3 bucket to store files there. You must also
	// configure S3 access keys above.
	'storage.s3.bucket' => null,

	// Phabricator uses a storage engine selector to choose which storage engine
	// to use when writing file data. If you add new storage engines or want to
	// provide very custom rules (e.g., write images to one storage engine and
	// other files to a different one), you can provide an alternate
	// implementation here. The default engine will use choose MySQL, Local Disk,
	// and S3, in that order, if they have valid configurations above and a file
	// fits within configured limits.
	'storage.engine-selector' => 'PhabricatorDefaultFileStorageEngineSelector',

	// Set the size of the largest file a user may upload. This is used to render
	// text like "Maximum file size: 10MB" on interfaces where users can upload
	// files, and files larger than this size will be rejected.
	//
	// Specify this limit in bytes, or using a "K", "M", or "G" suffix.
	//
	// NOTE: Setting this to a large size is NOT sufficient to allow users to
	// upload large files. You must also configure a number of other settings. To
	// configure file upload limits, consult the article "Configuring File Upload
	// Limits" in the documentation. Once you've configured some limit across all
	// levels of the server, you can set this limit to an appropriate value and
	// the UI will then reflect the actual configured limit.
	'storage.upload-size-limit' => null,

	// Phabricator puts databases in a namespace, which defualts to "phabricator"
	// -- for instance, the Differential database is named
	// "phabricator_differential" by default. You can change this namespace if you
	// want. Normally, you should not do this unless you are developing
	// Phabricator and using namespaces to separate multiple sandbox datasets.
	'storage.default-namespace' => 'phabricator',


	// -- Search ---------------------------------------------------------------- //

	// Phabricator supports Elastic Search; to use it, specify a host like
	// 'http://elastic.example.com:9200/' here.
	'search.elastic.host' => null,

	// Phabricator uses a search engine selector to choose which search engine
	// to use when indexing and reconstructing documents, and when executing
	// queries. You can override the engine selector to provide a new selector
	// class which can select some custom engine you implement, if you want to
	// store your documents in some search engine which does not have default
	// support.
	'search.engine-selector' => 'PhabricatorDefaultSearchEngineSelector',


	// -- Differential ---------------------------------------------------------- //

	'differential.revision-custom-detail-renderer' => null,

	// Array for custom remarkup rules. The array should have a list of
	// class names of classes that extend PhutilRemarkupRule
	'differential.custom-remarkup-rules' => null,

	// Array for custom remarkup block rules. The array should have a list of
	// class names of classes that extend PhutilRemarkupEngineBlockRule
	'differential.custom-remarkup-block-rules' => null,

	// List of file regexps where whitespace is meaningful and should not
	// use 'ignore-all' by default
	'differential.whitespace-matters' => array(
	'/\.py$/',
	'/\.l?hs$/',
	),

	'differential.field-selector' => 'DifferentialDefaultFieldSelector',

	// Differential can show "Host" and "Path" fields on revisions, with
	// information about the machine and working directory where the
	// change came from. These fields are disabled by default because they may
	// occasionally have sensitive information; you can set this to true to
	// enable them.
	'differential.show-host-field' => false,

	// Differential has a required "Test Plan" field by default, which requires
	// authors to fill out information about how they verified the correctness of
	// their changes when sending code for review. If you'd prefer not to use
	// this field, you can disable it here. You can also make it optional
	// (instead of required) below.
	'differential.show-test-plan-field' => true,

	// Differential has a required "Test Plan" field by default. You can make it
	// optional by setting this to false. You can also completely remove it above,
	// if you prefer.
	'differential.require-test-plan-field' => true,

	// If you set this to true, users can "!accept" revisions via email (normally,
	// they can take other actions but can not "!accept"). This action is disabled
	// by default because email authentication can be configured to be very weak,
	// and, socially, email "!accept" is kind of sketchy and implies revisions may
	// not actually be receiving thorough review.
	'differential.enable-email-accept' => false,

	// If you set this to true, users won't need to login to view differential
	// revisions. Anonymous users will have read-only access and won't be able to
	// interact with the revisions.
	'differential.anonymous-access' => false,

	// If you set this to true, revision author email address information will
	// be exposed in Conduit. This is useful for Arcanist.
	//
	// For example, consider the "arc patch DX" workflow which needs to ask
	// Differential for the revision DX. This data often should contain
	// the author's email address, eg "George Washington
	// <gwashinton@example.com>" when DX is a git or mercurial revision. If this
	// option is false, Differential defaults to the best it can, something like
	// "George Washington" or "gwashington".
	'differential.expose-emails-prudently' => false,

	// List of file regexps that should be treated as if they are generated by
	// an automatic process, and thus get hidden by default in differential.
	'differential.generated-paths' => array(
	// '/config\.h$/',
	// '#/autobuilt/#',
	),

	// If you set this to true, users can accept their own revisions. This action
	// is disabled by default because it's most likely not a behavior you want,
	// but it proves useful if you are working alone on a project and want to make
	// use of all of differential's features.
	'differential.allow-self-accept' => false,

	// If you set this to true, any user can close any revision so long as it has
	// been accepted. This can be useful depending on your development model. For
	// example, github-style pull requests where the reviewer is often the
	// actual committer can benefit from turning this option to true. If false,
	// only the submitter can close a revision.
	'differential.always-allow-close' => false,

	// Revisions newer than this number of days are marked as fresh in Action
	// Required and Revisions Waiting on You views. Only work days (not weekends
	// and holidays) are included. Set to 0 to disable this feature.
	'differential.days-fresh' => 1,

	// Similar to 'differential.days-fresh' but marks stale revisions. If the
	// revision is even older than it is marked as old.
	'differential.days-stale' => 3,

	// -- Maniphest ------------------------------------------------------------- //

	'maniphest.enabled' => true,

	// Array of custom fields for Maniphest tasks. For details on adding custom
	// fields to Maniphest, see "Maniphest User Guide: Adding Custom Fields".
	'maniphest.custom-fields' => array(),

	// Class which drives custom field construction. See "Maniphest User Guide:
	// Adding Custom Fields" in the documentation for more information.
	'maniphest.custom-task-extensions-class' => 'ManiphestDefaultTaskExtensions',

	// What should the default task priority be in create flows?
	// See the constants in @{class:ManiphestTaskPriority} for valid values.
	// Defaults to "needs triage".
	'maniphest.default-priority' => 90,

	// -- Phriction ------------------------------------------------------------- //

	'phriction.enabled' => true,

	// -- Phame ----------------------------------------------------------------- //

	// Should Phame users have Disqus comment widget, and if so what's the
	// website shortname to use? For example, secure.phabricator.org uses
	// "phabricator", which we registered with Disqus. If you aren't familiar
	// with Disqus, see:
	// Disqus quick start guide - http://docs.disqus.com/help/4/
	// Information on shortnames - http://docs.disqus.com/help/68/
	'disqus.shortname' => null,

	// Directories to look for Phame skins inside of.
	'phame.skins' => array(
	'externals/skins/',
	),

	// -- Remarkup -------------------------------------------------------------- //

	// If you enable this, linked YouTube videos will be embeded inline. This has
	// mild security implications (you'll leak referrers to YouTube) and is pretty
	// silly (but sort of awesome).
	'remarkup.enable-embedded-youtube' => false,


	// -- Garbage Collection ---------------------------------------------------- //

	// Phabricator generates various logs and caches in the database which can
	// be garbage collected after a while to make the total data size more
	// manageable. To run garbage collection, launch a
	// PhabricatorGarbageCollector daemon.

	// Since the GC daemon can issue large writes and table scans, you may want to
	// run it only during off hours or make sure it is scheduled so it doesn't
	// overlap with backups. This determines when the daemon can start running
	// each day.
	'gcdaemon.run-at' => '12 AM',

	// How many seconds after 'gcdaemon.run-at' the daemon may collect garbage
	// for. By default it runs continuously, but you can set it to run for a
	// limited period of time. For instance, if you do backups at 3 AM, you might
	// run garbage collection for an hour beforehand. This is not a high-precision
	// limit so you may want to leave some room for the GC to actually stop, and
	// if you set it to something like 3 seconds you're on your own.
	'gcdaemon.run-for' => 24 * 60 * 60,

	// These 'ttl' keys configure how much old data the GC daemon keeps around.
	// Objects older than the ttl will be collected. Set any value to 0 to store
	// data indefinitely.

	'gcdaemon.ttl.herald-transcripts' => 30 * (24 * 60 * 60),
	'gcdaemon.ttl.daemon-logs' => 7 * (24 * 60 * 60),
	'gcdaemon.ttl.differential-parse-cache' => 14 * (24 * 60 * 60),
	'gcdaemon.ttl.markup-cache' => 30 * (24 * 60 * 60),
	'gcdaemon.ttl.task-archive' => 14 * (24 * 60 * 60),


	// -- Feed ------------------------------------------------------------------ //

	// If you set this to true, you can embed Phabricator activity feeds in other
	// pages using iframes. These feeds are completely public, and a login is not
	// required to view them! This is intended for things like open source
	// projects that want to expose an activity feed on the project homepage.
	//
	// NOTE: You must also set `policy.allow-public` to true for this setting
	// to work properly.
	'feed.public' => false,

	// If you set this to a list of http URIs, when a feed story is published a
	// task will be created for each uri that posts the story data to the uri.
	// Daemons automagically retry failures 100 times, waiting $fail_count * 60s
	// between each subsequent failure. Be sure to keep the daemon console
	// (/daemon/) open while developing and testing your end points.
	//
	// NOTE: URIs are not validated, the URI must return http status 200 within
	// 30 seconds, and no permission checks are performed.
	'feed.http-hooks' => array(),

	// -- Drydock --------------------------------------------------------------- //

	// Drydock is used to allocate various software resources. For example, it
	// allocates working copies so continuous integration tests can be executed.
	// It needs at least one host to allocate these resources on.
	//
	// Set this option to true to let Drydock use the localhost for allocations.
	// This is the simplest configuration, but the least scalable. You MUST
	// disable this if you run daemons on more than one machine -- if you do not,
	// a daemon on machine A may allocate a resource locally, and then a daemon
	// on machine B may try to access it.
	'drydock.localhost.enabled' => true,

	// If the localhost is available to Drydock, specify the path on disk where
	// Drydock should write files. You should create this directory and make sure
	// the user that the daemons run as has permission to write to it.
	'drydock.localhost.path' => '/var/drydock/',

	// If you want to use Drydock's builtin EC2 Blueprints, configure your AWS
	// EC2 credentials here.
	'amazon-ec2.access-key' => null,
	'amazon-ec2.secret-key' => null,


	// -- Customization --------------------------------------------------------- //

	// Paths to additional phutil libraries to load.
	'load-libraries' => array(),

	'aphront.default-application-configuration-class' =>
	'AphrontDefaultApplicationConfiguration',

	'controller.oauth-registration' =>
	'PhabricatorOAuthDefaultRegistrationController',


	// Directory that phd (the Phabricator daemon control script) should use to
	// track running daemons.
	'phd.pid-directory' => '/var/tmp/phd/pid',

	// Directory that the Phabricator daemons should use to store the log file
	'phd.log-directory' => '/var/tmp/phd/log',

	// Number of "TaskMaster" daemons that "phd start" should start. You can
	// raise this if you have a task backlog, or explicitly launch more with
	// "phd launch <N> taskmaster".
	'phd.start-taskmasters' => 4,

	// Launch daemons in "verbose" mode by default. This creates a lot of output,
	// but can help debug issues. Daemons launched in debug mode with "phd debug"
	// are always launched in verbose mode. See also 'phd.trace'.
	'phd.verbose' => false,

	// 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
	// "phd debug" are always launched in trace mdoe. See also 'phd.verbose'.
	'phd.trace' => false,

	// Path to custom celerity resource map relative to 'phabricator/src'.
	// See also `scripts/celerity_mapper.php`.
	'celerity.resource-path' => '__celerity_resource_map__.php',

	// This value is an input to the hash function when building resource hashes.
	// It has no security value, but if you accidentally poison user caches (by
	// pushing a bad patch or having something go wrong with a CDN, e.g.) you can
	// change this to something else and rebuild the Celerity map to break user
	// caches. Unless you are doing Celerity development, it is exceptionally
	// unlikely that you need to modify this.
	'celerity.resource-hash' => 'd9455ea150622ee044f7931dabfa52aa',

	// In a development environment, it is desirable to force static resources
	// (CSS and JS) to be read from disk on every request, so that edits to them
	// appear when you reload the page even if you haven't updated the resource
	// maps. This setting ensures requests will be verified against the state on
	// disk. Generally, you should leave this off in production (caching behavior
	// and performance improve with it off) but turn it on in development. (These
	// settings are the defaults.)
	'celerity.force-disk-reads' => false,

	// Minify static resources by removing whitespace and comments. You should
	// enable this in production, but disable it in development.
	'celerity.minify' => false,

	// You can respond to various application events by installing listeners,
	// which will receive callbacks when interesting things occur. Specify a list
	// of classes which extend PhabricatorEventListener here.
	'events.listeners' => array(),

	// -- Syntax Highlighting --------------------------------------------------- //

	// Phabricator can highlight PHP by default and use Pygments for other
	// languages if enabled. You can provide a custom highlighter engine by
	// extending class PhutilSyntaxHighlighterEngine.
	'syntax-highlighter.engine' => 'PhutilDefaultSyntaxHighlighterEngine',

	// If you want syntax highlighting for other languages than PHP then you can
	// install the python package 'Pygments', make sure the 'pygmentize' script is
	// available in the $PATH of the webserver, and then enable this.
	'pygments.enabled' => false,

	// In places that we display a dropdown to syntax-highlight code,
	// this is where that list is defined.
	// Syntax is 'lexer-name' => 'Display Name',
	'pygments.dropdown-choices' => array(
	'apacheconf' => 'Apache Configuration',
	'bash' => 'Bash Scripting',
	'brainfuck' => 'Brainf*ck',
	'c' => 'C',
	'cpp' => 'C++',
	'css' => 'CSS',
	'd' => 'D',
	'diff' => 'Diff',
	'django' => 'Django Templating',
	'erb' => 'Embedded Ruby/ERB',
	'erlang' => 'Erlang',
	'haskell' => 'Haskell',
	'html' => 'HTML',
	'java' => 'Java',
	'js' => 'Javascript',
	'mysql' => 'MySQL',
	'objc' => 'Objective-C',
	'perl' => 'Perl',
	'php' => 'PHP',
	'rest' => 'reStructuredText',
	'text' => 'Plain Text',
	'python' => 'Python',
	'rainbow' => 'Rainbow',
	'remarkup' => 'Remarkup',
	'ruby' => 'Ruby',
	'xml' => 'XML',
	),

	// This is an override list of regular expressions which allows you to choose
	// what language files are highlighted as. If your projects have certain rules
	// about filenames or use unusual or ambiguous language extensions, you can
	// create a mapping here. This is an ordered dictionary of regular expressions
	// which will be tested against the filename. They should map to either an
	// explicit language as a string value, or a numeric index into the captured
	// groups as an integer.
	'syntax.filemap' => array(
	// Example: Treat all '*.xyz' files as PHP.
	// '@\\.xyz$@' => 'php',

	// Example: Treat 'httpd.conf' as 'apacheconf'.
	// '@/httpd\\.conf$@' => 'apacheconf',

	// Example: Treat all '*.x.bak' file as '.x'. NOTE: we map to capturing
	// group 1 by specifying the mapping as "1".
	// '@\\.([^.]+)\\.bak$@' => 1,

	'@\.arcconfig$@' => 'js',
	'@\.divinerconfig$@' => 'js',
	),

	// Set the default monospaced font style for users who haven't set a custom
	// style.
	'style.monospace' => '10px "Menlo", "Consolas", "Monaco", monospace',


	// -- Debugging ------------------------------------------------------------- //

	// Enable this to change HTTP redirects into normal pages with a link to the
	// redirection target. For example, after you submit a form you'll get a page
	// saying "normally, you'd be redirected...". This is useful to examine
	// service or profiler information on write pathways, or debug redirects. It
	// also makes the UX horrible for normal use, so you should enable it only
	// when debugging.
	//
	// NOTE: This does not currently work for forms with Javascript "workflow",
	// since the redirect happens in Javascript.
	'debug.stop-on-redirect' => false,

	// Set the rate for how often to do sampled profiling. On average, one
	// request for every number of requests specified here will be sampled.
	// Set this value to 0 to completely disable profiling. In a production
	// environment, this value should either be set to 0 (to disable) or to
	// a large number (to sample only a few requests).
	'debug.profile-rate' => 0,


	// -- Previews ------------------------------------------------------------- //

	// Turn on to enable the "viewport" meta tag. This is a preview feature which
	// will improve the usability of Phabricator on phones and tablets once it
	// is ready.
	'preview.viewport-meta-tag' => false,

	// -- Environment ---------------------------------------------------------- //

	// Phabricator occasionally shells out to other binaries on the server.
	// An example of this is the "pygmentize" command, used to syntax-highlight
	// code written in languages other than PHP. By default, it is assumed that
	// these binaries are in the $PATH of the user running Phabricator (normally
	// 'apache', 'httpd', or 'nobody'). Here you can add extra directories to
	// the $PATH environment variable, for when these binaries are in non-standard
	// locations.
	'environment.append-paths' => array(),
	);
	diff --git a/resources/sql/patches/20121209.xmacroadd.sql b/resources/sql/patches/20121209.xmacroadd.sql
	new file mode 100644
	index 0000000000..98237f1703
	--- /dev/null
	+++ b/resources/sql/patches/20121209.xmacroadd.sql
	@@ -0,0 +1,54 @@
	+CREATE TABLE {$NAMESPACE}_file.macro_transaction (
	+ id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
	+ phid VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ authorPHID VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ objectPHID VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ viewPolicy VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ editPolicy VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ commentPHID VARCHAR(64) COLLATE utf8_bin,
	+ commentVersion INT UNSIGNED NOT NULL,
	+ transactionType VARCHAR(32) NOT NULL COLLATE utf8_bin,
	+ oldValue LONGTEXT NOT NULL COLLATE utf8_bin,
	+ newValue LONGTEXT NOT NULL COLLATE utf8_bin,
	+ contentSource LONGTEXT NOT NULL COLLATE utf8_bin,
	+ dateCreated INT UNSIGNED NOT NULL,
	+ dateModified INT UNSIGNED NOT NULL,
	+
	+ UNIQUE KEY `key_phid` (phid),
	+ KEY `key_object` (objectPHID)
	+
	+) ENGINE=InnoDB, COLLATE utf8_general_ci;
	+
	+CREATE TABLE {$NAMESPACE}_file.macro_transaction_comment (
	+ id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
	+ phid VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ transactionPHID VARCHAR(64) COLLATE utf8_bin,
	+ authorPHID VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ viewPolicy VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ editPolicy VARCHAR(64) NOT NULL COLLATE utf8_bin,
	+ commentVersion INT UNSIGNED NOT NULL,
	+ content LONGTEXT NOT NULL COLLATE utf8_bin,
	+ contentSource LONGTEXT NOT NULL COLLATE utf8_bin,
	+ isDeleted BOOL NOT NULL,
	+ dateCreated INT UNSIGNED NOT NULL,
	+ dateModified INT UNSIGNED NOT NULL,
	+
	+ UNIQUE KEY `key_phid` (phid),
	+ UNIQUE KEY `key_version` (transactionPHID, commentVersion)
	+
	+) ENGINE=InnoDB, COLLATE utf8_general_ci;
	+
	+ALTER TABLE {$NAMESPACE}_file.file_imagemacro
	+ ADD dateCreated INT UNSIGNED NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_file.file_imagemacro
	+ ADD dateModified INT UNSIGNED NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_file.file_imagemacro
	+ ADD phid VARCHAR(64) NOT NULL COLLATE utf8_bin AFTER id;
	+
	+ALTER TABLE {$NAMESPACE}_file.file_imagemacro
	+ ADD isDisabled BOOL NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_file.file_imagemacro
	+ ADD KEY `key_disabled` (isDisabled);
	diff --git a/resources/sql/patches/20121209.xmacromigrate.php b/resources/sql/patches/20121209.xmacromigrate.php
	new file mode 100644
	index 0000000000..d31f40fd92
	--- /dev/null
	+++ b/resources/sql/patches/20121209.xmacromigrate.php
	@@ -0,0 +1,18 @@
	+<?php
	+
	+echo "Giving image macros PHIDs";
	+foreach (new LiskMigrationIterator(new PhabricatorFileImageMacro()) as $macro) {
	+ if ($macro->getPHID()) {
	+ continue;
	+ }
	+
	+ echo ".";
	+
	+ queryfx(
	+ $macro->establishConnection('r'),
	+ 'UPDATE %T SET phid = %s WHERE id = %d',
	+ $macro->getTableName(),
	+ $macro->generatePHID(),
	+ $macro->getID());
	+}
	+echo "\nDone.\n";
	diff --git a/resources/sql/patches/20121209.xmacromigratekey.sql b/resources/sql/patches/20121209.xmacromigratekey.sql
	new file mode 100644
	index 0000000000..3285c77f09
	--- /dev/null
	+++ b/resources/sql/patches/20121209.xmacromigratekey.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_file.file_imagemacro
	+ ADD UNIQUE KEY `key_phid` (phid);
	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index 644c43f8d0..f1296f6878 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,2553 +1,2574 @@
	<?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(
	'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',
	'AphrontAttachedFileView' => 'view/control/AphrontAttachedFileView.php',
	'AphrontCSRFException' => 'aphront/exception/AphrontCSRFException.php',
	'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
	'AphrontCalendarMonthView' => 'applications/calendar/view/AphrontCalendarMonthView.php',
	'AphrontContextBarView' => 'view/layout/AphrontContextBarView.php',
	'AphrontController' => 'aphront/AphrontController.php',
	'AphrontCrumbsView' => 'view/layout/AphrontCrumbsView.php',
	'AphrontCursorPagerView' => 'view/control/AphrontCursorPagerView.php',
	'AphrontDefaultApplicationConfiguration' => 'aphront/configuration/AphrontDefaultApplicationConfiguration.php',
	'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php',
	'AphrontDialogView' => 'view/AphrontDialogView.php',
	'AphrontErrorView' => 'view/form/AphrontErrorView.php',
	'AphrontException' => 'aphront/exception/AphrontException.php',
	'AphrontFileResponse' => 'aphront/response/AphrontFileResponse.php',
	'AphrontFormCheckboxControl' => 'view/form/control/AphrontFormCheckboxControl.php',
	'AphrontFormControl' => 'view/form/control/AphrontFormControl.php',
	'AphrontFormDateControl' => 'view/form/control/AphrontFormDateControl.php',
	'AphrontFormDividerControl' => 'view/form/control/AphrontFormDividerControl.php',
	'AphrontFormDragAndDropUploadControl' => 'view/form/control/AphrontFormDragAndDropUploadControl.php',
	'AphrontFormFileControl' => 'view/form/control/AphrontFormFileControl.php',
	'AphrontFormImageControl' => 'view/form/control/AphrontFormImageControl.php',
	'AphrontFormInsetView' => 'view/form/AphrontFormInsetView.php',
	'AphrontFormLayoutView' => 'view/form/AphrontFormLayoutView.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',
	'AphrontFormToggleButtonsControl' => 'view/form/control/AphrontFormToggleButtonsControl.php',
	'AphrontFormTokenizerControl' => 'view/form/control/AphrontFormTokenizerControl.php',
	'AphrontFormView' => 'view/form/AphrontFormView.php',
	'AphrontHTMLResponse' => 'aphront/response/AphrontHTMLResponse.php',
	'AphrontHTTPSink' => 'aphront/sink/AphrontHTTPSink.php',
	'AphrontHTTPSinkTestCase' => 'aphront/sink/__tests__/AphrontHTTPSinkTestCase.php',
	'AphrontHeadsupActionListView' => 'view/layout/headsup/AphrontHeadsupActionListView.php',
	'AphrontHeadsupActionView' => 'view/layout/headsup/AphrontHeadsupActionView.php',
	'AphrontHeadsupView' => 'view/layout/headsup/AphrontHeadsupView.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',
	'AphrontMiniPanelView' => 'view/layout/AphrontMiniPanelView.php',
	'AphrontMoreView' => 'view/layout/AphrontMoreView.php',
	'AphrontMySQLDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php',
	'AphrontNullView' => 'view/AphrontNullView.php',
	'AphrontPHPHTTPSink' => 'aphront/sink/AphrontPHPHTTPSink.php',
	'AphrontPageView' => 'view/page/AphrontPageView.php',
	'AphrontPagerView' => 'view/control/AphrontPagerView.php',
	'AphrontPanelView' => 'view/layout/AphrontPanelView.php',
	'AphrontPlainTextResponse' => 'aphront/response/AphrontPlainTextResponse.php',
	'AphrontProxyResponse' => 'aphront/response/AphrontProxyResponse.php',
	'AphrontRedirectException' => 'aphront/exception/AphrontRedirectException.php',
	'AphrontRedirectResponse' => 'aphront/response/AphrontRedirectResponse.php',
	'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php',
	'AphrontRequest' => 'aphront/AphrontRequest.php',
	'AphrontRequestFailureView' => 'view/page/AphrontRequestFailureView.php',
	'AphrontRequestTestCase' => 'aphront/__tests__/AphrontRequestTestCase.php',
	'AphrontResponse' => 'aphront/response/AphrontResponse.php',
	'AphrontSideNavFilterView' => 'view/layout/AphrontSideNavFilterView.php',
	'AphrontTableView' => 'view/control/AphrontTableView.php',
	'AphrontTokenizerTemplateView' => 'view/control/AphrontTokenizerTemplateView.php',
	'AphrontTypeaheadTemplateView' => 'view/control/AphrontTypeaheadTemplateView.php',
	'AphrontURIMapper' => 'aphront/AphrontURIMapper.php',
	'AphrontUsageException' => 'aphront/exception/AphrontUsageException.php',
	'AphrontView' => 'view/AphrontView.php',
	'AphrontWebpageResponse' => 'aphront/response/AphrontWebpageResponse.php',
	'CelerityAPI' => 'infrastructure/celerity/CelerityAPI.php',
	'CelerityPhabricatorResourceController' => 'infrastructure/celerity/CelerityPhabricatorResourceController.php',
	'CelerityResourceController' => 'infrastructure/celerity/CelerityResourceController.php',
	'CelerityResourceGraph' => 'infrastructure/celerity/CelerityResourceGraph.php',
	'CelerityResourceMap' => 'infrastructure/celerity/CelerityResourceMap.php',
	'CelerityResourceTransformer' => 'infrastructure/celerity/CelerityResourceTransformer.php',
	'CelerityResourceTransformerTestCase' => 'infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php',
	'CeleritySpriteGenerator' => 'infrastructure/celerity/CeleritySpriteGenerator.php',
	'CelerityStaticResourceResponse' => 'infrastructure/celerity/CelerityStaticResourceResponse.php',
	'ConduitAPIMethod' => 'applications/conduit/method/ConduitAPIMethod.php',
	'ConduitAPIRequest' => 'applications/conduit/protocol/ConduitAPIRequest.php',
	'ConduitAPIResponse' => 'applications/conduit/protocol/ConduitAPIResponse.php',
	'ConduitAPI_arcanist_Method' => 'applications/conduit/method/arcanist/ConduitAPI_arcanist_Method.php',
	'ConduitAPI_arcanist_projectinfo_Method' => 'applications/conduit/method/arcanist/ConduitAPI_arcanist_projectinfo_Method.php',
	'ConduitAPI_audit_Method' => 'applications/conduit/method/audit/ConduitAPI_audit_Method.php',
	'ConduitAPI_audit_query_Method' => 'applications/conduit/method/audit/ConduitAPI_audit_query_Method.php',
	'ConduitAPI_chatlog_Method' => 'applications/conduit/method/chatlog/ConduitAPI_chatlog_Method.php',
	'ConduitAPI_chatlog_query_Method' => 'applications/conduit/method/chatlog/ConduitAPI_chatlog_query_Method.php',
	'ConduitAPI_chatlog_record_Method' => 'applications/conduit/method/chatlog/ConduitAPI_chatlog_record_Method.php',
	'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_connect_Method.php',
	'ConduitAPI_conduit_getcertificate_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_getcertificate_Method.php',
	'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_ping_Method.php',
	'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_launched_Method.php',
	'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_log_Method.php',
	'ConduitAPI_daemon_setstatus_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_setstatus_Method.php',
	'ConduitAPI_differential_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_Method.php',
	'ConduitAPI_differential_close_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_close_Method.php',
	'ConduitAPI_differential_createcomment_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createcomment_Method.php',
	'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_creatediff_Method.php',
	'ConduitAPI_differential_createinline_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createinline_Method.php',
	'ConduitAPI_differential_createrawdiff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createrawdiff_Method.php',
	'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createrevision_Method.php',
	'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_find_Method.php',
	'ConduitAPI_differential_finishpostponedlinters_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_finishpostponedlinters_Method.php',
	'ConduitAPI_differential_getalldiffs_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getalldiffs_Method.php',
	'ConduitAPI_differential_getcommitmessage_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getcommitmessage_Method.php',
	'ConduitAPI_differential_getcommitpaths_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getcommitpaths_Method.php',
	'ConduitAPI_differential_getdiff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getdiff_Method.php',
	'ConduitAPI_differential_getrevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getrevision_Method.php',
	'ConduitAPI_differential_getrevisioncomments_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getrevisioncomments_Method.php',
	'ConduitAPI_differential_getrevisionfeedback_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getrevisionfeedback_Method.php',
	'ConduitAPI_differential_markcommitted_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_markcommitted_Method.php',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php',
	'ConduitAPI_differential_query_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_query_Method.php',
	'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_setdiffproperty_Method.php',
	'ConduitAPI_differential_updaterevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_updaterevision_Method.php',
	'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_updatetaskrevisionassoc_Method.php',
	'ConduitAPI_differential_updateunitresults_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_updateunitresults_Method.php',
	'ConduitAPI_diffusion_findsymbols_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_findsymbols_Method.php',
	'ConduitAPI_diffusion_getcommits_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_getcommits_Method.php',
	'ConduitAPI_diffusion_getlintmessages_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_getlintmessages_Method.php',
	'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php',
	'ConduitAPI_feed_publish_Method' => 'applications/conduit/method/feed/ConduitAPI_feed_publish_Method.php',
	'ConduitAPI_feed_query_Method' => 'applications/conduit/method/feed/ConduitAPI_feed_query_Method.php',
	'ConduitAPI_file_download_Method' => 'applications/conduit/method/file/ConduitAPI_file_download_Method.php',
	'ConduitAPI_file_info_Method' => 'applications/conduit/method/file/ConduitAPI_file_info_Method.php',
	'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/ConduitAPI_file_upload_Method.php',
	'ConduitAPI_flag_Method' => 'applications/conduit/method/flag/ConduitAPI_flag_Method.php',
	'ConduitAPI_flag_delete_Method' => 'applications/conduit/method/flag/ConduitAPI_flag_delete_Method.php',
	'ConduitAPI_flag_edit_Method' => 'applications/conduit/method/flag/ConduitAPI_flag_edit_Method.php',
	'ConduitAPI_flag_query_Method' => 'applications/conduit/method/flag/ConduitAPI_flag_query_Method.php',
	'ConduitAPI_macro_Method' => 'applications/conduit/method/macro/ConduitAPI_macro_Method.php',
	'ConduitAPI_macro_query_Method' => 'applications/conduit/method/macro/ConduitAPI_macro_query_Method.php',
	'ConduitAPI_maniphest_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_Method.php',
	'ConduitAPI_maniphest_createtask_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_createtask_Method.php',
	'ConduitAPI_maniphest_find_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_find_Method.php',
	'ConduitAPI_maniphest_gettasktransactions_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_gettasktransactions_Method.php',
	'ConduitAPI_maniphest_info_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_info_Method.php',
	'ConduitAPI_maniphest_query_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_query_Method.php',
	'ConduitAPI_maniphest_update_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_update_Method.php',
	'ConduitAPI_owners_query_Method' => 'applications/conduit/method/owners/ConduitAPI_owners_query_Method.php',
	'ConduitAPI_paste_Method' => 'applications/paste/conduit/ConduitAPI_paste_Method.php',
	'ConduitAPI_paste_create_Method' => 'applications/paste/conduit/ConduitAPI_paste_create_Method.php',
	'ConduitAPI_paste_info_Method' => 'applications/paste/conduit/ConduitAPI_paste_info_Method.php',
	'ConduitAPI_paste_query_Method' => 'applications/paste/conduit/ConduitAPI_paste_query_Method.php',
	'ConduitAPI_phid_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_Method.php',
	'ConduitAPI_phid_info_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_info_Method.php',
	'ConduitAPI_phid_lookup_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_lookup_Method.php',
	'ConduitAPI_phid_query_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_query_Method.php',
	'ConduitAPI_phpast_getast_Method' => 'applications/conduit/method/phpast/ConduitAPI_phpast_getast_Method.php',
	'ConduitAPI_phpast_version_Method' => 'applications/conduit/method/phpast/ConduitAPI_phpast_version_Method.php',
	'ConduitAPI_phriction_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_Method.php',
	'ConduitAPI_phriction_edit_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_edit_Method.php',
	'ConduitAPI_phriction_history_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_history_Method.php',
	'ConduitAPI_phriction_info_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_info_Method.php',
	'ConduitAPI_project_Method' => 'applications/conduit/method/project/ConduitAPI_project_Method.php',
	'ConduitAPI_project_query_Method' => 'applications/conduit/method/project/ConduitAPI_project_query_Method.php',
	'ConduitAPI_remarkup_process_Method' => 'applications/conduit/method/remarkup/ConduitAPI_remarkup_process_Method.php',
	'ConduitAPI_repository_Method' => 'applications/conduit/method/repository/ConduitAPI_repository_Method.php',
	'ConduitAPI_repository_create_Method' => 'applications/conduit/method/repository/ConduitAPI_repository_create_Method.php',
	'ConduitAPI_repository_query_Method' => 'applications/conduit/method/repository/ConduitAPI_repository_query_Method.php',
	'ConduitAPI_slowvote_info_Method' => 'applications/conduit/method/slowvote/ConduitAPI_slowvote_info_Method.php',
	'ConduitAPI_user_Method' => 'applications/conduit/method/user/ConduitAPI_user_Method.php',
	'ConduitAPI_user_addstatus_Method' => 'applications/conduit/method/user/ConduitAPI_user_addstatus_Method.php',
	'ConduitAPI_user_disable_Method' => 'applications/conduit/method/user/ConduitAPI_user_disable_Method.php',
	'ConduitAPI_user_enable_Method' => 'applications/conduit/method/user/ConduitAPI_user_enable_Method.php',
	'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/ConduitAPI_user_find_Method.php',
	'ConduitAPI_user_info_Method' => 'applications/conduit/method/user/ConduitAPI_user_info_Method.php',
	'ConduitAPI_user_query_Method' => 'applications/conduit/method/user/ConduitAPI_user_query_Method.php',
	'ConduitAPI_user_removestatus_Method' => 'applications/conduit/method/user/ConduitAPI_user_removestatus_Method.php',
	'ConduitAPI_user_whoami_Method' => 'applications/conduit/method/user/ConduitAPI_user_whoami_Method.php',
	'ConduitCall' => 'applications/conduit/call/ConduitCall.php',
	'ConduitCallTestCase' => 'applications/conduit/call/__tests__/ConduitCallTestCase.php',
	'ConduitException' => 'applications/conduit/protocol/ConduitException.php',
	'DarkConsoleConfigPlugin' => 'aphront/console/plugin/DarkConsoleConfigPlugin.php',
	'DarkConsoleController' => 'aphront/console/DarkConsoleController.php',
	'DarkConsoleCore' => 'aphront/console/DarkConsoleCore.php',
	'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/DarkConsoleErrorLogPlugin.php',
	'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php',
	'DarkConsoleEventPlugin' => 'aphront/console/plugin/DarkConsoleEventPlugin.php',
	'DarkConsoleEventPluginAPI' => 'aphront/console/plugin/event/DarkConsoleEventPluginAPI.php',
	'DarkConsolePlugin' => 'aphront/console/plugin/DarkConsolePlugin.php',
	'DarkConsoleRequestPlugin' => 'aphront/console/plugin/DarkConsoleRequestPlugin.php',
	'DarkConsoleServicesPlugin' => 'aphront/console/plugin/DarkConsoleServicesPlugin.php',
	'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/DarkConsoleXHProfPlugin.php',
	'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php',
	'DatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DatabaseConfigurationProvider.php',
	'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php',
	'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php',
	'DifferentialActionHasNoEffectException' => 'applications/differential/exception/DifferentialActionHasNoEffectException.php',
	'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php',
	'DifferentialAffectedPath' => 'applications/differential/storage/DifferentialAffectedPath.php',
	'DifferentialApplyPatchFieldSpecification' => 'applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php',
	'DifferentialArcanistProjectFieldSpecification' => 'applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php',
	'DifferentialAuditorsFieldSpecification' => 'applications/differential/field/specification/DifferentialAuditorsFieldSpecification.php',
	'DifferentialAuthorFieldSpecification' => 'applications/differential/field/specification/DifferentialAuthorFieldSpecification.php',
	'DifferentialAuxiliaryField' => 'applications/differential/storage/DifferentialAuxiliaryField.php',
	'DifferentialBlameRevisionFieldSpecification' => 'applications/differential/field/specification/DifferentialBlameRevisionFieldSpecification.php',
	'DifferentialBranchFieldSpecification' => 'applications/differential/field/specification/DifferentialBranchFieldSpecification.php',
	'DifferentialCCWelcomeMail' => 'applications/differential/mail/DifferentialCCWelcomeMail.php',
	'DifferentialCCsFieldSpecification' => 'applications/differential/field/specification/DifferentialCCsFieldSpecification.php',
	'DifferentialChangeSetTestCase' => 'applications/differential/storage/__tests__/DifferentialChangesetTestCase.php',
	'DifferentialChangeType' => 'applications/differential/constants/DifferentialChangeType.php',
	'DifferentialChangeset' => 'applications/differential/storage/DifferentialChangeset.php',
	'DifferentialChangesetDetailView' => 'applications/differential/view/DifferentialChangesetDetailView.php',
	'DifferentialChangesetListView' => 'applications/differential/view/DifferentialChangesetListView.php',
	'DifferentialChangesetParser' => 'applications/differential/parser/DifferentialChangesetParser.php',
	'DifferentialChangesetParserTestCase' => 'applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php',
	'DifferentialChangesetRenderer' => 'applications/differential/render/DifferentialChangesetRenderer.php',
	'DifferentialChangesetTwoUpRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpRenderer.php',
	'DifferentialChangesetViewController' => 'applications/differential/controller/DifferentialChangesetViewController.php',
	'DifferentialComment' => 'applications/differential/storage/DifferentialComment.php',
	'DifferentialCommentEditor' => 'applications/differential/editor/DifferentialCommentEditor.php',
	'DifferentialCommentMail' => 'applications/differential/mail/DifferentialCommentMail.php',
	'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
	'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
	'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/DifferentialCommitsFieldSpecification.php',
	'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
	'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
	'DifferentialDateCreatedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php',
	'DifferentialDateModifiedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateModifiedFieldSpecification.php',
	'DifferentialDefaultFieldSelector' => 'applications/differential/field/selector/DifferentialDefaultFieldSelector.php',
	'DifferentialDependenciesFieldSpecification' => 'applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php',
	'DifferentialDependsOnFieldSpecification' => 'applications/differential/field/specification/DifferentialDependsOnFieldSpecification.php',
	'DifferentialDiff' => 'applications/differential/storage/DifferentialDiff.php',
	'DifferentialDiffContentMail' => 'applications/differential/mail/DifferentialDiffContentMail.php',
	'DifferentialDiffCreateController' => 'applications/differential/controller/DifferentialDiffCreateController.php',
	'DifferentialDiffProperty' => 'applications/differential/storage/DifferentialDiffProperty.php',
	'DifferentialDiffTableOfContentsView' => 'applications/differential/view/DifferentialDiffTableOfContentsView.php',
	'DifferentialDiffTestCase' => 'applications/differential/storage/__tests__/DifferentialDiffTestCase.php',
	'DifferentialDiffViewController' => 'applications/differential/controller/DifferentialDiffViewController.php',
	'DifferentialException' => 'applications/differential/exception/DifferentialException.php',
	'DifferentialExceptionMail' => 'applications/differential/mail/DifferentialExceptionMail.php',
	'DifferentialExportPatchFieldSpecification' => 'applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php',
	'DifferentialFieldDataNotAvailableException' => 'applications/differential/field/exception/DifferentialFieldDataNotAvailableException.php',
	'DifferentialFieldParseException' => 'applications/differential/field/exception/DifferentialFieldParseException.php',
	'DifferentialFieldSelector' => 'applications/differential/field/selector/DifferentialFieldSelector.php',
	'DifferentialFieldSpecification' => 'applications/differential/field/specification/DifferentialFieldSpecification.php',
	'DifferentialFieldSpecificationIncompleteException' => 'applications/differential/field/exception/DifferentialFieldSpecificationIncompleteException.php',
	'DifferentialFieldValidationException' => 'applications/differential/field/exception/DifferentialFieldValidationException.php',
	'DifferentialFreeformFieldSpecification' => 'applications/differential/field/specification/DifferentialFreeformFieldSpecification.php',
	'DifferentialGitSVNIDFieldSpecification' => 'applications/differential/field/specification/DifferentialGitSVNIDFieldSpecification.php',
	'DifferentialHostFieldSpecification' => 'applications/differential/field/specification/DifferentialHostFieldSpecification.php',
	'DifferentialHunk' => 'applications/differential/storage/DifferentialHunk.php',
	'DifferentialHunkTestCase' => 'applications/differential/storage/__tests__/DifferentialHunkTestCase.php',
	'DifferentialInlineComment' => 'applications/differential/storage/DifferentialInlineComment.php',
	'DifferentialInlineCommentEditController' => 'applications/differential/controller/DifferentialInlineCommentEditController.php',
	'DifferentialInlineCommentEditView' => 'applications/differential/view/DifferentialInlineCommentEditView.php',
	'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/DifferentialInlineCommentPreviewController.php',
	'DifferentialInlineCommentView' => 'applications/differential/view/DifferentialInlineCommentView.php',
	'DifferentialLinesFieldSpecification' => 'applications/differential/field/specification/DifferentialLinesFieldSpecification.php',
	'DifferentialLintFieldSpecification' => 'applications/differential/field/specification/DifferentialLintFieldSpecification.php',
	'DifferentialLintStatus' => 'applications/differential/constants/DifferentialLintStatus.php',
	'DifferentialLocalCommitsView' => 'applications/differential/view/DifferentialLocalCommitsView.php',
	'DifferentialMail' => 'applications/differential/mail/DifferentialMail.php',
	'DifferentialMailPhase' => 'applications/differential/constants/DifferentialMailPhase.php',
	'DifferentialManiphestTasksFieldSpecification' => 'applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php',
	'DifferentialNewDiffMail' => 'applications/differential/mail/DifferentialNewDiffMail.php',
	'DifferentialPathFieldSpecification' => 'applications/differential/field/specification/DifferentialPathFieldSpecification.php',
	'DifferentialPrimaryPaneView' => 'applications/differential/view/DifferentialPrimaryPaneView.php',
	'DifferentialReplyHandler' => 'applications/differential/DifferentialReplyHandler.php',
	'DifferentialResultsTableView' => 'applications/differential/view/DifferentialResultsTableView.php',
	'DifferentialRevertPlanFieldSpecification' => 'applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php',
	'DifferentialReviewRequestMail' => 'applications/differential/mail/DifferentialReviewRequestMail.php',
	'DifferentialReviewedByFieldSpecification' => 'applications/differential/field/specification/DifferentialReviewedByFieldSpecification.php',
	'DifferentialReviewerStats' => 'applications/differential/stats/DifferentialReviewerStats.php',
	'DifferentialReviewerStatsTestCase' => 'applications/differential/stats/__tests__/DifferentialReviewerStatsTestCase.php',
	'DifferentialReviewersFieldSpecification' => 'applications/differential/field/specification/DifferentialReviewersFieldSpecification.php',
	'DifferentialRevision' => 'applications/differential/storage/DifferentialRevision.php',
	'DifferentialRevisionCommentListView' => 'applications/differential/view/DifferentialRevisionCommentListView.php',
	'DifferentialRevisionCommentView' => 'applications/differential/view/DifferentialRevisionCommentView.php',
	'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php',
	'DifferentialRevisionDetailRenderer' => 'applications/differential/controller/DifferentialRevisionDetailRenderer.php',
	'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php',
	'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
	'DifferentialRevisionEditor' => 'applications/differential/editor/DifferentialRevisionEditor.php',
	'DifferentialRevisionIDFieldParserTestCase' => 'applications/differential/field/specification/__tests__/DifferentialRevisionIDFieldParserTestCase.php',
	'DifferentialRevisionIDFieldSpecification' => 'applications/differential/field/specification/DifferentialRevisionIDFieldSpecification.php',
	'DifferentialRevisionListController' => 'applications/differential/controller/DifferentialRevisionListController.php',
	'DifferentialRevisionListData' => 'applications/differential/data/DifferentialRevisionListData.php',
	'DifferentialRevisionListView' => 'applications/differential/view/DifferentialRevisionListView.php',
	'DifferentialRevisionQuery' => 'applications/differential/query/DifferentialRevisionQuery.php',
	'DifferentialRevisionStatsController' => 'applications/differential/controller/DifferentialRevisionStatsController.php',
	'DifferentialRevisionStatsView' => 'applications/differential/view/DifferentialRevisionStatsView.php',
	'DifferentialRevisionStatusFieldSpecification' => 'applications/differential/field/specification/DifferentialRevisionStatusFieldSpecification.php',
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/DifferentialRevisionUpdateHistoryView.php',
	'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php',
	'DifferentialSubscribeController' => 'applications/differential/controller/DifferentialSubscribeController.php',
	'DifferentialSummaryFieldSpecification' => 'applications/differential/field/specification/DifferentialSummaryFieldSpecification.php',
	'DifferentialTasksAttacher' => 'applications/differential/DifferentialTasksAttacher.php',
	'DifferentialTestPlanFieldSpecification' => 'applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php',
	'DifferentialTitleFieldSpecification' => 'applications/differential/field/specification/DifferentialTitleFieldSpecification.php',
	'DifferentialUnitFieldSpecification' => 'applications/differential/field/specification/DifferentialUnitFieldSpecification.php',
	'DifferentialUnitStatus' => 'applications/differential/constants/DifferentialUnitStatus.php',
	'DifferentialUnitTestResult' => 'applications/differential/constants/DifferentialUnitTestResult.php',
	'DiffusionBranchInformation' => 'applications/diffusion/data/DiffusionBranchInformation.php',
	'DiffusionBranchQuery' => 'applications/diffusion/query/branch/DiffusionBranchQuery.php',
	'DiffusionBranchTableController' => 'applications/diffusion/controller/DiffusionBranchTableController.php',
	'DiffusionBranchTableView' => 'applications/diffusion/view/DiffusionBranchTableView.php',
	'DiffusionBrowseController' => 'applications/diffusion/controller/DiffusionBrowseController.php',
	'DiffusionBrowseFileController' => 'applications/diffusion/controller/DiffusionBrowseFileController.php',
	'DiffusionBrowseQuery' => 'applications/diffusion/query/browse/DiffusionBrowseQuery.php',
	'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
	'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php',
	'DiffusionCommentListView' => 'applications/diffusion/view/DiffusionCommentListView.php',
	'DiffusionCommentView' => 'applications/diffusion/view/DiffusionCommentView.php',
	'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php',
	'DiffusionCommitChangeTableView' => 'applications/diffusion/view/DiffusionCommitChangeTableView.php',
	'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php',
	'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php',
	'DiffusionCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionCommitParentsQuery.php',
	'DiffusionCommitTagsController' => 'applications/diffusion/controller/DiffusionCommitTagsController.php',
	'DiffusionCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionCommitTagsQuery.php',
	'DiffusionContainsQuery' => 'applications/diffusion/query/contains/DiffusionContainsQuery.php',
	'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
	'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
	'DiffusionDiffQuery' => 'applications/diffusion/query/diff/DiffusionDiffQuery.php',
	'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
	'DiffusionExistsQuery' => 'applications/diffusion/query/exists/DiffusionExistsQuery.php',
	'DiffusionExternalController' => 'applications/diffusion/controller/DiffusionExternalController.php',
	'DiffusionFileContent' => 'applications/diffusion/data/DiffusionFileContent.php',
	'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionFileContentQuery.php',
	'DiffusionGitBranchQuery' => 'applications/diffusion/query/branch/DiffusionGitBranchQuery.php',
	'DiffusionGitBranchQueryTestCase' => 'applications/diffusion/query/branch/__tests__/DiffusionGitBranchQueryTestCase.php',
	'DiffusionGitBrowseQuery' => 'applications/diffusion/query/browse/DiffusionGitBrowseQuery.php',
	'DiffusionGitCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionGitCommitParentsQuery.php',
	'DiffusionGitCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionGitCommitTagsQuery.php',
	'DiffusionGitContainsQuery' => 'applications/diffusion/query/contains/DiffusionGitContainsQuery.php',
	'DiffusionGitDiffQuery' => 'applications/diffusion/query/diff/DiffusionGitDiffQuery.php',
	'DiffusionGitExistsQuery' => 'applications/diffusion/query/exists/DiffusionGitExistsQuery.php',
	'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php',
	'DiffusionGitHistoryQuery' => 'applications/diffusion/query/history/DiffusionGitHistoryQuery.php',
	'DiffusionGitLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionGitLastModifiedQuery.php',
	'DiffusionGitMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionGitMergedCommitsQuery.php',
	'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php',
	'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php',
	'DiffusionGitTagListQuery' => 'applications/diffusion/query/taglist/DiffusionGitTagListQuery.php',
	'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
	'DiffusionHistoryQuery' => 'applications/diffusion/query/history/DiffusionHistoryQuery.php',
	'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
	'DiffusionHomeController' => 'applications/diffusion/controller/DiffusionHomeController.php',
	'DiffusionInlineCommentController' => 'applications/diffusion/controller/DiffusionInlineCommentController.php',
	'DiffusionInlineCommentPreviewController' => 'applications/diffusion/controller/DiffusionInlineCommentPreviewController.php',
	'DiffusionLastModifiedController' => 'applications/diffusion/controller/DiffusionLastModifiedController.php',
	'DiffusionLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionLastModifiedQuery.php',
	'DiffusionLintController' => 'applications/diffusion/controller/DiffusionLintController.php',
	'DiffusionLintDetailsController' => 'applications/diffusion/controller/DiffusionLintDetailsController.php',
	'DiffusionLintSaveRunner' => 'applications/diffusion/DiffusionLintSaveRunner.php',
	'DiffusionMercurialBranchQuery' => 'applications/diffusion/query/branch/DiffusionMercurialBranchQuery.php',
	'DiffusionMercurialBrowseQuery' => 'applications/diffusion/query/browse/DiffusionMercurialBrowseQuery.php',
	'DiffusionMercurialCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionMercurialCommitParentsQuery.php',
	'DiffusionMercurialCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionMercurialCommitTagsQuery.php',
	'DiffusionMercurialContainsQuery' => 'applications/diffusion/query/contains/DiffusionMercurialContainsQuery.php',
	'DiffusionMercurialDiffQuery' => 'applications/diffusion/query/diff/DiffusionMercurialDiffQuery.php',
	'DiffusionMercurialExistsQuery' => 'applications/diffusion/query/exists/DiffusionMercurialExistsQuery.php',
	'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php',
	'DiffusionMercurialHistoryQuery' => 'applications/diffusion/query/history/DiffusionMercurialHistoryQuery.php',
	'DiffusionMercurialLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionMercurialLastModifiedQuery.php',
	'DiffusionMercurialMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionMercurialMergedCommitsQuery.php',
	'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php',
	'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php',
	'DiffusionMercurialTagListQuery' => 'applications/diffusion/query/taglist/DiffusionMercurialTagListQuery.php',
	'DiffusionMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionMergedCommitsQuery.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',
	'DiffusionPathValidateController' => 'applications/diffusion/controller/DiffusionPathValidateController.php',
	'DiffusionQuery' => 'applications/diffusion/query/DiffusionQuery.php',
	'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php',
	'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/DiffusionRenameHistoryQuery.php',
	'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php',
	'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php',
	'DiffusionRepositoryTag' => 'applications/diffusion/DiffusionRepositoryTag.php',
	'DiffusionRequest' => 'applications/diffusion/request/DiffusionRequest.php',
	'DiffusionSetupException' => 'applications/diffusion/exception/DiffusionSetupException.php',
	'DiffusionSvnBrowseQuery' => 'applications/diffusion/query/browse/DiffusionSvnBrowseQuery.php',
	'DiffusionSvnCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionSvnCommitParentsQuery.php',
	'DiffusionSvnCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionSvnCommitTagsQuery.php',
	'DiffusionSvnContainsQuery' => 'applications/diffusion/query/contains/DiffusionSvnContainsQuery.php',
	'DiffusionSvnDiffQuery' => 'applications/diffusion/query/diff/DiffusionSvnDiffQuery.php',
	'DiffusionSvnExistsQuery' => 'applications/diffusion/query/exists/DiffusionSvnExistsQuery.php',
	'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php',
	'DiffusionSvnHistoryQuery' => 'applications/diffusion/query/history/DiffusionSvnHistoryQuery.php',
	'DiffusionSvnLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionSvnLastModifiedQuery.php',
	'DiffusionSvnMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionSvnMergedCommitsQuery.php',
	'DiffusionSvnRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php',
	'DiffusionSvnRequest' => 'applications/diffusion/request/DiffusionSvnRequest.php',
	'DiffusionSvnTagListQuery' => 'applications/diffusion/query/taglist/DiffusionSvnTagListQuery.php',
	'DiffusionSymbolController' => 'applications/diffusion/controller/DiffusionSymbolController.php',
	'DiffusionSymbolQuery' => 'applications/diffusion/query/DiffusionSymbolQuery.php',
	'DiffusionTagListController' => 'applications/diffusion/controller/DiffusionTagListController.php',
	'DiffusionTagListQuery' => 'applications/diffusion/query/taglist/DiffusionTagListQuery.php',
	'DiffusionTagListView' => 'applications/diffusion/view/DiffusionTagListView.php',
	'DiffusionURITestCase' => 'applications/diffusion/request/__tests__/DiffusionURITestCase.php',
	'DiffusionView' => 'applications/diffusion/view/DiffusionView.php',
	'DivinerListController' => 'applications/diviner/controller/DivinerListController.php',
	'DrydockAllocatorWorker' => 'applications/drydock/worker/DrydockAllocatorWorker.php',
	'DrydockApacheWebrootInterface' => 'applications/drydock/interface/webroot/DrydockApacheWebrootInterface.php',
	'DrydockBlueprint' => 'applications/drydock/blueprint/DrydockBlueprint.php',
	'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
	'DrydockConstants' => 'applications/drydock/constants/DrydockConstants.php',
	'DrydockController' => 'applications/drydock/controller/DrydockController.php',
	'DrydockDAO' => 'applications/drydock/storage/DrydockDAO.php',
	'DrydockInterface' => 'applications/drydock/interface/DrydockInterface.php',
	'DrydockLease' => 'applications/drydock/storage/DrydockLease.php',
	'DrydockLeaseListController' => 'applications/drydock/controller/DrydockLeaseListController.php',
	'DrydockLeaseStatus' => 'applications/drydock/constants/DrydockLeaseStatus.php',
	'DrydockLeaseViewController' => 'applications/drydock/controller/DrydockLeaseViewController.php',
	'DrydockLocalCommandInterface' => 'applications/drydock/interface/command/DrydockLocalCommandInterface.php',
	'DrydockLocalHostBlueprint' => 'applications/drydock/blueprint/DrydockLocalHostBlueprint.php',
	'DrydockLog' => 'applications/drydock/storage/DrydockLog.php',
	'DrydockLogController' => 'applications/drydock/controller/DrydockLogController.php',
	'DrydockLogQuery' => 'applications/drydock/query/DrydockLogQuery.php',
	'DrydockManagementCloseWorkflow' => 'applications/drydock/management/DrydockManagementCloseWorkflow.php',
	'DrydockManagementLeaseWorkflow' => 'applications/drydock/management/DrydockManagementLeaseWorkflow.php',
	'DrydockManagementWaitForLeaseWorkflow' => 'applications/drydock/management/DrydockManagementWaitForLeaseWorkflow.php',
	'DrydockManagementWorkflow' => 'applications/drydock/management/DrydockManagementWorkflow.php',
	'DrydockResource' => 'applications/drydock/storage/DrydockResource.php',
	'DrydockResourceCloseController' => 'applications/drydock/controller/DrydockResourceCloseController.php',
	'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
	'DrydockResourceStatus' => 'applications/drydock/constants/DrydockResourceStatus.php',
	'DrydockResourceViewController' => 'applications/drydock/controller/DrydockResourceViewController.php',
	'DrydockSSHCommandInterface' => 'applications/drydock/interface/command/DrydockSSHCommandInterface.php',
	'DrydockWebrootInterface' => 'applications/drydock/interface/webroot/DrydockWebrootInterface.php',
	'DrydockWorkingCopyBlueprint' => 'applications/drydock/blueprint/DrydockWorkingCopyBlueprint.php',
	'FeedPublisherWorker' => 'applications/feed/worker/FeedPublisherWorker.php',
	'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
	'HarbormasterObject' => 'applications/harbormaster/storage/HarbormasterObject.php',
	'HarbormasterScratchTable' => 'applications/harbormaster/storage/HarbormasterScratchTable.php',
	'HeraldAction' => 'applications/herald/storage/HeraldAction.php',
	'HeraldActionConfig' => 'applications/herald/config/HeraldActionConfig.php',
	'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
	'HeraldCommitAdapter' => 'applications/herald/adapter/HeraldCommitAdapter.php',
	'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
	'HeraldConditionConfig' => 'applications/herald/config/HeraldConditionConfig.php',
	'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
	'HeraldContentTypeConfig' => 'applications/herald/config/HeraldContentTypeConfig.php',
	'HeraldController' => 'applications/herald/controller/HeraldController.php',
	'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
	'HeraldDeleteController' => 'applications/herald/controller/HeraldDeleteController.php',
	'HeraldDifferentialRevisionAdapter' => 'applications/herald/adapter/HeraldDifferentialRevisionAdapter.php',
	'HeraldDryRunAdapter' => 'applications/herald/adapter/HeraldDryRunAdapter.php',
	'HeraldEditLogQuery' => 'applications/herald/query/HeraldEditLogQuery.php',
	'HeraldEffect' => 'applications/herald/engine/HeraldEffect.php',
	'HeraldEngine' => 'applications/herald/engine/HeraldEngine.php',
	'HeraldFieldConfig' => 'applications/herald/config/HeraldFieldConfig.php',
	'HeraldHomeController' => 'applications/herald/controller/HeraldHomeController.php',
	'HeraldInvalidConditionException' => 'applications/herald/engine/engine/HeraldInvalidConditionException.php',
	'HeraldInvalidFieldException' => 'applications/herald/engine/engine/HeraldInvalidFieldException.php',
	'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
	'HeraldObjectAdapter' => 'applications/herald/adapter/HeraldObjectAdapter.php',
	'HeraldObjectTranscript' => 'applications/herald/storage/transcript/HeraldObjectTranscript.php',
	'HeraldRecursiveConditionsException' => 'applications/herald/engine/engine/HeraldRecursiveConditionsException.php',
	'HeraldRepetitionPolicyConfig' => 'applications/herald/config/HeraldRepetitionPolicyConfig.php',
	'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
	'HeraldRuleController' => 'applications/herald/controller/HeraldRuleController.php',
	'HeraldRuleEdit' => 'applications/herald/storage/HeraldRuleEdit.php',
	'HeraldRuleEditHistoryController' => 'applications/herald/controller/HeraldRuleEditHistoryController.php',
	'HeraldRuleEditHistoryView' => 'applications/herald/view/HeraldRuleEditHistoryView.php',
	'HeraldRuleListView' => 'applications/herald/view/HeraldRuleListView.php',
	'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
	'HeraldRuleTranscript' => 'applications/herald/storage/transcript/HeraldRuleTranscript.php',
	'HeraldRuleTypeConfig' => 'applications/herald/config/HeraldRuleTypeConfig.php',
	'HeraldTestConsoleController' => 'applications/herald/controller/HeraldTestConsoleController.php',
	'HeraldTranscript' => 'applications/herald/storage/transcript/HeraldTranscript.php',
	'HeraldTranscriptController' => 'applications/herald/controller/HeraldTranscriptController.php',
	'HeraldTranscriptListController' => 'applications/herald/controller/HeraldTranscriptListController.php',
	'HeraldValueTypeConfig' => 'applications/herald/config/HeraldValueTypeConfig.php',
	'Javelin' => 'infrastructure/javelin/Javelin.php',
	'JavelinReactorExample' => 'applications/uiexample/examples/JavelinReactorExample.php',
	'JavelinUIExample' => 'applications/uiexample/examples/JavelinUIExample.php',
	'JavelinViewExample' => 'applications/uiexample/examples/JavelinViewExample.php',
	'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.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',
	'ManiphestAction' => 'applications/maniphest/constants/ManiphestAction.php',
	'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldDefaultSpecification.php',
	'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldSpecification.php',
	'ManiphestAuxiliaryFieldTypeException' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldTypeException.php',
	'ManiphestAuxiliaryFieldValidationException' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldValidationException.php',
	'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
	'ManiphestConstants' => 'applications/maniphest/constants/ManiphestConstants.php',
	'ManiphestController' => 'applications/maniphest/controller/ManiphestController.php',
	'ManiphestDAO' => 'applications/maniphest/storage/ManiphestDAO.php',
	'ManiphestDefaultTaskExtensions' => 'applications/maniphest/extensions/ManiphestDefaultTaskExtensions.php',
	'ManiphestEdgeEventListener' => 'applications/maniphest/event/ManiphestEdgeEventListener.php',
	'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
	'ManiphestReplyHandler' => 'applications/maniphest/ManiphestReplyHandler.php',
	'ManiphestReportController' => 'applications/maniphest/controller/ManiphestReportController.php',
	'ManiphestSavedQuery' => 'applications/maniphest/storage/ManiphestSavedQuery.php',
	'ManiphestSavedQueryDeleteController' => 'applications/maniphest/controller/ManiphestSavedQueryDeleteController.php',
	'ManiphestSavedQueryEditController' => 'applications/maniphest/controller/ManiphestSavedQueryEditController.php',
	'ManiphestSavedQueryListController' => 'applications/maniphest/controller/ManiphestSavedQueryListController.php',
	'ManiphestSubpriorityController' => 'applications/maniphest/controller/ManiphestSubpriorityController.php',
	'ManiphestTask' => 'applications/maniphest/storage/ManiphestTask.php',
	'ManiphestTaskAuxiliaryStorage' => 'applications/maniphest/storage/ManiphestTaskAuxiliaryStorage.php',
	'ManiphestTaskDescriptionChangeController' => 'applications/maniphest/controller/ManiphestTaskDescriptionChangeController.php',
	'ManiphestTaskDescriptionPreviewController' => 'applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php',
	'ManiphestTaskDetailController' => 'applications/maniphest/controller/ManiphestTaskDetailController.php',
	'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php',
	'ManiphestTaskExtensions' => 'applications/maniphest/extensions/ManiphestTaskExtensions.php',
	'ManiphestTaskListController' => 'applications/maniphest/controller/ManiphestTaskListController.php',
	'ManiphestTaskListView' => 'applications/maniphest/view/ManiphestTaskListView.php',
	'ManiphestTaskOwner' => 'applications/maniphest/constants/ManiphestTaskOwner.php',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/ManiphestTaskPriority.php',
	'ManiphestTaskProject' => 'applications/maniphest/storage/ManiphestTaskProject.php',
	'ManiphestTaskProjectsView' => 'applications/maniphest/view/ManiphestTaskProjectsView.php',
	'ManiphestTaskQuery' => 'applications/maniphest/ManiphestTaskQuery.php',
	'ManiphestTaskStatus' => 'applications/maniphest/constants/ManiphestTaskStatus.php',
	'ManiphestTaskSubscriber' => 'applications/maniphest/storage/ManiphestTaskSubscriber.php',
	'ManiphestTaskSummaryView' => 'applications/maniphest/view/ManiphestTaskSummaryView.php',
	'ManiphestTransaction' => 'applications/maniphest/storage/ManiphestTransaction.php',
	'ManiphestTransactionDetailView' => 'applications/maniphest/view/ManiphestTransactionDetailView.php',
	'ManiphestTransactionEditor' => 'applications/maniphest/editor/ManiphestTransactionEditor.php',
	'ManiphestTransactionListView' => 'applications/maniphest/view/ManiphestTransactionListView.php',
	'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/ManiphestTransactionPreviewController.php',
	'ManiphestTransactionSaveController' => 'applications/maniphest/controller/ManiphestTransactionSaveController.php',
	'ManiphestTransactionType' => 'applications/maniphest/constants/ManiphestTransactionType.php',
	'ManiphestView' => 'applications/maniphest/view/ManiphestView.php',
	'MetaMTAConstants' => 'applications/metamta/constants/MetaMTAConstants.php',
	'MetaMTANotificationType' => 'applications/metamta/constants/MetaMTANotificationType.php',
	'OwnersPackageReplyHandler' => 'applications/owners/OwnersPackageReplyHandler.php',
	'PackageCreateMail' => 'applications/owners/mail/PackageCreateMail.php',
	'PackageDeleteMail' => 'applications/owners/mail/PackageDeleteMail.php',
	'PackageMail' => 'applications/owners/mail/PackageMail.php',
	'PackageModifyMail' => 'applications/owners/mail/PackageModifyMail.php',
	'Phabricator404Controller' => 'applications/base/controller/Phabricator404Controller.php',
	'PhabricatorAccessLog' => 'infrastructure/PhabricatorAccessLog.php',
	'PhabricatorActionListExample' => 'applications/uiexample/examples/PhabricatorActionListExample.php',
	'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php',
	'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php',
	'PhabricatorAnchorView' => 'view/layout/PhabricatorAnchorView.php',
	'PhabricatorApplication' => 'applications/base/PhabricatorApplication.php',
	'PhabricatorApplicationApplications' => 'applications/meta/application/PhabricatorApplicationApplications.php',
	'PhabricatorApplicationAudit' => 'applications/audit/application/PhabricatorApplicationAudit.php',
	'PhabricatorApplicationAuth' => 'applications/auth/application/PhabricatorApplicationAuth.php',
	'PhabricatorApplicationCalendar' => 'applications/calendar/application/PhabricatorApplicationCalendar.php',
	'PhabricatorApplicationConduit' => 'applications/conduit/application/PhabricatorApplicationConduit.php',
	'PhabricatorApplicationCountdown' => 'applications/countdown/application/PhabricatorApplicationCountdown.php',
	'PhabricatorApplicationDaemons' => 'applications/daemon/application/PhabricatorApplicationDaemons.php',
	'PhabricatorApplicationDifferential' => 'applications/differential/application/PhabricatorApplicationDifferential.php',
	'PhabricatorApplicationDiffusion' => 'applications/diffusion/application/PhabricatorApplicationDiffusion.php',
	'PhabricatorApplicationDiviner' => 'applications/diviner/application/PhabricatorApplicationDiviner.php',
	'PhabricatorApplicationDrydock' => 'applications/drydock/application/PhabricatorApplicationDrydock.php',
	'PhabricatorApplicationFact' => 'applications/fact/application/PhabricatorApplicationFact.php',
	'PhabricatorApplicationFiles' => 'applications/files/application/PhabricatorApplicationFiles.php',
	'PhabricatorApplicationFlags' => 'applications/flag/application/PhabricatorApplicationFlags.php',
	'PhabricatorApplicationHerald' => 'applications/herald/application/PhabricatorApplicationHerald.php',
	'PhabricatorApplicationLaunchView' => 'applications/meta/view/PhabricatorApplicationLaunchView.php',
	'PhabricatorApplicationMacro' => 'applications/macro/application/PhabricatorApplicationMacro.php',
	'PhabricatorApplicationMailingLists' => 'applications/mailinglists/application/PhabricatorApplicationMailingLists.php',
	'PhabricatorApplicationManiphest' => 'applications/maniphest/application/PhabricatorApplicationManiphest.php',
	'PhabricatorApplicationMetaMTA' => 'applications/metamta/application/PhabricatorApplicationMetaMTA.php',
	'PhabricatorApplicationOwners' => 'applications/owners/application/PhabricatorApplicationOwners.php',
	'PhabricatorApplicationPHID' => 'applications/phid/application/PhabricatorApplicationPHID.php',
	'PhabricatorApplicationPHPAST' => 'applications/xhpastview/application/PhabricatorApplicationPHPAST.php',
	'PhabricatorApplicationPaste' => 'applications/paste/application/PhabricatorApplicationPaste.php',
	'PhabricatorApplicationPeople' => 'applications/people/application/PhabricatorApplicationPeople.php',
	'PhabricatorApplicationPhame' => 'applications/phame/application/PhabricatorApplicationPhame.php',
	'PhabricatorApplicationPholio' => 'applications/pholio/application/PhabricatorApplicationPholio.php',
	'PhabricatorApplicationPhriction' => 'applications/phriction/application/PhabricatorApplicationPhriction.php',
	'PhabricatorApplicationPonder' => 'applications/ponder/application/PhabricatorApplicationPonder.php',
	'PhabricatorApplicationProject' => 'applications/project/application/PhabricatorApplicationProject.php',
	'PhabricatorApplicationRepositories' => 'applications/repository/application/PhabricatorApplicationRepositories.php',
	'PhabricatorApplicationSettings' => 'applications/settings/application/PhabricatorApplicationSettings.php',
	'PhabricatorApplicationSlowvote' => 'applications/slowvote/application/PhabricatorApplicationSlowvote.php',
	'PhabricatorApplicationStatusView' => 'applications/meta/view/PhabricatorApplicationStatusView.php',
	'PhabricatorApplicationSubscriptions' => 'applications/subscriptions/application/PhabricatorApplicationSubscriptions.php',
	'PhabricatorApplicationTransaction' => 'applications/transactions/storage/PhabricatorApplicationTransaction.php',
	'PhabricatorApplicationTransactionComment' => 'applications/transactions/storage/PhabricatorApplicationTransactionComment.php',
	'PhabricatorApplicationTransactionCommentEditor' => 'applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php',
	'PhabricatorApplicationTransactionCommentQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php',
	'PhabricatorApplicationTransactionEditor' => 'applications/transactions/editor/PhabricatorApplicationTransactionEditor.php',
	'PhabricatorApplicationTransactionFeedStory' => 'applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php',
	'PhabricatorApplicationTransactionQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionQuery.php',
	+ 'PhabricatorApplicationTransactionView' => 'applications/transactions/view/PhabricatorApplicationTransactionView.php',
	'PhabricatorApplicationTransactions' => 'applications/transactions/application/PhabricatorApplicationTransactions.php',
	'PhabricatorApplicationUIExamples' => 'applications/uiexample/application/PhabricatorApplicationUIExamples.php',
	'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php',
	'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
	'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php',
	'PhabricatorAuditComment' => 'applications/audit/storage/PhabricatorAuditComment.php',
	'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
	'PhabricatorAuditCommitListView' => 'applications/audit/view/PhabricatorAuditCommitListView.php',
	'PhabricatorAuditCommitQuery' => 'applications/audit/query/PhabricatorAuditCommitQuery.php',
	'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
	'PhabricatorAuditController' => 'applications/audit/controller/PhabricatorAuditController.php',
	'PhabricatorAuditDAO' => 'applications/audit/storage/PhabricatorAuditDAO.php',
	'PhabricatorAuditInlineComment' => 'applications/audit/storage/PhabricatorAuditInlineComment.php',
	'PhabricatorAuditListController' => 'applications/audit/controller/PhabricatorAuditListController.php',
	'PhabricatorAuditListView' => 'applications/audit/view/PhabricatorAuditListView.php',
	'PhabricatorAuditPreviewController' => 'applications/audit/controller/PhabricatorAuditPreviewController.php',
	'PhabricatorAuditQuery' => 'applications/audit/query/PhabricatorAuditQuery.php',
	'PhabricatorAuditReplyHandler' => 'applications/audit/PhabricatorAuditReplyHandler.php',
	'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
	'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php',
	'PhabricatorBarePageExample' => 'applications/uiexample/examples/PhabricatorBarePageExample.php',
	'PhabricatorBarePageView' => 'view/page/PhabricatorBarePageView.php',
	'PhabricatorBaseEnglishTranslation' => 'infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php',
	'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php',
	'PhabricatorButtonsExample' => 'applications/uiexample/examples/PhabricatorButtonsExample.php',
	'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
	'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php',
	'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
	'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
	'PhabricatorCalendarDeleteStatusController' => 'applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php',
	'PhabricatorCalendarEditStatusController' => 'applications/calendar/controller/PhabricatorCalendarEditStatusController.php',
	'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
	'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
	'PhabricatorCalendarViewStatusController' => 'applications/calendar/controller/PhabricatorCalendarViewStatusController.php',
	'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
	'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
	'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/PhabricatorChatLogChannelLogController.php',
	'PhabricatorChatLogConstants' => 'applications/chatlog/constants/PhabricatorChatLogConstants.php',
	'PhabricatorChatLogController' => 'applications/chatlog/controller/PhabricatorChatLogController.php',
	'PhabricatorChatLogDAO' => 'applications/chatlog/storage/PhabricatorChatLogDAO.php',
	'PhabricatorChatLogEvent' => 'applications/chatlog/storage/PhabricatorChatLogEvent.php',
	'PhabricatorChatLogEventType' => 'applications/chatlog/constants/PhabricatorChatLogEventType.php',
	'PhabricatorChatLogQuery' => 'applications/chatlog/PhabricatorChatLogQuery.php',
	'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.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',
	'PhabricatorConduitListController' => 'applications/conduit/controller/PhabricatorConduitListController.php',
	'PhabricatorConduitLogController' => 'applications/conduit/controller/PhabricatorConduitLogController.php',
	'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/PhabricatorConduitMethodCallLog.php',
	'PhabricatorConduitTokenController' => 'applications/conduit/controller/PhabricatorConduitTokenController.php',
	'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php',
	'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php',
	'PhabricatorController' => 'applications/base/controller/PhabricatorController.php',
	'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
	'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
	'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php',
	'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php',
	'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php',
	'PhabricatorCountdownViewController' => 'applications/countdown/controller/PhabricatorCountdownViewController.php',
	'PhabricatorCrumbView' => 'view/layout/PhabricatorCrumbView.php',
	'PhabricatorCrumbsView' => 'view/layout/PhabricatorCrumbsView.php',
	'PhabricatorCursorPagedPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php',
	'PhabricatorDaemon' => 'infrastructure/daemon/PhabricatorDaemon.php',
	'PhabricatorDaemonCombinedLogController' => 'applications/daemon/controller/PhabricatorDaemonCombinedLogController.php',
	'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/PhabricatorDaemonConsoleController.php',
	'PhabricatorDaemonControl' => 'infrastructure/daemon/PhabricatorDaemonControl.php',
	'PhabricatorDaemonController' => 'applications/daemon/controller/PhabricatorDaemonController.php',
	'PhabricatorDaemonDAO' => 'infrastructure/daemon/storage/PhabricatorDaemonDAO.php',
	'PhabricatorDaemonLog' => 'infrastructure/daemon/storage/PhabricatorDaemonLog.php',
	'PhabricatorDaemonLogEvent' => 'infrastructure/daemon/storage/PhabricatorDaemonLogEvent.php',
	'PhabricatorDaemonLogEventsView' => 'applications/daemon/view/PhabricatorDaemonLogEventsView.php',
	'PhabricatorDaemonLogListController' => 'applications/daemon/controller/PhabricatorDaemonLogListController.php',
	'PhabricatorDaemonLogListView' => 'applications/daemon/view/PhabricatorDaemonLogListView.php',
	'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/PhabricatorDaemonLogViewController.php',
	'PhabricatorDaemonReference' => 'infrastructure/daemon/control/PhabricatorDaemonReference.php',
	'PhabricatorDaemonTimelineConsoleController' => 'applications/daemon/controller/PhabricatorDaemonTimelineConsoleController.php',
	'PhabricatorDaemonTimelineEventController' => 'applications/daemon/controller/PhabricatorDaemonTimelineEventController.php',
	'PhabricatorDefaultFileStorageEngineSelector' => 'applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php',
	'PhabricatorDefaultSearchEngineSelector' => 'applications/search/selector/PhabricatorDefaultSearchEngineSelector.php',
	'PhabricatorDifferenceEngine' => 'infrastructure/diff/PhabricatorDifferenceEngine.php',
	'PhabricatorDirectoryController' => 'applications/directory/controller/PhabricatorDirectoryController.php',
	'PhabricatorDirectoryMainController' => 'applications/directory/controller/PhabricatorDirectoryMainController.php',
	'PhabricatorDisabledUserController' => 'applications/auth/controller/PhabricatorDisabledUserController.php',
	'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php',
	'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php',
	'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
	'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
	'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.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',
	'PhabricatorEditor' => 'infrastructure/PhabricatorEditor.php',
	'PhabricatorEmailLoginController' => 'applications/auth/controller/PhabricatorEmailLoginController.php',
	'PhabricatorEmailTokenController' => 'applications/auth/controller/PhabricatorEmailTokenController.php',
	'PhabricatorEmailVerificationController' => 'applications/people/controller/PhabricatorEmailVerificationController.php',
	'PhabricatorEnglishTranslation' => 'infrastructure/internationalization/PhabricatorEnglishTranslation.php',
	'PhabricatorEnv' => 'infrastructure/PhabricatorEnv.php',
	'PhabricatorEnvTestCase' => 'infrastructure/__tests__/PhabricatorEnvTestCase.php',
	'PhabricatorErrorExample' => 'applications/uiexample/examples/PhabricatorErrorExample.php',
	'PhabricatorEvent' => 'infrastructure/events/PhabricatorEvent.php',
	'PhabricatorEventEngine' => 'infrastructure/events/PhabricatorEventEngine.php',
	'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
	'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
	'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.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',
	'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',
	'PhabricatorFeedBuilder' => 'applications/feed/builder/PhabricatorFeedBuilder.php',
	'PhabricatorFeedConstants' => 'applications/feed/constants/PhabricatorFeedConstants.php',
	'PhabricatorFeedController' => 'applications/feed/controller/PhabricatorFeedController.php',
	'PhabricatorFeedDAO' => 'applications/feed/storage/PhabricatorFeedDAO.php',
	'PhabricatorFeedPublicStreamController' => 'applications/feed/controller/PhabricatorFeedPublicStreamController.php',
	'PhabricatorFeedQuery' => 'applications/feed/PhabricatorFeedQuery.php',
	'PhabricatorFeedStory' => 'applications/feed/story/PhabricatorFeedStory.php',
	'PhabricatorFeedStoryAggregate' => 'applications/feed/story/PhabricatorFeedStoryAggregate.php',
	'PhabricatorFeedStoryAudit' => 'applications/feed/story/PhabricatorFeedStoryAudit.php',
	'PhabricatorFeedStoryCommit' => 'applications/feed/story/PhabricatorFeedStoryCommit.php',
	'PhabricatorFeedStoryData' => 'applications/feed/storage/PhabricatorFeedStoryData.php',
	'PhabricatorFeedStoryDifferential' => 'applications/feed/story/PhabricatorFeedStoryDifferential.php',
	'PhabricatorFeedStoryDifferentialAggregate' => 'applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php',
	'PhabricatorFeedStoryManiphest' => 'applications/feed/story/PhabricatorFeedStoryManiphest.php',
	'PhabricatorFeedStoryManiphestAggregate' => 'applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php',
	'PhabricatorFeedStoryNotification' => 'applications/notification/storage/PhabricatorFeedStoryNotification.php',
	'PhabricatorFeedStoryPhriction' => 'applications/feed/story/PhabricatorFeedStoryPhriction.php',
	'PhabricatorFeedStoryProject' => 'applications/feed/story/PhabricatorFeedStoryProject.php',
	'PhabricatorFeedStoryPublisher' => 'applications/feed/PhabricatorFeedStoryPublisher.php',
	'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php',
	'PhabricatorFeedStoryStatus' => 'applications/feed/story/PhabricatorFeedStoryStatus.php',
	'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/PhabricatorFeedStoryTypeConstants.php',
	'PhabricatorFeedStoryView' => 'applications/feed/view/PhabricatorFeedStoryView.php',
	'PhabricatorFeedView' => 'applications/feed/view/PhabricatorFeedView.php',
	'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.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',
	'PhabricatorFileImageMacro' => 'applications/macro/storage/PhabricatorFileImageMacro.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',
	'PhabricatorFileShortcutController' => 'applications/files/controller/PhabricatorFileShortcutController.php',
	'PhabricatorFileSideNavView' => 'applications/files/view/PhabricatorFileSideNavView.php',
	'PhabricatorFileStorageBlob' => 'applications/files/storage/PhabricatorFileStorageBlob.php',
	'PhabricatorFileStorageConfigurationException' => 'applications/files/exception/PhabricatorFileStorageConfigurationException.php',
	'PhabricatorFileStorageEngine' => 'applications/files/engine/PhabricatorFileStorageEngine.php',
	'PhabricatorFileStorageEngineSelector' => 'applications/files/engineselector/PhabricatorFileStorageEngineSelector.php',
	'PhabricatorFileTransformController' => 'applications/files/controller/PhabricatorFileTransformController.php',
	'PhabricatorFileUploadController' => 'applications/files/controller/PhabricatorFileUploadController.php',
	'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
	'PhabricatorFileUploadView' => 'applications/files/view/PhabricatorFileUploadView.php',
	'PhabricatorFilesManagementEnginesWorkflow' => 'applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php',
	'PhabricatorFilesManagementMigrateWorkflow' => 'applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php',
	'PhabricatorFilesManagementWorkflow' => 'applications/files/management/PhabricatorFilesManagementWorkflow.php',
	'PhabricatorFlag' => 'applications/flag/storage/PhabricatorFlag.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',
	'PhabricatorFlagEditController' => 'applications/flag/controller/PhabricatorFlagEditController.php',
	'PhabricatorFlagListController' => 'applications/flag/controller/PhabricatorFlagListController.php',
	'PhabricatorFlagListView' => 'applications/flag/view/PhabricatorFlagListView.php',
	'PhabricatorFlagQuery' => 'applications/flag/query/PhabricatorFlagQuery.php',
	'PhabricatorFlagsUIEventListener' => 'applications/flag/events/PhabricatorFlagsUIEventListener.php',
	'PhabricatorFormExample' => 'applications/uiexample/examples/PhabricatorFormExample.php',
	'PhabricatorGarbageCollectorDaemon' => 'infrastructure/daemon/PhabricatorGarbageCollectorDaemon.php',
	'PhabricatorGitGraphStream' => 'applications/repository/daemon/PhabricatorGitGraphStream.php',
	'PhabricatorGlobalLock' => 'infrastructure/util/PhabricatorGlobalLock.php',
	'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php',
	'PhabricatorHash' => 'infrastructure/util/PhabricatorHash.php',
	'PhabricatorHeaderView' => 'view/layout/PhabricatorHeaderView.php',
	'PhabricatorHelpController' => 'applications/help/controller/PhabricatorHelpController.php',
	'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
	'PhabricatorIRCBot' => 'infrastructure/daemon/irc/PhabricatorIRCBot.php',
	'PhabricatorIRCDifferentialNotificationHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCDifferentialNotificationHandler.php',
	'PhabricatorIRCHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCHandler.php',
	'PhabricatorIRCLogHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCLogHandler.php',
	'PhabricatorIRCMacroHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCMacroHandler.php',
	'PhabricatorIRCMessage' => 'infrastructure/daemon/irc/PhabricatorIRCMessage.php',
	'PhabricatorIRCObjectNameHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCObjectNameHandler.php',
	'PhabricatorIRCProtocolHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCProtocolHandler.php',
	'PhabricatorIRCWhatsNewHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php',
	'PhabricatorImageTransformer' => 'applications/files/PhabricatorImageTransformer.php',
	'PhabricatorInfrastructureTestCase' => 'infrastructure/__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',
	'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
	'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
	'PhabricatorLDAPLoginController' => 'applications/auth/controller/PhabricatorLDAPLoginController.php',
	'PhabricatorLDAPProvider' => 'applications/auth/ldap/PhabricatorLDAPProvider.php',
	'PhabricatorLDAPRegistrationController' => 'applications/auth/controller/PhabricatorLDAPRegistrationController.php',
	'PhabricatorLDAPUnknownUserException' => 'applications/auth/ldap/PhabricatorLDAPUnknownUserException.php',
	'PhabricatorLDAPUnlinkController' => 'applications/auth/controller/PhabricatorLDAPUnlinkController.php',
	'PhabricatorLintEngine' => 'infrastructure/lint/PhabricatorLintEngine.php',
	'PhabricatorLiskDAO' => 'infrastructure/storage/lisk/PhabricatorLiskDAO.php',
	'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
	'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
	'PhabricatorLoginController' => 'applications/auth/controller/PhabricatorLoginController.php',
	'PhabricatorLoginValidateController' => 'applications/auth/controller/PhabricatorLoginValidateController.php',
	'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
	+ 'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
	'PhabricatorMacroController' => 'applications/macro/controller/PhabricatorMacroController.php',
	- 'PhabricatorMacroDeleteController' => 'applications/macro/controller/PhabricatorMacroDeleteController.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',
	+ 'PhabricatorMacroReplyHandler' => 'applications/macro/mail/PhabricatorMacroReplyHandler.php',
	+ 'PhabricatorMacroTransaction' => 'applications/macro/storage/PhabricatorMacroTransaction.php',
	+ 'PhabricatorMacroTransactionComment' => 'applications/macro/storage/PhabricatorMacroTransactionComment.php',
	+ 'PhabricatorMacroTransactionQuery' => 'applications/macro/query/PhabricatorMacroTransactionQuery.php',
	+ 'PhabricatorMacroTransactionType' => 'applications/macro/constants/PhabricatorMacroTransactionType.php',
	+ 'PhabricatorMacroViewController' => 'applications/macro/controller/PhabricatorMacroViewController.php',
	'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAdapter.php',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.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',
	'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/PhabricatorMailReplyHandler.php',
	'PhabricatorMailingListsEditController' => 'applications/mailinglists/controller/PhabricatorMailingListsEditController.php',
	'PhabricatorMailingListsListController' => 'applications/mailinglists/controller/PhabricatorMailingListsListController.php',
	'PhabricatorMainMenuGroupView' => 'view/page/menu/PhabricatorMainMenuGroupView.php',
	'PhabricatorMainMenuIconView' => 'view/page/menu/PhabricatorMainMenuIconView.php',
	'PhabricatorMainMenuSearchView' => 'view/page/menu/PhabricatorMainMenuSearchView.php',
	'PhabricatorMainMenuView' => 'view/page/menu/PhabricatorMainMenuView.php',
	'PhabricatorMarkupCache' => 'applications/cache/storage/PhabricatorMarkupCache.php',
	'PhabricatorMarkupEngine' => 'infrastructure/markup/PhabricatorMarkupEngine.php',
	'PhabricatorMarkupInterface' => 'infrastructure/markup/PhabricatorMarkupInterface.php',
	'PhabricatorMenuItemView' => 'view/layout/PhabricatorMenuItemView.php',
	'PhabricatorMenuView' => 'view/layout/PhabricatorMenuView.php',
	'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php',
	'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php',
	'PhabricatorMetaMTAController' => 'applications/metamta/controller/PhabricatorMetaMTAController.php',
	'PhabricatorMetaMTADAO' => 'applications/metamta/storage/PhabricatorMetaMTADAO.php',
	'PhabricatorMetaMTAEmailBodyParser' => 'applications/metamta/PhabricatorMetaMTAEmailBodyParser.php',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'applications/metamta/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php',
	'PhabricatorMetaMTAListController' => 'applications/metamta/controller/PhabricatorMetaMTAListController.php',
	'PhabricatorMetaMTAMail' => 'applications/metamta/storage/PhabricatorMetaMTAMail.php',
	'PhabricatorMetaMTAMailBody' => 'applications/metamta/view/PhabricatorMetaMTAMailBody.php',
	'PhabricatorMetaMTAMailBodyTestCase' => 'applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php',
	'PhabricatorMetaMTAMailTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php',
	'PhabricatorMetaMTAMailingList' => 'applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php',
	'PhabricatorMetaMTAReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTAReceiveController.php',
	'PhabricatorMetaMTAReceivedListController' => 'applications/metamta/controller/PhabricatorMetaMTAReceivedListController.php',
	'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php',
	'PhabricatorMetaMTASendController' => 'applications/metamta/controller/PhabricatorMetaMTASendController.php',
	'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php',
	'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/PhabricatorMetaMTAViewController.php',
	'PhabricatorMetaMTAWorker' => 'applications/metamta/PhabricatorMetaMTAWorker.php',
	'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
	'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
	'PhabricatorNotificationBuilder' => 'applications/notification/builder/PhabricatorNotificationBuilder.php',
	'PhabricatorNotificationClearController' => 'applications/notification/controller/PhabricatorNotificationClearController.php',
	'PhabricatorNotificationController' => 'applications/notification/controller/PhabricatorNotificationController.php',
	'PhabricatorNotificationIndividualController' => 'applications/notification/controller/PhabricatorNotificationIndividualController.php',
	'PhabricatorNotificationListController' => 'applications/notification/controller/PhabricatorNotificationListController.php',
	'PhabricatorNotificationPanelController' => 'applications/notification/controller/PhabricatorNotificationPanelController.php',
	'PhabricatorNotificationQuery' => 'applications/notification/PhabricatorNotificationQuery.php',
	'PhabricatorNotificationStatusController' => 'applications/notification/controller/PhabricatorNotificationStatusController.php',
	'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
	'PhabricatorOAuthClientAuthorizationBaseController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationBaseController.php',
	'PhabricatorOAuthClientAuthorizationDeleteController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationDeleteController.php',
	'PhabricatorOAuthClientAuthorizationEditController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php',
	'PhabricatorOAuthClientAuthorizationListController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php',
	'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php',
	'PhabricatorOAuthClientBaseController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php',
	'PhabricatorOAuthClientDeleteController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php',
	'PhabricatorOAuthClientEditController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php',
	'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php',
	'PhabricatorOAuthClientViewController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php',
	'PhabricatorOAuthDefaultRegistrationController' => 'applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php',
	'PhabricatorOAuthDiagnosticsController' => 'applications/auth/controller/PhabricatorOAuthDiagnosticsController.php',
	'PhabricatorOAuthFailureView' => 'applications/auth/view/PhabricatorOAuthFailureView.php',
	'PhabricatorOAuthLoginController' => 'applications/auth/controller/PhabricatorOAuthLoginController.php',
	'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/PhabricatorOAuthProvider.php',
	'PhabricatorOAuthProviderDisqus' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderDisqus.php',
	'PhabricatorOAuthProviderException' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderException.php',
	'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderFacebook.php',
	'PhabricatorOAuthProviderGitHub' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderGitHub.php',
	'PhabricatorOAuthProviderGoogle' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderGoogle.php',
	'PhabricatorOAuthProviderPhabricator' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderPhabricator.php',
	'PhabricatorOAuthRegistrationController' => 'applications/auth/controller/oauthregistration/PhabricatorOAuthRegistrationController.php',
	'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php',
	'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php',
	'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php',
	'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php',
	'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php',
	'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/PhabricatorOAuthServerClient.php',
	'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php',
	'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.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',
	'PhabricatorOAuthUnlinkController' => 'applications/auth/controller/PhabricatorOAuthUnlinkController.php',
	'PhabricatorObjectHandle' => 'applications/phid/PhabricatorObjectHandle.php',
	'PhabricatorObjectHandleConstants' => 'applications/phid/handle/const/PhabricatorObjectHandleConstants.php',
	'PhabricatorObjectHandleData' => 'applications/phid/handle/PhabricatorObjectHandleData.php',
	'PhabricatorObjectHandleStatus' => 'applications/phid/handle/const/PhabricatorObjectHandleStatus.php',
	'PhabricatorObjectItemListView' => 'view/layout/PhabricatorObjectItemListView.php',
	'PhabricatorObjectItemView' => 'view/layout/PhabricatorObjectItemView.php',
	'PhabricatorObjectListView' => 'view/control/PhabricatorObjectListView.php',
	'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
	'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
	'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php',
	'PhabricatorOwnersController' => 'applications/owners/controller/PhabricatorOwnersController.php',
	'PhabricatorOwnersDAO' => 'applications/owners/storage/PhabricatorOwnersDAO.php',
	'PhabricatorOwnersDeleteController' => 'applications/owners/controller/PhabricatorOwnersDeleteController.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',
	'PhabricatorOwnersPackagePathValidator' => 'applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php',
	'PhabricatorOwnersPackageQuery' => 'applications/owners/query/PhabricatorOwnersPackageQuery.php',
	'PhabricatorOwnersPackageTestCase' => 'applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php',
	'PhabricatorOwnersPath' => 'applications/owners/storage/PhabricatorOwnersPath.php',
	'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
	'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
	'PhabricatorPHIDController' => 'applications/phid/controller/PhabricatorPHIDController.php',
	'PhabricatorPHIDLookupController' => 'applications/phid/controller/PhabricatorPHIDLookupController.php',
	'PhabricatorPaste' => 'applications/paste/storage/PhabricatorPaste.php',
	'PhabricatorPasteController' => 'applications/paste/controller/PhabricatorPasteController.php',
	'PhabricatorPasteDAO' => 'applications/paste/storage/PhabricatorPasteDAO.php',
	'PhabricatorPasteEditController' => 'applications/paste/controller/PhabricatorPasteEditController.php',
	'PhabricatorPasteListController' => 'applications/paste/controller/PhabricatorPasteListController.php',
	'PhabricatorPasteQuery' => 'applications/paste/query/PhabricatorPasteQuery.php',
	'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php',
	'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php',
	'PhabricatorPeopleEditController' => 'applications/people/controller/PhabricatorPeopleEditController.php',
	'PhabricatorPeopleLdapController' => 'applications/people/controller/PhabricatorPeopleLdapController.php',
	'PhabricatorPeopleListController' => 'applications/people/controller/PhabricatorPeopleListController.php',
	'PhabricatorPeopleLogsController' => 'applications/people/controller/PhabricatorPeopleLogsController.php',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
	'PhabricatorPeopleQuery' => 'applications/people/PhabricatorPeopleQuery.php',
	'PhabricatorPinboardItemView' => 'view/layout/PhabricatorPinboardItemView.php',
	'PhabricatorPinboardView' => 'view/layout/PhabricatorPinboardView.php',
	'PhabricatorPolicies' => 'applications/policy/constants/PhabricatorPolicies.php',
	'PhabricatorPolicy' => 'applications/policy/filter/PhabricatorPolicy.php',
	'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php',
	'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php',
	'PhabricatorPolicyCapability' => 'applications/policy/constants/PhabricatorPolicyCapability.php',
	'PhabricatorPolicyConstants' => 'applications/policy/constants/PhabricatorPolicyConstants.php',
	'PhabricatorPolicyException' => 'applications/policy/exception/PhabricatorPolicyException.php',
	'PhabricatorPolicyFilter' => 'applications/policy/filter/PhabricatorPolicyFilter.php',
	'PhabricatorPolicyInterface' => 'applications/policy/interface/PhabricatorPolicyInterface.php',
	'PhabricatorPolicyQuery' => 'applications/policy/query/PhabricatorPolicyQuery.php',
	'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php',
	'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
	'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
	'PhabricatorProfileHeaderView' => 'view/layout/PhabricatorProfileHeaderView.php',
	'PhabricatorProject' => 'applications/project/storage/PhabricatorProject.php',
	'PhabricatorProjectConstants' => 'applications/project/constants/PhabricatorProjectConstants.php',
	'PhabricatorProjectController' => 'applications/project/controller/PhabricatorProjectController.php',
	'PhabricatorProjectCreateController' => 'applications/project/controller/PhabricatorProjectCreateController.php',
	'PhabricatorProjectDAO' => 'applications/project/storage/PhabricatorProjectDAO.php',
	'PhabricatorProjectEditor' => 'applications/project/editor/PhabricatorProjectEditor.php',
	'PhabricatorProjectEditorTestCase' => 'applications/project/editor/__tests__/PhabricatorProjectEditorTestCase.php',
	'PhabricatorProjectListController' => 'applications/project/controller/PhabricatorProjectListController.php',
	'PhabricatorProjectMembersEditController' => 'applications/project/controller/PhabricatorProjectMembersEditController.php',
	'PhabricatorProjectNameCollisionException' => 'applications/project/exception/PhabricatorProjectNameCollisionException.php',
	'PhabricatorProjectProfile' => 'applications/project/storage/PhabricatorProjectProfile.php',
	'PhabricatorProjectProfileController' => 'applications/project/controller/PhabricatorProjectProfileController.php',
	'PhabricatorProjectProfileEditController' => 'applications/project/controller/PhabricatorProjectProfileEditController.php',
	'PhabricatorProjectQuery' => 'applications/project/query/PhabricatorProjectQuery.php',
	'PhabricatorProjectStatus' => 'applications/project/constants/PhabricatorProjectStatus.php',
	'PhabricatorProjectTransaction' => 'applications/project/storage/PhabricatorProjectTransaction.php',
	'PhabricatorProjectTransactionType' => 'applications/project/constants/PhabricatorProjectTransactionType.php',
	'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
	'PhabricatorPropertyListExample' => 'applications/uiexample/examples/PhabricatorPropertyListExample.php',
	'PhabricatorPropertyListView' => 'view/layout/PhabricatorPropertyListView.php',
	'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
	'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php',
	'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php',
	'PhabricatorRemarkupControl' => 'view/form/control/PhabricatorRemarkupControl.php',
	'PhabricatorRemarkupRuleCountdown' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleCountdown.php',
	'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleDifferential.php',
	'PhabricatorRemarkupRuleDifferentialHandle' => 'infrastructure/markup/rule/handle/PhabricatorRemarkupRuleDifferentialHandle.php',
	'PhabricatorRemarkupRuleDiffusion' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleDiffusion.php',
	'PhabricatorRemarkupRuleEmbedFile' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php',
	'PhabricatorRemarkupRuleImageMacro' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php',
	'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleManiphest.php',
	'PhabricatorRemarkupRuleManiphestHandle' => 'infrastructure/markup/rule/handle/PhabricatorRemarkupRuleManiphestHandle.php',
	'PhabricatorRemarkupRuleMention' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleMention.php',
	'PhabricatorRemarkupRuleObjectHandle' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleObjectHandle.php',
	'PhabricatorRemarkupRuleObjectName' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleObjectName.php',
	'PhabricatorRemarkupRulePaste' => 'infrastructure/markup/rule/PhabricatorRemarkupRulePaste.php',
	'PhabricatorRemarkupRulePhriction' => 'infrastructure/markup/rule/PhabricatorRemarkupRulePhriction.php',
	'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php',
	'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php',
	'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php',
	'PhabricatorRepositoryArcanistProjectDeleteController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectDeleteController.php',
	'PhabricatorRepositoryArcanistProjectEditController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectEditController.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',
	'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php',
	'PhabricatorRepositoryController' => 'applications/repository/controller/PhabricatorRepositoryController.php',
	'PhabricatorRepositoryCreateController' => 'applications/repository/controller/PhabricatorRepositoryCreateController.php',
	'PhabricatorRepositoryDAO' => 'applications/repository/storage/PhabricatorRepositoryDAO.php',
	'PhabricatorRepositoryDeleteController' => 'applications/repository/controller/PhabricatorRepositoryDeleteController.php',
	'PhabricatorRepositoryEditController' => 'applications/repository/controller/PhabricatorRepositoryEditController.php',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php',
	'PhabricatorRepositoryListController' => 'applications/repository/controller/PhabricatorRepositoryListController.php',
	'PhabricatorRepositoryManagementDeleteWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementDeleteWorkflow.php',
	'PhabricatorRepositoryManagementDiscoverWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php',
	'PhabricatorRepositoryManagementListWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementListWorkflow.php',
	'PhabricatorRepositoryManagementPullWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php',
	'PhabricatorRepositoryManagementWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementWorkflow.php',
	'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php',
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php',
	'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php',
	'PhabricatorRepositoryPullLocalDaemonTestCase' => 'applications/repository/daemon/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php',
	'PhabricatorRepositoryShortcut' => 'applications/repository/storage/PhabricatorRepositoryShortcut.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',
	'PhabricatorRepositoryType' => 'applications/repository/constants/PhabricatorRepositoryType.php',
	'PhabricatorRequestOverseer' => 'infrastructure/PhabricatorRequestOverseer.php',
	'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php',
	'PhabricatorSQLPatchList' => 'infrastructure/storage/patch/PhabricatorSQLPatchList.php',
	'PhabricatorScopedEnv' => 'infrastructure/PhabricatorScopedEnv.php',
	'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php',
	'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php',
	'PhabricatorSearchBaseController' => 'applications/search/controller/PhabricatorSearchBaseController.php',
	'PhabricatorSearchCommitIndexer' => 'applications/search/index/indexer/PhabricatorSearchCommitIndexer.php',
	'PhabricatorSearchController' => 'applications/search/controller/PhabricatorSearchController.php',
	'PhabricatorSearchDAO' => 'applications/search/storage/PhabricatorSearchDAO.php',
	'PhabricatorSearchDifferentialIndexer' => 'applications/search/index/indexer/PhabricatorSearchDifferentialIndexer.php',
	'PhabricatorSearchDocument' => 'applications/search/storage/document/PhabricatorSearchDocument.php',
	'PhabricatorSearchDocumentField' => 'applications/search/storage/document/PhabricatorSearchDocumentField.php',
	'PhabricatorSearchDocumentIndexer' => 'applications/search/index/indexer/PhabricatorSearchDocumentIndexer.php',
	'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/PhabricatorSearchDocumentRelationship.php',
	'PhabricatorSearchEngine' => 'applications/search/engine/PhabricatorSearchEngine.php',
	'PhabricatorSearchEngineElastic' => 'applications/search/engine/PhabricatorSearchEngineElastic.php',
	'PhabricatorSearchEngineMySQL' => 'applications/search/engine/PhabricatorSearchEngineMySQL.php',
	'PhabricatorSearchEngineSelector' => 'applications/search/selector/PhabricatorSearchEngineSelector.php',
	'PhabricatorSearchField' => 'applications/search/constants/PhabricatorSearchField.php',
	'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/PhabricatorSearchManiphestIndexer.php',
	'PhabricatorSearchPhrictionIndexer' => 'applications/search/index/indexer/PhabricatorSearchPhrictionIndexer.php',
	'PhabricatorSearchPonderIndexer' => 'applications/ponder/search/PhabricatorSearchPonderIndexer.php',
	'PhabricatorSearchQuery' => 'applications/search/storage/PhabricatorSearchQuery.php',
	'PhabricatorSearchRelationship' => 'applications/search/constants/PhabricatorSearchRelationship.php',
	'PhabricatorSearchResultView' => 'applications/search/view/PhabricatorSearchResultView.php',
	'PhabricatorSearchScope' => 'applications/search/constants/PhabricatorSearchScope.php',
	'PhabricatorSearchSelectController' => 'applications/search/controller/PhabricatorSearchSelectController.php',
	'PhabricatorSearchUserIndexer' => 'applications/search/index/indexer/PhabricatorSearchUserIndexer.php',
	'PhabricatorSettingsAdjustController' => 'applications/settings/controller/PhabricatorSettingsAdjustController.php',
	'PhabricatorSettingsMainController' => 'applications/settings/controller/PhabricatorSettingsMainController.php',
	'PhabricatorSettingsPanel' => 'applications/settings/panel/PhabricatorSettingsPanel.php',
	'PhabricatorSettingsPanelAccount' => 'applications/settings/panel/PhabricatorSettingsPanelAccount.php',
	'PhabricatorSettingsPanelConduit' => 'applications/settings/panel/PhabricatorSettingsPanelConduit.php',
	'PhabricatorSettingsPanelDisplayPreferences' => 'applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php',
	'PhabricatorSettingsPanelEmailAddresses' => 'applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php',
	'PhabricatorSettingsPanelEmailPreferences' => 'applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php',
	'PhabricatorSettingsPanelLDAP' => 'applications/settings/panel/PhabricatorSettingsPanelLDAP.php',
	'PhabricatorSettingsPanelOAuth' => 'applications/settings/panel/PhabricatorSettingsPanelOAuth.php',
	'PhabricatorSettingsPanelPassword' => 'applications/settings/panel/PhabricatorSettingsPanelPassword.php',
	'PhabricatorSettingsPanelProfile' => 'applications/settings/panel/PhabricatorSettingsPanelProfile.php',
	'PhabricatorSettingsPanelSSHKeys' => 'applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php',
	'PhabricatorSettingsPanelSearchPreferences' => 'applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php',
	'PhabricatorSetup' => 'infrastructure/PhabricatorSetup.php',
	'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
	'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/PhabricatorSlowvoteComment.php',
	'PhabricatorSlowvoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteController.php',
	'PhabricatorSlowvoteCreateController' => 'applications/slowvote/controller/PhabricatorSlowvoteCreateController.php',
	'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/PhabricatorSlowvoteDAO.php',
	'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/PhabricatorSlowvoteListController.php',
	'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/PhabricatorSlowvoteOption.php',
	'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/PhabricatorSlowvotePoll.php',
	'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/PhabricatorSlowvotePollController.php',
	'PhabricatorSlug' => 'infrastructure/util/PhabricatorSlug.php',
	'PhabricatorSlugTestCase' => 'infrastructure/util/__tests__/PhabricatorSlugTestCase.php',
	'PhabricatorSortTableExample' => 'applications/uiexample/examples/PhabricatorSortTableExample.php',
	'PhabricatorSourceCodeView' => 'view/layout/PhabricatorSourceCodeView.php',
	'PhabricatorStandardPageView' => 'view/page/PhabricatorStandardPageView.php',
	'PhabricatorStatusController' => 'applications/status/PhabricatorStatusController.php',
	'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php',
	'PhabricatorStorageManagementAPI' => 'infrastructure/storage/management/PhabricatorStorageManagementAPI.php',
	'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
	'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
	'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.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',
	'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php',
	'PhabricatorSubscribersQuery' => 'applications/subscriptions/query/PhabricatorSubscribersQuery.php',
	'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php',
	'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php',
	'PhabricatorSubscriptionsUIEventListener' => 'applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php',
	'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php',
	'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
	'PhabricatorTagExample' => 'applications/uiexample/examples/PhabricatorTagExample.php',
	'PhabricatorTagView' => 'view/layout/PhabricatorTagView.php',
	'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
	'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php',
	'PhabricatorTestWorker' => 'infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php',
	'PhabricatorTimelineCursor' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineCursor.php',
	'PhabricatorTimelineDAO' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineDAO.php',
	'PhabricatorTimelineEvent' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineEvent.php',
	'PhabricatorTimelineEventData' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineEventData.php',
	'PhabricatorTimelineEventView' => 'view/layout/PhabricatorTimelineEventView.php',
	'PhabricatorTimelineExample' => 'applications/uiexample/examples/PhabricatorTimelineExample.php',
	'PhabricatorTimelineIterator' => 'infrastructure/daemon/timeline/cursor/PhabricatorTimelineIterator.php',
	'PhabricatorTimelineView' => 'view/layout/PhabricatorTimelineView.php',
	'PhabricatorTimer' => 'applications/countdown/storage/PhabricatorTimer.php',
	'PhabricatorTransactionView' => 'view/layout/PhabricatorTransactionView.php',
	'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php',
	'PhabricatorTransformedFile' => 'applications/files/storage/PhabricatorTransformedFile.php',
	'PhabricatorTranslation' => 'infrastructure/internationalization/PhabricatorTranslation.php',
	'PhabricatorTrivialTestCase' => 'infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php',
	'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php',
	'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php',
	'PhabricatorTypeaheadResult' => 'applications/typeahead/storage/PhabricatorTypeaheadResult.php',
	'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php',
	'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php',
	'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/PhabricatorUIListFilterExample.php',
	'PhabricatorUINotificationExample' => 'applications/uiexample/examples/PhabricatorUINotificationExample.php',
	'PhabricatorUIPagerExample' => 'applications/uiexample/examples/PhabricatorUIPagerExample.php',
	'PhabricatorUITooltipExample' => 'applications/uiexample/examples/PhabricatorUITooltipExample.php',
	'PhabricatorUnitsTestCase' => 'view/__tests__/PhabricatorUnitsTestCase.php',
	'PhabricatorUser' => 'applications/people/storage/PhabricatorUser.php',
	'PhabricatorUserDAO' => 'applications/people/storage/PhabricatorUserDAO.php',
	'PhabricatorUserEditor' => 'applications/people/PhabricatorUserEditor.php',
	'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
	'PhabricatorUserLDAPInfo' => 'applications/people/storage/PhabricatorUserLDAPInfo.php',
	'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
	'PhabricatorUserOAuthInfo' => 'applications/people/storage/PhabricatorUserOAuthInfo.php',
	'PhabricatorUserPreferences' => 'applications/settings/storage/PhabricatorUserPreferences.php',
	'PhabricatorUserProfile' => 'applications/people/storage/PhabricatorUserProfile.php',
	'PhabricatorUserSSHKey' => 'applications/settings/storage/PhabricatorUserSSHKey.php',
	'PhabricatorUserStatus' => 'applications/people/storage/PhabricatorUserStatus.php',
	'PhabricatorUserStatusInvalidEpochException' => 'applications/people/exception/PhabricatorUserStatusInvalidEpochException.php',
	'PhabricatorUserStatusOverlapException' => 'applications/people/exception/PhabricatorUserStatusOverlapException.php',
	'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
	'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php',
	'PhabricatorWorkerActiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php',
	'PhabricatorWorkerArchiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php',
	'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php',
	'PhabricatorWorkerLeaseQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php',
	'PhabricatorWorkerPermanentFailureException' => 'infrastructure/daemon/workers/exception/PhabricatorWorkerPermanentFailureException.php',
	'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php',
	'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php',
	'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/PhabricatorWorkerTaskDetailController.php',
	'PhabricatorWorkerTaskUpdateController' => 'applications/daemon/controller/PhabricatorWorkerTaskUpdateController.php',
	'PhabricatorWorkerTestCase' => 'infrastructure/daemon/workers/__tests__/PhabricatorWorkerTestCase.php',
	'PhabricatorXHPASTViewController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewController.php',
	'PhabricatorXHPASTViewDAO' => 'applications/xhpastview/storage/PhabricatorXHPASTViewDAO.php',
	'PhabricatorXHPASTViewFrameController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewFrameController.php',
	'PhabricatorXHPASTViewFramesetController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewFramesetController.php',
	'PhabricatorXHPASTViewInputController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewInputController.php',
	'PhabricatorXHPASTViewPanelController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewPanelController.php',
	'PhabricatorXHPASTViewParseTree' => 'applications/xhpastview/storage/PhabricatorXHPASTViewParseTree.php',
	'PhabricatorXHPASTViewRunController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewRunController.php',
	'PhabricatorXHPASTViewStreamController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewStreamController.php',
	'PhabricatorXHPASTViewTreeController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewTreeController.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',
	'PhabricatorXHProfSampleListView' => 'applications/xhprof/view/PhabricatorXHProfSampleListView.php',
	'PhameBasicBlogSkin' => 'applications/phame/skins/PhameBasicBlogSkin.php',
	'PhameBasicTemplateBlogSkin' => 'applications/phame/skins/PhameBasicTemplateBlogSkin.php',
	'PhameBlog' => 'applications/phame/storage/PhameBlog.php',
	'PhameBlogDeleteController' => 'applications/phame/controller/blog/PhameBlogDeleteController.php',
	'PhameBlogEditController' => 'applications/phame/controller/blog/PhameBlogEditController.php',
	'PhameBlogListController' => 'applications/phame/controller/blog/PhameBlogListController.php',
	'PhameBlogLiveController' => 'applications/phame/controller/blog/PhameBlogLiveController.php',
	'PhameBlogQuery' => 'applications/phame/query/PhameBlogQuery.php',
	'PhameBlogSkin' => 'applications/phame/skins/PhameBlogSkin.php',
	'PhameBlogViewController' => 'applications/phame/controller/blog/PhameBlogViewController.php',
	'PhameController' => 'applications/phame/controller/PhameController.php',
	'PhameDAO' => 'applications/phame/storage/PhameDAO.php',
	'PhamePost' => 'applications/phame/storage/PhamePost.php',
	'PhamePostDeleteController' => 'applications/phame/controller/post/PhamePostDeleteController.php',
	'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
	'PhamePostFramedController' => 'applications/phame/controller/post/PhamePostFramedController.php',
	'PhamePostListController' => 'applications/phame/controller/post/PhamePostListController.php',
	'PhamePostNewController' => 'applications/phame/controller/post/PhamePostNewController.php',
	'PhamePostNotLiveController' => 'applications/phame/controller/post/PhamePostNotLiveController.php',
	'PhamePostPreviewController' => 'applications/phame/controller/post/PhamePostPreviewController.php',
	'PhamePostPublishController' => 'applications/phame/controller/post/PhamePostPublishController.php',
	'PhamePostQuery' => 'applications/phame/query/PhamePostQuery.php',
	'PhamePostUnpublishController' => 'applications/phame/controller/post/PhamePostUnpublishController.php',
	'PhamePostView' => 'applications/phame/view/PhamePostView.php',
	'PhamePostViewController' => 'applications/phame/controller/post/PhamePostViewController.php',
	'PhameResourceController' => 'applications/phame/controller/PhameResourceController.php',
	'PhameSkinSpecification' => 'applications/phame/skins/PhameSkinSpecification.php',
	'PholioConstants' => 'applications/pholio/constants/PholioConstants.php',
	'PholioController' => 'applications/pholio/controller/PholioController.php',
	'PholioDAO' => 'applications/pholio/storage/PholioDAO.php',
	'PholioImage' => 'applications/pholio/storage/PholioImage.php',
	'PholioIndexer' => 'applications/pholio/indexer/PholioIndexer.php',
	'PholioMock' => 'applications/pholio/storage/PholioMock.php',
	'PholioMockCommentController' => 'applications/pholio/controller/PholioMockCommentController.php',
	'PholioMockEditController' => 'applications/pholio/controller/PholioMockEditController.php',
	'PholioMockEditor' => 'applications/pholio/editor/PholioMockEditor.php',
	'PholioMockListController' => 'applications/pholio/controller/PholioMockListController.php',
	'PholioMockQuery' => 'applications/pholio/query/PholioMockQuery.php',
	'PholioMockViewController' => 'applications/pholio/controller/PholioMockViewController.php',
	'PholioReplyHandler' => 'applications/pholio/mail/PholioReplyHandler.php',
	'PholioTransaction' => 'applications/pholio/storage/PholioTransaction.php',
	'PholioTransactionComment' => 'applications/pholio/storage/PholioTransactionComment.php',
	'PholioTransactionQuery' => 'applications/pholio/query/PholioTransactionQuery.php',
	'PholioTransactionType' => 'applications/pholio/constants/PholioTransactionType.php',
	'PhortuneMonthYearExpiryControl' => 'applications/phortune/control/PhortuneMonthYearExpiryControl.php',
	'PhortuneStripeBaseController' => 'applications/phortune/stripe/controller/PhortuneStripeBaseController.php',
	'PhortuneStripePaymentFormView' => 'applications/phortune/stripe/view/PhortuneStripePaymentFormView.php',
	'PhortuneStripeTestPaymentFormController' => 'applications/phortune/stripe/controller/PhortuneStripeTestPaymentFormController.php',
	'PhrictionActionConstants' => 'applications/phriction/constants/PhrictionActionConstants.php',
	'PhrictionChangeType' => 'applications/phriction/constants/PhrictionChangeType.php',
	'PhrictionConstants' => 'applications/phriction/constants/PhrictionConstants.php',
	'PhrictionContent' => 'applications/phriction/storage/PhrictionContent.php',
	'PhrictionController' => 'applications/phriction/controller/PhrictionController.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',
	'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
	'PhrictionDocumentEditor' => 'applications/phriction/editor/PhrictionDocumentEditor.php',
	'PhrictionDocumentPreviewController' => 'applications/phriction/controller/PhrictionDocumentPreviewController.php',
	'PhrictionDocumentStatus' => 'applications/phriction/constants/PhrictionDocumentStatus.php',
	'PhrictionDocumentTestCase' => 'applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php',
	'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
	'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php',
	'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php',
	'PhrictionNewController' => 'applications/phriction/controller/PhrictionNewController.php',
	'PonderAddAnswerView' => 'applications/ponder/view/PonderAddAnswerView.php',
	'PonderAddCommentView' => 'applications/ponder/view/PonderAddCommentView.php',
	'PonderAnswer' => 'applications/ponder/storage/PonderAnswer.php',
	'PonderAnswerEditor' => 'applications/ponder/editor/PonderAnswerEditor.php',
	'PonderAnswerListView' => 'applications/ponder/view/PonderAnswerListView.php',
	'PonderAnswerPreviewController' => 'applications/ponder/controller/PonderAnswerPreviewController.php',
	'PonderAnswerQuery' => 'applications/ponder/query/PonderAnswerQuery.php',
	'PonderAnswerSaveController' => 'applications/ponder/controller/PonderAnswerSaveController.php',
	'PonderAnswerViewController' => 'applications/ponder/controller/PonderAnswerViewController.php',
	'PonderAnsweredMail' => 'applications/ponder/mail/PonderAnsweredMail.php',
	'PonderComment' => 'applications/ponder/storage/PonderComment.php',
	'PonderCommentEditor' => 'applications/ponder/editor/PonderCommentEditor.php',
	'PonderCommentListView' => 'applications/ponder/view/PonderCommentListView.php',
	'PonderCommentMail' => 'applications/ponder/mail/PonderCommentMail.php',
	'PonderCommentQuery' => 'applications/ponder/query/PonderCommentQuery.php',
	'PonderCommentSaveController' => 'applications/ponder/controller/PonderCommentSaveController.php',
	'PonderConstants' => 'applications/ponder/PonderConstants.php',
	'PonderController' => 'applications/ponder/controller/PonderController.php',
	'PonderDAO' => 'applications/ponder/storage/PonderDAO.php',
	'PonderFeedController' => 'applications/ponder/controller/PonderFeedController.php',
	'PonderMail' => 'applications/ponder/mail/PonderMail.php',
	'PonderMentionMail' => 'applications/ponder/mail/PonderMentionMail.php',
	'PonderPostBodyView' => 'applications/ponder/view/PonderPostBodyView.php',
	'PonderQuestion' => 'applications/ponder/storage/PonderQuestion.php',
	'PonderQuestionAskController' => 'applications/ponder/controller/PonderQuestionAskController.php',
	'PonderQuestionDetailView' => 'applications/ponder/view/PonderQuestionDetailView.php',
	'PonderQuestionEditor' => 'applications/ponder/editor/PonderQuestionEditor.php',
	'PonderQuestionPreviewController' => 'applications/ponder/controller/PonderQuestionPreviewController.php',
	'PonderQuestionQuery' => 'applications/ponder/query/PonderQuestionQuery.php',
	'PonderQuestionSummaryView' => 'applications/ponder/view/PonderQuestionSummaryView.php',
	'PonderQuestionViewController' => 'applications/ponder/controller/PonderQuestionViewController.php',
	'PonderReplyHandler' => 'applications/ponder/PonderReplyHandler.php',
	'PonderRuleQuestion' => 'infrastructure/markup/rule/PonderRuleQuestion.php',
	'PonderUserProfileView' => 'applications/ponder/view/PonderUserProfileView.php',
	'PonderVotableInterface' => 'applications/ponder/storage/PonderVotableInterface.php',
	'PonderVotableView' => 'applications/ponder/view/PonderVotableView.php',
	'PonderVoteEditor' => 'applications/ponder/editor/PonderVoteEditor.php',
	'PonderVoteSaveController' => 'applications/ponder/controller/PonderVoteSaveController.php',
	'QueryFormattingTestCase' => 'infrastructure/storage/__tests__/QueryFormattingTestCase.php',
	),
	'function' =>
	array(
	'_phabricator_date_format' => 'view/viewutils.php',
	'celerity_generate_unique_node_id' => 'infrastructure/celerity/api.php',
	'celerity_get_resource_uri' => 'infrastructure/celerity/api.php',
	'celerity_register_resource_map' => 'infrastructure/celerity/map.php',
	'javelin_render_tag' => 'infrastructure/javelin/markup.php',
	'phabricator_date' => 'view/viewutils.php',
	'phabricator_datetime' => 'view/viewutils.php',
	'phabricator_format_bytes' => 'view/viewutils.php',
	'phabricator_format_local_time' => 'view/viewutils.php',
	'phabricator_format_relative_time' => 'view/viewutils.php',
	'phabricator_format_relative_time_detailed' => 'view/viewutils.php',
	'phabricator_format_units_generic' => 'view/viewutils.php',
	'phabricator_on_relative_date' => 'view/viewutils.php',
	'phabricator_parse_bytes' => 'view/viewutils.php',
	'phabricator_relative_date' => 'view/viewutils.php',
	'phabricator_render_form' => 'infrastructure/javelin/markup.php',
	'phabricator_render_form_magic' => 'infrastructure/javelin/markup.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' => 'infrastructure/celerity/api.php',
	),
	'xmap' =>
	array(
	'Aphront304Response' => 'AphrontResponse',
	'Aphront400Response' => 'AphrontResponse',
	'Aphront403Response' => 'AphrontHTMLResponse',
	'Aphront404Response' => 'AphrontHTMLResponse',
	'AphrontAjaxResponse' => 'AphrontResponse',
	'AphrontAttachedFileView' => 'AphrontView',
	'AphrontCSRFException' => 'AphrontException',
	'AphrontCalendarEventView' => 'AphrontView',
	'AphrontCalendarMonthView' => 'AphrontView',
	'AphrontContextBarView' => 'AphrontView',
	'AphrontCrumbsView' => 'AphrontView',
	'AphrontCursorPagerView' => 'AphrontView',
	'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
	'AphrontDialogResponse' => 'AphrontResponse',
	'AphrontDialogView' => 'AphrontView',
	'AphrontErrorView' => 'AphrontView',
	'AphrontException' => 'Exception',
	'AphrontFileResponse' => 'AphrontResponse',
	'AphrontFormCheckboxControl' => 'AphrontFormControl',
	'AphrontFormControl' => 'AphrontView',
	'AphrontFormDateControl' => 'AphrontFormControl',
	'AphrontFormDividerControl' => 'AphrontFormControl',
	'AphrontFormDragAndDropUploadControl' => 'AphrontFormControl',
	'AphrontFormFileControl' => 'AphrontFormControl',
	'AphrontFormImageControl' => 'AphrontFormControl',
	'AphrontFormInsetView' => 'AphrontView',
	'AphrontFormLayoutView' => 'AphrontView',
	'AphrontFormMarkupControl' => 'AphrontFormControl',
	'AphrontFormPasswordControl' => 'AphrontFormControl',
	'AphrontFormPolicyControl' => 'AphrontFormControl',
	'AphrontFormRadioButtonControl' => 'AphrontFormControl',
	'AphrontFormRecaptchaControl' => 'AphrontFormControl',
	'AphrontFormSelectControl' => 'AphrontFormControl',
	'AphrontFormStaticControl' => 'AphrontFormControl',
	'AphrontFormSubmitControl' => 'AphrontFormControl',
	'AphrontFormTextAreaControl' => 'AphrontFormControl',
	'AphrontFormTextControl' => 'AphrontFormControl',
	'AphrontFormToggleButtonsControl' => 'AphrontFormControl',
	'AphrontFormTokenizerControl' => 'AphrontFormControl',
	'AphrontFormView' => 'AphrontView',
	'AphrontHTMLResponse' => 'AphrontResponse',
	'AphrontHTTPSinkTestCase' => 'PhabricatorTestCase',
	'AphrontHeadsupActionListView' => 'AphrontView',
	'AphrontHeadsupActionView' => 'AphrontView',
	'AphrontHeadsupView' => 'AphrontView',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink',
	'AphrontJSONResponse' => 'AphrontResponse',
	'AphrontJavelinView' => 'AphrontView',
	'AphrontKeyboardShortcutsAvailableView' => 'AphrontView',
	'AphrontListFilterView' => 'AphrontView',
	'AphrontMiniPanelView' => 'AphrontView',
	'AphrontMoreView' => 'AphrontView',
	'AphrontMySQLDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontNullView' => 'AphrontView',
	'AphrontPHPHTTPSink' => 'AphrontHTTPSink',
	'AphrontPageView' => 'AphrontView',
	'AphrontPagerView' => 'AphrontView',
	'AphrontPanelView' => 'AphrontView',
	'AphrontPlainTextResponse' => 'AphrontResponse',
	'AphrontProxyResponse' => 'AphrontResponse',
	'AphrontRedirectException' => 'AphrontException',
	'AphrontRedirectResponse' => 'AphrontResponse',
	'AphrontReloadResponse' => 'AphrontRedirectResponse',
	'AphrontRequestFailureView' => 'AphrontView',
	'AphrontRequestTestCase' => 'PhabricatorTestCase',
	'AphrontSideNavFilterView' => 'AphrontView',
	'AphrontTableView' => 'AphrontView',
	'AphrontTokenizerTemplateView' => 'AphrontView',
	'AphrontTypeaheadTemplateView' => 'AphrontView',
	'AphrontUsageException' => 'AphrontException',
	'AphrontWebpageResponse' => 'AphrontHTMLResponse',
	'CelerityPhabricatorResourceController' => 'CelerityResourceController',
	'CelerityResourceController' => 'PhabricatorController',
	'CelerityResourceGraph' => 'AbstractDirectedGraph',
	'CelerityResourceTransformerTestCase' => 'PhabricatorTestCase',
	'ConduitAPI_arcanist_Method' => 'ConduitAPIMethod',
	'ConduitAPI_arcanist_projectinfo_Method' => 'ConduitAPI_arcanist_Method',
	'ConduitAPI_audit_Method' => 'ConduitAPIMethod',
	'ConduitAPI_audit_query_Method' => 'ConduitAPI_audit_Method',
	'ConduitAPI_chatlog_Method' => 'ConduitAPIMethod',
	'ConduitAPI_chatlog_query_Method' => 'ConduitAPI_chatlog_Method',
	'ConduitAPI_chatlog_record_Method' => 'ConduitAPI_chatlog_Method',
	'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
	'ConduitAPI_conduit_getcertificate_Method' => 'ConduitAPIMethod',
	'ConduitAPI_conduit_ping_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_launched_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_log_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_setstatus_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_close_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_createcomment_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_createinline_Method' => 'ConduitAPI_differential_Method',
	'ConduitAPI_differential_createrawdiff_Method' => 'ConduitAPI_differential_Method',
	'ConduitAPI_differential_createrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_finishpostponedlinters_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getdiff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevisioncomments_Method' => 'ConduitAPI_differential_Method',
	'ConduitAPI_differential_getrevisionfeedback_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_markcommitted_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_query_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updateunitresults_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_findsymbols_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getcommits_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getlintmessages_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'ConduitAPIMethod',
	'ConduitAPI_feed_publish_Method' => 'ConduitAPIMethod',
	'ConduitAPI_feed_query_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_download_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
	'ConduitAPI_flag_Method' => 'ConduitAPIMethod',
	'ConduitAPI_flag_delete_Method' => 'ConduitAPI_flag_Method',
	'ConduitAPI_flag_edit_Method' => 'ConduitAPI_flag_Method',
	'ConduitAPI_flag_query_Method' => 'ConduitAPI_flag_Method',
	'ConduitAPI_macro_Method' => 'ConduitAPIMethod',
	'ConduitAPI_macro_query_Method' => 'ConduitAPI_macro_Method',
	'ConduitAPI_maniphest_Method' => 'ConduitAPIMethod',
	'ConduitAPI_maniphest_createtask_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_find_Method' => 'ConduitAPI_maniphest_query_Method',
	'ConduitAPI_maniphest_gettasktransactions_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_info_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_query_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_update_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_owners_query_Method' => 'ConduitAPIMethod',
	'ConduitAPI_paste_Method' => 'ConduitAPIMethod',
	'ConduitAPI_paste_create_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_paste_info_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_paste_query_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_phid_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phid_info_Method' => 'ConduitAPI_phid_Method',
	'ConduitAPI_phid_lookup_Method' => 'ConduitAPI_phid_Method',
	'ConduitAPI_phid_query_Method' => 'ConduitAPI_phid_Method',
	'ConduitAPI_phpast_getast_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phpast_version_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phriction_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phriction_edit_Method' => 'ConduitAPI_phriction_Method',
	'ConduitAPI_phriction_history_Method' => 'ConduitAPI_phriction_Method',
	'ConduitAPI_phriction_info_Method' => 'ConduitAPI_phriction_Method',
	'ConduitAPI_project_Method' => 'ConduitAPIMethod',
	'ConduitAPI_project_query_Method' => 'ConduitAPI_project_Method',
	'ConduitAPI_remarkup_process_Method' => 'ConduitAPIMethod',
	'ConduitAPI_repository_Method' => 'ConduitAPIMethod',
	'ConduitAPI_repository_create_Method' => 'ConduitAPI_repository_Method',
	'ConduitAPI_repository_query_Method' => 'ConduitAPI_repository_Method',
	'ConduitAPI_slowvote_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_addstatus_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_disable_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_enable_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_find_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_info_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_query_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_removestatus_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_whoami_Method' => 'ConduitAPI_user_Method',
	'ConduitCallTestCase' => 'PhabricatorTestCase',
	'ConduitException' => 'Exception',
	'DarkConsoleConfigPlugin' => 'DarkConsolePlugin',
	'DarkConsoleController' => 'PhabricatorController',
	'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
	'DarkConsoleEventPlugin' => 'DarkConsolePlugin',
	'DarkConsoleEventPluginAPI' => 'PhutilEventListener',
	'DarkConsoleRequestPlugin' => 'DarkConsolePlugin',
	'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
	'DefaultDatabaseConfigurationProvider' => 'DatabaseConfigurationProvider',
	'DifferentialActionHasNoEffectException' => 'DifferentialException',
	'DifferentialAddCommentView' => 'AphrontView',
	'DifferentialAffectedPath' => 'DifferentialDAO',
	'DifferentialApplyPatchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialArcanistProjectFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuditorsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuthorFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuxiliaryField' => 'DifferentialDAO',
	'DifferentialBlameRevisionFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialBranchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialCCWelcomeMail' => 'DifferentialReviewRequestMail',
	'DifferentialCCsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialChangeSetTestCase' => 'PhabricatorTestCase',
	'DifferentialChangeset' => 'DifferentialDAO',
	'DifferentialChangesetDetailView' => 'AphrontView',
	'DifferentialChangesetListView' => 'AphrontView',
	'DifferentialChangesetParserTestCase' => 'ArcanistPhutilTestCase',
	'DifferentialChangesetTwoUpRenderer' => 'DifferentialChangesetRenderer',
	'DifferentialChangesetViewController' => 'DifferentialController',
	'DifferentialComment' =>
	array(
	0 => 'DifferentialDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'DifferentialCommentEditor' => 'PhabricatorEditor',
	'DifferentialCommentMail' => 'DifferentialMail',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialCommitsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	'DifferentialDateCreatedFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialDateModifiedFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialDefaultFieldSelector' => 'DifferentialFieldSelector',
	'DifferentialDependenciesFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialDependsOnFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialDiff' => 'DifferentialDAO',
	'DifferentialDiffContentMail' => 'DifferentialMail',
	'DifferentialDiffCreateController' => 'DifferentialController',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffTableOfContentsView' => 'AphrontView',
	'DifferentialDiffTestCase' => 'ArcanistPhutilTestCase',
	'DifferentialDiffViewController' => 'DifferentialController',
	'DifferentialException' => 'Exception',
	'DifferentialExceptionMail' => 'DifferentialMail',
	'DifferentialExportPatchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialFieldDataNotAvailableException' => 'Exception',
	'DifferentialFieldParseException' => 'Exception',
	'DifferentialFieldSpecificationIncompleteException' => 'Exception',
	'DifferentialFieldValidationException' => 'Exception',
	'DifferentialFreeformFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialGitSVNIDFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialHostFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialHunk' => 'DifferentialDAO',
	'DifferentialHunkTestCase' => 'ArcanistPhutilTestCase',
	'DifferentialInlineComment' =>
	array(
	0 => 'DifferentialDAO',
	1 => 'PhabricatorInlineCommentInterface',
	),
	'DifferentialInlineCommentEditController' => 'PhabricatorInlineCommentController',
	'DifferentialInlineCommentEditView' => 'AphrontView',
	'DifferentialInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
	'DifferentialInlineCommentView' => 'AphrontView',
	'DifferentialLinesFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialLintFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialLocalCommitsView' => 'AphrontView',
	'DifferentialManiphestTasksFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialNewDiffMail' => 'DifferentialReviewRequestMail',
	'DifferentialPathFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialPrimaryPaneView' => 'AphrontView',
	'DifferentialReplyHandler' => 'PhabricatorMailReplyHandler',
	'DifferentialResultsTableView' => 'AphrontView',
	'DifferentialRevertPlanFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialReviewRequestMail' => 'DifferentialMail',
	'DifferentialReviewedByFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialReviewerStatsTestCase' => 'PhabricatorTestCase',
	'DifferentialReviewersFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevision' => 'DifferentialDAO',
	'DifferentialRevisionCommentListView' => 'AphrontView',
	'DifferentialRevisionCommentView' => 'AphrontView',
	'DifferentialRevisionDetailView' => 'AphrontView',
	'DifferentialRevisionEditController' => 'DifferentialController',
	'DifferentialRevisionEditor' => 'PhabricatorEditor',
	'DifferentialRevisionIDFieldParserTestCase' => 'PhabricatorTestCase',
	'DifferentialRevisionIDFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionListView' => 'AphrontView',
	'DifferentialRevisionStatsController' => 'DifferentialController',
	'DifferentialRevisionStatsView' => 'AphrontView',
	'DifferentialRevisionStatusFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'DifferentialSubscribeController' => 'DifferentialController',
	'DifferentialSummaryFieldSpecification' => 'DifferentialFreeformFieldSpecification',
	'DifferentialTestPlanFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialTitleFieldSpecification' => 'DifferentialFreeformFieldSpecification',
	'DifferentialUnitFieldSpecification' => 'DifferentialFieldSpecification',
	'DiffusionBranchTableController' => 'DiffusionController',
	'DiffusionBranchTableView' => 'DiffusionView',
	'DiffusionBrowseController' => 'DiffusionController',
	'DiffusionBrowseFileController' => 'DiffusionController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	'DiffusionChangeController' => 'DiffusionController',
	'DiffusionCommentListView' => 'AphrontView',
	'DiffusionCommentView' => 'AphrontView',
	'DiffusionCommitBranchesController' => 'DiffusionController',
	'DiffusionCommitChangeTableView' => 'DiffusionView',
	'DiffusionCommitController' => 'DiffusionController',
	'DiffusionCommitEditController' => 'DiffusionController',
	'DiffusionCommitParentsQuery' => 'DiffusionQuery',
	'DiffusionCommitTagsController' => 'DiffusionController',
	'DiffusionCommitTagsQuery' => 'DiffusionQuery',
	'DiffusionContainsQuery' => 'DiffusionQuery',
	'DiffusionController' => 'PhabricatorController',
	'DiffusionDiffController' => 'DiffusionController',
	'DiffusionDiffQuery' => 'DiffusionQuery',
	'DiffusionEmptyResultView' => 'DiffusionView',
	'DiffusionExistsQuery' => 'DiffusionQuery',
	'DiffusionExternalController' => 'DiffusionController',
	'DiffusionFileContentQuery' => 'DiffusionQuery',
	'DiffusionGitBranchQuery' => 'DiffusionBranchQuery',
	'DiffusionGitBranchQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionGitBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionGitCommitParentsQuery' => 'DiffusionCommitParentsQuery',
	'DiffusionGitCommitTagsQuery' => 'DiffusionCommitTagsQuery',
	'DiffusionGitContainsQuery' => 'DiffusionContainsQuery',
	'DiffusionGitDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionGitExistsQuery' => 'DiffusionExistsQuery',
	'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionGitHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionGitLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionGitMergedCommitsQuery' => 'DiffusionMergedCommitsQuery',
	'DiffusionGitRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionGitRequest' => 'DiffusionRequest',
	'DiffusionGitTagListQuery' => 'DiffusionTagListQuery',
	'DiffusionHistoryController' => 'DiffusionController',
	'DiffusionHistoryQuery' => 'DiffusionQuery',
	'DiffusionHistoryTableView' => 'DiffusionView',
	'DiffusionHomeController' => 'DiffusionController',
	'DiffusionInlineCommentController' => 'PhabricatorInlineCommentController',
	'DiffusionInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
	'DiffusionLastModifiedController' => 'DiffusionController',
	'DiffusionLastModifiedQuery' => 'DiffusionQuery',
	'DiffusionLintController' => 'DiffusionController',
	'DiffusionLintDetailsController' => 'DiffusionController',
	'DiffusionMercurialBranchQuery' => 'DiffusionBranchQuery',
	'DiffusionMercurialBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionMercurialCommitParentsQuery' => 'DiffusionCommitParentsQuery',
	'DiffusionMercurialCommitTagsQuery' => 'DiffusionCommitTagsQuery',
	'DiffusionMercurialContainsQuery' => 'DiffusionContainsQuery',
	'DiffusionMercurialDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionMercurialExistsQuery' => 'DiffusionExistsQuery',
	'DiffusionMercurialFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionMercurialHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionMercurialLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionMercurialMergedCommitsQuery' => 'DiffusionMergedCommitsQuery',
	'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionMercurialRequest' => 'DiffusionRequest',
	'DiffusionMercurialTagListQuery' => 'DiffusionTagListQuery',
	'DiffusionMergedCommitsQuery' => 'DiffusionQuery',
	'DiffusionPathCompleteController' => 'DiffusionController',
	'DiffusionPathQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionPathValidateController' => 'DiffusionController',
	'DiffusionRawDiffQuery' => 'DiffusionQuery',
	'DiffusionRepositoryController' => 'DiffusionController',
	'DiffusionSetupException' => 'AphrontUsageException',
	'DiffusionSvnBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionSvnCommitParentsQuery' => 'DiffusionCommitParentsQuery',
	'DiffusionSvnCommitTagsQuery' => 'DiffusionCommitTagsQuery',
	'DiffusionSvnContainsQuery' => 'DiffusionContainsQuery',
	'DiffusionSvnDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionSvnExistsQuery' => 'DiffusionExistsQuery',
	'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionSvnHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionSvnLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionSvnMergedCommitsQuery' => 'DiffusionMergedCommitsQuery',
	'DiffusionSvnRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionSvnRequest' => 'DiffusionRequest',
	'DiffusionSvnTagListQuery' => 'DiffusionTagListQuery',
	'DiffusionSymbolController' => 'DiffusionController',
	'DiffusionSymbolQuery' => 'PhabricatorOffsetPagedQuery',
	'DiffusionTagListController' => 'DiffusionController',
	'DiffusionTagListQuery' => 'DiffusionQuery',
	'DiffusionTagListView' => 'DiffusionView',
	'DiffusionURITestCase' => 'ArcanistPhutilTestCase',
	'DiffusionView' => 'AphrontView',
	'DivinerListController' => 'PhabricatorController',
	'DrydockAllocatorWorker' => 'PhabricatorWorker',
	'DrydockApacheWebrootInterface' => 'DrydockWebrootInterface',
	'DrydockCommandInterface' => 'DrydockInterface',
	'DrydockController' => 'PhabricatorController',
	'DrydockDAO' => 'PhabricatorLiskDAO',
	'DrydockLease' => 'DrydockDAO',
	'DrydockLeaseListController' => 'DrydockController',
	'DrydockLeaseStatus' => 'DrydockConstants',
	'DrydockLeaseViewController' => 'DrydockController',
	'DrydockLocalCommandInterface' => 'DrydockCommandInterface',
	'DrydockLocalHostBlueprint' => 'DrydockBlueprint',
	'DrydockLog' => 'DrydockDAO',
	'DrydockLogController' => 'DrydockController',
	'DrydockLogQuery' => 'PhabricatorOffsetPagedQuery',
	'DrydockManagementCloseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementLeaseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementWaitForLeaseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementWorkflow' => 'PhutilArgumentWorkflow',
	'DrydockResource' => 'DrydockDAO',
	'DrydockResourceCloseController' => 'DrydockController',
	'DrydockResourceListController' => 'DrydockController',
	'DrydockResourceStatus' => 'DrydockConstants',
	'DrydockResourceViewController' => 'DrydockController',
	'DrydockSSHCommandInterface' => 'DrydockCommandInterface',
	'DrydockWebrootInterface' => 'DrydockInterface',
	'DrydockWorkingCopyBlueprint' => 'DrydockBlueprint',
	'FeedPublisherWorker' => 'PhabricatorWorker',
	'HarbormasterDAO' => 'PhabricatorLiskDAO',
	'HarbormasterObject' => 'HarbormasterDAO',
	'HarbormasterScratchTable' => 'HarbormasterDAO',
	'HeraldAction' => 'HeraldDAO',
	'HeraldApplyTranscript' => 'HeraldDAO',
	'HeraldCommitAdapter' => 'HeraldObjectAdapter',
	'HeraldCondition' => 'HeraldDAO',
	'HeraldController' => 'PhabricatorController',
	'HeraldDAO' => 'PhabricatorLiskDAO',
	'HeraldDeleteController' => 'HeraldController',
	'HeraldDifferentialRevisionAdapter' => 'HeraldObjectAdapter',
	'HeraldDryRunAdapter' => 'HeraldObjectAdapter',
	'HeraldEditLogQuery' => 'PhabricatorOffsetPagedQuery',
	'HeraldHomeController' => 'HeraldController',
	'HeraldInvalidConditionException' => 'Exception',
	'HeraldInvalidFieldException' => 'Exception',
	'HeraldNewController' => 'HeraldController',
	'HeraldRecursiveConditionsException' => 'Exception',
	'HeraldRule' => 'HeraldDAO',
	'HeraldRuleController' => 'HeraldController',
	'HeraldRuleEdit' => 'HeraldDAO',
	'HeraldRuleEditHistoryController' => 'HeraldController',
	'HeraldRuleEditHistoryView' => 'AphrontView',
	'HeraldRuleListView' => 'AphrontView',
	'HeraldRuleQuery' => 'PhabricatorOffsetPagedQuery',
	'HeraldTestConsoleController' => 'HeraldController',
	'HeraldTranscript' => 'HeraldDAO',
	'HeraldTranscriptController' => 'HeraldController',
	'HeraldTranscriptListController' => 'HeraldController',
	'JavelinReactorExample' => 'PhabricatorUIExample',
	'JavelinUIExample' => 'PhabricatorUIExample',
	'JavelinViewExample' => 'PhabricatorUIExample',
	'JavelinViewExampleServerView' => 'AphrontView',
	'LiskDAOTestCase' => 'PhabricatorTestCase',
	'LiskEphemeralObjectException' => 'Exception',
	'LiskFixtureTestCase' => 'PhabricatorTestCase',
	'LiskIsolationTestCase' => 'PhabricatorTestCase',
	'LiskIsolationTestDAO' => 'LiskDAO',
	'LiskIsolationTestDAOException' => 'Exception',
	'LiskMigrationIterator' => 'PhutilBufferedIterator',
	'ManiphestAction' => 'ManiphestConstants',
	'ManiphestAuxiliaryFieldDefaultSpecification' => 'ManiphestAuxiliaryFieldSpecification',
	'ManiphestAuxiliaryFieldTypeException' => 'Exception',
	'ManiphestAuxiliaryFieldValidationException' => 'Exception',
	'ManiphestBatchEditController' => 'ManiphestController',
	'ManiphestController' => 'PhabricatorController',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestDefaultTaskExtensions' => 'ManiphestTaskExtensions',
	'ManiphestEdgeEventListener' => 'PhutilEventListener',
	'ManiphestExportController' => 'ManiphestController',
	'ManiphestReplyHandler' => 'PhabricatorMailReplyHandler',
	'ManiphestReportController' => 'ManiphestController',
	'ManiphestSavedQuery' => 'ManiphestDAO',
	'ManiphestSavedQueryDeleteController' => 'ManiphestController',
	'ManiphestSavedQueryEditController' => 'ManiphestController',
	'ManiphestSavedQueryListController' => 'ManiphestController',
	'ManiphestSubpriorityController' => 'ManiphestController',
	'ManiphestTask' =>
	array(
	0 => 'ManiphestDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'ManiphestTaskAuxiliaryStorage' => 'ManiphestDAO',
	'ManiphestTaskDescriptionChangeController' => 'ManiphestController',
	'ManiphestTaskDescriptionPreviewController' => 'ManiphestController',
	'ManiphestTaskDetailController' => 'ManiphestController',
	'ManiphestTaskEditController' => 'ManiphestController',
	'ManiphestTaskListController' => 'ManiphestController',
	'ManiphestTaskListView' => 'ManiphestView',
	'ManiphestTaskOwner' => 'ManiphestConstants',
	'ManiphestTaskPriority' => 'ManiphestConstants',
	'ManiphestTaskProject' => 'ManiphestDAO',
	'ManiphestTaskProjectsView' => 'ManiphestView',
	'ManiphestTaskQuery' => 'PhabricatorQuery',
	'ManiphestTaskStatus' => 'ManiphestConstants',
	'ManiphestTaskSubscriber' => 'ManiphestDAO',
	'ManiphestTaskSummaryView' => 'ManiphestView',
	'ManiphestTransaction' =>
	array(
	0 => 'ManiphestDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'ManiphestTransactionDetailView' => 'ManiphestView',
	'ManiphestTransactionEditor' => 'PhabricatorEditor',
	'ManiphestTransactionListView' => 'ManiphestView',
	'ManiphestTransactionPreviewController' => 'ManiphestController',
	'ManiphestTransactionSaveController' => 'ManiphestController',
	'ManiphestTransactionType' => 'ManiphestConstants',
	'ManiphestView' => 'AphrontView',
	'MetaMTANotificationType' => 'MetaMTAConstants',
	'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
	'PackageCreateMail' => 'PackageMail',
	'PackageDeleteMail' => 'PackageMail',
	'PackageModifyMail' => 'PackageMail',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorActionListExample' => 'PhabricatorUIExample',
	'PhabricatorActionListView' => 'AphrontView',
	'PhabricatorActionView' => 'AphrontView',
	'PhabricatorAnchorView' => 'AphrontView',
	'PhabricatorApplicationApplications' => 'PhabricatorApplication',
	'PhabricatorApplicationAudit' => 'PhabricatorApplication',
	'PhabricatorApplicationAuth' => 'PhabricatorApplication',
	'PhabricatorApplicationCalendar' => 'PhabricatorApplication',
	'PhabricatorApplicationConduit' => 'PhabricatorApplication',
	'PhabricatorApplicationCountdown' => 'PhabricatorApplication',
	'PhabricatorApplicationDaemons' => 'PhabricatorApplication',
	'PhabricatorApplicationDifferential' => 'PhabricatorApplication',
	'PhabricatorApplicationDiffusion' => 'PhabricatorApplication',
	'PhabricatorApplicationDiviner' => 'PhabricatorApplication',
	'PhabricatorApplicationDrydock' => 'PhabricatorApplication',
	'PhabricatorApplicationFact' => 'PhabricatorApplication',
	'PhabricatorApplicationFiles' => 'PhabricatorApplication',
	'PhabricatorApplicationFlags' => 'PhabricatorApplication',
	'PhabricatorApplicationHerald' => 'PhabricatorApplication',
	'PhabricatorApplicationLaunchView' => 'AphrontView',
	'PhabricatorApplicationMacro' => 'PhabricatorApplication',
	'PhabricatorApplicationMailingLists' => 'PhabricatorApplication',
	'PhabricatorApplicationManiphest' => 'PhabricatorApplication',
	'PhabricatorApplicationMetaMTA' => 'PhabricatorApplication',
	'PhabricatorApplicationOwners' => 'PhabricatorApplication',
	'PhabricatorApplicationPHID' => 'PhabricatorApplication',
	'PhabricatorApplicationPHPAST' => 'PhabricatorApplication',
	'PhabricatorApplicationPaste' => 'PhabricatorApplication',
	'PhabricatorApplicationPeople' => 'PhabricatorApplication',
	'PhabricatorApplicationPhame' => 'PhabricatorApplication',
	'PhabricatorApplicationPholio' => 'PhabricatorApplication',
	'PhabricatorApplicationPhriction' => 'PhabricatorApplication',
	'PhabricatorApplicationPonder' => 'PhabricatorApplication',
	'PhabricatorApplicationProject' => 'PhabricatorApplication',
	'PhabricatorApplicationRepositories' => 'PhabricatorApplication',
	'PhabricatorApplicationSettings' => 'PhabricatorApplication',
	'PhabricatorApplicationSlowvote' => 'PhabricatorApplication',
	'PhabricatorApplicationStatusView' => 'AphrontView',
	'PhabricatorApplicationSubscriptions' => 'PhabricatorApplication',
	'PhabricatorApplicationTransaction' =>
	array(
	0 => 'PhabricatorLiskDAO',
	1 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorApplicationTransactionComment' =>
	array(
	0 => 'PhabricatorLiskDAO',
	1 => 'PhabricatorMarkupInterface',
	2 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorApplicationTransactionCommentEditor' => 'PhabricatorEditor',
	'PhabricatorApplicationTransactionCommentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorApplicationTransactionEditor' => 'PhabricatorEditor',
	'PhabricatorApplicationTransactionFeedStory' => 'PhabricatorFeedStory',
	'PhabricatorApplicationTransactionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhabricatorApplicationTransactionView' => 'AphrontView',
	'PhabricatorApplicationTransactions' => 'PhabricatorApplication',
	'PhabricatorApplicationUIExamples' => 'PhabricatorApplication',
	'PhabricatorApplicationsListController' => 'PhabricatorController',
	'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController',
	'PhabricatorAuditComment' =>
	array(
	0 => 'PhabricatorAuditDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'PhabricatorAuditCommentEditor' => 'PhabricatorEditor',
	'PhabricatorAuditCommitListView' => 'AphrontView',
	'PhabricatorAuditController' => 'PhabricatorController',
	'PhabricatorAuditDAO' => 'PhabricatorLiskDAO',
	'PhabricatorAuditInlineComment' =>
	array(
	0 => 'PhabricatorAuditDAO',
	1 => 'PhabricatorInlineCommentInterface',
	),
	'PhabricatorAuditListController' => 'PhabricatorAuditController',
	'PhabricatorAuditListView' => 'AphrontView',
	'PhabricatorAuditPreviewController' => 'PhabricatorAuditController',
	'PhabricatorAuditReplyHandler' => 'PhabricatorMailReplyHandler',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorBarePageExample' => 'PhabricatorUIExample',
	'PhabricatorBarePageView' => 'AphrontPageView',
	'PhabricatorBaseEnglishTranslation' => 'PhabricatorTranslation',
	'PhabricatorBuiltinPatchList' => 'PhabricatorSQLPatchList',
	'PhabricatorButtonsExample' => 'PhabricatorUIExample',
	'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarController' => 'PhabricatorController',
	'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCalendarDeleteStatusController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEditStatusController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO',
	'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
	'PhabricatorCalendarViewStatusController' => 'PhabricatorCalendarController',
	'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
	'PhabricatorChatLogChannelListController' => 'PhabricatorChatLogController',
	'PhabricatorChatLogChannelLogController' => 'PhabricatorChatLogController',
	'PhabricatorChatLogController' => 'PhabricatorController',
	'PhabricatorChatLogDAO' => 'PhabricatorLiskDAO',
	'PhabricatorChatLogEvent' =>
	array(
	0 => 'PhabricatorChatLogDAO',
	1 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorChatLogEventType' => 'PhabricatorChatLogConstants',
	'PhabricatorChatLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
	'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
	'PhabricatorConduitController' => 'PhabricatorController',
	'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
	'PhabricatorConduitListController' => 'PhabricatorConduitController',
	'PhabricatorConduitLogController' => 'PhabricatorConduitController',
	'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
	'PhabricatorContentSourceView' => 'AphrontView',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorCountdownController' => 'PhabricatorController',
	'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownViewController' => 'PhabricatorCountdownController',
	'PhabricatorCrumbView' => 'AphrontView',
	'PhabricatorCrumbsView' => 'AphrontView',
	'PhabricatorCursorPagedPolicyAwareQuery' => 'PhabricatorPolicyAwareQuery',
	'PhabricatorDaemon' => 'PhutilDaemon',
	'PhabricatorDaemonCombinedLogController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonController' => 'PhabricatorController',
	'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDaemonLog' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEvent' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEventsView' => 'AphrontView',
	'PhabricatorDaemonLogListController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonLogListView' => 'AphrontView',
	'PhabricatorDaemonLogViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineEventController' => 'PhabricatorDaemonController',
	'PhabricatorDefaultFileStorageEngineSelector' => 'PhabricatorFileStorageEngineSelector',
	'PhabricatorDefaultSearchEngineSelector' => 'PhabricatorSearchEngineSelector',
	'PhabricatorDirectoryController' => 'PhabricatorController',
	'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
	'PhabricatorDisabledUserController' => 'PhabricatorAuthController',
	'PhabricatorDraft' => 'PhabricatorDraftDAO',
	'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
	'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
	'PhabricatorEdgeCycleException' => 'Exception',
	'PhabricatorEdgeEditor' => 'PhabricatorEditor',
	'PhabricatorEdgeGraph' => 'AbstractDirectedGraph',
	'PhabricatorEdgeQuery' => 'PhabricatorQuery',
	'PhabricatorEdgeTestCase' => 'PhabricatorTestCase',
	'PhabricatorEditor' => 'Phobject',
	'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
	'PhabricatorEmailTokenController' => 'PhabricatorAuthController',
	'PhabricatorEmailVerificationController' => 'PhabricatorPeopleController',
	'PhabricatorEnglishTranslation' => 'PhabricatorBaseEnglishTranslation',
	'PhabricatorEnvTestCase' => 'PhabricatorTestCase',
	'PhabricatorErrorExample' => 'PhabricatorUIExample',
	'PhabricatorEvent' => 'PhutilEvent',
	'PhabricatorEventType' => 'PhutilEventType',
	'PhabricatorExampleEventListener' => 'PhutilEventListener',
	'PhabricatorFactAggregate' => 'PhabricatorFactDAO',
	'PhabricatorFactChartController' => 'PhabricatorFactController',
	'PhabricatorFactController' => 'PhabricatorController',
	'PhabricatorFactCountEngine' => 'PhabricatorFactEngine',
	'PhabricatorFactCursor' => 'PhabricatorFactDAO',
	'PhabricatorFactDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFactDaemon' => 'PhabricatorDaemon',
	'PhabricatorFactHomeController' => 'PhabricatorFactController',
	'PhabricatorFactLastUpdatedEngine' => 'PhabricatorFactEngine',
	'PhabricatorFactManagementAnalyzeWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementCursorsWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementDestroyWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementListWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementStatusWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementWorkflow' => 'PhutilArgumentWorkflow',
	'PhabricatorFactRaw' => 'PhabricatorFactDAO',
	'PhabricatorFactSimpleSpec' => 'PhabricatorFactSpec',
	'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
	'PhabricatorFeedController' => 'PhabricatorController',
	'PhabricatorFeedDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFeedPublicStreamController' => 'PhabricatorFeedController',
	'PhabricatorFeedQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFeedStory' => 'PhabricatorPolicyInterface',
	'PhabricatorFeedStoryAggregate' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryAudit' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryCommit' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryData' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryDifferential' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryDifferentialAggregate' => 'PhabricatorFeedStoryAggregate',
	'PhabricatorFeedStoryManiphest' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryManiphestAggregate' => 'PhabricatorFeedStoryAggregate',
	'PhabricatorFeedStoryNotification' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryPhriction' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryProject' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryStatus' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryTypeConstants' => 'PhabricatorFeedConstants',
	'PhabricatorFeedStoryView' => 'PhabricatorFeedView',
	'PhabricatorFeedView' => 'AphrontView',
	'PhabricatorFile' =>
	array(
	0 => 'PhabricatorFileDAO',
	1 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorFileController' => 'PhabricatorController',
	'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFileDataController' => 'PhabricatorFileController',
	'PhabricatorFileDeleteController' => 'PhabricatorFileController',
	'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
	- 'PhabricatorFileImageMacro' => 'PhabricatorFileDAO',
	+ 'PhabricatorFileImageMacro' =>
	+ array(
	+ 0 => 'PhabricatorFileDAO',
	+ 1 => 'PhabricatorSubscribableInterface',
	+ ),
	'PhabricatorFileInfoController' => 'PhabricatorFileController',
	'PhabricatorFileLinkListView' => 'AphrontView',
	'PhabricatorFileLinkView' => 'AphrontView',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	'PhabricatorFileQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFileShortcutController' => 'PhabricatorFileController',
	'PhabricatorFileSideNavView' => 'AphrontView',
	'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
	'PhabricatorFileStorageConfigurationException' => 'Exception',
	'PhabricatorFileTransformController' => 'PhabricatorFileController',
	'PhabricatorFileUploadController' => 'PhabricatorFileController',
	'PhabricatorFileUploadException' => 'Exception',
	'PhabricatorFileUploadView' => 'AphrontView',
	'PhabricatorFilesManagementEnginesWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementMigrateWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementWorkflow' => 'PhutilArgumentWorkflow',
	'PhabricatorFlag' => 'PhabricatorFlagDAO',
	'PhabricatorFlagColor' => 'PhabricatorFlagConstants',
	'PhabricatorFlagController' => 'PhabricatorController',
	'PhabricatorFlagDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFlagDeleteController' => 'PhabricatorFlagController',
	'PhabricatorFlagEditController' => 'PhabricatorFlagController',
	'PhabricatorFlagListController' => 'PhabricatorFlagController',
	'PhabricatorFlagListView' => 'AphrontView',
	'PhabricatorFlagsUIEventListener' => 'PhutilEventListener',
	'PhabricatorFormExample' => 'PhabricatorUIExample',
	'PhabricatorGarbageCollectorDaemon' => 'PhabricatorDaemon',
	'PhabricatorGlobalLock' => 'PhutilLock',
	'PhabricatorHeaderView' => 'AphrontView',
	'PhabricatorHelpController' => 'PhabricatorController',
	'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
	'PhabricatorIRCBot' => 'PhabricatorDaemon',
	'PhabricatorIRCDifferentialNotificationHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCLogHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCMacroHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCObjectNameHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCProtocolHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCWhatsNewHandler' => 'PhabricatorIRCHandler',
	'PhabricatorInfrastructureTestCase' => 'PhabricatorTestCase',
	'PhabricatorInlineCommentController' => 'PhabricatorController',
	'PhabricatorInlineCommentInterface' => 'PhabricatorMarkupInterface',
	'PhabricatorInlineCommentPreviewController' => 'PhabricatorController',
	'PhabricatorInlineSummaryView' => 'AphrontView',
	'PhabricatorJavelinLinter' => 'ArcanistLinter',
	'PhabricatorLDAPLoginController' => 'PhabricatorAuthController',
	'PhabricatorLDAPRegistrationController' => 'PhabricatorAuthController',
	'PhabricatorLDAPUnknownUserException' => 'Exception',
	'PhabricatorLDAPUnlinkController' => 'PhabricatorAuthController',
	'PhabricatorLintEngine' => 'PhutilLintEngine',
	'PhabricatorLiskDAO' => 'LiskDAO',
	'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
	'PhabricatorLoginController' => 'PhabricatorAuthController',
	'PhabricatorLoginValidateController' => 'PhabricatorAuthController',
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	+ 'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
	'PhabricatorMacroController' => 'PhabricatorController',
	- 'PhabricatorMacroDeleteController' => 'PhabricatorMacroController',
	+ 'PhabricatorMacroDisableController' => 'PhabricatorMacroController',
	'PhabricatorMacroEditController' => 'PhabricatorMacroController',
	+ 'PhabricatorMacroEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorMacroListController' => 'PhabricatorMacroController',
	+ 'PhabricatorMacroReplyHandler' => 'PhabricatorMailReplyHandler',
	+ 'PhabricatorMacroTransaction' => 'PhabricatorApplicationTransaction',
	+ 'PhabricatorMacroTransactionComment' => 'PhabricatorApplicationTransactionComment',
	+ 'PhabricatorMacroTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	+ 'PhabricatorMacroViewController' => 'PhabricatorMacroController',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
	'PhabricatorMailImplementationPHPMailerAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationSendGridAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationTestAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailingListsEditController' => 'PhabricatorController',
	'PhabricatorMailingListsListController' => 'PhabricatorController',
	'PhabricatorMainMenuGroupView' => 'AphrontView',
	'PhabricatorMainMenuIconView' => 'AphrontView',
	'PhabricatorMainMenuSearchView' => 'AphrontView',
	'PhabricatorMainMenuView' => 'AphrontView',
	'PhabricatorMarkupCache' => 'PhabricatorCacheDAO',
	'PhabricatorMenuItemView' => 'AphrontView',
	'PhabricatorMenuView' => 'AphrontView',
	'PhabricatorMetaMTAController' => 'PhabricatorController',
	'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailBodyTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAMailTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAMailingList' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceivedListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceivedMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTASendGridReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAViewController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAWorker' => 'PhabricatorWorker',
	'PhabricatorMustVerifyEmailController' => 'PhabricatorAuthController',
	'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorNotificationClearController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationController' => 'PhabricatorController',
	'PhabricatorNotificationIndividualController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationListController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationPanelController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorNotificationStatusController' => 'PhabricatorNotificationController',
	'PhabricatorOAuthClientAuthorization' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthClientAuthorizationBaseController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthClientAuthorizationDeleteController' => 'PhabricatorOAuthClientAuthorizationBaseController',
	'PhabricatorOAuthClientAuthorizationEditController' => 'PhabricatorOAuthClientAuthorizationBaseController',
	'PhabricatorOAuthClientAuthorizationListController' => 'PhabricatorOAuthClientAuthorizationBaseController',
	'PhabricatorOAuthClientAuthorizationQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorOAuthClientBaseController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthClientDeleteController' => 'PhabricatorOAuthClientBaseController',
	'PhabricatorOAuthClientEditController' => 'PhabricatorOAuthClientBaseController',
	'PhabricatorOAuthClientListController' => 'PhabricatorOAuthClientBaseController',
	'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientBaseController',
	'PhabricatorOAuthDefaultRegistrationController' => 'PhabricatorOAuthRegistrationController',
	'PhabricatorOAuthDiagnosticsController' => 'PhabricatorAuthController',
	'PhabricatorOAuthFailureView' => 'AphrontView',
	'PhabricatorOAuthLoginController' => 'PhabricatorAuthController',
	'PhabricatorOAuthProviderDisqus' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderException' => 'Exception',
	'PhabricatorOAuthProviderFacebook' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderGitHub' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderGoogle' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderPhabricator' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthRegistrationController' => 'PhabricatorAuthController',
	'PhabricatorOAuthResponse' => 'AphrontResponse',
	'PhabricatorOAuthServerAccessToken' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController',
	'PhabricatorOAuthServerAuthorizationCode' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthServerClient' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthServerClientQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorOAuthServerController' => 'PhabricatorController',
	'PhabricatorOAuthServerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOAuthServerTestCase' => 'PhabricatorTestCase',
	'PhabricatorOAuthServerTestController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthServerTokenController' => 'PhabricatorAuthController',
	'PhabricatorOAuthUnlinkController' => 'PhabricatorAuthController',
	'PhabricatorObjectHandleStatus' => 'PhabricatorObjectHandleConstants',
	'PhabricatorObjectItemListView' => 'AphrontView',
	'PhabricatorObjectItemView' => 'AphrontView',
	'PhabricatorObjectListView' => 'AphrontView',
	'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
	'PhabricatorOwnersController' => 'PhabricatorController',
	'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOwnersDeleteController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersDetailController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersEditController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersOwner' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPackage' =>
	array(
	0 => 'PhabricatorOwnersDAO',
	1 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorOwnersPackageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOwnersPackageTestCase' => 'PhabricatorTestCase',
	'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
	'PhabricatorPHIDController' => 'PhabricatorController',
	'PhabricatorPHIDLookupController' => 'PhabricatorPHIDController',
	'PhabricatorPaste' =>
	array(
	0 => 'PhabricatorPasteDAO',
	1 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorPasteController' => 'PhabricatorController',
	'PhabricatorPasteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPasteEditController' => 'PhabricatorPasteController',
	'PhabricatorPasteListController' => 'PhabricatorPasteController',
	'PhabricatorPasteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorPasteViewController' => 'PhabricatorPasteController',
	'PhabricatorPeopleController' => 'PhabricatorController',
	'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleLdapController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorPinboardItemView' => 'AphrontView',
	'PhabricatorPinboardView' => 'AphrontView',
	'PhabricatorPolicies' => 'PhabricatorPolicyConstants',
	'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorPolicyAwareTestQuery' => 'PhabricatorPolicyAwareQuery',
	'PhabricatorPolicyCapability' => 'PhabricatorPolicyConstants',
	'PhabricatorPolicyException' => 'Exception',
	'PhabricatorPolicyQuery' => 'PhabricatorQuery',
	'PhabricatorPolicyTestCase' => 'PhabricatorTestCase',
	'PhabricatorPolicyTestObject' => 'PhabricatorPolicyInterface',
	'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
	'PhabricatorProfileHeaderView' => 'AphrontView',
	'PhabricatorProject' =>
	array(
	0 => 'PhabricatorProjectDAO',
	1 => 'PhabricatorPolicyInterface',
	),
	'PhabricatorProjectController' => 'PhabricatorController',
	'PhabricatorProjectCreateController' => 'PhabricatorProjectController',
	'PhabricatorProjectDAO' => 'PhabricatorLiskDAO',
	'PhabricatorProjectEditor' => 'PhabricatorEditor',
	'PhabricatorProjectEditorTestCase' => 'PhabricatorTestCase',
	'PhabricatorProjectListController' => 'PhabricatorProjectController',
	'PhabricatorProjectMembersEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectNameCollisionException' => 'Exception',
	'PhabricatorProjectProfile' => 'PhabricatorProjectDAO',
	'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
	'PhabricatorProjectProfileEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorProjectTransaction' => 'PhabricatorProjectDAO',
	'PhabricatorProjectTransactionType' => 'PhabricatorProjectConstants',
	'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
	'PhabricatorPropertyListExample' => 'PhabricatorUIExample',
	'PhabricatorPropertyListView' => 'AphrontView',
	'PhabricatorRedirectController' => 'PhabricatorController',
	'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',
	'PhabricatorRemarkupControl' => 'AphrontFormTextAreaControl',
	'PhabricatorRemarkupRuleCountdown' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleDifferential' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRuleDifferentialHandle' => 'PhabricatorRemarkupRuleObjectHandle',
	'PhabricatorRemarkupRuleDiffusion' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleEmbedFile' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleImageMacro' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleManiphest' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRuleManiphestHandle' => 'PhabricatorRemarkupRuleObjectHandle',
	'PhabricatorRemarkupRuleMention' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleObjectHandle' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleObjectName' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRulePaste' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRulePhriction' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleYoutube' => 'PhutilRemarkupRule',
	'PhabricatorRepository' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryArcanistProject' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryArcanistProjectDeleteController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryArcanistProjectEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryAuditRequest' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryBranch' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommit' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitOwnersWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryController' => 'PhabricatorController',
	'PhabricatorRepositoryCreateController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorRepositoryDeleteController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryListController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryManagementDeleteWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementDiscoverWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementListWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementPullWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementWorkflow' => 'PhutilArgumentWorkflow',
	'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryPullLocalDaemon' => 'PhabricatorDaemon',
	'PhabricatorRepositoryPullLocalDaemonTestCase' => 'PhabricatorTestCase',
	'PhabricatorRepositoryShortcut' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositorySymbol' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryTestCase' => 'PhabricatorTestCase',
	'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorSearchAttachController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchBaseController' => 'PhabricatorController',
	'PhabricatorSearchCommitIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSearchDifferentialIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchDocument' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentField' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
	'PhabricatorSearchEngineElastic' => 'PhabricatorSearchEngine',
	'PhabricatorSearchEngineMySQL' => 'PhabricatorSearchEngine',
	'PhabricatorSearchManiphestIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchPhrictionIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchPonderIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchQuery' => 'PhabricatorSearchDAO',
	'PhabricatorSearchResultView' => 'AphrontView',
	'PhabricatorSearchSelectController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchUserIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSettingsAdjustController' => 'PhabricatorController',
	'PhabricatorSettingsMainController' => 'PhabricatorController',
	'PhabricatorSettingsPanelAccount' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelConduit' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelDisplayPreferences' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelEmailAddresses' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelEmailPreferences' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelLDAP' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelOAuth' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelPassword' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelProfile' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelSSHKeys' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsPanelSearchPreferences' => 'PhabricatorSettingsPanel',
	'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteController' => 'PhabricatorController',
	'PhabricatorSlowvoteCreateController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteOption' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePoll' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePollController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlugTestCase' => 'PhabricatorTestCase',
	'PhabricatorSortTableExample' => 'PhabricatorUIExample',
	'PhabricatorSourceCodeView' => 'AphrontView',
	'PhabricatorStandardPageView' => 'PhabricatorBarePageView',
	'PhabricatorStatusController' => 'PhabricatorController',
	'PhabricatorStorageManagementDatabasesWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementDestroyWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementDumpWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementStatusWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementUpgradeWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementWorkflow' => 'PhutilArgumentWorkflow',
	'PhabricatorSubscribersQuery' => 'PhabricatorQuery',
	'PhabricatorSubscriptionsEditController' => 'PhabricatorController',
	'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor',
	'PhabricatorSubscriptionsUIEventListener' => 'PhutilEventListener',
	'PhabricatorSymbolNameLinter' => 'ArcanistXHPASTLintNamingHook',
	'PhabricatorTagExample' => 'PhabricatorUIExample',
	'PhabricatorTagView' => 'AphrontView',
	'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
	'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
	'PhabricatorTestWorker' => 'PhabricatorWorker',
	'PhabricatorTimelineCursor' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineDAO' => 'PhabricatorLiskDAO',
	'PhabricatorTimelineEvent' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineEventData' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineEventView' => 'AphrontView',
	'PhabricatorTimelineExample' => 'PhabricatorUIExample',
	'PhabricatorTimelineIterator' => 'Iterator',
	'PhabricatorTimelineView' => 'AphrontView',
	'PhabricatorTimer' => 'PhabricatorCountdownDAO',
	'PhabricatorTransactionView' => 'AphrontView',
	'PhabricatorTransformedFile' => 'PhabricatorFileDAO',
	'PhabricatorTrivialTestCase' => 'PhabricatorTestCase',
	'PhabricatorTypeaheadCommonDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
	'PhabricatorUIExampleRenderController' => 'PhabricatorController',
	'PhabricatorUIListFilterExample' => 'PhabricatorUIExample',
	'PhabricatorUINotificationExample' => 'PhabricatorUIExample',
	'PhabricatorUIPagerExample' => 'PhabricatorUIExample',
	'PhabricatorUITooltipExample' => 'PhabricatorUIExample',
	'PhabricatorUnitsTestCase' => 'PhabricatorTestCase',
	'PhabricatorUser' =>
	array(
	0 => 'PhabricatorUserDAO',
	1 => 'PhutilPerson',
	),
	'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
	'PhabricatorUserEditor' => 'PhabricatorEditor',
	'PhabricatorUserEmail' => 'PhabricatorUserDAO',
	'PhabricatorUserLDAPInfo' => 'PhabricatorUserDAO',
	'PhabricatorUserLog' => 'PhabricatorUserDAO',
	'PhabricatorUserOAuthInfo' => 'PhabricatorUserDAO',
	'PhabricatorUserPreferences' => 'PhabricatorUserDAO',
	'PhabricatorUserProfile' => 'PhabricatorUserDAO',
	'PhabricatorUserSSHKey' => 'PhabricatorUserDAO',
	'PhabricatorUserStatus' => 'PhabricatorUserDAO',
	'PhabricatorUserStatusInvalidEpochException' => 'Exception',
	'PhabricatorUserStatusOverlapException' => 'Exception',
	'PhabricatorUserTestCase' => 'PhabricatorTestCase',
	'PhabricatorWorkerActiveTask' => 'PhabricatorWorkerTask',
	'PhabricatorWorkerArchiveTask' => 'PhabricatorWorkerTask',
	'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorWorkerLeaseQuery' => 'PhabricatorQuery',
	'PhabricatorWorkerPermanentFailureException' => 'Exception',
	'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
	'PhabricatorWorkerTaskUpdateController' => 'PhabricatorDaemonController',
	'PhabricatorWorkerTestCase' => 'PhabricatorTestCase',
	'PhabricatorXHPASTViewController' => 'PhabricatorController',
	'PhabricatorXHPASTViewDAO' => 'PhabricatorLiskDAO',
	'PhabricatorXHPASTViewFrameController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewFramesetController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewInputController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewPanelController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewParseTree' => 'PhabricatorXHPASTViewDAO',
	'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHProfController' => 'PhabricatorController',
	'PhabricatorXHProfDAO' => 'PhabricatorLiskDAO',
	'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfProfileSymbolView' => 'PhabricatorXHProfProfileView',
	'PhabricatorXHProfProfileTopLevelView' => 'PhabricatorXHProfProfileView',
	'PhabricatorXHProfProfileView' => 'AphrontView',
	'PhabricatorXHProfSample' => 'PhabricatorXHProfDAO',
	'PhabricatorXHProfSampleListController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfSampleListView' => 'AphrontView',
	'PhameBasicBlogSkin' => 'PhameBlogSkin',
	'PhameBasicTemplateBlogSkin' => 'PhameBasicBlogSkin',
	'PhameBlog' =>
	array(
	0 => 'PhameDAO',
	1 => 'PhabricatorPolicyInterface',
	2 => 'PhabricatorMarkupInterface',
	),
	'PhameBlogDeleteController' => 'PhameController',
	'PhameBlogEditController' => 'PhameController',
	'PhameBlogListController' => 'PhameController',
	'PhameBlogLiveController' => 'PhameController',
	'PhameBlogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhameBlogSkin' => 'PhabricatorController',
	'PhameBlogViewController' => 'PhameController',
	'PhameController' => 'PhabricatorController',
	'PhameDAO' => 'PhabricatorLiskDAO',
	'PhamePost' =>
	array(
	0 => 'PhameDAO',
	1 => 'PhabricatorPolicyInterface',
	2 => 'PhabricatorMarkupInterface',
	),
	'PhamePostDeleteController' => 'PhameController',
	'PhamePostEditController' => 'PhameController',
	'PhamePostFramedController' => 'PhameController',
	'PhamePostListController' => 'PhameController',
	'PhamePostNewController' => 'PhameController',
	'PhamePostNotLiveController' => 'PhameController',
	'PhamePostPreviewController' => 'PhameController',
	'PhamePostPublishController' => 'PhameController',
	'PhamePostQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhamePostUnpublishController' => 'PhameController',
	'PhamePostView' => 'AphrontView',
	'PhamePostViewController' => 'PhameController',
	'PhameResourceController' => 'CelerityResourceController',
	'PholioController' => 'PhabricatorController',
	'PholioDAO' => 'PhabricatorLiskDAO',
	'PholioImage' =>
	array(
	0 => 'PholioDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'PholioIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PholioMock' =>
	array(
	0 => 'PholioDAO',
	1 => 'PhabricatorMarkupInterface',
	2 => 'PhabricatorPolicyInterface',
	3 => 'PhabricatorSubscribableInterface',
	),
	'PholioMockCommentController' => 'PholioController',
	'PholioMockEditController' => 'PholioController',
	'PholioMockEditor' => 'PhabricatorApplicationTransactionEditor',
	'PholioMockListController' => 'PholioController',
	'PholioMockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PholioMockViewController' => 'PholioController',
	'PholioReplyHandler' => 'PhabricatorMailReplyHandler',
	'PholioTransaction' => 'PhabricatorApplicationTransaction',
	'PholioTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PholioTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PholioTransactionType' => 'PholioConstants',
	'PhortuneMonthYearExpiryControl' => 'AphrontFormControl',
	'PhortuneStripeBaseController' => 'PhabricatorController',
	'PhortuneStripePaymentFormView' => 'AphrontView',
	'PhortuneStripeTestPaymentFormController' => 'PhortuneStripeBaseController',
	'PhrictionActionConstants' => 'PhrictionConstants',
	'PhrictionChangeType' => 'PhrictionConstants',
	'PhrictionContent' =>
	array(
	0 => 'PhrictionDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'PhrictionController' => 'PhabricatorController',
	'PhrictionDAO' => 'PhabricatorLiskDAO',
	'PhrictionDeleteController' => 'PhrictionController',
	'PhrictionDiffController' => 'PhrictionController',
	'PhrictionDocument' => 'PhrictionDAO',
	'PhrictionDocumentController' => 'PhrictionController',
	'PhrictionDocumentEditor' => 'PhabricatorEditor',
	'PhrictionDocumentPreviewController' => 'PhrictionController',
	'PhrictionDocumentStatus' => 'PhrictionConstants',
	'PhrictionDocumentTestCase' => 'PhabricatorTestCase',
	'PhrictionEditController' => 'PhrictionController',
	'PhrictionHistoryController' => 'PhrictionController',
	'PhrictionListController' => 'PhrictionController',
	'PhrictionNewController' => 'PhrictionController',
	'PonderAddAnswerView' => 'AphrontView',
	'PonderAddCommentView' => 'AphrontView',
	'PonderAnswer' =>
	array(
	0 => 'PonderDAO',
	1 => 'PhabricatorMarkupInterface',
	2 => 'PonderVotableInterface',
	),
	'PonderAnswerEditor' => 'PhabricatorEditor',
	'PonderAnswerListView' => 'AphrontView',
	'PonderAnswerPreviewController' => 'PonderController',
	'PonderAnswerQuery' => 'PhabricatorOffsetPagedQuery',
	'PonderAnswerSaveController' => 'PonderController',
	'PonderAnswerViewController' => 'PonderController',
	'PonderAnsweredMail' => 'PonderMail',
	'PonderComment' =>
	array(
	0 => 'PonderDAO',
	1 => 'PhabricatorMarkupInterface',
	),
	'PonderCommentEditor' => 'PhabricatorEditor',
	'PonderCommentListView' => 'AphrontView',
	'PonderCommentMail' => 'PonderMail',
	'PonderCommentQuery' => 'PhabricatorQuery',
	'PonderCommentSaveController' => 'PonderController',
	'PonderController' => 'PhabricatorController',
	'PonderDAO' => 'PhabricatorLiskDAO',
	'PonderFeedController' => 'PonderController',
	'PonderMentionMail' => 'PonderMail',
	'PonderPostBodyView' => 'AphrontView',
	'PonderQuestion' =>
	array(
	0 => 'PonderDAO',
	1 => 'PhabricatorMarkupInterface',
	2 => 'PonderVotableInterface',
	3 => 'PhabricatorSubscribableInterface',
	),
	'PonderQuestionAskController' => 'PonderController',
	'PonderQuestionDetailView' => 'AphrontView',
	'PonderQuestionEditor' => 'PhabricatorEditor',
	'PonderQuestionPreviewController' => 'PonderController',
	'PonderQuestionQuery' => 'PhabricatorOffsetPagedQuery',
	'PonderQuestionSummaryView' => 'AphrontView',
	'PonderQuestionViewController' => 'PonderController',
	'PonderReplyHandler' => 'PhabricatorMailReplyHandler',
	'PonderRuleQuestion' => 'PhabricatorRemarkupRuleObjectName',
	'PonderUserProfileView' => 'AphrontView',
	'PonderVotableView' => 'AphrontView',
	'PonderVoteEditor' => 'PhabricatorEditor',
	'PonderVoteSaveController' => 'PonderController',
	'QueryFormattingTestCase' => 'PhabricatorTestCase',
	),
	));
	diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
	index d83bbb27c6..282ed13774 100644
	--- a/src/aphront/AphrontRequest.php
	+++ b/src/aphront/AphrontRequest.php
	@@ -1,332 +1,337 @@
	<?php

	/**
	*
	* @task data Accessing Request Data
	*
	* @group aphront
	*/
	final class AphrontRequest {

	// NOTE: These magic request-type parameters are automatically included in
	// certain requests (e.g., by phabricator_render_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__';

	private $host;
	private $path;
	private $requestData;
	private $user;
	private $applicationConfiguration;

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

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

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

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

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

	final 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();
	}


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


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


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


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


	/**
	* @task data
	*/
	final 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
	*/
	final 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
	*/
	final 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
	*/
	final 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
	*/
	final public function getExists($name) {
	return array_key_exists($name, $this->requestData);
	}

	+ final public function getFileExists($name) {
	+ return isset($_FILES[$name]) &&
	+ (idx($_FILES[$name], 'error') !== UPLOAD_ERR_NO_FILE);
	+ }
	+
	final public function isHTTPPost() {
	return ($_SERVER['REQUEST_METHOD'] == 'POST');
	}

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

	final public function isJavelinWorkflow() {
	return $this->getExists(self::TYPE_WORKFLOW);
	}

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

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

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

	final 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)) {

	// PHP mangles HTTP headers by uppercasing them and replacing hyphens with
	// underscores, then prepending 'HTTP_'.
	$php_index = self::getCSRFHeaderName();
	$php_index = strtoupper($php_index);
	$php_index = str_replace('-', '_', $php_index);
	$php_index = 'HTTP_'.$php_index;

	$token = idx($_SERVER, $php_index);
	}

	$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.
	if ($token) {
	$token_info = "with an invalid CSRF token";
	} else {
	$token_info = "without a CSRF token";
	}

	if ($this->isAjax()) {
	$more_info = "(This was an Ajax request, {$token_info}.)";
	} else {
	$more_info = "(This was a web request, {$token_info}.)";
	}

	// 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(
	"The form you just submitted did not include a valid CSRF token. ".
	"This token is a technical security measure which prevents a ".
	"certain type of login hijacking attack. However, the token can ".
	"become invalid if you leave a page open for more than six hours ".
	"without a connection to the internet. To fix this problem: reload ".
	"the page, and then resubmit it. All data inserted to the form will ".
	"be lost in some browsers so copy them somewhere before reloading.\n\n".
	$more_info);
	}

	return true;
	}

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

	if (!$post) {
	return false;
	}

	return $this->validateCSRF();
	}

	final public function getCookie($name, $default = null) {
	return idx($_COOKIE, $name, $default);
	}

	final public function clearCookie($name) {
	$this->setCookie($name, '', time() - (60 * 60 * 24 * 30));
	}

	final public function setCookie($name, $value, $expire = null) {

	// Ensure cookies are only set on the configured domain.

	$base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
	$base_uri = new PhutilURI($base_uri);

	$base_domain = $base_uri->getDomain();
	$base_protocol = $base_uri->getProtocol();

	$host = $this->getHost();

	if ($base_domain != $host) {
	throw new Exception(
	"This install of Phabricator is configured as '{$base_domain}' but ".
	"you are accessing it via '{$host}'. Access Phabricator via ".
	"the primary configured domain.");
	}

	if ($expire === null) {
	$expire = time() + (60 * 60 * 24 * 365 * 5);
	}

	$is_secure = ($base_protocol == 'https');

	setcookie(
	$name,
	$value,
	$expire,
	$path = '/',
	$base_domain,
	$is_secure,
	$http_only = true);

	return $this;
	}

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

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

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

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

	final 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;
	}

	}
	diff --git a/src/applications/macro/application/PhabricatorApplicationMacro.php b/src/applications/macro/application/PhabricatorApplicationMacro.php
	index 972ae0ed4d..a2f68437e1 100644
	--- a/src/applications/macro/application/PhabricatorApplicationMacro.php
	+++ b/src/applications/macro/application/PhabricatorApplicationMacro.php
	@@ -1,35 +1,38 @@
	<?php

	final class PhabricatorApplicationMacro extends PhabricatorApplication {

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

	public function getShortDescription() {
	return 'Image Macros and Memes';
	}

	public function getIconName() {
	return 'macro';
	}

	public function getTitleGlyph() {
	return "\xE2\x9A\x98";
	}

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

	public function getRoutes() {
	return array(
	'/macro/' => array(
	'' => 'PhabricatorMacroListController',
	- 'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhabricatorMacroEditController',
	- 'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroDeleteController',
	+ 'create/' => 'PhabricatorMacroEditController',
	+ 'view/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroViewController',
	+ 'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroCommentController',
	+ 'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroEditController',
	+ 'disable/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroDisableController',
	),
	);
	}

	}
	diff --git a/src/applications/macro/constants/PhabricatorMacroTransactionType.php b/src/applications/macro/constants/PhabricatorMacroTransactionType.php
	new file mode 100644
	index 0000000000..fb1b8013aa
	--- /dev/null
	+++ b/src/applications/macro/constants/PhabricatorMacroTransactionType.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+final class PhabricatorMacroTransactionType {
	+
	+ const TYPE_NAME = 'macro:name';
	+ const TYPE_DISABLED = 'macro:disabled';
	+ const TYPE_FILE = 'macro:file';
	+
	+}
	diff --git a/src/applications/macro/controller/PhabricatorMacroCommentController.php b/src/applications/macro/controller/PhabricatorMacroCommentController.php
	new file mode 100644
	index 0000000000..241348fdec
	--- /dev/null
	+++ b/src/applications/macro/controller/PhabricatorMacroCommentController.php
	@@ -0,0 +1,49 @@
	+<?php
	+
	+final class PhabricatorMacroCommentController
	+ extends PhabricatorMacroController {
	+
	+ private $id;
	+
	+ public function willProcessRequest(array $data) {
	+ $this->id = idx($data, 'id');
	+ }
	+
	+ public function processRequest() {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ if (!$request->isFormPost()) {
	+ return new Aphront400Response();
	+ }
	+
	+ $macro = id(new PhabricatorFileImageMacro())->load($this->id);
	+ if (!$macro) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = $this->getApplicationURI('/view/'.$macro->getID().'/');
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorMacroTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	+ ->attachComment(
	+ id(new PhabricatorMacroTransactionComment())
	+ ->setContent($request->getStr('comment')));
	+
	+ $editor = id(new PhabricatorMacroEditor())
	+ ->setActor($user)
	+ ->setContentSource(
	+ PhabricatorContentSource::newForSource(
	+ PhabricatorContentSource::SOURCE_WEB,
	+ array(
	+ 'ip' => $request->getRemoteAddr(),
	+ )))
	+ ->applyTransactions($macro, $xactions);
	+
	+ return id(new AphrontRedirectResponse())
	+ ->setURI($view_uri);
	+ }
	+
	+}
	diff --git a/src/applications/macro/controller/PhabricatorMacroController.php b/src/applications/macro/controller/PhabricatorMacroController.php
	index 48adf16723..8ae3e7f1bc 100644
	--- a/src/applications/macro/controller/PhabricatorMacroController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroController.php
	@@ -1,21 +1,41 @@
	<?php

	abstract class PhabricatorMacroController
	extends PhabricatorController {

	- protected function buildSideNavView(PhabricatorFileImageMacro $macro = null) {
	+ protected function buildSideNavView($for_app = false, $has_search = false) {
	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	- $nav->addLabel('Create');
	- $nav->addFilter('edit', 'Create Macro');
	-
	- $nav->addSpacer();
	+ if ($for_app) {
	+ $nav->addLabel('Create');
	+ $nav->addFilter('', 'Create Macro', $this->getApplicationURI('/create/'));
	+ }

	$nav->addLabel('Macros');
	- $nav->addFilter('', 'All Macros');
	+ $nav->addFilter('/', 'All Macros');
	+ if ($has_search) {
	+ $nav->addFilter('search', 'Search', $this->getRequest()->getRequestURI());
	+ }
	+

	return $nav;
	}

	+ public function buildApplicationMenu() {
	+ return $this->buildSideNavView($for_app = true)->getMenu();
	+ }
	+
	+ protected function buildApplicationCrumbs() {
	+ $crumbs = parent::buildApplicationCrumbs();
	+
	+ $crumbs->addAction(
	+ id(new PhabricatorMenuItemView())
	+ ->setName(pht('Create Macro'))
	+ ->setHref($this->getApplicationURI('/create/'))
	+ ->setIcon('create'));
	+
	+ return $crumbs;
	+ }
	+
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroDeleteController.php b/src/applications/macro/controller/PhabricatorMacroDeleteController.php
	deleted file mode 100644
	index 2f00e92c3b..0000000000
	--- a/src/applications/macro/controller/PhabricatorMacroDeleteController.php
	+++ /dev/null
	@@ -1,42 +0,0 @@
	-<?php
	-
	-final class PhabricatorMacroDeleteController
	- extends PhabricatorMacroController {
	-
	- private $id;
	-
	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- }
	-
	- public function processRequest() {
	-
	- $macro = id(new PhabricatorFileImageMacro())->load($this->id);
	- if (!$macro) {
	- return new Aphront404Response();
	- }
	-
	- $request = $this->getRequest();
	-
	- if ($request->isDialogFormPost()) {
	- $macro->delete();
	- return id(new AphrontRedirectResponse())->setURI(
	- $this->getApplicationURI());
	- }
	-
	- $dialog = new AphrontDialogView();
	- $dialog
	- ->setUser($request->getUser())
	- ->setTitle('Really delete macro?')
	- ->appendChild(
	- '<p>Really delete the much-beloved image macro "'.
	- phutil_escape_html($macro->getName()).'"? It will be sorely missed.'.
	- '</p>')
	- ->setSubmitURI($this->getApplicationURI('/delete/'.$this->id.'/'))
	- ->addSubmitButton('Delete')
	- ->addCancelButton($this->getApplicationURI());
	-
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	- }
	-}
	diff --git a/src/applications/macro/controller/PhabricatorMacroDisableController.php b/src/applications/macro/controller/PhabricatorMacroDisableController.php
	new file mode 100644
	index 0000000000..474285d77e
	--- /dev/null
	+++ b/src/applications/macro/controller/PhabricatorMacroDisableController.php
	@@ -0,0 +1,55 @@
	+<?php
	+
	+final class PhabricatorMacroDisableController
	+ extends PhabricatorMacroController {
	+
	+ private $id;
	+
	+ public function willProcessRequest(array $data) {
	+ $this->id = $data['id'];
	+ }
	+
	+ public function processRequest() {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ $macro = id(new PhabricatorFileImageMacro())->load($this->id);
	+ if (!$macro) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = $this->getApplicationURI('/view/'.$this->id.'/');
	+
	+ if ($request->isDialogFormPost() \|\| $macro->getIsDisabled()) {
	+ $xaction = id(new PhabricatorMacroTransaction())
	+ ->setTransactionType(PhabricatorMacroTransactionType::TYPE_DISABLED)
	+ ->setNewValue($macro->getIsDisabled() ? 0 : 1);
	+
	+ $editor = id(new PhabricatorMacroEditor())
	+ ->setActor($user)
	+ ->setContentSource(
	+ PhabricatorContentSource::newForSource(
	+ PhabricatorContentSource::SOURCE_WEB,
	+ array(
	+ 'ip' => $request->getRemoteAddr(),
	+ )))
	+ ->applyTransactions($macro, array($xaction));
	+
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	+ }
	+
	+ $dialog = new AphrontDialogView();
	+ $dialog
	+ ->setUser($request->getUser())
	+ ->setTitle('Really disable macro?')
	+ ->appendChild(
	+ '<p>Really disable the much-beloved image macro "'.
	+ phutil_escape_html($macro->getName()).'"? It will be sorely missed.'.
	+ '</p>')
	+ ->setSubmitURI($this->getApplicationURI('/disable/'.$this->id.'/'))
	+ ->addSubmitButton('Disable')
	+ ->addCancelButton($view_uri);
	+
	+ return id(new AphrontDialogResponse())->setDialog($dialog);
	+ }
	+}
	diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
	index 7c9cdb4fe9..ff9f9fcbf3 100644
	--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
	@@ -1,129 +1,245 @@
	<?php

	final class PhabricatorMacroEditController
	extends PhabricatorMacroController {

	private $id;

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	}

	public function processRequest() {

	if ($this->id) {
	$macro = id(new PhabricatorFileImageMacro())->load($this->id);
	if (!$macro) {
	return new Aphront404Response();
	}
	} else {
	$macro = new PhabricatorFileImageMacro();
	}

	$errors = array();
	$e_name = true;
	+ $e_file = true;
	$file = null;

	$request = $this->getRequest();
	$user = $request->getUser();
	if ($request->isFormPost()) {
	-
	- $macro->setName($request->getStr('name'));
	-
	- if (!strlen($macro->getName())) {
	- $errors[] = 'Macro name is required.';
	- $e_name = 'Required';
	- } else if (!preg_match('/^[a-z0-9_-]{3,}$/', $macro->getName())) {
	- $errors[] = 'Macro must be at least three characters long and contain '.
	- 'only lowercase letters, digits, hyphen and underscore.';
	- $e_name = 'Invalid';
	- } else {
	- $e_name = null;
	+ $original = clone $macro;
	+
	+ $new_name = null;
	+ if ($request->getBool('name_form') \|\| !$macro->getID()) {
	+ $new_name = $request->getStr('name');
	+
	+ $macro->setName($new_name);
	+
	+ if (!strlen($macro->getName())) {
	+ $errors[] = 'Macro name is required.';
	+ $e_name = 'Required';
	+ } else if (!preg_match('/^[a-z0-9_-]{3,}$/', $macro->getName())) {
	+ $errors[] = 'Macro must be at least three characters long and '.
	+ 'contain only lowercase letters, digits, hyphen and '.
	+ 'underscore.';
	+ $e_name = 'Invalid';
	+ } else {
	+ $e_name = null;
	+ }
	}

	- if (!$errors) {
	-
	+ $file = null;
	+ if ($request->getFileExists('file')) {
	$file = PhabricatorFile::newFromPHPUpload(
	- idx($_FILES, 'file'),
	+ $_FILES['file'],
	array(
	'name' => $request->getStr('name'),
	'authorPHID' => $user->getPHID(),
	));
	- $macro->setFilePHID($file->getPHID());
	+ } else if ($request->getStr('phid')) {
	+ $file = id(new PhabricatorFile())->loadOneWhere(
	+ 'phid = %s',
	+ $request->getStr('phid'));
	+ }
	+
	+ if ($file) {
	+ if (!$file->isViewableInBrowser()) {
	+ $errors[] = pht('You must upload an image.');
	+ $e_file = pht('Invalid');
	+ } else {
	+ $macro->setFilePHID($file->getPHID());
	+ $e_file = null;
	+ }
	+ }

	+ if (!$macro->getID() && !$file) {
	+ $errors[] = 'You must upload an image to create a macro.';
	+ $e_file = pht('Required');
	+ }
	+
	+ if (!$errors) {
	try {
	- $macro->save();
	- return id(new AphrontRedirectResponse())->setURI(
	- $this->getApplicationURI());
	+ $xactions = array();
	+
	+ if ($new_name !== null) {
	+ $xactions[] = id(new PhabricatorMacroTransaction())
	+ ->setTransactionType(PhabricatorMacroTransactionType::TYPE_NAME)
	+ ->setNewValue($new_name);
	+ }
	+
	+ if ($file) {
	+ $xactions[] = id(new PhabricatorMacroTransaction())
	+ ->setTransactionType(PhabricatorMacroTransactionType::TYPE_FILE)
	+ ->setNewValue($file->getPHID());
	+ }
	+
	+ $editor = id(new PhabricatorMacroEditor())
	+ ->setActor($user)
	+ ->setContentSource(
	+ PhabricatorContentSource::newForSource(
	+ PhabricatorContentSource::SOURCE_WEB,
	+ array(
	+ 'ip' => $request->getRemoteAddr(),
	+ )))
	+ ->applyTransactions($original, $xactions);
	+
	+ $view_uri = $this->getApplicationURI('/view/'.$original->getID().'/');
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	} catch (AphrontQueryDuplicateKeyException $ex) {
	+ throw $ex;
	$errors[] = 'Macro name is not unique!';
	$e_name = 'Duplicate';
	}
	}
	- } else if ($this->id) {
	- $file = id(new PhabricatorFile())
	- ->loadOneWhere('phid = %s', $macro->getFilePHID());
	- }
	-
	- $caption = null;
	- if ($file) {
	- $caption = phutil_render_tag(
	- 'img',
	- array(
	- 'src' => $file->getViewURI(),
	- ));
	}

	if ($errors) {
	$error_view = new AphrontErrorView();
	$error_view->setTitle('Form Errors');
	$error_view->setErrors($errors);
	} else {
	$error_view = null;
	}

	+
	+ $current_file = null;
	+ if ($macro->getFilePHID()) {
	+ $current_file = id(new PhabricatorFile())->loadOneWhere(
	+ 'phid = %s',
	+ $macro->getFilePHID());
	+ }
	+
	$form = new AphrontFormView();
	+ $form->setFlexible(true);
	+ $form->addHiddenInput('name_form', 1);
	$form->setUser($request->getUser());

	$form
	->setEncType('multipart/form-data')
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Name')
	->setName('name')
	->setValue($macro->getName())
	->setCaption('This word or phrase will be replaced with the image.')
	- ->setError($e_name))
	- ->appendChild(
	+ ->setError($e_name));
	+
	+ if (!$macro->getID()) {
	+ if ($current_file) {
	+ $current_file_view = id(new PhabricatorFileLinkView())
	+ ->setFilePHID($current_file->getPHID())
	+ ->setFileName($current_file->getName())
	+ ->setFileViewable(true)
	+ ->setFileViewURI($current_file->getBestURI())
	+ ->render();
	+ $form->addHiddenInput('phid', $current_file->getPHID());
	+ $form->appendChild(
	+ id(new AphrontFormMarkupControl())
	+ ->setLabel('Selected File')
	+ ->setValue($current_file_view));
	+
	+ $other_label = pht('Change File');
	+ } else {
	+ $other_label = pht('File');
	+ }
	+
	+ $form->appendChild(
	id(new AphrontFormFileControl())
	- ->setLabel('File')
	+ ->setLabel($other_label)
	->setName('file')
	- ->setCaption($caption)
	- ->setError(true))
	+ ->setError($e_file));
	+ }
	+
	+
	+ $view_uri = $this->getApplicationURI('/view/'.$macro->getID().'/');
	+
	+ if ($macro->getID()) {
	+ $cancel_uri = $view_uri;
	+ } else {
	+ $cancel_uri = $this->getApplicationURI();
	+ }
	+
	+ $form
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue('Save Image Macro')
	- ->addCancelButton($this->getApplicationURI()));
	+ ->setValue(pht('Save Image Macro'))
	+ ->addCancelButton($cancel_uri));
	+
	+ $crumbs = $this->buildApplicationCrumbs();

	- $panel = new AphrontPanelView();
	if ($macro->getID()) {
	- $title = 'Edit Image Macro';
	+ $title = pht('Edit Image Macro');
	+ $crumb = pht('Edit');
	+
	+ $crumbs->addCrumb(
	+ id(new PhabricatorCrumbView())
	+ ->setHref($view_uri)
	+ ->setName(pht('Macro "%s"', $macro->getName())));
	} else {
	- $title = 'Create Image Macro';
	+ $title = pht('Create Image Macro');
	+ $crumb = pht('Create');
	}
	- $panel->setHeader($title);
	- $panel->appendChild($form);
	- $panel->setWidth(AphrontPanelView::WIDTH_FULL);

	- $nav = $this->buildSideNavView($macro);
	- $nav->selectFilter('#', 'edit');
	- $nav->appendChild($error_view);
	- $nav->appendChild($panel);
	+ $crumbs->addCrumb(
	+ id(new PhabricatorCrumbView())
	+ ->setHref($request->getRequestURI())
	+ ->setName($crumb));
	+
	+ $header = id(new PhabricatorHeaderView())
	+ ->setHeader($title);
	+
	+
	+ $upload = null;
	+ if ($macro->getID()) {
	+ $upload_header = id(new PhabricatorHeaderView())
	+ ->setHeader(pht('Upload New File'));
	+
	+ $upload_form = id(new AphrontFormView())
	+ ->setFlexible(true)
	+ ->setEncType('multipart/form-data')
	+ ->setUser($request->getUser())
	+ ->appendChild(
	+ id(new AphrontFormFileControl())
	+ ->setLabel('File')
	+ ->setName('file'))
	+ ->appendChild(
	+ id(new AphrontFormSubmitControl())
	+ ->setValue('Upload File'));
	+
	+ $upload = array($upload_header, $upload_form);
	+ }

	return $this->buildApplicationPage(
	- $nav,
	+ array(
	+ $crumbs,
	+ $header,
	+ $error_view,
	+ $form,
	+ $upload,
	+ ),
	array(
	'title' => $title,
	));
	}
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroListController.php b/src/applications/macro/controller/PhabricatorMacroListController.php
	index 3d73a4e5b7..7047a50c6c 100644
	--- a/src/applications/macro/controller/PhabricatorMacroListController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroListController.php
	@@ -1,124 +1,136 @@
	<?php

	final class PhabricatorMacroListController
	extends PhabricatorMacroController {

	public function processRequest() {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$macro_table = new PhabricatorFileImageMacro();

	$filter = $request->getStr('name');
	if (strlen($filter)) {
	$macros = $macro_table->loadAllWhere(
	'name LIKE %~',
	$filter);

	$nodata = pht(
	'There are no macros matching the filter "%s".',
	phutil_escape_html($filter));
	} else {
	$pager = new AphrontPagerView();
	$pager->setOffset($request->getInt('page'));

	$macros = $macro_table->loadAllWhere(
	'1 = 1 ORDER BY id DESC LIMIT %d, %d',
	$pager->getOffset(),
	$pager->getPageSize());

	// Get an exact count since the size here is reasonably going to be a few
	// thousand at most in any reasonable case.
	$count = queryfx_one(
	$macro_table->establishConnection('r'),
	'SELECT COUNT(*) N FROM %T',
	$macro_table->getTableName());
	$count = $count['N'];

	$pager->setCount($count);
	$pager->setURI($request->getRequestURI(), 'page');

	$nodata = pht('There are no image macros yet.');
	}

	$file_phids = mpull($macros, 'getFilePHID');

	$files = array();
	if ($file_phids) {
	$files = id(new PhabricatorFile())->loadAllWhere(
	"phid IN (%Ls)",
	$file_phids);
	$author_phids = mpull($files, 'getAuthorPHID', 'getPHID');

	$this->loadHandles($author_phids);
	}
	$files_map = mpull($files, null, 'getPHID');

	$filter_form = id(new AphrontFormView())
	->setMethod('GET')
	->setUser($request->getUser())
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('name')
	->setLabel('Name')
	->setValue($filter))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Filter Image Macros'));

	$filter_view = new AphrontListFilterView();
	$filter_view->appendChild($filter_form);

	- $nav = $this->buildSideNavView();
	- $nav->selectFilter('/');
	+ $has_search = strlen($filter);
	+ $nav = $this->buildSideNavView(
	+ $for_app = false,
	+ $has_search);
	+ $nav->selectFilter($has_search ? 'search' : '/');

	$nav->appendChild($filter_view);

	if ($macros) {
	$pinboard = new PhabricatorPinboardView();
	foreach ($macros as $macro) {
	$file_phid = $macro->getFilePHID();
	$file = idx($files_map, $file_phid);

	$item = new PhabricatorPinboardItemView();
	if ($file) {
	$item->setImageURI($file->getThumb220x165URI());
	$item->setImageSize(220, 165);
	if ($file->getAuthorPHID()) {
	$author_handle = $this->getHandle($file->getAuthorPHID());
	$item->appendChild(
	'Created by '.$author_handle->renderLink());
	}
	$datetime = phabricator_date($file->getDateCreated(), $viewer);
	$item->appendChild(
	phutil_render_tag(
	'div',
	array(),
	'Created on '.$datetime));
	}
	- $item->setURI($this->getApplicationURI('/edit/'.$macro->getID().'/'));
	+ $item->setURI($this->getApplicationURI('/view/'.$macro->getID().'/'));
	$item->setHeader($macro->getName());

	$pinboard->addItem($item);
	}
	$nav->appendChild($pinboard);
	} else {
	$list = new PhabricatorObjectItemListView();
	$list->setNoDataString($nodata);
	$nav->appendChild($list);
	}

	-
	- if ($filter === null) {
	+ if (!strlen($filter)) {
	$nav->appendChild($pager);
	+ $name = pht('All Macros');
	+ } else {
	+ $name = pht('Search');
	}

	+ $crumbs = $this->buildApplicationCrumbs();
	+ $crumbs->addCrumb(
	+ id(new PhabricatorCrumbView())
	+ ->setName($name)
	+ ->setHref($request->getRequestURI()));
	+ $nav->setCrumbs($crumbs);
	+
	return $this->buildApplicationPage(
	$nav,
	array(
	'device' => true,
	'title' => 'Image Macros',
	));
	}
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
	new file mode 100644
	index 0000000000..dac6c6e25d
	--- /dev/null
	+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
	@@ -0,0 +1,193 @@
	+<?php
	+
	+final class PhabricatorMacroViewController
	+ extends PhabricatorMacroController {
	+
	+ private $id;
	+
	+ public function willProcessRequest(array $data) {
	+ $this->id = $data['id'];
	+ }
	+
	+ public function processRequest() {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ $macro = id(new PhabricatorFileImageMacro())->load($this->id);
	+ if (!$macro) {
	+ return new Aphront404Response();
	+ }
	+
	+ $file = id(new PhabricatorFile())->loadOneWhere(
	+ 'phid = %s',
	+ $macro->getFilePHID());
	+
	+ $title_short = pht('Macro "%s"', $macro->getName());
	+ $title_long = pht('Image Macro "%s"', $macro->getName());
	+
	+ $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	+ $macro->getPHID());
	+
	+ $this->loadHandles($subscribers);
	+
	+ $crumbs = $this->buildApplicationCrumbs();
	+ $crumbs->addCrumb(
	+ id(new PhabricatorCrumbView())
	+ ->setHref($this->getApplicationURI('/view/'.$macro->getID().'/'))
	+ ->setName($title_short));
	+
	+ $actions = $this->buildActionView($macro);
	+ $properties = $this->buildPropertyView($macro, $file, $subscribers);
	+
	+ $xactions = id(new PhabricatorMacroTransactionQuery())
	+ ->setViewer($request->getUser())
	+ ->withObjectPHIDs(array($macro->getPHID()))
	+ ->execute();
	+
	+ $engine = id(new PhabricatorMarkupEngine())
	+ ->setViewer($user);
	+ foreach ($xactions as $xaction) {
	+ if ($xaction->getComment()) {
	+ $engine->addObject(
	+ $xaction->getComment(),
	+ PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
	+ }
	+ }
	+ $engine->process();
	+
	+ $timeline = id(new PhabricatorApplicationTransactionView())
	+ ->setViewer($user)
	+ ->setTransactions($xactions)
	+ ->setMarkupEngine($engine);
	+
	+ $header = id(new PhabricatorHeaderView())
	+ ->setHeader($title_long);
	+
	+ if ($macro->getIsDisabled()) {
	+ $header->addTag(
	+ id(new PhabricatorTagView())
	+ ->setType(PhabricatorTagView::TYPE_STATE)
	+ ->setName(pht('Macro Disabled'))
	+ ->setBackgroundColor(PhabricatorTagView::COLOR_RED));
	+ }
	+
	+ $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	+
	+ $add_comment_header = id(new PhabricatorHeaderView())
	+ ->setHeader(
	+ $is_serious
	+ ? pht('Add Comment')
	+ : pht('Grovel in Awe'));
	+
	+ $add_comment_form = id(new AphrontFormView())
	+ ->setWorkflow(true)
	+ ->setFlexible(true)
	+ ->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
	+ ->setUser($user)
	+ ->appendChild(
	+ id(new PhabricatorRemarkupControl())
	+ ->setUser($user)
	+ ->setLabel('Comment')
	+ ->setName('comment'))
	+ ->appendChild(
	+ id(new AphrontFormSubmitControl())
	+ ->setValue(
	+ $is_serious
	+ ? pht('Add Comment')
	+ : pht('Lavish Praise')));
	+
	+ return $this->buildApplicationPage(
	+ array(
	+ $crumbs,
	+ $header,
	+ $actions,
	+ $properties,
	+ $timeline,
	+ $add_comment_header,
	+ $add_comment_form,
	+ ),
	+ array(
	+ 'title' => $title_short,
	+ ));
	+ }
	+
	+ private function buildActionView(PhabricatorFileImageMacro $macro) {
	+ $view = new PhabricatorActionListView();
	+ $view->setUser($this->getRequest()->getUser());
	+ $view->setObject($macro);
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName('Edit Macro')
	+ ->setHref($this->getApplicationURI('/edit/'.$macro->getID().'/'))
	+ ->setIcon('edit'));
	+
	+ if ($macro->getIsDisabled()) {
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName('Restore Macro')
	+ ->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	+ ->setWorkflow(true)
	+ ->setIcon('undo'));
	+ } else {
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName('Disable Macro')
	+ ->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	+ ->setWorkflow(true)
	+ ->setIcon('delete'));
	+ }
	+
	+ return $view;
	+ }
	+
	+ private function buildPropertyView(
	+ PhabricatorFileImageMacro $macro,
	+ PhabricatorFile $file = null,
	+ array $subscribers) {
	+
	+ $view = new PhabricatorPropertyListView();
	+
	+ $view->addProperty(
	+ pht('Name'),
	+ phutil_escape_html($macro->getName()));
	+
	+ $view->addProperty(
	+ pht('Status'),
	+ $macro->getIsDisabled()
	+ ? pht('Disabled')
	+ : pht('Enabled'));
	+
	+ $view->addProperty(
	+ pht('Created'),
	+ phabricator_date(
	+ $macro->getDateCreated(),
	+ $this->getRequest()->getUser()));
	+
	+ if ($subscribers) {
	+ $sub_view = array();
	+ foreach ($subscribers as $subscriber) {
	+ $sub_view[] = $this->getHandle($subscriber)->renderLink();
	+ }
	+ $sub_view = implode(', ', $sub_view);
	+ } else {
	+ $sub_view = '<em>'.pht('None').'</em>';
	+ }
	+
	+ $view->addProperty(
	+ pht('Subscribers'),
	+ $sub_view);
	+
	+ if ($file) {
	+ $view->addTextContent(
	+ phutil_render_tag(
	+ 'img',
	+ array(
	+ 'src' => $file->getViewURI(),
	+ 'class' => 'phabricator-image-macro-hero',
	+ )));
	+ }
	+
	+ return $view;
	+ }
	+
	+}
	diff --git a/src/applications/macro/editor/PhabricatorMacroEditor.php b/src/applications/macro/editor/PhabricatorMacroEditor.php
	new file mode 100644
	index 0000000000..e10046f8cc
	--- /dev/null
	+++ b/src/applications/macro/editor/PhabricatorMacroEditor.php
	@@ -0,0 +1,123 @@
	+<?php
	+
	+final class PhabricatorMacroEditor
	+ extends PhabricatorApplicationTransactionEditor {
	+
	+ public function getTransactionTypes() {
	+ $types = parent::getTransactionTypes();
	+
	+ $types[] = PhabricatorMacroTransactionType::TYPE_NAME;
	+ $types[] = PhabricatorMacroTransactionType::TYPE_DISABLED;
	+ $types[] = PhabricatorMacroTransactionType::TYPE_FILE;
	+
	+ return $types;
	+ }
	+
	+ protected function getCustomTransactionOldValue(
	+ PhabricatorLiskDAO $object,
	+ PhabricatorApplicationTransaction $xaction) {
	+
	+ switch ($xaction->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ return $object->getName();
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ return $object->getIsDisabled();
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ return $object->getFilePHID();
	+ }
	+ }
	+
	+ protected function getCustomTransactionNewValue(
	+ PhabricatorLiskDAO $object,
	+ PhabricatorApplicationTransaction $xaction) {
	+
	+ switch ($xaction->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ return $xaction->getNewValue();
	+ }
	+ }
	+
	+ protected function applyCustomInternalTransaction(
	+ PhabricatorLiskDAO $object,
	+ PhabricatorApplicationTransaction $xaction) {
	+
	+ switch ($xaction->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ $object->setName($xaction->getNewValue());
	+ break;
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ $object->setIsDisabled($xaction->getNewValue());
	+ break;
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ $object->setFilePHID($xaction->getNewValue());
	+ break;
	+ }
	+ }
	+
	+ protected function applyCustomExternalTransaction(
	+ PhabricatorLiskDAO $object,
	+ PhabricatorApplicationTransaction $xaction) {
	+ return;
	+ }
	+
	+ protected function mergeTransactions(
	+ PhabricatorApplicationTransaction $u,
	+ PhabricatorApplicationTransaction $v) {
	+
	+ $type = $u->getTransactionType();
	+ switch ($type) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ return $v;
	+ }
	+
	+ return parent::mergeTransactions($u, $v);
	+ }
	+
	+ protected function supportsMail() {
	+ return true;
	+ }
	+
	+ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	+ return id(new PhabricatorMacroReplyHandler())
	+ ->setMailReceiver($object);
	+ }
	+
	+ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	+ $name = $object->getName();
	+ $name = 'Image Macro "'.$name.'"';
	+
	+ return id(new PhabricatorMetaMTAMail())
	+ ->setSubject($name)
	+ ->addHeader('Thread-Topic', $name);
	+ }
	+
	+ protected function getMailTo(PhabricatorLiskDAO $object) {
	+ return array(
	+ $this->requireActor()->getPHID(),
	+ );
	+ }
	+
	+ protected function buildMailBody(
	+ PhabricatorLiskDAO $object,
	+ array $xactions) {
	+
	+ $body = parent::buildMailBody($object, $xactions);
	+ $body->addTextSection(
	+ pht('MACRO DETAIL'),
	+ PhabricatorEnv::getProductionURI('/macro/view/'.$object->getID().'/'));
	+
	+ return $body;
	+ }
	+
	+ protected function getMailSubjectPrefix() {
	+ return PhabricatorEnv::getEnvConfig('metamta.macro.subject-prefix');
	+ }
	+
	+ protected function supportsFeed() {
	+ return true;
	+ }
	+}
	diff --git a/src/applications/macro/mail/PhabricatorMacroReplyHandler.php b/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
	new file mode 100644
	index 0000000000..6c932eb709
	--- /dev/null
	+++ b/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
	@@ -0,0 +1,40 @@
	+<?php
	+
	+final class PhabricatorMacroReplyHandler extends PhabricatorMailReplyHandler {
	+
	+ public function validateMailReceiver($mail_receiver) {
	+ if (!($mail_receiver instanceof PhabricatorFileImageMacro)) {
	+ throw new Exception("Mail receiver is not a PhabricatorFileImageMacro!");
	+ }
	+ }
	+
	+ public function getPrivateReplyHandlerEmailAddress(
	+ PhabricatorObjectHandle $handle) {
	+ return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'MCRO');
	+ }
	+
	+ public function getPublicReplyHandlerEmailAddress() {
	+ return $this->getDefaultPublicReplyHandlerEmailAddress('MCRO');
	+ }
	+
	+ public function getReplyHandlerDomain() {
	+ return PhabricatorEnv::getEnvConfig(
	+ 'metamta.macro.reply-handler-domain');
	+ }
	+
	+ public function getReplyHandlerInstructions() {
	+ if ($this->supportsReplies()) {
	+ // TODO: Implement.
	+ return null;
	+ return "Reply to comment.";
	+ } else {
	+ return null;
	+ }
	+ }
	+
	+ protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
	+ // TODO: Implement this.
	+ return null;
	+ }
	+
	+}
	diff --git a/src/applications/macro/query/PhabricatorMacroTransactionQuery.php b/src/applications/macro/query/PhabricatorMacroTransactionQuery.php
	new file mode 100644
	index 0000000000..a2f9d3136a
	--- /dev/null
	+++ b/src/applications/macro/query/PhabricatorMacroTransactionQuery.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class PhabricatorMacroTransactionQuery
	+ extends PhabricatorApplicationTransactionQuery {
	+
	+ protected function getTemplateApplicationTransaction() {
	+ return new PhabricatorMacroTransaction();
	+ }
	+
	+}
	diff --git a/src/applications/macro/storage/PhabricatorFileImageMacro.php b/src/applications/macro/storage/PhabricatorFileImageMacro.php
	index 8e41e7b471..2575ffe3e2 100644
	--- a/src/applications/macro/storage/PhabricatorFileImageMacro.php
	+++ b/src/applications/macro/storage/PhabricatorFileImageMacro.php
	@@ -1,29 +1,42 @@
	<?php

	-final class PhabricatorFileImageMacro extends PhabricatorFileDAO {
	+final class PhabricatorFileImageMacro extends PhabricatorFileDAO
	+ implements PhabricatorSubscribableInterface {

	protected $filePHID;
	+ protected $phid;
	protected $name;
	+ protected $isDisabled = 0;

	public function getConfiguration() {
	return array(
	- self::CONFIG_TIMESTAMPS => false,
	+ self::CONFIG_AUX_PHID => true,
	) + parent::getConfiguration();
	}

	+ public function generatePHID() {
	+ return PhabricatorPHID::generateNewPHID(
	+ PhabricatorPHIDConstants::PHID_TYPE_MCRO);
	+ }
	+
	static public function newFromImageURI($uri, $file_name, $image_macro_name) {
	$file = PhabricatorFile::newFromFileDownload($uri, $file_name);

	if (!$file) {
	return null;
	}

	$image_macro = new PhabricatorFileImageMacro();
	$image_macro->setName($image_macro_name);
	$image_macro->setFilePHID($file->getPHID());
	$image_macro->save();

	return $image_macro;
	}
	+
	+ public function isAutomaticallySubscribed($phid) {
	+ return false;
	+ }
	+
	}

	diff --git a/src/applications/macro/storage/PhabricatorMacroTransaction.php b/src/applications/macro/storage/PhabricatorMacroTransaction.php
	new file mode 100644
	index 0000000000..5711d7899e
	--- /dev/null
	+++ b/src/applications/macro/storage/PhabricatorMacroTransaction.php
	@@ -0,0 +1,231 @@
	+<?php
	+
	+final class PhabricatorMacroTransaction
	+ extends PhabricatorApplicationTransaction {
	+
	+ public function getApplicationName() {
	+ return 'file';
	+ }
	+
	+ public function getTableName() {
	+ return 'macro_transaction';
	+ }
	+
	+ public function getApplicationTransactionType() {
	+ return PhabricatorPHIDConstants::PHID_TYPE_MCRO;
	+ }
	+
	+ public function getApplicationTransactionCommentObject() {
	+ return new PhabricatorMacroTransactionComment();
	+ }
	+
	+ public function getApplicationObjectTypeName() {
	+ return pht('macro');
	+ }
	+
	+ public function getRequiredHandlePHIDs() {
	+ $phids = parent::getRequiredHandlePHIDs();
	+
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ if ($old !== null) {
	+ $phids[] = $old;
	+ }
	+ $phids[] = $new;
	+ break;
	+ }
	+
	+ return $phids;
	+ }
	+
	+ public function shouldHide() {
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ return ($old === null);
	+ }
	+
	+ return parent::shouldHide();
	+ }
	+
	+ public function getTitle() {
	+ $author_phid = $this->getAuthorPHID();
	+
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ return pht(
	+ '%s renamed this macro from "%s" to "%s".',
	+ $this->renderHandleLink($author_phid),
	+ phutil_escape_html($old),
	+ phutil_escape_html($new));
	+ break;
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ if ($new) {
	+ return pht(
	+ '%s disabled this macro.',
	+ $this->renderHandleLink($author_phid));
	+ } else {
	+ return pht(
	+ '%s restored this macro.',
	+ $this->renderHandleLink($author_phid));
	+ }
	+ break;
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ if ($old === null) {
	+ return pht(
	+ '%s created this macro.',
	+ $this->renderHandleLink($author_phid));
	+ } else {
	+ return pht(
	+ '%s changed the image for this macro from %s to %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($old),
	+ $this->renderHandleLink($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 PhabricatorMacroTransactionType::TYPE_NAME:
	+ return pht(
	+ '%s renamed %s from "%s" to "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($object_phid),
	+ phutil_escape_html($old),
	+ phutil_escape_html($new));
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ if ($new) {
	+ return pht(
	+ '%s disabled %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($object_phid));
	+ } else {
	+ return pht(
	+ '%s restored %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($object_phid));
	+ }
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ if ($old === null) {
	+ return pht(
	+ '%s created %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($object_phid));
	+ } else {
	+ return pht(
	+ '%s updated the image for %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($object_phid));
	+ }
	+ }
	+
	+ return parent::getTitleForFeed();
	+ }
	+
	+ public function getActionName() {
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ if ($old === null) {
	+ return pht('Created');
	+ } else {
	+ return pht('Renamed');
	+ }
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ if ($new) {
	+ return pht('Disabled');
	+ } else {
	+ return pht('Restored');
	+ }
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ if ($old === null) {
	+ return pht('Created');
	+ } else {
	+ return pht('Edited Image');
	+ }
	+ }
	+
	+ return parent::getActionName();
	+ }
	+
	+ public function getActionStrength() {
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ return 2.0;
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ return 1.5;
	+ }
	+ return parent::getActionStrength();
	+ }
	+
	+ public function getIcon() {
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ return 'edit';
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ if ($old === null) {
	+ return 'create';
	+ } else {
	+ return 'edit';
	+ }
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ if ($new) {
	+ return 'delete';
	+ } else {
	+ return 'undo';
	+ }
	+ }
	+
	+ return parent::getIcon();
	+ }
	+
	+ public function getColor() {
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorMacroTransactionType::TYPE_NAME:
	+ return PhabricatorTransactions::COLOR_BLUE;
	+ case PhabricatorMacroTransactionType::TYPE_FILE:
	+ if ($old === null) {
	+ return PhabricatorTransactions::COLOR_GREEN;
	+ } else {
	+ return PhabricatorTransactions::COLOR_BLUE;
	+ }
	+ case PhabricatorMacroTransactionType::TYPE_DISABLED:
	+ if ($new) {
	+ return PhabricatorTransactions::COLOR_BLACK;
	+ } else {
	+ return PhabricatorTransactions::COLOR_SKY;
	+ }
	+ }
	+
	+ return parent::getColor();
	+ }
	+
	+
	+}
	+
	diff --git a/src/applications/macro/storage/PhabricatorMacroTransactionComment.php b/src/applications/macro/storage/PhabricatorMacroTransactionComment.php
	new file mode 100644
	index 0000000000..565f5040ee
	--- /dev/null
	+++ b/src/applications/macro/storage/PhabricatorMacroTransactionComment.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class PhabricatorMacroTransactionComment
	+ extends PhabricatorApplicationTransactionComment {
	+
	+ public function getApplicationTransactionObject() {
	+ return new PhabricatorMacroTransaction();
	+ }
	+
	+}
	+
	diff --git a/src/applications/phid/PhabricatorPHIDConstants.php b/src/applications/phid/PhabricatorPHIDConstants.php
	index fdeb1755c0..cabc7d2d5e 100644
	--- a/src/applications/phid/PhabricatorPHIDConstants.php
	+++ b/src/applications/phid/PhabricatorPHIDConstants.php
	@@ -1,36 +1,37 @@
	<?php

	final class PhabricatorPHIDConstants {

	const PHID_TYPE_USER = 'USER';
	const PHID_TYPE_MLST = 'MLST';
	const PHID_TYPE_DREV = 'DREV';
	const PHID_TYPE_TASK = 'TASK';
	const PHID_TYPE_FILE = 'FILE';
	const PHID_TYPE_PROJ = 'PROJ';
	const PHID_TYPE_UNKNOWN = '????';
	const PHID_TYPE_MAGIC = '!!!!';
	const PHID_TYPE_REPO = 'REPO';
	const PHID_TYPE_CMIT = 'CMIT';
	const PHID_TYPE_OPKG = 'OPKG';
	const PHID_TYPE_PSTE = 'PSTE';
	const PHID_TYPE_STRY = 'STRY';
	const PHID_TYPE_POLL = 'POLL';
	const PHID_TYPE_WIKI = 'WIKI';
	const PHID_TYPE_APRJ = 'APRJ';
	const PHID_TYPE_ACMT = 'ACMT';
	const PHID_TYPE_DRYR = 'DRYR';
	const PHID_TYPE_DRYL = 'DRYL';
	const PHID_TYPE_OASC = 'OASC';
	const PHID_TYPE_OASA = 'OASA';
	const PHID_TYPE_POST = 'POST';
	const PHID_TYPE_TOBJ = 'TOBJ';
	const PHID_TYPE_BLOG = 'BLOG';
	const PHID_TYPE_QUES = 'QUES';
	const PHID_TYPE_ANSW = 'ANSW';
	const PHID_TYPE_MOCK = 'MOCK';
	+ const PHID_TYPE_MCRO = 'MCRO';

	const PHID_TYPE_XACT = 'XACT';
	const PHID_TYPE_XCMT = 'XCMT';

	}
	diff --git a/src/applications/phid/handle/PhabricatorObjectHandleData.php b/src/applications/phid/handle/PhabricatorObjectHandleData.php
	index d737b872ab..e60a3b5226 100644
	--- a/src/applications/phid/handle/PhabricatorObjectHandleData.php
	+++ b/src/applications/phid/handle/PhabricatorObjectHandleData.php
	@@ -1,632 +1,666 @@
	<?php

	final class PhabricatorObjectHandleData {

	private $phids;
	private $viewer;

	public function __construct(array $phids) {
	$this->phids = array_unique($phids);
	}

	public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	public static function loadOneHandle($phid, $viewer = null) {
	$query = new PhabricatorObjectHandleData(array($phid));

	if ($viewer) {
	$query->setViewer($viewer);
	}

	$handles = $query->loadHandles();
	return $handles[$phid];
	}

	public function loadObjects() {
	$types = array();
	foreach ($this->phids as $phid) {
	$type = phid_get_type($phid);
	$types[$type][] = $phid;
	}

	$objects = array();
	foreach ($types as $type => $phids) {
	switch ($type) {
	case PhabricatorPHIDConstants::PHID_TYPE_USER:
	$user_dao = new PhabricatorUser();
	$users = $user_dao->loadAllWhere(
	'phid in (%Ls)',
	$phids);
	foreach ($users as $user) {
	$objects[$user->getPHID()] = $user;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_CMIT:
	$commit_dao = new PhabricatorRepositoryCommit();
	$commits = $commit_dao->loadAllWhere(
	'phid IN (%Ls)',
	$phids);
	$commit_data = array();
	if ($commits) {
	$data_dao = new PhabricatorRepositoryCommitData();
	$commit_data = $data_dao->loadAllWhere(
	'commitID IN (%Ld)',
	mpull($commits, 'getID'));
	$commit_data = mpull($commit_data, null, 'getCommitID');
	}
	foreach ($commits as $commit) {
	$data = idx($commit_data, $commit->getID());
	if ($data) {
	$commit->attachCommitData($data);
	$objects[$commit->getPHID()] = $commit;
	} else {
	// If we couldn't load the commit data, just act as though we
	// couldn't load the object at all so we don't load half an object.
	}
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_TASK:
	$task_dao = new ManiphestTask();
	$tasks = $task_dao->loadAllWhere(
	'phid IN (%Ls)',
	$phids);
	foreach ($tasks as $task) {
	$objects[$task->getPHID()] = $task;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_DREV:
	$revision_dao = new DifferentialRevision();
	$revisions = $revision_dao->loadAllWhere(
	'phid IN (%Ls)',
	$phids);
	foreach ($revisions as $revision) {
	$objects[$revision->getPHID()] = $revision;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_QUES:
	$questions = id(new PonderQuestionQuery())
	->setViewer($this->viewer)
	->withPHIDs($phids)
	->execute();
	foreach ($questions as $question) {
	$objects[$question->getPHID()] = $question;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_MOCK:
	$mocks = id(new PholioMockQuery())
	->setViewer($this->viewer)
	->withPHIDs($phids)
	->execute();
	foreach ($mocks as $mock) {
	$objects[$mock->getPHID()] = $mock;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_XACT:
	$subtypes = array();
	foreach ($phids as $phid) {
	$subtypes[phid_get_subtype($phid)][] = $phid;
	}
	$xactions = array();
	foreach ($subtypes as $subtype => $subtype_phids) {
	// TODO: Do this magically.
	switch ($subtype) {
	case PhabricatorPHIDConstants::PHID_TYPE_MOCK:
	$results = id(new PholioTransactionQuery())
	->setViewer($this->viewer)
	->withPHIDs($subtype_phids)
	->execute();
	$xactions += mpull($results, null, 'getPHID');
	break;
	+ case PhabricatorPHIDConstants::PHID_TYPE_MCRO:
	+ $results = id(new PhabricatorMacroTransactionQuery())
	+ ->setViewer($this->viewer)
	+ ->withPHIDs($subtype_phids)
	+ ->execute();
	+ $xactions += mpull($results, null, 'getPHID');
	+ break;
	}
	}
	foreach ($xactions as $xaction) {
	$objects[$xaction->getPHID()] = $xaction;
	}
	break;
	+ case PhabricatorPHIDConstants::PHID_TYPE_MCRO:
	+ $macros = id(new PhabricatorFileImageMacro())->loadAllWhere(
	+ 'phid IN (%Ls)',
	+ $phids);
	+ $objects += mpull($macros, null, 'getPHID');
	+ break;
	}
	}

	return $objects;
	}

	public function loadHandles() {

	$types = phid_group_by_type($this->phids);

	$handles = array();

	$external_loaders = PhabricatorEnv::getEnvConfig('phid.external-loaders');

	foreach ($types as $type => $phids) {
	switch ($type) {
	case PhabricatorPHIDConstants::PHID_TYPE_MAGIC:
	// Black magic!
	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	switch ($phid) {
	case ManiphestTaskOwner::OWNER_UP_FOR_GRABS:
	$handle->setName('Up For Grabs');
	$handle->setFullName('upforgrabs (Up For Grabs)');
	$handle->setComplete(true);
	break;
	case ManiphestTaskOwner::PROJECT_NO_PROJECT:
	$handle->setName('No Project');
	$handle->setFullName('noproject (No Project)');
	$handle->setComplete(true);
	break;
	default:
	$handle->setName('Foul Magicks');
	break;
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_USER:
	$object = new PhabricatorUser();

	$users = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$users = mpull($users, null, 'getPHID');

	$image_phids = mpull($users, 'getProfileImagePHID');
	$image_phids = array_unique(array_filter($image_phids));

	$images = array();
	if ($image_phids) {
	$images = id(new PhabricatorFile())->loadAllWhere(
	'phid IN (%Ls)',
	$image_phids);
	$images = mpull($images, 'getBestURI', 'getPHID');
	}

	$statuses = id(new PhabricatorUserStatus())->loadCurrentStatuses(
	$phids);

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($users[$phid])) {
	$handle->setName('Unknown User');
	} else {
	$user = $users[$phid];
	$handle->setName($user->getUsername());
	$handle->setURI('/p/'.$user->getUsername().'/');
	$handle->setFullName(
	$user->getUsername().' ('.$user->getRealName().')');
	$handle->setAlternateID($user->getID());
	$handle->setComplete(true);
	if (isset($statuses[$phid])) {
	$status = $statuses[$phid]->getTextStatus();
	if ($this->viewer) {
	$date = $statuses[$phid]->getDateTo();
	$status .= ' until '.phabricator_date($date, $this->viewer);
	}
	$handle->setStatus($status);
	}
	$handle->setDisabled($user->getIsDisabled());

	$img_uri = idx($images, $user->getProfileImagePHID());
	if ($img_uri) {
	$handle->setImageURI($img_uri);
	} else {
	$handle->setImageURI(
	PhabricatorUser::getDefaultProfileImageURI());
	}
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_MLST:
	$object = new PhabricatorMetaMTAMailingList();

	$lists = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$lists = mpull($lists, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($lists[$phid])) {
	$handle->setName('Unknown Mailing List');
	} else {
	$list = $lists[$phid];
	$handle->setName($list->getName());
	$handle->setURI($list->getURI());
	$handle->setFullName($list->getName());
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_DREV:
	$object = new DifferentialRevision();

	$revs = $object->loadAllWhere('phid in (%Ls)', $phids);
	$revs = mpull($revs, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($revs[$phid])) {
	$handle->setName('Unknown Revision');
	} else {
	$rev = $revs[$phid];
	$handle->setName($rev->getTitle());
	$handle->setURI('/D'.$rev->getID());
	$handle->setFullName('D'.$rev->getID().': '.$rev->getTitle());
	$handle->setComplete(true);

	$status = $rev->getStatus();
	if (($status == ArcanistDifferentialRevisionStatus::CLOSED) \|\|
	($status == ArcanistDifferentialRevisionStatus::ABANDONED)) {
	$closed = PhabricatorObjectHandleStatus::STATUS_CLOSED;
	$handle->setStatus($closed);
	}

	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_CMIT:
	$object = new PhabricatorRepositoryCommit();

	$commits = $object->loadAllWhere('phid in (%Ls)', $phids);
	$commits = mpull($commits, null, 'getPHID');

	$repository_ids = array();
	$callsigns = array();
	if ($commits) {
	$repository_ids = mpull($commits, 'getRepositoryID');
	$repositories = id(new PhabricatorRepository())->loadAllWhere(
	'id in (%Ld)', array_unique($repository_ids));
	$callsigns = mpull($repositories, 'getCallsign');
	}

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($commits[$phid]) \|\|
	!isset($callsigns[$repository_ids[$phid]])) {
	$handle->setName('Unknown Commit');
	} else {
	$commit = $commits[$phid];
	$callsign = $callsigns[$repository_ids[$phid]];
	$repository = $repositories[$repository_ids[$phid]];
	$commit_identifier = $commit->getCommitIdentifier();

	// In case where the repository for the commit was deleted,
	// we don't have have info about the repository anymore.
	if ($repository) {
	$name = $repository->formatCommitName($commit_identifier);
	$handle->setName($name);
	} else {
	$handle->setName('Commit '.'r'.$callsign.$commit_identifier);
	}

	$handle->setURI('/r'.$callsign.$commit_identifier);
	$handle->setFullName('r'.$callsign.$commit_identifier);
	$handle->setTimestamp($commit->getEpoch());
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_TASK:
	$object = new ManiphestTask();

	$tasks = $object->loadAllWhere('phid in (%Ls)', $phids);
	$tasks = mpull($tasks, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($tasks[$phid])) {
	$handle->setName('Unknown Task');
	} else {
	$task = $tasks[$phid];
	$handle->setName($task->getTitle());
	$handle->setURI('/T'.$task->getID());
	$handle->setFullName('T'.$task->getID().': '.$task->getTitle());
	$handle->setComplete(true);
	$handle->setAlternateID($task->getID());
	if ($task->getStatus() != ManiphestTaskStatus::STATUS_OPEN) {
	$closed = PhabricatorObjectHandleStatus::STATUS_CLOSED;
	$handle->setStatus($closed);
	}
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_FILE:
	$object = new PhabricatorFile();

	$files = $object->loadAllWhere('phid IN (%Ls)', $phids);
	$files = mpull($files, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($files[$phid])) {
	$handle->setName('Unknown File');
	} else {
	$file = $files[$phid];
	$handle->setName($file->getName());
	$handle->setURI($file->getBestURI());
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_PROJ:
	$object = new PhabricatorProject();

	if ($this->viewer) {
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->viewer)
	->withPHIDs($phids)
	->execute();
	} else {
	$projects = $object->loadAllWhere('phid IN (%Ls)', $phids);
	}

	$projects = mpull($projects, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($projects[$phid])) {
	$handle->setName('Unknown Project');
	} else {
	$project = $projects[$phid];
	$handle->setName($project->getName());
	$handle->setURI('/project/view/'.$project->getID().'/');
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_REPO:
	$object = new PhabricatorRepository();

	$repositories = $object->loadAllWhere('phid in (%Ls)', $phids);
	$repositories = mpull($repositories, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($repositories[$phid])) {
	$handle->setName('Unknown Repository');
	} else {
	$repository = $repositories[$phid];
	$handle->setName($repository->getCallsign());
	$handle->setURI('/diffusion/'.$repository->getCallsign().'/');
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_OPKG:
	$object = new PhabricatorOwnersPackage();

	$packages = $object->loadAllWhere('phid in (%Ls)', $phids);
	$packages = mpull($packages, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($packages[$phid])) {
	$handle->setName('Unknown Package');
	} else {
	$package = $packages[$phid];
	$handle->setName($package->getName());
	$handle->setURI('/owners/package/'.$package->getID().'/');
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_APRJ:
	$project_dao = new PhabricatorRepositoryArcanistProject();

	$projects = $project_dao->loadAllWhere(
	'phid IN (%Ls)',
	$phids);
	$projects = mpull($projects, null, 'getPHID');
	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($projects[$phid])) {
	$handle->setName('Unknown Arcanist Project');
	} else {
	$project = $projects[$phid];
	$handle->setName($project->getName());
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_WIKI:
	$document_dao = new PhrictionDocument();
	$content_dao = new PhrictionContent();

	$conn = $document_dao->establishConnection('r');
	$documents = queryfx_all(
	$conn,
	'SELECT * FROM %T document JOIN %T content
	ON document.contentID = content.id
	WHERE document.phid IN (%Ls)',
	$document_dao->getTableName(),
	$content_dao->getTableName(),
	$phids);
	$documents = ipull($documents, null, 'phid');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($documents[$phid])) {
	$handle->setName('Unknown Document');
	} else {
	$info = $documents[$phid];
	$handle->setName($info['title']);
	$handle->setURI(PhrictionDocument::getSlugURI($info['slug']));
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_QUES:
	$questions = id(new PonderQuestionQuery())
	->withPHIDs($phids)
	->execute();
	$questions = mpull($questions, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($questions[$phid])) {
	$handle->setName('Unknown Ponder Question');
	} else {
	$question = $questions[$phid];
	$handle->setName(phutil_utf8_shorten($question->getTitle(), 60));
	$handle->setURI(new PhutilURI('/Q' . $question->getID()));
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_PSTE:
	$pastes = id(new PhabricatorPasteQuery())
	->withPHIDs($phids)
	->setViewer($this->viewer)
	->execute();
	$pastes = mpull($pastes, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($pastes[$phid])) {
	$handle->setName('Unknown Paste');
	} else {
	$paste = $pastes[$phid];
	$handle->setName($paste->getTitle());
	$handle->setFullName($paste->getFullName());
	$handle->setURI('/P'.$paste->getID());
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_BLOG:
	$blogs = id(new PhameBlogQuery())
	->withPHIDs($phids)
	->setViewer($this->viewer)
	->execute();
	$blogs = mpull($blogs, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($blogs[$phid])) {
	$handle->setName('Unknown Blog');
	} else {
	$blog = $blogs[$phid];
	$handle->setName($blog->getName());
	$handle->setFullName($blog->getName());
	$handle->setURI('/phame/blog/view/'.$blog->getID().'/');
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_POST:
	$posts = id(new PhamePostQuery())
	->withPHIDs($phids)
	->setViewer($this->viewer)
	->execute();
	$posts = mpull($posts, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($posts[$phid])) {
	$handle->setName('Unknown Post');
	} else {
	$post = $posts[$phid];
	$handle->setName($post->getTitle());
	$handle->setFullName($post->getTitle());
	$handle->setURI('/phame/post/view/'.$post->getID().'/');
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_MOCK:
	$mocks = id(new PholioMockQuery())
	->withPHIDs($phids)
	->setViewer($this->viewer)
	->execute();
	$mocks = mpull($mocks, null, 'getPHID');

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setType($type);
	if (empty($mocks[$phid])) {
	$handle->setName('Unknown Mock');
	} else {
	$mock = $mocks[$phid];
	$handle->setName($mock->getName());
	$handle->setFullName('M'.$mock->getID().': '.$mock->getName());
	$handle->setURI('/M'.$mock->getID());
	$handle->setComplete(true);
	}
	$handles[$phid] = $handle;
	}
	break;
	+ case PhabricatorPHIDConstants::PHID_TYPE_MCRO:
	+ $macros = id(new PhabricatorFileImageMacro())->loadAllWhere(
	+ 'phid IN (%Ls)',
	+ $phids);
	+ $macros = mpull($macros, null, 'getPHID');
	+ foreach ($phids as $phid) {
	+ $handle = new PhabricatorObjectHandle();
	+ $handle->setPHID($phid);
	+ $handle->setType($type);
	+ if (empty($macros[$phid])) {
	+ $handle->setName('Unknown Macro');
	+ } else {
	+ $macro = $macros[$phid];
	+ $handle->setName($macro->getName());
	+ $handle->setFullName('Image Macro "'.$macro->getName().'"');
	+ $handle->setURI('/macro/view/'.$macro->getID().'/');
	+ $handle->setComplete(true);
	+ }
	+ $handles[$phid] = $handle;
	+ }
	+ break;
	default:
	$loader = null;
	if (isset($external_loaders[$type])) {
	$loader = $external_loaders[$type];
	} else if (isset($external_loaders['*'])) {
	$loader = $external_loaders['*'];
	}

	if ($loader) {
	$object = newv($loader, array());
	$handles += $object->loadHandles($phids);
	break;
	}

	foreach ($phids as $phid) {
	$handle = new PhabricatorObjectHandle();
	$handle->setType($type);
	$handle->setPHID($phid);
	$handle->setName('Unknown Object');
	$handle->setFullName('An Unknown Object');
	$handles[$phid] = $handle;
	}
	break;
	}
	}

	return $handles;
	}
	}
	diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
	index 9b124ec58c..cf386a5303 100644
	--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
	+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
	@@ -1,788 +1,786 @@
	<?php

	/**
	* @task mail Sending Mail
	* @task feed Publishing Feed Stories
	*/
	abstract class PhabricatorApplicationTransactionEditor
	extends PhabricatorEditor {

	private $contentSource;
	private $object;
	private $xactions;

	private $isNewObject;
	private $mentionedPHIDs;

	protected function getIsNewObject() {
	return $this->isNewObject;
	}

	protected function getMentionedPHIDs() {
	return $this->mentionedPHIDs;
	}

	public function getTransactionTypes() {
	$types = array(
	PhabricatorTransactions::TYPE_COMMENT,
	);

	if ($this->object instanceof PhabricatorSubscribableInterface) {
	$types[] = PhabricatorTransactions::TYPE_SUBSCRIBERS;
	}

	return $types;
	}

	private function adjustTransactionValues(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	$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_SUBSCRIBERS:
	if ($object->getPHID()) {
	$old_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$object->getPHID());
	} else {
	$old_phids = array();
	}
	return array_values($old_phids);
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	return $object->getViewPolicy();
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return $object->getEditPolicy();
	default:
	return $this->getCustomTransactionOldValue($object, $xaction);
	}
	}

	private function getTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return $this->getPHIDTransactionNewValue($xaction);
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return $xaction->getNewValue();
	default:
	return $this->getCustomTransactionNewValue($object, $xaction);
	}
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	throw new Exception("Capability not supported!");
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	throw new Exception("Capability not supported!");
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	return ($xaction->getOldValue() !== $xaction->getNewValue());
	}

	private function applyInternalEffects(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	break;
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	$object->setViewPolicy($xaction->getNewValue());
	break;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	$object->setEditPolicy($xaction->getNewValue());
	break;
	default:
	return $this->applyCustomInternalTransaction($object, $xaction);
	}
	}

	private function applyExternalEffects(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$subeditor = id(new PhabricatorSubscriptionsEditor())
	->setObject($object)
	->setActor($this->requireActor())
	->subscribeExplicit($xaction->getNewValue())
	->save();
	break;
	default:
	return $this->applyCustomExternalTransaction($object, $xaction);
	}
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	throw new Exception("Capability not supported!");
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	throw new Exception("Capability not supported!");
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source;
	return $this;
	}

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

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

	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();

	$mention_xaction = $this->buildMentionTransaction($object, $xactions);
	if ($mention_xaction) {
	$xactions[] = $mention_xaction;
	}

	$xactions = $this->combineTransactions($xactions);

	foreach ($xactions as $xaction) {
	// TODO: This needs to be more sophisticated once we have meta-policies.
	$xaction->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC);
	$xaction->setEditPolicy($actor->getPHID());

	$xaction->setAuthorPHID($actor->getPHID());
	$xaction->setContentSource($this->getContentSource());
	}

	foreach ($xactions as $xaction) {
	$this->adjustTransactionValues($object, $xaction);
	}

	foreach ($xactions as $key => $xaction) {
	if (!$this->transactionHasEffect($object, $xaction)) {
	// TODO: Raise these to the user.
	if ($xaction->getComment()) {
	$xaction->setTransactionType(
	PhabricatorTransactions::TYPE_COMMENT);
	$xaction->setOldValue(null);
	$xaction->setNewValue(null);
	} else {
	unset($xactions[$key]);
	}
	}
	}

	if (!$xactions) {
	return $this;
	}

	$xactions = $this->sortTransactions($xactions);

	$comment_editor = id(new PhabricatorApplicationTransactionCommentEditor())
	->setActor($actor)
	->setContentSource($this->getContentSource());

	$object->openTransaction();
	foreach ($xactions as $xaction) {
	$this->applyInternalEffects($object, $xaction);
	}

	$object->save();

	foreach ($xactions as $xaction) {
	$xaction->setObjectPHID($object->getPHID());
	if ($xaction->getComment()) {
	$xaction->setPHID($xaction->generatePHID());
	$comment_editor->applyEdit($xaction, $xaction->getComment());
	} else {
	$xaction->save();
	}
	}

	foreach ($xactions as $xaction) {
	$this->applyExternalEffects($object, $xaction);
	}
	$object->saveTransaction();


	$this->loadHandles($xactions);


	$mail = null;
	if ($this->supportsMail()) {
	$mail = $this->sendMail($object, $xactions);
	}

	// TODO: Index object.

	if ($this->supportsFeed()) {
	$mailed = array();
	if ($mail) {
	$mailed = $mail->buildRecipientList();
	}
	$this->publishFeedStory(
	$object,
	$xactions,
	$mailed);
	}

	$this->didApplyTransactions($object, $xactions);

	return $this;
	}

	private function loadHandles(array $xactions) {
	$phids = array();
	foreach ($xactions as $xaction) {
	$phids[$xaction->getPHID()] = $xaction->getRequiredHandlePHIDs();
	}
	$handles = array();
	$merged = array_mergev($phids);
	if ($merged) {
	$handles = id(new PhabricatorObjectHandleData($merged))
	->setViewer($this->requireActor())
	->loadHandles();
	}
	foreach ($xactions as $xaction) {
	$xaction->setHandles(
	array_select_keys(
	$handles,
	$phids[$xaction->getPHID()]));
	}
	}

	private function validateEditParameters(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if (!$this->getContentSource()) {
	throw new Exception(
	"Call setContentSource() before applyTransactions()!");
	}

	// 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 Exception(
	"You can not apply transactions which already have IDs/PHIDs!");
	}
	if ($xaction->getObjectPHID()) {
	throw new Exception(
	"You can not apply transactions which already have objectPHIDs!");
	}
	if ($xaction->getAuthorPHID()) {
	throw new Exception(
	"You can not apply transactions which already have authorPHIDs!");
	}
	if ($xaction->getCommentPHID()) {
	throw new Exception(
	"You can not apply transactions which already have commentPHIDs!");
	}
	if ($xaction->getCommentVersion() !== 0) {
	throw new Exception(
	"You can not apply transactions which already have commentVersions!");
	}
	if ($xaction->getOldValue() !== null) {
	throw new Exception(
	"You can not apply transactions which already have oldValue!");
	}

	$type = $xaction->getTransactionType();
	if (empty($types[$type])) {
	throw new Exception("Transaction has unknown type '{$type}'.");
	}
	}

	// The actor must have permission to view and edit the object.

	$actor = $this->requireActor();

	PhabricatorPolicyFilter::requireCapability(
	$actor,
	$xaction,
	PhabricatorPolicyCapability::CAN_VIEW);

	PhabricatorPolicyFilter::requireCapability(
	$actor,
	$xaction,
	PhabricatorPolicyCapability::CAN_EDIT);
	}

	private function buildMentionTransaction(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if (!($object instanceof PhabricatorSubscribableInterface)) {
	return null;
	}

	$texts = array();
	foreach ($xactions as $xaction) {
	$texts[] = $this->getMentionableTextsFromTransaction($xaction);
	}
	$texts = array_mergev($texts);

	$phids = PhabricatorMarkupEngine::extractPHIDsFromMentions($texts);

	$this->mentionedPHIDs = $phids;

	if (!$phids) {
	return null;
	}

	$xaction = newv(get_class(head($xactions)), array());
	$xaction->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS);
	$xaction->setNewValue(array('+' => $phids));

	return $xaction;
	}

	protected function getMentionableTextsFromTransaction(
	PhabricatorApplicationTransaction $transaction) {
	$texts = array();
	if ($transaction->getComment()) {
	$texts[] = $transaction->getComment()->getContent();
	}
	return $texts;
	}

	protected function mergeTransactions(
	PhabricatorApplicationTransaction $u,
	PhabricatorApplicationTransaction $v) {

	$type = $u->getTransactionType();

	switch ($type) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return $this->mergePHIDTransactions($u, $v);
	}

	// By default, do not merge the transactions.
	return null;
	}


	/**
	* 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 mergePHIDTransactions(
	PhabricatorApplicationTransaction $u,
	PhabricatorApplicationTransaction $v) {

	$result = $u->getNewValue();
	foreach ($v->getNewValue() as $key => $value) {
	$result[$key] = array_merge($value, idx($result, $key, array()));
	}
	$u->setNewValue($result);

	return $u;
	}


	protected function getPHIDTransactionNewValue(
	PhabricatorApplicationTransaction $xaction) {

	$old = array_combine($xaction->getOldValue(), $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_combine($new_set, $new_set);
	}
	unset($new['=']);

	if ($new) {
	throw new Exception(
	"Invalid 'new' value for PHID transaction. Value should contain only ".
	"keys '+' (add PHIDs), '-' (remove PHIDs) and '=' (set PHIDS).");
	}

	$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 sortTransactions(array $xactions) {
	$head = array();
	$tail = array();

	// Move bare comments to the end, so the actions preceed 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));
	}


	/* -( Sending Mail )------------------------------------------------------- */


	/**
	* @task mail
	*/
	protected function supportsMail() {
	return false;
	}


	/**
	* @task mail
	*/
	protected function sendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$email_to = $this->getMailTo($object);
	$email_cc = $this->getMailCC($object);

	$phids = array_merge($email_to, $email_cc);
	$handles = id(new PhabricatorObjectHandleData($phids))
	->setViewer($this->requireActor())
	->loadHandles();

	$template = $this->buildMailTemplate($object);
	$body = $this->buildMailBody($object, $xactions);

	$mail_tags = $this->getMailTags($object, $xactions);

	$action = $this->getStrongestAction($object, $xactions)->getActionName();

	$template
	->setFrom($this->requireActor()->getPHID())
	->setSubjectPrefix($this->getMailSubjectPrefix())
	->setVarySubjectPrefix('['.$action.']')
	->setThreadID($object->getPHID(), $this->getIsNewObject())
	->setRelatedPHID($object->getPHID())
	->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
	->setMailTags($mail_tags)
	->setIsBulk(true)
	->setBody($body->render());

	// TODO
	// ->setParentMessageID(...)

	$mails = $this
	->buildReplyHandler($object)
	->multiplexMail(
	$template,
	array_select_keys($handles, $email_to),
	array_select_keys($handles, $email_cc));

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

	$template->addTos($email_to);
	$template->addCCs($email_cc);

	return $template;
	}


	/**
	* @task mail
	*/
	protected function getStrongestAction(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return last(msort($xactions, 'getActionStrength'));
	}


	/**
	* @task mail
	*/
	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	throw new Exception("Capability not supported.");
	}


	/**
	* @task mail
	*/
	protected function getMailSubjectPrefix() {
	throw new Exception("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
	*/
	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	throw new Exception("Capability not supported.");
	}


	/**
	* @task mail
	*/
	protected function getMailTo(PhabricatorLiskDAO $object) {
	throw new Exception("Capability not supported.");
	}


	/**
	* @task mail
	*/
	protected function getMailCC(PhabricatorLiskDAO $object) {
	if ($object instanceof PhabricatorSubscribableInterface) {
	$phid = $object->getPHID();
	return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid);
	}
	throw new Exception("Capability not supported.");
	}


	/**
	* @task mail
	*/
	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$headers = array();
	$comments = array();

	foreach ($xactions as $xaction) {
	$headers[] = id(clone $xaction)->setRenderingTarget('text')->getTitle();
	$comment = $xaction->getComment();
	if ($comment && strlen($comment->getContent())) {
	$comments[] = $comment->getContent();
	}
	}

	$body = new PhabricatorMetaMTAMailBody();
	$body->addRawSection(implode("\n", $headers));

	foreach ($comments as $comment) {
	$body->addRawSection($comment);
	}

	return $body;
	}


	/* -( Publishing Feed Stories )-------------------------------------------- */


	/**
	* @task feed
	*/
	protected function supportsFeed() {
	return false;
	}


	/**
	* @task feed
	*/
	protected function getFeedStoryType() {
	return 'PhabricatorApplicationTransactionFeedStory';
	}


	/**
	* @task feed
	*/
	protected function getFeedRelatedPHIDs(
	PhabricatorLiskDAO $object,
	array $xactions) {

	return array(
	$object->getPHID(),
	$this->requireActor()->getPHID(),
	);
	}


	/**
	* @task feed
	*/
	protected function getFeedNotifyPHIDs(
	PhabricatorLiskDAO $object,
	array $xactions) {

	return 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) {

	$related_phids = $this->getFeedRelatedPHIDs($object, $xactions);
	$subscribed_phids = $this->getFeedNotifyPHIDs($object, $xactions);

	$story_type = $this->getFeedStoryType();
	$story_data = $this->getFeedStoryData($object, $xactions);

	- phlog($subscribed_phids);
	-
	id(new PhabricatorFeedStoryPublisher())
	->setStoryType($story_type)
	->setStoryData($story_data)
	->setStoryTime(time())
	->setStoryAuthorPHID($this->requireActor()->getPHID())
	->setRelatedPHIDs($related_phids)
	->setPrimaryObjectPHID($object->getPHID())
	->setSubscribedPHIDs($subscribed_phids)
	->setMailRecipientPHIDs($mailed_phids)
	->publish();
	}

	}
	diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	index 205f09b14a..15f9d81fc4 100644
	--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	@@ -1,306 +1,317 @@
	<?php

	abstract class PhabricatorApplicationTransaction
	extends PhabricatorLiskDAO
	- implements PhabricatorPolicyInterface{
	-
	- const MARKUP_FIELD_COMMENT = 'markup:comment';
	+ implements PhabricatorPolicyInterface {

	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 $contentSource;

	private $comment;
	private $commentNotLoaded;

	private $handles;
	private $renderingTarget = self::TARGET_HTML;

	abstract public function getApplicationTransactionType();
	abstract public function getApplicationTransactionCommentObject();
	abstract public function getApplicationObjectTypeName();

	public function generatePHID() {
	$type = PhabricatorPHIDConstants::PHID_TYPE_XACT;
	$subtype = $this->getApplicationTransactionType();

	return PhabricatorPHID::generateNewPHID($type, $subtype);
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'oldValue' => self::SERIALIZATION_JSON,
	'newValue' => self::SERIALIZATION_JSON,
	),
	) + 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("Comment for this transaction was not loaded.");
	}
	return $this->comment;
	}

	public function attachComment(
	PhabricatorApplicationTransactionComment $comment) {
	$this->comment = $comment;
	$this->commentNotLoaded = false;
	return $this;
	}

	public function setCommentNotLoaded($not_loaded) {
	$this->commentNotLoaded = $not_loaded;
	return $this;
	}

	/* -( Rendering )---------------------------------------------------------- */

	public function setRenderingTarget($rendering_target) {
	$this->renderingTarget = $rendering_target;
	return $this;
	}

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

	public function getRequiredHandlePHIDs() {
	$phids = array();

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

	$phids[] = array($this->getAuthorPHID());
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$phids[] = $old;
	$phids[] = $new;
	break;
	}

	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(
	"Transaction requires a handle ('{$phid}') it did not load.");
	}
	return $this->handles[$phid];
	}

	protected function renderHandleLink($phid) {
	if ($this->renderingTarget == self::TARGET_HTML) {
	return $this->getHandle($phid)->renderLink();
	} else {
	return $this->getHandle($phid)->getName();
	}
	}

	protected function renderHandleList(array $phids) {
	$links = array();
	foreach ($phids as $phid) {
	$links[] = $this->renderHandleLink($phid);
	}
	return implode(', ', $links);
	}

	public function getIcon() {
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_COMMENT:
	+ return 'comment';
	+ case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	+ return 'message';
	+ case PhabricatorTransactions::TYPE_VIEW_POLICY:
	+ case PhabricatorTransactions::TYPE_EDIT_POLICY:
	+ return 'lock';
	+ }
	+
	return null;
	}

	public function getColor() {
	return null;
	}

	public function shouldHide() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	if ($this->getOldValue() === null) {
	return true;
	} else {
	return false;
	}
	break;
	}

	return false;
	}

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

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

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht(
	'%s added a comment.',
	$this->renderHandleLink($author_phid));
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	// TODO: Render human-readable.
	return pht(
	'%s changed the visibility of this %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->getApplicationObjectTypeName(),
	phutil_escape_html($old),
	phutil_escape_html($new));
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	// TODO: Render human-readable.
	return pht(
	'%s changed the edit policy of this %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->getApplicationObjectTypeName(),
	phutil_escape_html($old),
	phutil_escape_html($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->renderHandleList($add),
	count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return pht(
	'%s added %d subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderHandleList($add));
	} else {
	return pht(
	'%s removed %d subscribers: %s.',
	$this->renderHandleLink($author_phid),
	count($rem),
	$this->renderHandleList($rem));
	}
	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_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_SUBSCRIBERS:
	return pht(
	'%s updated subscribers of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}

	return $this->getTitle();
	}

	public function getActionStrength() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return 0.5;
	}
	return 1.0;
	}

	public function getActionName() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht('Commented On');
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return pht('Changed Policy');
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht('Changed Subscribers');
	default:
	return pht('Updated');
	}
	}

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


	/* -( 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());
	}

	}
	diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php b/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php
	index 7ca928f85b..f68325e585 100644
	--- a/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php
	+++ b/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php
	@@ -1,103 +1,105 @@
	<?php

	abstract class PhabricatorApplicationTransactionComment
	extends PhabricatorLiskDAO
	implements PhabricatorMarkupInterface, PhabricatorPolicyInterface {

	+ const MARKUP_FIELD_COMMENT = 'markup:comment';
	+
	protected $transactionPHID;
	protected $commentVersion;
	protected $authorPHID;
	protected $viewPolicy;
	protected $editPolicy;
	protected $content;
	protected $contentSource;
	protected $isDeleted = 0;

	abstract public function getApplicationTransactionObject();

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_XCMT);
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	) + parent::getConfiguration();
	}

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

	public function getTableName() {
	$xaction = $this->getApplicationTransactionObject();
	return self::getTableNameFromTransaction($xaction);
	}

	public static function getTableNameFromTransaction(
	PhabricatorApplicationTransaction $xaction) {
	return $xaction->getTableName().'_comment';
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source->serialize();
	return $this;
	}

	public function getContentSource() {
	return PhabricatorContentSource::newFromSerialized($this->contentSource);
	}


	/* -( PhabricatorMarkupInterface )----------------------------------------- */


	public function getMarkupFieldKey($field) {
	return PhabricatorPHIDConstants::PHID_TYPE_XCMT.':'.$this->getPHID();
	}


	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newMarkupEngine(array());
	}


	public function getMarkupText($field) {
	return $this->getContent();
	}


	public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
	return $output;
	}


	public function shouldUseMarkupCache($field) {
	return (bool)$this->getPHID();
	}

	/* -( 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());
	}

	}
	diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
	new file mode 100644
	index 0000000000..1fed5dada0
	--- /dev/null
	+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
	@@ -0,0 +1,81 @@
	+<?php
	+
	+/**
	+ * @concrete-extensible
	+ */
	+class PhabricatorApplicationTransactionView extends AphrontView {
	+
	+ private $viewer;
	+ private $transactions;
	+ private $engine;
	+ private $anchorOffset = 0;
	+
	+ public function setAnchorOffset($anchor_offset) {
	+ $this->anchorOffset = $anchor_offset;
	+ return $this;
	+ }
	+
	+ 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 setViewer(PhabricatorUser $viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ public function render() {
	+ $field = PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT;
	+
	+ if (!$this->engine) {
	+ $engine = id(new PhabricatorMarkupEngine())
	+ ->setViewer($this->viewer);
	+ foreach ($this->transactions as $xaction) {
	+ if (!$xaction->hasComment()) {
	+ continue;
	+ }
	+ $engine->addObject($xaction->getComment(), $field);
	+ }
	+ $engine->process();
	+
	+ $this->engine = $engine;
	+ }
	+
	+ $view = new PhabricatorTimelineView();
	+
	+ $anchor = $this->anchorOffset;
	+ foreach ($this->transactions as $xaction) {
	+ if ($xaction->shouldHide()) {
	+ continue;
	+ }
	+
	+ $anchor++;
	+ $event = id(new PhabricatorTimelineEventView())
	+ ->setViewer($this->viewer)
	+ ->setUserHandle($xaction->getHandle($xaction->getAuthorPHID()))
	+ ->setIcon($xaction->getIcon())
	+ ->setColor($xaction->getColor())
	+ ->setTitle($xaction->getTitle())
	+ ->setDateCreated($xaction->getDateCreated())
	+ ->setContentSource($xaction->getContentSource())
	+ ->setAnchor($anchor);
	+
	+ if ($xaction->hasComment()) {
	+ $event->appendChild(
	+ $this->engine->getOutput($xaction->getComment(), $field));
	+ }
	+
	+ $view->addEvent($event);
	+ }
	+
	+ return $view->render();
	+ }
	+}
	+
	diff --git a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
	index 558349fae7..a9dc4560fd 100644
	--- a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
	+++ b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
	@@ -1,124 +1,125 @@
	<?php

	final class PhabricatorEdgeConfig extends PhabricatorEdgeConstants {

	const TABLE_NAME_EDGE = 'edge';
	const TABLE_NAME_EDGEDATA = 'edgedata';

	const TYPE_TASK_HAS_COMMIT = 1;
	const TYPE_COMMIT_HAS_TASK = 2;

	const TYPE_TASK_DEPENDS_ON_TASK = 3;
	const TYPE_TASK_DEPENDED_ON_BY_TASK = 4;

	const TYPE_DREV_DEPENDS_ON_DREV = 5;
	const TYPE_DREV_DEPENDED_ON_BY_DREV = 6;

	const TYPE_BLOG_HAS_POST = 7;
	const TYPE_POST_HAS_BLOG = 8;
	const TYPE_BLOG_HAS_BLOGGER = 9;
	const TYPE_BLOGGER_HAS_BLOG = 10;

	const TYPE_TASK_HAS_RELATED_DREV = 11;
	const TYPE_DREV_HAS_RELATED_TASK = 12;

	const TYPE_PROJ_MEMBER = 13;
	const TYPE_MEMBER_OF_PROJ = 14;

	const TYPE_COMMIT_HAS_PROJECT = 15;
	const TYPE_PROJECT_HAS_COMMIT = 16;

	const TYPE_QUESTION_HAS_VOTING_USER = 17;
	const TYPE_VOTING_USER_HAS_QUESTION = 18;
	const TYPE_ANSWER_HAS_VOTING_USER = 19;
	const TYPE_VOTING_USER_HAS_ANSWER = 20;

	const TYPE_OBJECT_HAS_SUBSCRIBER = 21;
	const TYPE_SUBSCRIBED_TO_OBJECT = 22;

	const TYPE_OBJECT_HAS_UNSUBSCRIBER = 23;
	const TYPE_UNSUBSCRIBED_FROM_OBJECT = 24;

	const TYPE_TEST_NO_CYCLE = 9000;

	public static function getInverse($edge_type) {
	static $map = array(
	self::TYPE_TASK_HAS_COMMIT => self::TYPE_COMMIT_HAS_TASK,
	self::TYPE_COMMIT_HAS_TASK => self::TYPE_TASK_HAS_COMMIT,

	self::TYPE_TASK_DEPENDS_ON_TASK => self::TYPE_TASK_DEPENDED_ON_BY_TASK,
	self::TYPE_TASK_DEPENDED_ON_BY_TASK => self::TYPE_TASK_DEPENDS_ON_TASK,

	self::TYPE_DREV_DEPENDS_ON_DREV => self::TYPE_DREV_DEPENDED_ON_BY_DREV,
	self::TYPE_DREV_DEPENDED_ON_BY_DREV => self::TYPE_DREV_DEPENDS_ON_DREV,

	self::TYPE_BLOG_HAS_POST => self::TYPE_POST_HAS_BLOG,
	self::TYPE_POST_HAS_BLOG => self::TYPE_BLOG_HAS_POST,
	self::TYPE_BLOG_HAS_BLOGGER => self::TYPE_BLOGGER_HAS_BLOG,
	self::TYPE_BLOGGER_HAS_BLOG => self::TYPE_BLOG_HAS_BLOGGER,

	self::TYPE_TASK_HAS_RELATED_DREV => self::TYPE_DREV_HAS_RELATED_TASK,
	self::TYPE_DREV_HAS_RELATED_TASK => self::TYPE_TASK_HAS_RELATED_DREV,

	self::TYPE_PROJ_MEMBER => self::TYPE_MEMBER_OF_PROJ,
	self::TYPE_MEMBER_OF_PROJ => self::TYPE_PROJ_MEMBER,

	self::TYPE_COMMIT_HAS_PROJECT => self::TYPE_PROJECT_HAS_COMMIT,
	self::TYPE_PROJECT_HAS_COMMIT => self::TYPE_COMMIT_HAS_PROJECT,

	self::TYPE_QUESTION_HAS_VOTING_USER =>
	self::TYPE_VOTING_USER_HAS_QUESTION,
	self::TYPE_VOTING_USER_HAS_QUESTION =>
	self::TYPE_QUESTION_HAS_VOTING_USER,
	self::TYPE_ANSWER_HAS_VOTING_USER => self::TYPE_VOTING_USER_HAS_ANSWER,
	self::TYPE_VOTING_USER_HAS_ANSWER => self::TYPE_ANSWER_HAS_VOTING_USER,

	self::TYPE_OBJECT_HAS_SUBSCRIBER => self::TYPE_SUBSCRIBED_TO_OBJECT,
	self::TYPE_SUBSCRIBED_TO_OBJECT => self::TYPE_OBJECT_HAS_SUBSCRIBER,

	self::TYPE_OBJECT_HAS_UNSUBSCRIBER => self::TYPE_UNSUBSCRIBED_FROM_OBJECT,
	self::TYPE_UNSUBSCRIBED_FROM_OBJECT => self::TYPE_OBJECT_HAS_UNSUBSCRIBER,
	);

	return idx($map, $edge_type);
	}

	public static function shouldPreventCycles($edge_type) {
	static $map = array(
	self::TYPE_TEST_NO_CYCLE => true,
	self::TYPE_TASK_DEPENDS_ON_TASK => true,
	self::TYPE_DREV_DEPENDS_ON_DREV => true,
	);
	return isset($map[$edge_type]);
	}

	public static function establishConnection($phid_type, $conn_type) {
	static $class_map = array(
	PhabricatorPHIDConstants::PHID_TYPE_TASK => 'ManiphestTask',
	PhabricatorPHIDConstants::PHID_TYPE_CMIT => 'PhabricatorRepository',
	PhabricatorPHIDConstants::PHID_TYPE_DREV => 'DifferentialRevision',
	PhabricatorPHIDConstants::PHID_TYPE_FILE => 'PhabricatorFile',
	PhabricatorPHIDConstants::PHID_TYPE_USER => 'PhabricatorUser',
	PhabricatorPHIDConstants::PHID_TYPE_PROJ => 'PhabricatorProject',
	PhabricatorPHIDConstants::PHID_TYPE_MLST =>
	'PhabricatorMetaMTAMailingList',
	PhabricatorPHIDConstants::PHID_TYPE_TOBJ => 'HarbormasterObject',
	PhabricatorPHIDConstants::PHID_TYPE_BLOG => 'PhameBlog',
	PhabricatorPHIDConstants::PHID_TYPE_POST => 'PhamePost',
	PhabricatorPHIDConstants::PHID_TYPE_QUES => 'PonderQuestion',
	PhabricatorPHIDConstants::PHID_TYPE_ANSW => 'PonderAnswer',
	PhabricatorPHIDConstants::PHID_TYPE_MOCK => 'PholioMock',
	+ PhabricatorPHIDConstants::PHID_TYPE_MCRO => 'PhabricatorFileImageMacro',

	);

	$class = idx($class_map, $phid_type);

	if (!$class) {
	throw new Exception(
	"Edges are not available for objects of type '{$phid_type}'!");
	}

	return newv($class, array())->establishConnection($conn_type);
	}

	}
	diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
	index 5a59fc41cd..19ff4b6bf0 100644
	--- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
	+++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
	@@ -1,50 +1,51 @@
	<?php

	/**
	* @group markup
	*/
	final class PhabricatorRemarkupRuleImageMacro
	extends PhutilRemarkupRule {

	private $images;

	public function apply($text) {
	return preg_replace_callback(
	'@^([a-zA-Z0-9_\-]+)$@m',
	array($this, 'markupImageMacro'),
	$text);
	}

	public function markupImageMacro($matches) {
	if ($this->images === null) {
	$this->images = array();
	- $rows = id(new PhabricatorFileImageMacro())->loadAll();
	+ $rows = id(new PhabricatorFileImageMacro())->loadAllWhere(
	+ 'isDisabled = 0');
	foreach ($rows as $row) {
	$this->images[$row->getName()] = $row->getFilePHID();
	}
	}

	if (array_key_exists($matches[1], $this->images)) {
	$phid = $this->images[$matches[1]];

	$file = id(new PhabricatorFile())->loadOneWhere('phid = %s', $phid);
	if ($file) {
	$src_uri = $file->getBestURI();
	} else {
	$src_uri = null;
	}

	$img = phutil_render_tag(
	'img',
	array(
	'src' => $src_uri,
	'alt' => $matches[1],
	'title' => $matches[1]),
	null);
	return $this->getEngine()->storeText($img);
	} else {
	return $matches[1];
	}
	}

	}
	diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
	index 4f82e93d06..2d1cae1c24 100644
	--- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
	+++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
	@@ -1,1054 +1,1066 @@
	<?php

	final class PhabricatorBuiltinPatchList extends PhabricatorSQLPatchList {

	public function getNamespace() {
	return 'phabricator';
	}

	private function getPatchPath($file) {
	$root = dirname(phutil_get_library_root('phabricator'));
	$path = $root.'/resources/sql/patches/'.$file;

	// Make sure it exists.
	Filesystem::readFile($path);

	return $path;
	}

	public function getPatches() {
	return array(
	'db.audit' => array(
	'type' => 'db',
	'name' => 'audit',
	'after' => array( /* First Patch */ ),
	),
	'db.calendar' => array(
	'type' => 'db',
	'name' => 'calendar',
	),
	'db.chatlog' => array(
	'type' => 'db',
	'name' => 'chatlog',
	),
	'db.conduit' => array(
	'type' => 'db',
	'name' => 'conduit',
	),
	'db.countdown' => array(
	'type' => 'db',
	'name' => 'countdown',
	),
	'db.daemon' => array(
	'type' => 'db',
	'name' => 'daemon',
	),
	'db.differential' => array(
	'type' => 'db',
	'name' => 'differential',
	),
	'db.draft' => array(
	'type' => 'db',
	'name' => 'draft',
	),
	'db.drydock' => array(
	'type' => 'db',
	'name' => 'drydock',
	),
	'db.feed' => array(
	'type' => 'db',
	'name' => 'feed',
	),
	'db.file' => array(
	'type' => 'db',
	'name' => 'file',
	),
	'db.flag' => array(
	'type' => 'db',
	'name' => 'flag',
	),
	'db.harbormaster' => array(
	'type' => 'db',
	'name' => 'harbormaster',
	),
	'db.herald' => array(
	'type' => 'db',
	'name' => 'herald',
	),
	'db.maniphest' => array(
	'type' => 'db',
	'name' => 'maniphest',
	),
	'db.meta_data' => array(
	'type' => 'db',
	'name' => 'meta_data',
	),
	'db.metamta' => array(
	'type' => 'db',
	'name' => 'metamta',
	),
	'db.oauth_server' => array(
	'type' => 'db',
	'name' => 'oauth_server',
	),
	'db.owners' => array(
	'type' => 'db',
	'name' => 'owners',
	),
	'db.pastebin' => array(
	'type' => 'db',
	'name' => 'pastebin',
	),
	'db.phame' => array(
	'type' => 'db',
	'name' => 'phame',
	),
	'db.phriction' => array(
	'type' => 'db',
	'name' => 'phriction',
	),
	'db.project' => array(
	'type' => 'db',
	'name' => 'project',
	),
	'db.repository' => array(
	'type' => 'db',
	'name' => 'repository',
	),
	'db.search' => array(
	'type' => 'db',
	'name' => 'search',
	),
	'db.slowvote' => array(
	'type' => 'db',
	'name' => 'slowvote',
	),
	'db.timeline' => array(
	'type' => 'db',
	'name' => 'timeline',
	),
	'db.user' => array(
	'type' => 'db',
	'name' => 'user',
	),
	'db.worker' => array(
	'type' => 'db',
	'name' => 'worker',
	),
	'db.xhpastview' => array(
	'type' => 'db',
	'name' => 'xhpastview',
	),
	'db.cache' => array(
	'type' => 'db',
	'name' => 'cache',
	),
	'db.fact' => array(
	'type' => 'db',
	'name' => 'fact',
	),
	'db.ponder' => array(
	'type' => 'db',
	'name' => 'ponder',
	),
	'db.xhprof' => array(
	'type' => 'db',
	'name' => 'xhprof',
	),
	'db.pholio' => array(
	'type' => 'db',
	'name' => 'pholio',
	),
	'0000.legacy.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('0000.legacy.sql'),
	'legacy' => 0,
	),
	'000.project.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('000.project.sql'),
	'legacy' => 0,
	),
	'001.maniphest_projects.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('001.maniphest_projects.sql'),
	'legacy' => 1,
	),
	'002.oauth.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('002.oauth.sql'),
	'legacy' => 2,
	),
	'003.more_oauth.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('003.more_oauth.sql'),
	'legacy' => 3,
	),
	'004.daemonrepos.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('004.daemonrepos.sql'),
	'legacy' => 4,
	),
	'005.workers.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('005.workers.sql'),
	'legacy' => 5,
	),
	'006.repository.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('006.repository.sql'),
	'legacy' => 6,
	),
	'007.daemonlog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('007.daemonlog.sql'),
	'legacy' => 7,
	),
	'008.repoopt.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('008.repoopt.sql'),
	'legacy' => 8,
	),
	'009.repo_summary.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('009.repo_summary.sql'),
	'legacy' => 9,
	),
	'010.herald.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('010.herald.sql'),
	'legacy' => 10,
	),
	'011.badcommit.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('011.badcommit.sql'),
	'legacy' => 11,
	),
	'012.dropphidtype.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('012.dropphidtype.sql'),
	'legacy' => 12,
	),
	'013.commitdetail.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('013.commitdetail.sql'),
	'legacy' => 13,
	),
	'014.shortcuts.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('014.shortcuts.sql'),
	'legacy' => 14,
	),
	'015.preferences.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('015.preferences.sql'),
	'legacy' => 15,
	),
	'016.userrealnameindex.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('016.userrealnameindex.sql'),
	'legacy' => 16,
	),
	'017.sessionkeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('017.sessionkeys.sql'),
	'legacy' => 17,
	),
	'018.owners.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('018.owners.sql'),
	'legacy' => 18,
	),
	'019.arcprojects.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('019.arcprojects.sql'),
	'legacy' => 19,
	),
	'020.pathcapital.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('020.pathcapital.sql'),
	'legacy' => 20,
	),
	'021.xhpastview.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('021.xhpastview.sql'),
	'legacy' => 21,
	),
	'022.differentialcommit.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('022.differentialcommit.sql'),
	'legacy' => 22,
	),
	'023.dxkeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('023.dxkeys.sql'),
	'legacy' => 23,
	),
	'024.mlistkeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('024.mlistkeys.sql'),
	'legacy' => 24,
	),
	'025.commentopt.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('025.commentopt.sql'),
	'legacy' => 25,
	),
	'026.diffpropkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('026.diffpropkey.sql'),
	'legacy' => 26,
	),
	'027.metamtakeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('027.metamtakeys.sql'),
	'legacy' => 27,
	),
	'028.systemagent.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('028.systemagent.sql'),
	'legacy' => 28,
	),
	'029.cursors.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('029.cursors.sql'),
	'legacy' => 29,
	),
	'030.imagemacro.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('030.imagemacro.sql'),
	'legacy' => 30,
	),
	'031.workerrace.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('031.workerrace.sql'),
	'legacy' => 31,
	),
	'032.viewtime.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('032.viewtime.sql'),
	'legacy' => 32,
	),
	'033.privtest.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('033.privtest.sql'),
	'legacy' => 33,
	),
	'034.savedheader.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('034.savedheader.sql'),
	'legacy' => 34,
	),
	'035.proxyimage.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('035.proxyimage.sql'),
	'legacy' => 35,
	),
	'036.mailkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('036.mailkey.sql'),
	'legacy' => 36,
	),
	'037.setuptest.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('037.setuptest.sql'),
	'legacy' => 37,
	),
	'038.admin.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('038.admin.sql'),
	'legacy' => 38,
	),
	'039.userlog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('039.userlog.sql'),
	'legacy' => 39,
	),
	'040.transform.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('040.transform.sql'),
	'legacy' => 40,
	),
	'041.heraldrepetition.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('041.heraldrepetition.sql'),
	'legacy' => 41,
	),
	'042.commentmetadata.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('042.commentmetadata.sql'),
	'legacy' => 42,
	),
	'043.pastebin.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('043.pastebin.sql'),
	'legacy' => 43,
	),
	'044.countdown.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('044.countdown.sql'),
	'legacy' => 44,
	),
	'045.timezone.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('045.timezone.sql'),
	'legacy' => 45,
	),
	'046.conduittoken.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('046.conduittoken.sql'),
	'legacy' => 46,
	),
	'047.projectstatus.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('047.projectstatus.sql'),
	'legacy' => 47,
	),
	'048.relationshipkeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('048.relationshipkeys.sql'),
	'legacy' => 48,
	),
	'049.projectowner.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('049.projectowner.sql'),
	'legacy' => 49,
	),
	'050.taskdenormal.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('050.taskdenormal.sql'),
	'legacy' => 50,
	),
	'051.projectfilter.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('051.projectfilter.sql'),
	'legacy' => 51,
	),
	'052.pastelanguage.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('052.pastelanguage.sql'),
	'legacy' => 52,
	),
	'053.feed.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('053.feed.sql'),
	'legacy' => 53,
	),
	'054.subscribers.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('054.subscribers.sql'),
	'legacy' => 54,
	),
	'055.add_author_to_files.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('055.add_author_to_files.sql'),
	'legacy' => 55,
	),
	'056.slowvote.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('056.slowvote.sql'),
	'legacy' => 56,
	),
	'057.parsecache.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('057.parsecache.sql'),
	'legacy' => 57,
	),
	'058.missingkeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('058.missingkeys.sql'),
	'legacy' => 58,
	),
	'059.engines.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('059.engines.php'),
	'legacy' => 59,
	),
	'060.phriction.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('060.phriction.sql'),
	'legacy' => 60,
	),
	'061.phrictioncontent.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('061.phrictioncontent.sql'),
	'legacy' => 61,
	),
	'062.phrictionmenu.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('062.phrictionmenu.sql'),
	'legacy' => 62,
	),
	'063.pasteforks.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('063.pasteforks.sql'),
	'legacy' => 63,
	),
	'064.subprojects.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('064.subprojects.sql'),
	'legacy' => 64,
	),
	'065.sshkeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('065.sshkeys.sql'),
	'legacy' => 65,
	),
	'066.phrictioncontent.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('066.phrictioncontent.sql'),
	'legacy' => 66,
	),
	'067.preferences.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('067.preferences.sql'),
	'legacy' => 67,
	),
	'068.maniphestauxiliarystorage.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('068.maniphestauxiliarystorage.sql'),
	'legacy' => 68,
	),
	'069.heraldxscript.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('069.heraldxscript.sql'),
	'legacy' => 69,
	),
	'070.differentialaux.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('070.differentialaux.sql'),
	'legacy' => 70,
	),
	'071.contentsource.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('071.contentsource.sql'),
	'legacy' => 71,
	),
	'072.blamerevert.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('072.blamerevert.sql'),
	'legacy' => 72,
	),
	'073.reposymbols.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('073.reposymbols.sql'),
	'legacy' => 73,
	),
	'074.affectedpath.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('074.affectedpath.sql'),
	'legacy' => 74,
	),
	'075.revisionhash.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('075.revisionhash.sql'),
	'legacy' => 75,
	),
	'076.indexedlanguages.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('076.indexedlanguages.sql'),
	'legacy' => 76,
	),
	'077.originalemail.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('077.originalemail.sql'),
	'legacy' => 77,
	),
	'078.nametoken.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('078.nametoken.sql'),
	'legacy' => 78,
	),
	'079.nametokenindex.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('079.nametokenindex.php'),
	'legacy' => 79,
	),
	'080.filekeys.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('080.filekeys.sql'),
	'legacy' => 80,
	),
	'081.filekeys.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('081.filekeys.php'),
	'legacy' => 81,
	),
	'082.xactionkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('082.xactionkey.sql'),
	'legacy' => 82,
	),
	'083.dxviewtime.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('083.dxviewtime.sql'),
	'legacy' => 83,
	),
	'084.pasteauthorkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('084.pasteauthorkey.sql'),
	'legacy' => 84,
	),
	'085.packagecommitrelationship.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('085.packagecommitrelationship.sql'),
	'legacy' => 85,
	),
	'086.formeraffil.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('086.formeraffil.sql'),
	'legacy' => 86,
	),
	'087.phrictiondelete.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('087.phrictiondelete.sql'),
	'legacy' => 87,
	),
	'088.audit.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('088.audit.sql'),
	'legacy' => 88,
	),
	'089.projectwiki.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('089.projectwiki.sql'),
	'legacy' => 89,
	),
	'090.forceuniqueprojectnames.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('090.forceuniqueprojectnames.php'),
	'legacy' => 90,
	),
	'091.uniqueslugkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('091.uniqueslugkey.sql'),
	'legacy' => 91,
	),
	'092.dropgithubnotification.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('092.dropgithubnotification.sql'),
	'legacy' => 92,
	),
	'093.gitremotes.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('093.gitremotes.php'),
	'legacy' => 93,
	),
	'094.phrictioncolumn.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('094.phrictioncolumn.sql'),
	'legacy' => 94,
	),
	'095.directory.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('095.directory.sql'),
	'legacy' => 95,
	),
	'096.filename.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('096.filename.sql'),
	'legacy' => 96,
	),
	'097.heraldruletypes.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('097.heraldruletypes.sql'),
	'legacy' => 97,
	),
	'098.heraldruletypemigration.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('098.heraldruletypemigration.php'),
	'legacy' => 98,
	),
	'099.drydock.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('099.drydock.sql'),
	'legacy' => 99,
	),
	'100.projectxaction.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('100.projectxaction.sql'),
	'legacy' => 100,
	),
	'101.heraldruleapplied.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('101.heraldruleapplied.sql'),
	'legacy' => 101,
	),
	'102.heraldcleanup.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('102.heraldcleanup.php'),
	'legacy' => 102,
	),
	'103.heraldedithistory.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('103.heraldedithistory.sql'),
	'legacy' => 103,
	),
	'104.searchkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('104.searchkey.sql'),
	'legacy' => 104,
	),
	'105.mimetype.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('105.mimetype.sql'),
	'legacy' => 105,
	),
	'106.chatlog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('106.chatlog.sql'),
	'legacy' => 106,
	),
	'107.oauthserver.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('107.oauthserver.sql'),
	'legacy' => 107,
	),
	'108.oauthscope.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('108.oauthscope.sql'),
	'legacy' => 108,
	),
	'109.oauthclientphidkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('109.oauthclientphidkey.sql'),
	'legacy' => 109,
	),
	'110.commitaudit.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('110.commitaudit.sql'),
	'legacy' => 110,
	),
	'111.commitauditmigration.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('111.commitauditmigration.php'),
	'legacy' => 111,
	),
	'112.oauthaccesscoderedirecturi.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('112.oauthaccesscoderedirecturi.sql'),
	'legacy' => 112,
	),
	'113.lastreviewer.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('113.lastreviewer.sql'),
	'legacy' => 113,
	),
	'114.auditrequest.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('114.auditrequest.sql'),
	'legacy' => 114,
	),
	'115.prepareutf8.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('115.prepareutf8.sql'),
	'legacy' => 115,
	),
	'116.utf8-backup-first-expect-wait.sql' => array(
	'type' => 'sql',
	'name' =>
	$this->getPatchPath('116.utf8-backup-first-expect-wait.sql'),
	'legacy' => 116,
	),
	'117.repositorydescription.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('117.repositorydescription.php'),
	'legacy' => 117,
	),
	'118.auditinline.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('118.auditinline.sql'),
	'legacy' => 118,
	),
	'119.filehash.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('119.filehash.sql'),
	'legacy' => 119,
	),
	'120.noop.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('120.noop.sql'),
	'legacy' => 120,
	),
	'121.drydocklog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('121.drydocklog.sql'),
	'legacy' => 121,
	),
	'122.flag.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('122.flag.sql'),
	'legacy' => 122,
	),
	'123.heraldrulelog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('123.heraldrulelog.sql'),
	'legacy' => 123,
	),
	'124.subpriority.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('124.subpriority.sql'),
	'legacy' => 124,
	),
	'125.ipv6.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('125.ipv6.sql'),
	'legacy' => 125,
	),
	'126.edges.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('126.edges.sql'),
	'legacy' => 126,
	),
	'127.userkeybody.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('127.userkeybody.sql'),
	'legacy' => 127,
	),
	'128.phabricatorcom.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('128.phabricatorcom.sql'),
	'legacy' => 128,
	),
	'129.savedquery.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('129.savedquery.sql'),
	'legacy' => 129,
	),
	'130.denormalrevisionquery.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('130.denormalrevisionquery.sql'),
	'legacy' => 130,
	),
	'131.migraterevisionquery.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('131.migraterevisionquery.php'),
	'legacy' => 131,
	),
	'132.phame.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('132.phame.sql'),
	'legacy' => 132,
	),
	'133.imagemacro.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('133.imagemacro.sql'),
	'legacy' => 133,
	),
	'134.emptysearch.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('134.emptysearch.sql'),
	'legacy' => 134,
	),
	'135.datecommitted.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('135.datecommitted.sql'),
	'legacy' => 135,
	),
	'136.sex.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('136.sex.sql'),
	'legacy' => 136,
	),
	'137.auditmetadata.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('137.auditmetadata.sql'),
	'legacy' => 137,
	),
	'138.notification.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('138.notification.sql'),
	),
	'holidays.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('holidays.sql'),
	),
	'userstatus.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('userstatus.sql'),
	),
	'emailtable.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('emailtable.sql'),
	),
	'emailtableport.sql' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('emailtableport.php'),
	),
	'emailtableremove.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('emailtableremove.sql'),
	),
	'phiddrop.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('phiddrop.sql'),
	),
	'testdatabase.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('testdatabase.sql'),
	),
	'ldapinfo.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('ldapinfo.sql'),
	),
	'threadtopic.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('threadtopic.sql'),
	),
	'usertranslation.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('usertranslation.sql'),
	),
	'differentialbookmarks.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('differentialbookmarks.sql'),
	),
	'harbormasterobject.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('harbormasterobject.sql'),
	),
	'markupcache.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('markupcache.sql'),
	),
	'maniphestxcache.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('maniphestxcache.sql'),
	),
	'migrate-maniphest-dependencies.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('migrate-maniphest-dependencies.php'),
	),
	'migrate-differential-dependencies.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath(
	'migrate-differential-dependencies.php'),
	),
	'phameblog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('phameblog.sql'),
	),
	'migrate-maniphest-revisions.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('migrate-maniphest-revisions.php'),
	),
	'daemonstatus.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('daemonstatus.sql'),
	),
	'symbolcontexts.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('symbolcontexts.sql'),
	),
	'migrate-project-edges.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('migrate-project-edges.php'),
	),
	'fact-raw.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('fact-raw.sql'),
	),
	'ponder.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('ponder.sql')
	),
	'policy-project.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('policy-project.sql'),
	),
	'daemonstatuskey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('daemonstatuskey.sql'),
	),
	'edgetype.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('edgetype.sql'),
	),
	'ponder-comments.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('ponder-comments.sql'),
	),
	'pastepolicy.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('pastepolicy.sql'),
	),
	'xhprof.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('xhprof.sql'),
	),
	'draft-metadata.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('draft-metadata.sql'),
	),
	'phamedomain.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('phamedomain.sql'),
	),
	'ponder-mailkey.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('ponder-mailkey.sql'),
	),
	'ponder-mailkey-populate.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('ponder-mailkey-populate.php'),
	),
	'phamepolicy.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('phamepolicy.sql'),
	),
	'phameoneblog.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('phameoneblog.sql'),
	),
	'statustxt.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('statustxt.sql'),
	),
	'daemontaskarchive.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('daemontaskarchive.sql'),
	),
	'drydocktaskid.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('drydocktaskid.sql'),
	),
	'drydockresoucetype.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('drydockresourcetype.sql'),
	),
	'liskcounters.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('liskcounters.sql'),
	),
	'liskcounters.php' => array(
	'type' => 'php',
	'name' => $this->getPatchPath('liskcounters.php'),
	),
	'dropfileproxyimage.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('dropfileproxyimage.sql'),
	),
	'repository-lint.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('repository-lint.sql'),
	),
	'liskcounters-task.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('liskcounters-task.sql'),
	),
	'pholio.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('pholio.sql'),
	),
	'owners-exclude.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('owners-exclude.sql'),
	),
	'20121209.pholioxactions.sql' => array(
	'type' => 'sql',
	'name' => $this->getPatchPath('20121209.pholioxactions.sql'),
	),
	+ '20121209.xmacroadd.sql' => array(
	+ 'type' => 'sql',
	+ 'name' => $this->getPatchPath('20121209.xmacroadd.sql'),
	+ ),
	+ '20121209.xmacromigrate.php' => array(
	+ 'type' => 'php',
	+ 'name' => $this->getPatchPath('20121209.xmacromigrate.php'),
	+ ),
	+ '20121209.xmacromigratekey.sql' => array(
	+ 'type' => 'sql',
	+ 'name' => $this->getPatchPath('20121209.xmacromigratekey.sql'),
	+ ),
	);
	}

	}
	diff --git a/src/view/layout/PhabricatorHeaderView.php b/src/view/layout/PhabricatorHeaderView.php
	index 9ddb8d4f38..169b4b7f57 100644
	--- a/src/view/layout/PhabricatorHeaderView.php
	+++ b/src/view/layout/PhabricatorHeaderView.php
	@@ -1,41 +1,56 @@
	<?php

	final class PhabricatorHeaderView extends AphrontView {

	private $objectName;
	private $header;
	+ private $tags = array();

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

	public function setObjectName($object_name) {
	$this->objectName = $object_name;
	return $this;
	}

	+ public function addTag(PhabricatorTagView $tag) {
	+ $this->tags[] = $tag;
	+ return $this;
	+ }
	+
	public function render() {
	require_celerity_resource('phabricator-header-view-css');

	$header = phutil_escape_html($this->header);

	if ($this->objectName) {
	$header = phutil_render_tag(
	'a',
	array(
	'href' => '/'.$this->objectName,
	),
	phutil_escape_html($this->objectName)).' '.$header;
	}

	+ if ($this->tags) {
	+ $header .= phutil_render_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phabricator-header-tags',
	+ ),
	+ self::renderSingleView($this->tags));
	+ }
	+
	return phutil_render_tag(
	'h1',
	array(
	'class' => 'phabricator-header-view',
	),
	$header);
	}


	}
	diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
	index 3973f65b66..b38a65f82f 100644
	--- a/webroot/rsrc/css/core/remarkup.css
	+++ b/webroot/rsrc/css/core/remarkup.css
	@@ -1,314 +1,319 @@
	/**
	* @provides phabricator-remarkup-css
	*/

	.phabricator-remarkup {
	line-height: 1.45em;
	}

	.phabricator-remarkup p {
	margin: 0 0 1em;
	}

	.phabricator-remarkup p:last-child {
	margin-bottom: 0;
	}

	.phabricator-remarkup .remarkup-code-block {
	margin: 1em 2em;
	white-space: pre;
	font-family: "Monaco", monospace;
	font-size: 10px;
	}

	.phabricator-remarkup .remarkup-code-header {
	padding: .25em 1em;
	background: #edead7;
	color: #444444;
	}

	.phabricator-remarkup .remarkup-code-block pre {
	background: #fdfae7;
	border: 1px solid #f5e178;
	display: block;
	color: #000000;
	overflow: auto;
	padding: .5em 1em;
	font-family: "Monaco", monospace;
	}

	.phabricator-remarkup pre.remarkup-counterexample {
	border: 1px solid #aa0000;
	background-color: #ffaaaa;
	}

	.phabricator-remarkup tt {
	color: #333333;
	background: #ebebeb;
	padding: 0 .25em;
	white-space: pre-wrap;
	}

	.phabricator-remarkup ul {
	list-style: disc;
	margin: 1em 0 1em 3em;
	}

	.phabricator-remarkup ol {
	list-style: decimal;
	margin: 1em 0 1em 3em;
	}

	.phabricator-remarkup ul ol,
	.phabricator-remarkup ul ul,
	.phabricator-remarkup ol ol,
	.phabricator-remarkup ol ul {
	margin: .25em 0 .25em 2em;
	}

	.phabricator-remarkup li.phantom-item,
	.phabricator-remarkup li.phantom-item {
	list-style-type: none;
	}

	.phabricator-remarkup h1:first-child,
	.phabricator-remarkup h2:first-child,
	.phabricator-remarkup h3:first-child,
	.phabricator-remarkup h4:first-child,
	.phabricator-remarkup h5:first-child,
	.phabricator-remarkup h6:first-child {
	margin-top: 0;
	}

	.phabricator-remarkup h1:last-child,
	.phabricator-remarkup h2:last-child,
	.phabricator-remarkup h3:last-child,
	.phabricator-remarkup h4:last-child,
	.phabricator-remarkup h5:last-child,
	.phabricator-remarkup h6:last-child {
	margin-bottom: 0;
	}

	.phabricator-remarkup h1 {
	font-size: 1.625em;
	line-height: 1.625em;
	margin: .8em 0;
	}

	.phabricator-remarkup h2 {
	font-size: 1.5em;
	line-height: 1.5em;
	margin: .75em 0;
	}

	.phabricator-remarkup h3 {
	font-size: 1.375em;
	line-height: 1.375em;
	margin: .69em 0;
	}

	.phabricator-remarkup h4 {
	font-size: 1.25em;
	line-height: 1.25em;
	margin: .63em 0;
	}

	.phabricator-remarkup h5 {
	font-size: 1.125em;
	line-height: 1.125em;
	margin: .56em 0;
	}

	.phabricator-remarkup h6 {
	font-size: 1em;
	line-height: 1em;
	margin: .5em 0;
	}

	.phabricator-remarkup blockquote {
	border-left: 1px solid #AAAAAA;
	color: #333333;
	font-style: italic;
	margin: .5em 0em;
	padding: .25em 1em;
	}

	.phabricator-remarkup img.remarkup-proxy-image {
	max-width: 640px;
	max-height: 640px;
	}

	.phabricator-remarkup-mention-exists {
	font-weight: bold;
	background: #e6f3ff;
	}

	.phabricator-remarkup-mention-disabled {
	font-weight: bold;
	background: #dddddd;
	}

	.aphront-panel-preview .phabricator-remarkup-mention-unknown {
	font-weight: bold;
	background: #ffaaaa;
	}

	.phabricator-remarkup .remarkup-note {
	margin: 1em 1.5em;
	padding: 0.5em 1em;
	border: 1px solid #ddddff;
	background: #f3f3ff;
	}

	.phabricator-remarkup-toc {
	float: right;
	border: 1px solid #999999;
	background: #f9f9f9;
	padding: 4px 12px;
	width: 220px;
	}

	.phabricator-remarkup-toc-header {
	font-size: 11px;
	color: #444444;
	border-bottom: 1px solid #bbbbbb;
	margin-bottom: 4px;
	}

	.phabricator-remarkup-toc ul {
	padding: 0;
	margin: 0;
	list-style: none;
	overflow: hidden;
	padding-left: 0.25em;
	}

	.phabricator-remarkup-toc ul ul {
	margin-left: 1.25em;
	}

	.phabricator-remarkup-toc ul li {
	padding: 0;
	margin: 0;
	}

	.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 table.remarkup-table {
	border-collapse: separate;
	border-spacing: 1px;
	background: #d3d3d3;
	margin: 1em;
	}

	.phabricator-remarkup table.remarkup-table th {
	font-weight: bold;
	padding: 3px 6px;
	background: #e3e3e3;
	}

	.phabricator-remarkup table.remarkup-table td {
	background: #ffffff;
	padding: 3px 6px;
	}


	.remarkup-assist-textarea {
	border-width: 1px;
	border-color: #e5e5e5 #999999 #999999;

	/* Prevent Safari and Chrome users from dragging the textarea any wider,
	because the top bar won't resize along with it. */
	resize: vertical;
	}

	.remarkup-assist-bar {
	height: 27px;
	padding: 0 2px;

	border-width: 1px 1px 0;
	border-style: solid;
	border-color: #737373 #999999;

	background: #f5f5f5;
	overflow: hidden;
	}

	.remarkup-assist-button {
	display: block;
	padding: 3px;
	margin: 2px 1px;
	float: left;

	border: 1px solid transparent;
	border-radius: 2px;
	}

	.remarkup-assist-button:hover {
	background: #f7f7f7;
	border-color: #c6c6c6;
	box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.10);
	}

	.remarkup-assist-button:active {
	outline: none;
	background: #f3f3f3;
	box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.10);
	}

	.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-assist {
	display: block;
	width: 14px;
	height: 14px;
	overflow: hidden;
	}

	.remarkup-assist-right {
	float: right;
	}
	+
	+.phabricator-image-macro-hero {
	+ margin: 2em auto;
	+ max-width: 90%;
	+}
	diff --git a/webroot/rsrc/css/layout/phabricator-header-view.css b/webroot/rsrc/css/layout/phabricator-header-view.css
	index c3f96e9239..52fd75ba26 100644
	--- a/webroot/rsrc/css/layout/phabricator-header-view.css
	+++ b/webroot/rsrc/css/layout/phabricator-header-view.css
	@@ -1,13 +1,18 @@
	/**
	* @provides phabricator-header-view-css
	*/

	.phabricator-header-view {
	padding: 1em 2%;
	font-size: 15px;
	color: #333333;
	}

	.device-desktop .phabricator-header-view {
	width: 66%;
	}
	+
	+.phabricator-header-tags {
	+ font-size: 13px;
	+ float: right;
	+}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 13:00 (3 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1124843
Default Alt Text: (437 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions