diff --git a/resources/sql/patches/059.engines.php b/resources/sql/patches/059.engines.php
index 5fdb3ea2e..8c1c7bc8e 100644
--- a/resources/sql/patches/059.engines.php
+++ b/resources/sql/patches/059.engines.php
@@ -1,31 +1,31 @@
 <?php
 
 $conn = $schema_conn;
 
 $tables = queryfx_all(
   $conn,
   "SELECT TABLE_SCHEMA db, TABLE_NAME tbl
     FROM information_schema.TABLES s
     WHERE s.TABLE_SCHEMA LIKE %>
     AND s.TABLE_NAME != 'search_documentfield'
     AND s.ENGINE != 'InnoDB'",
     '{$NAMESPACE}_');
 
 if (!$tables) {
   return;
 }
 
 echo "There are ".count($tables)." tables using the MyISAM engine. These will ".
      "now be converted to InnoDB. This process may take a few minutes, please ".
      "be patient.\n";
 
 foreach ($tables as $table) {
   $name = $table['db'].'.'.$table['tbl'];
   echo "Converting {$name}...\n";
   queryfx(
     $conn,
-    "ALTER TABLE %T.%T ENGINE=InnoDB",
+    'ALTER TABLE %T.%T ENGINE=InnoDB',
     $table['db'],
     $table['tbl']);
 }
 echo "Done!\n";
diff --git a/resources/sql/patches/079.nametokenindex.php b/resources/sql/patches/079.nametokenindex.php
index f8b74ee39..931a850bf 100644
--- a/resources/sql/patches/079.nametokenindex.php
+++ b/resources/sql/patches/079.nametokenindex.php
@@ -1,18 +1,18 @@
 <?php
 
 echo "Indexing username tokens for typeaheads...\n";
 
 $table = new PhabricatorUser();
 $table->openTransaction();
 $table->beginReadLocking();
 
 $users = $table->loadAll();
-echo count($users)." users to index";
+echo count($users).' users to index';
 foreach ($users as $user) {
   $user->updateNameTokens();
-  echo ".";
+  echo '.';
 }
 
 $table->endReadLocking();
 $table->saveTransaction();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/090.forceuniqueprojectnames.php b/resources/sql/patches/090.forceuniqueprojectnames.php
index 1bd525588..f8a7508d9 100644
--- a/resources/sql/patches/090.forceuniqueprojectnames.php
+++ b/resources/sql/patches/090.forceuniqueprojectnames.php
@@ -1,107 +1,107 @@
 <?php
 
 echo "Ensuring project names are unique enough...\n";
 $table = new PhabricatorProject();
 $table->openTransaction();
 $table->beginReadLocking();
 
 $projects = $table->loadAll();
 
 $slug_map = array();
 
 foreach ($projects as $project) {
   $project->setPhrictionSlug($project->getName());
   $slug = $project->getPhrictionSlug();
   if ($slug == '/') {
     $project_id = $project->getID();
     echo "Project #{$project_id} doesn't have a meaningful name...\n";
     $project->setName(trim('Unnamed Project '.$project->getName()));
   }
   $slug_map[$slug][] = $project->getID();
 }
 
 
 foreach ($slug_map as $slug => $similar) {
   if (count($similar) <= 1) {
     continue;
   }
   echo "Too many projects are similar to '{$slug}'...\n";
 
   foreach (array_slice($similar, 1, null, true) as $key => $project_id) {
     $project = $projects[$project_id];
     $old_name = $project->getName();
     $new_name = rename_project($project, $projects);
 
     echo "Renaming project #{$project_id} ".
          "from '{$old_name}' to '{$new_name}'.\n";
     $project->setName($new_name);
   }
 }
 
 $update = $projects;
 while ($update) {
   $size = count($update);
   foreach ($update as $key => $project) {
     $id = $project->getID();
     $name = $project->getName();
     $project->setPhrictionSlug($name);
     $slug = $project->getPhrictionSlug();
 
     echo "Updating project #{$id} '{$name}' ({$slug})...";
     try {
       queryfx(
         $project->establishConnection('w'),
         'UPDATE %T SET name = %s, phrictionSlug = %s WHERE id = %d',
         $project->getTableName(),
         $name,
         $slug,
         $project->getID());
       unset($update[$key]);
       echo "okay.\n";
     } catch (AphrontQueryDuplicateKeyException $ex) {
       echo "failed, will retry.\n";
     }
   }
   if (count($update) == $size) {
     throw new Exception(
-      "Failed to make any progress while updating projects. Schema upgrade ".
-      "has failed. Go manually fix your project names to be unique (they are ".
-      "probably ridiculous?) and then try again.");
+      'Failed to make any progress while updating projects. Schema upgrade '.
+      'has failed. Go manually fix your project names to be unique (they are '.
+      'probably ridiculous?) and then try again.');
   }
 }
 
 $table->endReadLocking();
 $table->saveTransaction();
 echo "Done.\n";
 
 
 /**
  * Rename the project so that it has a unique slug, by appending (2), (3), etc.
  * to its name.
  */
 function rename_project($project, $projects) {
   $suffix = 2;
   while (true) {
     $new_name = $project->getName().' ('.$suffix.')';
     $project->setPhrictionSlug($new_name);
     $new_slug = $project->getPhrictionSlug();
 
     $okay = true;
     foreach ($projects as $other) {
       if ($other->getID() == $project->getID()) {
         continue;
       }
       if ($other->getPhrictionSlug() == $new_slug) {
         $okay = false;
         break;
       }
     }
     if ($okay) {
       break;
     } else {
       $suffix++;
     }
   }
 
   return $new_name;
 }
diff --git a/resources/sql/patches/102.heraldcleanup.php b/resources/sql/patches/102.heraldcleanup.php
index 22f198df8..24bf382c0 100644
--- a/resources/sql/patches/102.heraldcleanup.php
+++ b/resources/sql/patches/102.heraldcleanup.php
@@ -1,39 +1,39 @@
 <?php
 
 echo "Cleaning up old Herald rule applied rows...\n";
 $table = new HeraldRule();
 $table->openTransaction();
 $table->beginReadLocking();
 
 $rules = $table->loadAll();
 foreach ($rules as $key => $rule) {
   $first_policy = HeraldRepetitionPolicyConfig::toInt(
     HeraldRepetitionPolicyConfig::FIRST);
   if ($rule->getRepetitionPolicy() != $first_policy) {
     unset($rules[$key]);
   }
 }
 
 $conn_w = $table->establishConnection('w');
 
 $clause = '';
 if ($rules) {
   $clause = qsprintf(
     $conn_w,
     'WHERE ruleID NOT IN (%Ld)',
     mpull($rules, 'getID'));
 }
 
-echo "This may take a moment";
+echo 'This may take a moment';
 do {
   queryfx(
     $conn_w,
     'DELETE FROM %T %Q LIMIT 1000',
     HeraldRule::TABLE_RULE_APPLIED,
     $clause);
-  echo ".";
+  echo '.';
 } while ($conn_w->getAffectedRows());
 
 $table->endReadLocking();
 $table->saveTransaction();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/117.repositorydescription.php b/resources/sql/patches/117.repositorydescription.php
index 18ee4a463..692a78335 100644
--- a/resources/sql/patches/117.repositorydescription.php
+++ b/resources/sql/patches/117.repositorydescription.php
@@ -1,6 +1,6 @@
 <?php
 
 $conn = id(new PhabricatorRepository())->establishConnection('w');
 if (queryfx_one($conn, "SHOW COLUMNS FROM `repository` LIKE 'description'")) {
-  queryfx($conn, "ALTER TABLE `repository` DROP `description`");
+  queryfx($conn, 'ALTER TABLE `repository` DROP `description`');
 }
diff --git a/resources/sql/patches/131.migraterevisionquery.php b/resources/sql/patches/131.migraterevisionquery.php
index 027edbaeb..cf505b629 100644
--- a/resources/sql/patches/131.migraterevisionquery.php
+++ b/resources/sql/patches/131.migraterevisionquery.php
@@ -1,35 +1,35 @@
 <?php
 
 $table = new DifferentialRevision();
 $table->openTransaction();
 $table->beginReadLocking();
 $conn_w = $table->establishConnection('w');
 
-echo "Migrating revisions";
+echo 'Migrating revisions';
 do {
   $revisions = $table->loadAllWhere('branchName IS NULL LIMIT 1000');
 
   foreach ($revisions as $revision) {
-    echo ".";
+    echo '.';
 
     $diff = $revision->loadActiveDiff();
     if (!$diff) {
       continue;
     }
 
     $branch_name = $diff->getBranch();
     $arc_project_phid = $diff->getArcanistProjectPHID();
 
     queryfx(
       $conn_w,
       'UPDATE %T SET branchName = %s, arcanistProjectPHID = %s WHERE id = %d',
       $table->getTableName(),
       $branch_name,
       $arc_project_phid,
       $revision->getID());
   }
 } while (count($revisions) == 1000);
 
 $table->endReadLocking();
 $table->saveTransaction();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/20121209.xmacromigrate.php b/resources/sql/patches/20121209.xmacromigrate.php
index 0372faafa..df52cb317 100644
--- a/resources/sql/patches/20121209.xmacromigrate.php
+++ b/resources/sql/patches/20121209.xmacromigrate.php
@@ -1,23 +1,23 @@
 <?php
 
-echo "Giving image macros PHIDs";
+echo 'Giving image macros PHIDs';
 $table = new PhabricatorFileImageMacro();
 $table->openTransaction();
 
 foreach (new LiskMigrationIterator($table) as $macro) {
   if ($macro->getPHID()) {
     continue;
   }
 
-  echo ".";
+  echo '.';
 
   queryfx(
     $macro->establishConnection('w'),
     'UPDATE %T SET phid = %s WHERE id = %d',
     $macro->getTableName(),
     $macro->generatePHID(),
     $macro->getID());
 }
 
 $table->saveTransaction();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/20130201.revisionunsubscribed.php b/resources/sql/patches/20130201.revisionunsubscribed.php
index b15379893..38f1e5207 100644
--- a/resources/sql/patches/20130201.revisionunsubscribed.php
+++ b/resources/sql/patches/20130201.revisionunsubscribed.php
@@ -1,33 +1,33 @@
 <?php
 
 echo "Migrating Differential unsubscribed users to edges...\n";
 $table = new DifferentialRevision();
 $table->openTransaction();
 
 // We couldn't use new LiskMigrationIterator($table) because the $unsubscribed
 // property gets deleted.
 $revs = queryfx_all(
   $table->establishConnection('w'),
   'SELECT id, phid, unsubscribed FROM differential_revision');
 
 foreach ($revs as $rev) {
-  echo ".";
+  echo '.';
 
   $unsubscribed = json_decode($rev['unsubscribed']);
   if (!$unsubscribed) {
     continue;
   }
 
   $editor = new PhabricatorEdgeEditor();
   $editor->setSuppressEvents(true);
   foreach ($unsubscribed as $user_phid => $_) {
     $editor->addEdge(
       $rev['phid'],
       PhabricatorEdgeConfig::TYPE_OBJECT_HAS_UNSUBSCRIBER,
       $user_phid);
   }
   $editor->save();
 }
 
 $table->saveTransaction();
 echo "Done.\n";
diff --git a/resources/sql/patches/20130409.commitdrev.php b/resources/sql/patches/20130409.commitdrev.php
index 300b28238..86d00ac21 100644
--- a/resources/sql/patches/20130409.commitdrev.php
+++ b/resources/sql/patches/20130409.commitdrev.php
@@ -1,33 +1,33 @@
 <?php
 
 echo "Migrating differential.revisionPHID to edges...\n";
 $commit_table = new PhabricatorRepositoryCommit();
 $data_table = new PhabricatorRepositoryCommitData();
 $editor = id(new PhabricatorEdgeEditor())->setSuppressEvents(true);
 $commit_table->establishConnection('w');
 $edges = 0;
 
 foreach (new LiskMigrationIterator($commit_table) as $commit) {
   $data = $commit->loadOneRelative($data_table, 'commitID');
   if (!$data) {
     continue;
   }
 
   $revision_phid = $data->getCommitDetail('differential.revisionPHID');
   if (!$revision_phid) {
     continue;
   }
 
   $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV;
   $editor->addEdge($commit->getPHID(), $commit_drev, $revision_phid);
   $edges++;
   if ($edges % 256 == 0) {
-    echo ".";
+    echo '.';
     $editor->save();
     $editor = id(new PhabricatorEdgeEditor())->setSuppressEvents(true);
   }
 }
 
-echo ".";
+echo '.';
 $editor->save();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/20130502.countdownrevamp2.php b/resources/sql/patches/20130502.countdownrevamp2.php
index f4fc96413..6f7e41e1d 100644
--- a/resources/sql/patches/20130502.countdownrevamp2.php
+++ b/resources/sql/patches/20130502.countdownrevamp2.php
@@ -1,23 +1,23 @@
 <?php
 
-echo "Giving countdowns PHIDs";
+echo 'Giving countdowns PHIDs';
 $table = new PhabricatorCountdown();
 $table->openTransaction();
 
 foreach (new LiskMigrationIterator($table) as $countdown) {
   if ($countdown->getPHID()) {
     continue;
   }
 
-  echo ".";
+  echo '.';
 
   queryfx(
     $countdown->establishConnection('w'),
     'UPDATE %T SET phid = %s WHERE id = %d',
     $countdown->getTableName(),
     $countdown->generatePHID(),
     $countdown->getID());
 }
 
 $table->saveTransaction();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/20130703.legalpaddocdenorm.php b/resources/sql/patches/20130703.legalpaddocdenorm.php
index 9492e26bc..da31e906f 100644
--- a/resources/sql/patches/20130703.legalpaddocdenorm.php
+++ b/resources/sql/patches/20130703.legalpaddocdenorm.php
@@ -1,46 +1,46 @@
 <?php
 
-echo "Populating Legalpad Documents with ",
+echo 'Populating Legalpad Documents with ',
  "titles, recentContributorPHIDs, and contributorCounts...\n";
 $table = new LegalpadDocument();
 $table->openTransaction();
 
 foreach (new LiskMigrationIterator($table) as $document) {
   $updated = false;
   $id = $document->getID();
 
   echo "Document {$id}: ";
   if (!$document->getTitle()) {
     $document_body = id(new LegalpadDocumentBody())
       ->loadOneWhere('phid = %s', $document->getDocumentBodyPHID());
     $title = $document_body->getTitle();
     $document->setTitle($title);
     $updated = true;
     echo "Added title: $title\n";
   } else {
     echo "-\n";
   }
 
   if (!$document->getContributorCount() ||
       !$document->getRecentContributorPHIDs()) {
     $updated = true;
     $type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_CONTRIBUTOR;
     $contributors = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $document->getPHID(),
       $type);
     $document->setRecentContributorPHIDs(array_slice($contributors, 0, 3));
     echo "Added recent contributor phids.\n";
     $document->setContributorCount(count($contributors));
     echo "Added contributor count.\n";
   }
 
   if (!$updated) {
     echo "-\n";
     continue;
   }
 
   $document->save();
 }
 
 $table->saveTransaction();
 echo "Done.\n";
diff --git a/resources/sql/patches/20130711.pholioimageobsolete.php b/resources/sql/patches/20130711.pholioimageobsolete.php
index 738f82085..eae9a479d 100644
--- a/resources/sql/patches/20130711.pholioimageobsolete.php
+++ b/resources/sql/patches/20130711.pholioimageobsolete.php
@@ -1,23 +1,23 @@
 <?php
 
-echo "Giving pholio images PHIDs";
+echo 'Giving pholio images PHIDs';
 $table = new PholioImage();
 $table->openTransaction();
 
 foreach (new LiskMigrationIterator($table) as $image) {
   if ($image->getPHID()) {
     continue;
   }
 
-  echo ".";
+  echo '.';
 
   queryfx(
     $image->establishConnection('w'),
     'UPDATE %T SET phid = %s WHERE id = %d',
     $image->getTableName(),
     $image->generatePHID(),
     $image->getID());
 }
 
 $table->saveTransaction();
 echo "\nDone.\n";
diff --git a/resources/sql/patches/20131205.buildstepordermig.php b/resources/sql/patches/20131205.buildstepordermig.php
index 9721e1527..b17724252 100644
--- a/resources/sql/patches/20131205.buildstepordermig.php
+++ b/resources/sql/patches/20131205.buildstepordermig.php
@@ -1,41 +1,41 @@
 <?php
 
 $table = new HarbormasterBuildPlan();
 $conn_w = $table->establishConnection('w');
 $viewer = PhabricatorUser::getOmnipotentUser();
 
 // Since HarbormasterBuildStepQuery has been updated to handle the
 // correct order, we can't use the built in database access.
 
 foreach (new LiskMigrationIterator($table) as $plan) {
   $planname = $plan->getName();
   echo "Migrating steps in {$planname}...\n";
 
   $rows = queryfx_all(
     $conn_w,
-    "SELECT id, sequence FROM harbormaster_buildstep ".
-    "WHERE buildPlanPHID = %s ".
-    "ORDER BY id ASC",
+    'SELECT id, sequence FROM harbormaster_buildstep '.
+    'WHERE buildPlanPHID = %s '.
+    'ORDER BY id ASC',
     $plan->getPHID());
 
   $sequence = 1;
   foreach ($rows as $row) {
     $id = $row['id'];
     $existing = $row['sequence'];
     if ($existing != 0) {
       echo "  - {$id} (already migrated)...\n";
       continue;
     }
     echo "  - {$id} to position {$sequence}...\n";
     queryfx(
       $conn_w,
-      "UPDATE harbormaster_buildstep ".
-      "SET sequence = %d ".
-      "WHERE id = %d",
+      'UPDATE harbormaster_buildstep '.
+      'SET sequence = %d '.
+      'WHERE id = %d',
       $sequence,
       $id);
     $sequence++;
   }
 }
 
 echo "Done.\n";
diff --git a/scripts/calendar/import_us_holidays.php b/scripts/calendar/import_us_holidays.php
index 2ae82a4d5..78d1d50c3 100755
--- a/scripts/calendar/import_us_holidays.php
+++ b/scripts/calendar/import_us_holidays.php
@@ -1,62 +1,62 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 // http://www.opm.gov/operating_status_schedules/fedhol/
 $holidays = array(
   '2014-01-01' => "New Year's Day",
-  '2014-01-20' => "Birthday of Martin Luther King, Jr.",
+  '2014-01-20' => 'Birthday of Martin Luther King, Jr.',
   '2014-02-17' => "Washington's Birthday",
-  '2014-05-26' => "Memorial Day",
-  '2014-07-04' => "Independence Day",
-  '2014-09-01' => "Labor Day",
-  '2014-10-13' => "Columbus Day",
-  '2014-11-11' => "Veterans Day",
-  '2014-11-27' => "Thanksgiving Day",
-  '2014-12-25' => "Christmas Day",
+  '2014-05-26' => 'Memorial Day',
+  '2014-07-04' => 'Independence Day',
+  '2014-09-01' => 'Labor Day',
+  '2014-10-13' => 'Columbus Day',
+  '2014-11-11' => 'Veterans Day',
+  '2014-11-27' => 'Thanksgiving Day',
+  '2014-12-25' => 'Christmas Day',
   '2015-01-01' => "New Year's Day",
-  '2015-01-19' => "Birthday of Martin Luther King, Jr.",
+  '2015-01-19' => 'Birthday of Martin Luther King, Jr.',
   '2015-02-16' => "Washington's Birthday",
-  '2015-05-25' => "Memorial Day",
-  '2015-07-03' => "Independence Day",
-  '2015-09-07' => "Labor Day",
-  '2015-10-12' => "Columbus Day",
-  '2015-11-11' => "Veterans Day",
-  '2015-11-26' => "Thanksgiving Day",
-  '2015-12-25' => "Christmas Day",
+  '2015-05-25' => 'Memorial Day',
+  '2015-07-03' => 'Independence Day',
+  '2015-09-07' => 'Labor Day',
+  '2015-10-12' => 'Columbus Day',
+  '2015-11-11' => 'Veterans Day',
+  '2015-11-26' => 'Thanksgiving Day',
+  '2015-12-25' => 'Christmas Day',
   '2016-01-01' => "New Year's Day",
-  '2016-01-18' => "Birthday of Martin Luther King, Jr.",
+  '2016-01-18' => 'Birthday of Martin Luther King, Jr.',
   '2016-02-15' => "Washington's Birthday",
-  '2016-05-30' => "Memorial Day",
-  '2016-07-04' => "Independence Day",
-  '2016-09-05' => "Labor Day",
-  '2016-10-10' => "Columbus Day",
-  '2016-11-11' => "Veterans Day",
-  '2016-11-24' => "Thanksgiving Day",
-  '2016-12-26' => "Christmas Day",
+  '2016-05-30' => 'Memorial Day',
+  '2016-07-04' => 'Independence Day',
+  '2016-09-05' => 'Labor Day',
+  '2016-10-10' => 'Columbus Day',
+  '2016-11-11' => 'Veterans Day',
+  '2016-11-24' => 'Thanksgiving Day',
+  '2016-12-26' => 'Christmas Day',
   '2017-01-02' => "New Year's Day",
-  '2017-01-16' => "Birthday of Martin Luther King, Jr.",
+  '2017-01-16' => 'Birthday of Martin Luther King, Jr.',
   '2017-02-10' => "Washington's Birthday",
-  '2017-05-29' => "Memorial Day",
-  '2017-07-04' => "Independence Day",
-  '2017-09-04' => "Labor Day",
-  '2017-10-09' => "Columbus Day",
-  '2017-11-10' => "Veterans Day",
-  '2017-11-23' => "Thanksgiving Day",
-  '2017-12-25' => "Christmas Day",
+  '2017-05-29' => 'Memorial Day',
+  '2017-07-04' => 'Independence Day',
+  '2017-09-04' => 'Labor Day',
+  '2017-10-09' => 'Columbus Day',
+  '2017-11-10' => 'Veterans Day',
+  '2017-11-23' => 'Thanksgiving Day',
+  '2017-12-25' => 'Christmas Day',
 );
 
 $table = new PhabricatorCalendarHoliday();
 $conn_w = $table->establishConnection('w');
 $table_name = $table->getTableName();
 
 foreach ($holidays as $day => $name) {
   queryfx(
     $conn_w,
     'INSERT IGNORE INTO %T (day, name) VALUES (%s, %s)',
     $table_name,
     $day,
     $name);
 }
diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
index 63d6688a5..214b51ee1 100755
--- a/scripts/mail/mail_handler.php
+++ b/scripts/mail/mail_handler.php
@@ -1,94 +1,94 @@
 #!/usr/bin/env php
 <?php
 
 // NOTE: This script is very oldschool and takes the environment as an argument.
 // Some day, we could take a shot at cleaning this up.
 if ($argc > 1) {
   foreach (array_slice($argv, 1) as $arg) {
     if (!preg_match('/^-/', $arg)) {
       $_SERVER['PHABRICATOR_ENV'] = $arg;
       break;
     }
   }
 }
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 require_once $root.'/externals/mimemailparser/MimeMailParser.class.php';
 
 $args = new PhutilArgumentParser($argv);
 $args->parseStandardArguments();
 $args->parse(
   array(
     array(
       'name' => 'process-duplicates',
       'help' => pht(
         "Process this message, even if it's a duplicate of another message. ".
         "This is mostly useful when debugging issues with mail routing."),
     ),
     array(
       'name' => 'env',
       'wildcard' => true,
     ),
   ));
 
 $parser = new MimeMailParser();
 $parser->setText(file_get_contents('php://stdin'));
 
 $text_body = $parser->getMessageBody('text');
 
 $text_body_headers = $parser->getMessageBodyHeaders('text');
 $content_type = idx($text_body_headers, 'content-type');
 if (
   !phutil_is_utf8($text_body) &&
   (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
    preg_match('/charset=(\S+)/', $content_type, $matches))
 ) {
-  $text_body = phutil_utf8_convert($text_body, "UTF-8", $matches[1]);
+  $text_body = phutil_utf8_convert($text_body, 'UTF-8', $matches[1]);
 }
 
 $headers = $parser->getHeaders();
-$headers['subject'] = iconv_mime_decode($headers['subject'], 0, "UTF-8");
-$headers['from'] = iconv_mime_decode($headers['from'], 0, "UTF-8");
+$headers['subject'] = iconv_mime_decode($headers['subject'], 0, 'UTF-8');
+$headers['from'] = iconv_mime_decode($headers['from'], 0, 'UTF-8');
 
 if ($args->getArg('process-duplicates')) {
   $headers['message-id'] = Filesystem::readRandomCharacters(64);
 }
 
 $received = new PhabricatorMetaMTAReceivedMail();
 $received->setHeaders($headers);
 $received->setBodies(array(
   'text' => $text_body,
   'html' => $parser->getMessageBody('html'),
 ));
 
 $attachments = array();
 foreach ($parser->getAttachments() as $attachment) {
   if (preg_match('@text/(plain|html)@', $attachment->getContentType()) &&
       $attachment->getContentDisposition() == 'inline') {
     // If this is an "inline" attachment with some sort of text content-type,
     // do not treat it as a file for attachment. MimeMailParser already picked
     // it up in the getMessageBody() call above. We still want to treat 'inline'
     // attachments with other content types (e.g., images) as attachments.
     continue;
   }
 
   $file = PhabricatorFile::newFromFileData(
     $attachment->getContent(),
     array(
       'name' => $attachment->getFilename(),
     ));
   $attachments[] = $file->getPHID();
 }
 
 try {
   $received->setAttachments($attachments);
   $received->save();
   $received->processReceivedMail();
 } catch (Exception $e) {
   $received
     ->setMessage('EXCEPTION: '.$e->getMessage())
     ->save();
 
   throw $e;
 }
diff --git a/scripts/repository/rebuild_summaries.php b/scripts/repository/rebuild_summaries.php
index d0bb215c3..a98a6f01b 100755
--- a/scripts/repository/rebuild_summaries.php
+++ b/scripts/repository/rebuild_summaries.php
@@ -1,53 +1,53 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 $commit = new PhabricatorRepositoryCommit();
 
 $conn_w = id(new PhabricatorRepository())->establishConnection('w');
 $sizes = queryfx_all(
   $conn_w,
   'SELECT repositoryID, count(*) N FROM %T GROUP BY repositoryID',
   $commit->getTableName());
 $sizes = ipull($sizes, 'N', 'repositoryID');
 
 $maxes = queryfx_all(
   $conn_w,
   'SELECT repositoryID, max(epoch) maxEpoch FROM %T GROUP BY repositoryID',
   $commit->getTableName());
 $maxes = ipull($maxes, 'maxEpoch', 'repositoryID');
 
 
 $repository_ids = array_keys($sizes + $maxes);
 
-echo "Updating ".count($repository_ids)." repositories";
+echo 'Updating '.count($repository_ids).' repositories';
 
 foreach ($repository_ids as $repository_id) {
   $last_commit = queryfx_one(
     $conn_w,
     'SELECT id FROM %T WHERE repositoryID = %d AND epoch = %d LIMIT 1',
     $commit->getTableName(),
     $repository_id,
     idx($maxes, $repository_id, 0));
   if ($last_commit) {
     $last_commit = $last_commit['id'];
   } else {
     $last_commit = 0;
   }
   queryfx(
     $conn_w,
     'INSERT INTO %T (repositoryID, lastCommitID, size, epoch)
       VALUES (%d, %d, %d, %d) ON DUPLICATE KEY UPDATE
         lastCommitID = VALUES(lastCommitID),
         size = VALUES(size),
         epoch = VALUES(epoch)',
     PhabricatorRepository::TABLE_SUMMARY,
     $repository_id,
     $last_commit,
     idx($sizes, $repository_id, 0),
     idx($maxes, $repository_id, 0));
-  echo ".";
+  echo '.';
 }
 echo "\ndone.\n";
diff --git a/scripts/repository/reparse.php b/scripts/repository/reparse.php
index 37730a7b0..9e4e86e9e 100755
--- a/scripts/repository/reparse.php
+++ b/scripts/repository/reparse.php
@@ -1,291 +1,291 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 $args = new PhutilArgumentParser($argv);
 $args->setSynopsis(<<<EOHELP
 **reparse.php** __what__ __which_parts__ [--trace] [--force]
 
 Rerun the Diffusion parser on specific commits and repositories. Mostly
 useful for debugging changes to Diffusion.
 
 e.g. enqueue reparse owners in the TEST repo for all commits:
 ./reparse.php --all TEST --owners
 
 e.g. do same but exclude before yesterday (local time):
 ./reparse.php --all TEST --owners --min-date yesterday
 ./reparse.php --all TEST --owners --min-date "today -1 day"
 
 e.g. do same but exclude before 03/31/2013 (local time):
 ./reparse.php --all TEST --owners --min-date "03/31/2013"
 EOHELP
 );
 
 $min_date_usage_examples =
   "Valid examples:\n".
   "  'today', 'today 2pm', '-1 hour', '-2 hours', '-24 hours',\n".
   "  'yesterday', 'today -1 day', 'yesterday 2pm', '2pm -1 day',\n".
   "  'last Monday', 'last Monday 14:00', 'last Monday 2pm',\n".
   "  '31 March 2013', '31 Mar', '03/31', '03/31/2013',\n".
   "See __http://www.php.net/manual/en/datetime.formats.php__ for more.\n";
 
 $args->parseStandardArguments();
 $args->parse(
   array(
     // what
     array(
       'name'     => 'revision',
       'wildcard' => true,
     ),
     array(
       'name'     => 'all',
       'param'    => 'callsign or phid',
       'help'     => 'Reparse all commits in the specified repository. This '.
                     'mode queues parsers into the task queue; you must run '.
                     'taskmasters to actually do the parses. Use with '.
                     '__--force-local__ to run the tasks locally instead of '.
                     'with taskmasters.',
     ),
     array(
       'name'     => 'min-date',
       'param'    => 'date',
       'help'     => 'Must be used with __--all__, this will exclude commits '.
                     'which are earlier than __date__.'.
                     "\n".$min_date_usage_examples,
     ),
     // which parts
     array(
       'name'     => 'message',
       'help'     => 'Reparse commit messages.',
     ),
     array(
       'name'     => 'change',
       'help'     => 'Reparse changes.',
     ),
     array(
       'name'     => 'herald',
       'help'     => 'Reevaluate Herald rules (may send huge amounts of email!)',
     ),
     array(
       'name'     => 'owners',
       'help'     => 'Reevaluate related commits for owners packages (may '.
                     'delete existing relationship entries between your '.
                     'package and some old commits!)',
     ),
     array(
       'name'     => 'harbormaster',
       'help'     => 'EXPERIMENTAL. Execute Harbormaster.',
     ),
     // misc options
     array(
       'name'     => 'force',
       'short'    => 'f',
       'help'     => 'Act noninteractively, without prompting.',
     ),
     array(
       'name'     => 'force-local',
       'help'     => 'Only used with __--all__, use this to run the tasks '.
                     'locally instead of deferring them to taskmaster daemons.',
     ),
   ));
 
 $all_from_repo = $args->getArg('all');
 $reparse_message = $args->getArg('message');
 $reparse_change = $args->getArg('change');
 $reparse_herald = $args->getArg('herald');
 $reparse_owners = $args->getArg('owners');
 $reparse_harbormaster = $args->getArg('harbormaster');
 $reparse_what = $args->getArg('revision');
 $force = $args->getArg('force');
 $force_local = $args->getArg('force-local');
 $min_date = $args->getArg('min-date');
 
 if (!$all_from_repo && !$reparse_what) {
-  usage("Specify a commit or repository to reparse.");
+  usage('Specify a commit or repository to reparse.');
 }
 
 if ($all_from_repo && $reparse_what) {
   $commits = implode(', ', $reparse_what);
   usage(
     "Specify a commit or repository to reparse, not both:\n".
     "All from repo: ".$all_from_repo."\n".
     "Commit(s) to reparse: ".$commits);
 }
 
 if (!$reparse_message && !$reparse_change && !$reparse_herald &&
     !$reparse_owners && !$reparse_harbormaster) {
-  usage("Specify what information to reparse with --message, --change,  ".
-        "--herald, --harbormaster, and/or --owners");
+  usage('Specify what information to reparse with --message, --change,  '.
+        '--herald, --harbormaster, and/or --owners');
 }
 
 $min_timestamp = false;
 if ($min_date) {
   $min_timestamp = strtotime($min_date);
 
   if (!$all_from_repo) {
     usage(
       "You must use --all if you specify --min-date\n".
       "e.g.\n".
       "  ./reparse.php --all TEST --owners --min-date yesterday");
   }
 
   // previous to PHP 5.1.0 you would compare with -1, instead of false
   if (false === $min_timestamp) {
     usage(
       "Supplied --min-date is not valid\n".
       "Supplied value: '".$min_date."'\n".
       $min_date_usage_examples);
   }
 }
 
 if ($reparse_owners && !$force) {
   echo phutil_console_wrap(
-    "You are about to recreate the relationship entries between the commits ".
-    "and the packages they touch. This might delete some existing ".
-    "relationship entries for some old commits.");
+    'You are about to recreate the relationship entries between the commits '.
+    'and the packages they touch. This might delete some existing '.
+    'relationship entries for some old commits.');
 
   if (!phutil_console_confirm('Are you ready to continue?')) {
     echo "Cancelled.\n";
     exit(1);
   }
 }
 
 $commits = array();
 if ($all_from_repo) {
   $repository = id(new PhabricatorRepository())->loadOneWhere(
     'callsign = %s OR phid = %s',
     $all_from_repo,
     $all_from_repo);
   if (!$repository) {
     throw new Exception("Unknown repository {$all_from_repo}!");
   }
   $constraint = '';
   if ($min_timestamp) {
     echo "Excluding entries before UNIX timestamp: ".$min_timestamp."\n";
     $table = new PhabricatorRepositoryCommit();
     $conn_r = $table->establishConnection('r');
     $constraint = qsprintf(
       $conn_r,
       'AND epoch >= %d',
       $min_timestamp);
   }
   $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
     'repositoryID = %d %Q',
     $repository->getID(),
     $constraint);
   $callsign = $repository->getCallsign();
   if (!$commits) {
     echo "No commits have been discovered in {$callsign} repository!\n";
     exit;
   }
 } else {
   $commits = array();
   foreach ($reparse_what as $identifier) {
     $matches = null;
     if (!preg_match('/r([A-Z]+)([a-z0-9]+)/', $identifier, $matches)) {
       throw new Exception("Can't parse commit identifier!");
     }
     $callsign = $matches[1];
     $commit_identifier = $matches[2];
     $repository = id(new PhabricatorRepository())->loadOneWhere(
       'callsign = %s',
       $callsign);
     if (!$repository) {
       throw new Exception("No repository with callsign '{$callsign}'!");
     }
     $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
       'repositoryID = %d AND commitIdentifier = %s',
       $repository->getID(),
       $commit_identifier);
     if (!$commit) {
       throw new Exception(
         "No matching commit '{$commit_identifier}' in repository ".
         "'{$callsign}'. (For git and mercurial repositories, you must specify ".
         "the entire commit hash.)");
     }
     $commits[] = $commit;
   }
 }
 
 if ($all_from_repo && !$force_local) {
   echo phutil_console_format(
     '**NOTE**: This script will queue tasks to reparse the data. Once the '.
     'tasks have been queued, you need to run Taskmaster daemons to execute '.
     'them.');
   echo "\n\n";
   echo "QUEUEING TASKS (".number_format(count($commits))." Commits):\n";
 }
 
 $tasks = array();
 foreach ($commits as $commit) {
   $classes = array();
   switch ($repository->getVersionControlSystem()) {
     case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
       if ($reparse_message) {
         $classes[] = 'PhabricatorRepositoryGitCommitMessageParserWorker';
       }
       if ($reparse_change) {
         $classes[] = 'PhabricatorRepositoryGitCommitChangeParserWorker';
       }
       break;
     case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
       if ($reparse_message) {
         $classes[] = 'PhabricatorRepositoryMercurialCommitMessageParserWorker';
       }
       if ($reparse_change) {
         $classes[] = 'PhabricatorRepositoryMercurialCommitChangeParserWorker';
       }
       break;
     case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
       if ($reparse_message) {
         $classes[] = 'PhabricatorRepositorySvnCommitMessageParserWorker';
       }
       if ($reparse_change) {
         $classes[] = 'PhabricatorRepositorySvnCommitChangeParserWorker';
       }
       break;
   }
 
   if ($reparse_herald) {
     $classes[] = 'PhabricatorRepositoryCommitHeraldWorker';
   }
 
   if ($reparse_owners) {
     $classes[] = 'PhabricatorRepositoryCommitOwnersWorker';
   }
 
   if ($reparse_harbormaster) {
     $classes[] = 'HarbormasterRunnerWorker';
   }
 
   $spec = array(
     'commitID'  => $commit->getID(),
     'only'      => true,
   );
 
   if ($all_from_repo && !$force_local) {
     foreach ($classes as $class) {
       PhabricatorWorker::scheduleTask($class, $spec);
 
       $commit_name = 'r'.$callsign.$commit->getCommitIdentifier();
       echo "  Queued '{$class}' for commit '{$commit_name}'.\n";
     }
   } else {
     foreach ($classes as $class) {
       $worker = newv($class, array($spec));
       echo "Running '{$class}'...\n";
       $worker->executeTask();
     }
   }
 }
 
 echo "\nDone.\n";
 
 function usage($message) {
   echo phutil_console_format(
     '**Usage Exception:** '.$message."\n".
     "Use __--help__ to display full help\n");
   exit(1);
 }
diff --git a/scripts/repository/save_lint.php b/scripts/repository/save_lint.php
index 0a23adb49..6cd066413 100755
--- a/scripts/repository/save_lint.php
+++ b/scripts/repository/save_lint.php
@@ -1,58 +1,58 @@
 #!/usr/bin/env php
 <?php
 
 require_once dirname(__FILE__).'/../__init_script__.php';
 
 $synopsis = <<<EOT
 **save_lint.php**
     Discover lint problems and save them to database so that they can
     be displayed in Diffusion.
 
 EOT;
 
 $args = id(new PhutilArgumentParser($argv))
   ->setTagline('save lint errors to database')
   ->setSynopsis($synopsis)
   ->parseStandardArguments()
   ->parse(array(
     array(
       'name' => 'all',
       'help' =>
-        "Discover problems in the whole repository instead of just changes ".
-        "since the last run.",
+        'Discover problems in the whole repository instead of just changes '.
+        'since the last run.',
     ),
     array(
       'name' => 'arc',
       'param' => 'path',
       'default' => 'arc',
-      'help' => "Path to Arcanist executable.",
+      'help' => 'Path to Arcanist executable.',
     ),
     array(
       'name' => 'severity',
       'param' => 'string',
       'default' => ArcanistLintSeverity::SEVERITY_ADVICE,
-      'help' => "Minimum severity, one of ArcanistLintSeverity constants.",
+      'help' => 'Minimum severity, one of ArcanistLintSeverity constants.',
     ),
     array(
       'name' => 'chunk-size',
       'param' => 'number',
       'default' => 256,
-      'help' => "Number of paths passed to `arc` at once.",
+      'help' => 'Number of paths passed to `arc` at once.',
     ),
     array(
       'name' => 'blame',
-      'help' => "Assign lint errors to authors who last modified the line.",
+      'help' => 'Assign lint errors to authors who last modified the line.',
     ),
   ));
 
 echo "Saving lint errors to database...\n";
 
 $count = id(new DiffusionLintSaveRunner())
   ->setAll($args->getArg('all', false))
   ->setArc($args->getArg('arc'))
   ->setSeverity($args->getArg('severity'))
   ->setChunkSize($args->getArg('chunk-size'))
   ->setNeedsBlame($args->getArg('blame'))
   ->run('.');
 
 echo "\nProcessed {$count} files.\n";
diff --git a/scripts/ssh/ssh-auth.php b/scripts/ssh/ssh-auth.php
index aba2b20f0..eeebfecd1 100755
--- a/scripts/ssh/ssh-auth.php
+++ b/scripts/ssh/ssh-auth.php
@@ -1,53 +1,53 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 $user_dao = new PhabricatorUser();
 $ssh_dao = new PhabricatorUserSSHKey();
 $conn_r = $user_dao->establishConnection('r');
 
 $rows = queryfx_all(
   $conn_r,
   'SELECT userName, keyBody, keyType FROM %T u JOIN %T ssh
     ON u.phid = ssh.userPHID',
   $user_dao->getTableName(),
   $ssh_dao->getTableName());
 
 if (!$rows) {
-  echo pht("No keys found.")."\n";
+  echo pht('No keys found.')."\n";
   exit(1);
 }
 
 $bin = $root.'/bin/ssh-exec';
 foreach ($rows as $row) {
   $user = $row['userName'];
 
   $cmd = csprintf('%s --phabricator-ssh-user %s', $bin, $user);
   // This is additional escaping for the SSH 'command="..."' string.
   $cmd = addcslashes($cmd, '"\\');
 
   // Strip out newlines and other nonsense from the key type and key body.
 
   $type = $row['keyType'];
   $type = preg_replace('@[\x00-\x20]+@', '', $type);
 
   $key = $row['keyBody'];
   $key = preg_replace('@[\x00-\x20]+@', '', $key);
 
 
   $options = array(
     'command="'.$cmd.'"',
     'no-port-forwarding',
     'no-X11-forwarding',
     'no-agent-forwarding',
     'no-pty',
   );
   $options = implode(',', $options);
 
   $lines[] = $options.' '.$type.' '.$key."\n";
 }
 
 echo implode('', $lines);
 exit(0);
diff --git a/scripts/ssh/ssh-exec.php b/scripts/ssh/ssh-exec.php
index 6dba54b1e..395ae4bd9 100755
--- a/scripts/ssh/ssh-exec.php
+++ b/scripts/ssh/ssh-exec.php
@@ -1,159 +1,159 @@
 #!/usr/bin/env php
 <?php
 
 $ssh_start_time = microtime(true);
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 $ssh_log = PhabricatorSSHLog::getLog();
 
 // First, figure out the authenticated user.
 $args = new PhutilArgumentParser($argv);
 $args->setTagline('receive SSH requests');
 $args->setSynopsis(<<<EOSYNOPSIS
 **ssh-exec** --phabricator-ssh-user __user__ [--ssh-command __commmand__]
     Receive SSH requests.
 EOSYNOPSIS
 );
 
 $args->parse(
   array(
     array(
       'name'  => 'phabricator-ssh-user',
       'param' => 'username',
     ),
     array(
       'name' => 'ssh-command',
       'param' => 'command',
     ),
   ));
 
 try {
   $user_name = $args->getArg('phabricator-ssh-user');
   if (!strlen($user_name)) {
-    throw new Exception("No username.");
+    throw new Exception('No username.');
   }
 
   $user = id(new PhabricatorUser())->loadOneWhere(
     'userName = %s',
     $user_name);
   if (!$user) {
-    throw new Exception("Invalid username.");
+    throw new Exception('Invalid username.');
   }
 
   $ssh_log->setData(
     array(
       'u' => $user->getUsername(),
       'P' => $user->getPHID(),
     ));
 
   if (!$user->isUserActivated()) {
-    throw new Exception(pht("Your account is not activated."));
+    throw new Exception(pht('Your account is not activated.'));
   }
 
   if ($args->getArg('ssh-command')) {
     $original_command = $args->getArg('ssh-command');
   } else {
     $original_command = getenv('SSH_ORIGINAL_COMMAND');
   }
 
   $workflows = id(new PhutilSymbolLoader())
     ->setAncestorClass('PhabricatorSSHWorkflow')
     ->loadObjects();
 
   $workflow_names = mpull($workflows, 'getName', 'getName');
 
   // Now, rebuild the original command.
   $original_argv = id(new PhutilShellLexer())
     ->splitArguments($original_command);
   if (!$original_argv) {
     throw new Exception(
       pht(
         "Welcome to Phabricator.\n\n".
         "You are logged in as %s.\n\n".
         "You haven't specified a command to run. This means you're requesting ".
         "an interactive shell, but Phabricator does not provide an ".
         "interactive shell over SSH.\n\n".
         "Usually, you should run a command like `git clone` or `hg push` ".
         "rather than connecting directly with SSH.\n\n".
         "Supported commands are: %s.",
         $user->getUsername(),
         implode(', ', $workflow_names)));
   }
 
   $ssh_log->setData(
     array(
       'C' => $original_argv[0],
       'U' => phutil_utf8_shorten(
         implode(' ', array_slice($original_argv, 1)),
         128),
     ));
 
   $command = head($original_argv);
   array_unshift($original_argv, 'phabricator-ssh-exec');
 
   $original_args = new PhutilArgumentParser($original_argv);
 
   if (empty($workflow_names[$command])) {
-    throw new Exception("Invalid command.");
+    throw new Exception('Invalid command.');
   }
 
   $workflow = $original_args->parseWorkflows($workflows);
   $workflow->setUser($user);
 
   $sock_stdin = fopen('php://stdin', 'r');
   if (!$sock_stdin) {
-    throw new Exception("Unable to open stdin.");
+    throw new Exception('Unable to open stdin.');
   }
 
   $sock_stdout = fopen('php://stdout', 'w');
   if (!$sock_stdout) {
-    throw new Exception("Unable to open stdout.");
+    throw new Exception('Unable to open stdout.');
   }
 
   $sock_stderr = fopen('php://stderr', 'w');
   if (!$sock_stderr) {
-    throw new Exception("Unable to open stderr.");
+    throw new Exception('Unable to open stderr.');
   }
 
   $socket_channel = new PhutilSocketChannel(
     $sock_stdin,
     $sock_stdout);
   $error_channel = new PhutilSocketChannel(null, $sock_stderr);
   $metrics_channel = new PhutilMetricsChannel($socket_channel);
   $workflow->setIOChannel($metrics_channel);
   $workflow->setErrorChannel($error_channel);
 
   $rethrow = null;
   try {
     $err = $workflow->execute($original_args);
 
     $metrics_channel->flush();
     $error_channel->flush();
   } catch (Exception $ex) {
     $rethrow = $ex;
   }
 
   // Always write this if we got as far as building a metrics channel.
   $ssh_log->setData(
     array(
       'i' => $metrics_channel->getBytesRead(),
       'o' => $metrics_channel->getBytesWritten(),
     ));
 
   if ($rethrow) {
     throw $rethrow;
   }
 } catch (Exception $ex) {
   fwrite(STDERR, "phabricator-ssh-exec: ".$ex->getMessage()."\n");
   $err = 1;
 }
 
 $ssh_log->setData(
   array(
     'c' => $err,
     'T' => (int)(1000000 * (microtime(true) - $ssh_start_time)),
   ));
 
 exit($err);
diff --git a/scripts/symbols/generate_ctags_symbols.php b/scripts/symbols/generate_ctags_symbols.php
index 9a8ee3060..42d3dbf25 100755
--- a/scripts/symbols/generate_ctags_symbols.php
+++ b/scripts/symbols/generate_ctags_symbols.php
@@ -1,124 +1,124 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 if (ctags_check_executable() == false) {
   echo phutil_console_format(
     "Could not find Exuberant ctags. Make sure it is installed and\n".
     "available in executable path.\n\n".
     "Exuberant ctags project page: http://ctags.sourceforge.net/\n");
   exit(1);
 }
 
 if ($argc !== 1 || posix_isatty(STDIN)) {
   echo phutil_console_format(
     "usage: find . -type f -name '*.py' | ./generate_ctags_symbols.php\n");
   exit(1);
 }
 
 $input = file_get_contents('php://stdin');
 $input = trim($input);
 $input = explode("\n", $input);
 
 $data = array();
 $futures = array();
 
 foreach ($input as $file) {
   $file = Filesystem::readablePath($file);
   $futures[$file] = ctags_get_parser_future($file);
 }
 
 foreach (Futures($futures)->limit(8) as $file => $future) {
   $tags = $future->resolve();
   $tags = explode("\n", $tags[1]);
 
   foreach ($tags as $tag) {
-    $parts = explode(";", $tag);
+    $parts = explode(';', $tag);
     // skip lines that we can not parse
     if (count($parts) < 2) {
       continue;
     }
 
     // split ctags information
     $tag_info = explode("\t", $parts[0]);
     // split exuberant ctags "extension fields" (additional information)
     $parts[1] = trim($parts[1], "\t \"");
     $extension_fields = explode("\t", $parts[1]);
 
     // skip lines that we can not parse
     if (count($tag_info) < 3 || count($extension_fields) < 2) {
       continue;
     }
 
     // default $context to empty
     $extension_fields[] = '';
     list($token, $file_path, $line_num) = $tag_info;
     list($type, $language, $context) = $extension_fields;
 
     // skip lines with tokens containing a space
     if (strpos($token, ' ') !== false) {
       continue;
     }
 
     // strip "language:"
     $language = substr($language, 9);
 
     // To keep consistent with "Separate with commas, for example: php, py"
     // in Arcanist Project edit form.
-    $language = str_ireplace("python", "py", $language);
+    $language = str_ireplace('python', 'py', $language);
 
     // also, "normalize" c++ and c#
-    $language = str_ireplace("c++", "cpp", $language);
-    $language = str_ireplace("c#", "cs", $language);
+    $language = str_ireplace('c++', 'cpp', $language);
+    $language = str_ireplace('c#', 'cs', $language);
 
     // Ruby has "singleton method", for example
     $type = substr(str_replace(' ', '_', $type), 0, 12);
     // class:foo, struct:foo, union:foo, enum:foo, ...
     $context = last(explode(':', $context, 2));
 
     $ignore = array(
       'variable' => true,
     );
     if (empty($ignore[$type])) {
       print_symbol($file_path, $line_num, $type, $token, $context, $language);
     }
   }
 }
 
 function ctags_get_parser_future($file_path) {
   $future = new ExecFuture('ctags -n --fields=Kls -o - %s',
                            $file_path);
   return $future;
 }
 
 function ctags_check_executable() {
   $future = new ExecFuture('ctags --version');
   $result = $future->resolve();
 
   if (empty($result[1])) {
     return false;
   }
 
   return true;
 }
 
 function print_symbol($file, $line_num, $type, $token, $context, $language) {
   // get rid of relative path
   $file = explode('/', $file);
-  if ($file[0] == '.' || $file[0] == "..") {
+  if ($file[0] == '.' || $file[0] == '..') {
     array_shift($file);
   }
   $file = '/' . implode('/', $file);
 
   $parts = array(
     $context,
     $token,
     $type,
     strtolower($language),
     $line_num,
     $file,
   );
   echo implode(' ', $parts)."\n";
 }
diff --git a/scripts/user/account_admin.php b/scripts/user/account_admin.php
index e980b5cef..3d18c16ac 100755
--- a/scripts/user/account_admin.php
+++ b/scripts/user/account_admin.php
@@ -1,226 +1,226 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 $table = new PhabricatorUser();
 $any_user = queryfx_one(
   $table->establishConnection('r'),
   'SELECT * FROM %T LIMIT 1',
   $table->getTableName());
 $is_first_user = (!$any_user);
 
 if ($is_first_user) {
   echo pht(
     "WARNING\n\n".
     "You're about to create the first account on this install. Normally, you ".
     "should use the web interface to create the first account, not this ".
     "script.\n\n".
     "If you use the web interface, it will drop you into a nice UI workflow ".
     "which gives you more help setting up your install. If you create an ".
     "account with this script instead, you will skip the setup help and you ".
     "will not be able to access it later.");
-  if (!phutil_console_confirm(pht("Skip easy setup and create account?"))) {
-    echo pht("Cancelled.")."\n";
+  if (!phutil_console_confirm(pht('Skip easy setup and create account?'))) {
+    echo pht('Cancelled.')."\n";
     exit(1);
   }
 }
 
-echo "Enter a username to create a new account or edit an existing account.";
+echo 'Enter a username to create a new account or edit an existing account.';
 
-$username = phutil_console_prompt("Enter a username:");
+$username = phutil_console_prompt('Enter a username:');
 if (!strlen($username)) {
   echo "Cancelled.\n";
   exit(1);
 }
 
 if (!PhabricatorUser::validateUsername($username)) {
   $valid = PhabricatorUser::describeValidUsername();
   echo "The username '{$username}' is invalid. {$valid}\n";
   exit(1);
 }
 
 
 $user = id(new PhabricatorUser())->loadOneWhere(
   'username = %s',
   $username);
 
 if (!$user) {
   $original = new PhabricatorUser();
 
   echo "There is no existing user account '{$username}'.\n";
   $ok = phutil_console_confirm(
     "Do you want to create a new '{$username}' account?",
     $default_no = false);
   if (!$ok) {
     echo "Cancelled.\n";
     exit(1);
   }
   $user = new PhabricatorUser();
   $user->setUsername($username);
 
   $is_new = true;
 } else {
   $original = clone $user;
 
   echo "There is an existing user account '{$username}'.\n";
   $ok = phutil_console_confirm(
     "Do you want to edit the existing '{$username}' account?",
     $default_no = false);
   if (!$ok) {
     echo "Cancelled.\n";
     exit(1);
   }
 
   $is_new = false;
 }
 
 $user_realname = $user->getRealName();
 if (strlen($user_realname)) {
   $realname_prompt = ' ['.$user_realname.']';
 } else {
   $realname_prompt = '';
 }
 $realname = nonempty(
   phutil_console_prompt("Enter user real name{$realname_prompt}:"),
   $user_realname);
 $user->setRealName($realname);
 
 // When creating a new user we prompt for an email address; when editing an
 // existing user we just skip this because it would be quite involved to provide
 // a reasonable CLI interface for editing multiple addresses and managing email
 // verification and primary addresses.
 
 $create_email = null;
 if ($is_new) {
   do {
-    $email = phutil_console_prompt("Enter user email address:");
+    $email = phutil_console_prompt('Enter user email address:');
     $duplicate = id(new PhabricatorUserEmail())->loadOneWhere(
       'address = %s',
       $email);
     if ($duplicate) {
       echo "ERROR: There is already a user with that email address. ".
            "Each user must have a unique email address.\n";
     } else {
       break;
     }
   } while (true);
 
   $create_email = $email;
 }
 
 $changed_pass = false;
 // This disables local echo, so the user's password is not shown as they type
 // it.
 phutil_passthru('stty -echo');
 $password = phutil_console_prompt(
-  "Enter a password for this user [blank to leave unchanged]:");
+  'Enter a password for this user [blank to leave unchanged]:');
 phutil_passthru('stty echo');
 if (strlen($password)) {
   $changed_pass = $password;
 }
 
 $is_system_agent = $user->getIsSystemAgent();
 $set_system_agent = phutil_console_confirm(
   'Is this user a bot/script?',
   $default_no = !$is_system_agent);
 
 $verify_email = null;
 $set_verified = false;
 // Allow administrators to verify primary email addresses at this time in edit
 // scenarios. (Create will work just fine from here as we auto-verify email
 // on create.)
 if (!$is_new) {
   $verify_email = $user->loadPrimaryEmail();
   if (!$verify_email->getIsVerified()) {
     $set_verified = phutil_console_confirm(
       'Should the primary email address be verified?',
       $default_no = true);
   } else {
     // already verified so let's not make a fuss
     $verify_email = null;
   }
 }
 
 $is_admin = $user->getIsAdmin();
 $set_admin = phutil_console_confirm(
   'Should this user be an administrator?',
   $default_no = !$is_admin);
 
 echo "\n\nACCOUNT SUMMARY\n\n";
 $tpl = "%12s   %-30s   %-30s\n";
 printf($tpl, null, 'OLD VALUE', 'NEW VALUE');
 printf($tpl, 'Username', $original->getUsername(), $user->getUsername());
 printf($tpl, 'Real Name', $original->getRealName(), $user->getRealName());
 if ($is_new) {
   printf($tpl, 'Email', '', $create_email);
 }
 printf($tpl, 'Password', null,
   ($changed_pass !== false)
     ? 'Updated'
     : 'Unchanged');
 
 printf(
   $tpl,
   'Bot/Script',
   $original->getIsSystemAgent() ? 'Y' : 'N',
   $set_system_agent ? 'Y' : 'N');
 
 if ($verify_email) {
   printf(
     $tpl,
     'Verify Email',
     $verify_email->getIsVerified() ? 'Y' : 'N',
     $set_verified ? 'Y' : 'N');
 }
 
 printf(
   $tpl,
   'Admin',
   $original->getIsAdmin() ? 'Y' : 'N',
   $set_admin ? 'Y' : 'N');
 
 echo "\n";
 
-if (!phutil_console_confirm("Save these changes?", $default_no = false)) {
+if (!phutil_console_confirm('Save these changes?', $default_no = false)) {
   echo "Cancelled.\n";
   exit(1);
 }
 
 $user->openTransaction();
 
   $editor = new PhabricatorUserEditor();
 
   // TODO: This is wrong, but we have a chicken-and-egg problem when you use
   // this script to create the first user.
   $editor->setActor($user);
 
   if ($is_new) {
     $email = id(new PhabricatorUserEmail())
       ->setAddress($create_email)
       ->setIsVerified(1);
 
     // Unconditionally approve new accounts created from the CLI.
     $user->setIsApproved(1);
 
     $editor->createNewUser($user, $email);
   } else {
     if ($verify_email) {
       $user->setIsEmailVerified(1);
       $verify_email->setIsVerified($set_verified ? 1 : 0);
     }
     $editor->updateUser($user, $verify_email);
   }
 
   $editor->makeAdminUser($user, $set_admin);
   $editor->makeSystemAgentUser($user, $set_system_agent);
 
   if ($changed_pass !== false) {
     $envelope = new PhutilOpaqueEnvelope($changed_pass);
     $editor->changePassword($user, $envelope);
   }
 
 $user->saveTransaction();
 
 echo "Saved changes.\n";
diff --git a/scripts/user/add_user.php b/scripts/user/add_user.php
index 958ff4b89..f2cdac396 100755
--- a/scripts/user/add_user.php
+++ b/scripts/user/add_user.php
@@ -1,57 +1,57 @@
 #!/usr/bin/env php
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
 if ($argc !== 5) {
   echo "usage: add_user.php <username> <email> <realname> <admin_user>\n";
   exit(1);
 }
 
 $username = $argv[1];
 $email = $argv[2];
 $realname = $argv[3];
 $admin = $argv[4];
 
 $admin = id(new PhabricatorUser())->loadOneWhere(
   'username = %s',
   $argv[4]);
 if (!$admin) {
   throw new Exception(
-    "Admin user must be the username of a valid Phabricator account, used ".
-    "to send the new user a welcome email.");
+    'Admin user must be the username of a valid Phabricator account, used '.
+    'to send the new user a welcome email.');
 }
 
 $existing_user = id(new PhabricatorUser())->loadOneWhere(
   'username = %s',
   $username);
 if ($existing_user) {
   throw new Exception(
     "There is already a user with the username '{$username}'!");
 }
 
 $existing_email = id(new PhabricatorUserEmail())->loadOneWhere(
   'address = %s',
   $email);
 if ($existing_email) {
   throw new Exception(
     "There is already a user with the email '{$email}'!");
 }
 
 $user = new PhabricatorUser();
 $user->setUsername($username);
 $user->setRealname($realname);
 $user->setIsApproved(1);
 
 $email_object = id(new PhabricatorUserEmail())
   ->setAddress($email)
   ->setIsVerified(1);
 
 id(new PhabricatorUserEditor())
   ->setActor($admin)
   ->createNewUser($user, $email_object);
 
 $user->sendWelcomeEmail($admin);
 
 echo "Created user '{$username}' (realname='{$realname}', email='{$email}').\n";
diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
index c83746c5e..cf609011b 100644
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -1,599 +1,599 @@
 <?php
 
 /**
  * @task data   Accessing Request Data
  * @task cookie Managing Cookies
  *
  */
 final class AphrontRequest {
 
   // NOTE: These magic request-type parameters are automatically included in
   // certain requests (e.g., by phabricator_form(), JX.Request,
   // JX.Workflow, and ConduitClient) and help us figure out what sort of
   // response the client expects.
 
   const TYPE_AJAX = '__ajax__';
   const TYPE_FORM = '__form__';
   const TYPE_CONDUIT = '__conduit__';
   const TYPE_WORKFLOW = '__wflow__';
   const TYPE_CONTINUE = '__continue__';
   const TYPE_PREVIEW = '__preview__';
   const TYPE_HISEC = '__hisec__';
 
   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 isHTTPGet() {
     return ($_SERVER['REQUEST_METHOD'] == 'GET');
   }
 
   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)) {
       $token = self::getHTTPHeader(self::getCSRFHeaderName());
     }
 
     $valid = $this->getUser()->validateCSRFToken($token);
     if (!$valid) {
 
       // Add some diagnostic details so we can figure out if some CSRF issues
       // are JS problems or people accessing Ajax URIs directly with their
       // browsers.
       $more_info = array();
 
       if ($this->isAjax()) {
         $more_info[] = pht('This was an Ajax request.');
       } else {
         $more_info[] = pht('This was a Web request.');
       }
 
       if ($token) {
         $more_info[] = pht('This request had an invalid CSRF token.');
       } else {
         $more_info[] = pht('This request had no CSRF token.');
       }
 
       // Give a more detailed explanation of how to avoid the exception
       // in developer mode.
       if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
         // TODO: Clean this up, see T1921.
         $more_info[] =
           "To avoid this error, use phabricator_form() to construct forms. " .
           "If you are already using phabricator_form(), make sure the form " .
           "'action' uses a relative URI (i.e., begins with a '/'). Forms " .
           "using absolute URIs do not include CSRF tokens, to prevent " .
           "leaking tokens to external sites.\n\n" .
           "If this page performs writes which do not require CSRF " .
           "protection (usually, filling caches or logging), you can use " .
           "AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily " .
           "bypass CSRF protection while writing. You should use this only " .
           "for writes which can not be protected with normal CSRF " .
           "mechanisms.\n\n" .
           "Some UI elements (like PhabricatorActionListView) also have " .
           "methods which will allow you to render links as forms (like " .
           "setRenderAsForm(true)).";
       }
 
       // This should only be able to happen if you load a form, pull your
       // internet for 6 hours, and then reconnect and immediately submit,
       // but give the user some indication of what happened since the workflow
       // is incredibly confusing otherwise.
       throw new AphrontCSRFException(
         pht(
           "You are trying to save some data to Phabricator, but the request ".
           "your browser made included an incorrect token. Reload the page ".
           "and try again. You may need to clear your cookies.\n\n%s",
           implode("\n", $more_info)));
     }
 
     return true;
   }
 
   final public function isFormPost() {
     $post = $this->getExists(self::TYPE_FORM) &&
             !$this->getExists(self::TYPE_HISEC) &&
             $this->isHTTPPost();
 
     if (!$post) {
       return false;
     }
 
     return $this->validateCSRF();
   }
 
   final public function setCookiePrefix($prefix) {
     $this->cookiePrefix = $prefix;
     return $this;
   }
 
   final private function getPrefixedCookieName($name) {
     if (strlen($this->cookiePrefix)) {
       return $this->cookiePrefix.'_'.$name;
     } else {
       return $name;
     }
   }
 
   final public function getCookie($name, $default = null) {
     $name = $this->getPrefixedCookieName($name);
     $value = idx($_COOKIE, $name, $default);
 
     // Internally, PHP deletes cookies by setting them to the value 'deleted'
     // with an expiration date in the past.
 
     // At least in Safari, the browser may send this cookie anyway in some
     // circumstances. After logging out, the 302'd GET to /login/ consistently
     // includes deleted cookies on my local install. If a cookie value is
     // literally 'deleted', pretend it does not exist.
 
     if ($value === 'deleted') {
       return null;
     }
 
     return $value;
   }
 
   final public function clearCookie($name) {
     $name = $this->getPrefixedCookieName($name);
     $this->setCookieWithExpiration($name, '', time() - (60 * 60 * 24 * 30));
     unset($_COOKIE[$name]);
   }
 
   /**
    * Get the domain which cookies should be set on for this request, or null
    * if the request does not correspond to a valid cookie domain.
    *
    * @return PhutilURI|null   Domain URI, or null if no valid domain exists.
    *
    * @task cookie
    */
   private function getCookieDomainURI() {
     if (PhabricatorEnv::getEnvConfig('security.require-https') &&
         !$this->isHTTPS()) {
       return null;
     }
 
     $host = $this->getHost();
 
     // If there's no base domain configured, just use whatever the request
     // domain is. This makes setup easier, and we'll tell administrators to
     // configure a base domain during the setup process.
     $base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
     if (!strlen($base_uri)) {
       return new PhutilURI('http://'.$host.'/');
     }
 
     $alternates = PhabricatorEnv::getEnvConfig('phabricator.allowed-uris');
     $allowed_uris = array_merge(
       array($base_uri),
       $alternates);
 
     foreach ($allowed_uris as $allowed_uri) {
       $uri = new PhutilURI($allowed_uri);
       if ($uri->getDomain() == $host) {
         return $uri;
       }
     }
 
     return null;
   }
 
   /**
    * Determine if security policy rules will allow cookies to be set when
    * responding to the request.
    *
    * @return bool True if setCookie() will succeed. If this method returns
    *              false, setCookie() will throw.
    *
    * @task cookie
    */
   final public function canSetCookies() {
     return (bool)$this->getCookieDomainURI();
   }
 
 
   /**
    * Set a cookie which does not expire for a long time.
    *
    * To set a temporary cookie, see @{method:setTemporaryCookie}.
    *
    * @param string  Cookie name.
    * @param string  Cookie value.
    * @return this
    * @task cookie
    */
   final public function setCookie($name, $value) {
     $far_future = time() + (60 * 60 * 24 * 365 * 5);
     return $this->setCookieWithExpiration($name, $value, $far_future);
   }
 
 
   /**
    * Set a cookie which expires soon.
    *
    * To set a durable cookie, see @{method:setCookie}.
    *
    * @param string  Cookie name.
    * @param string  Cookie value.
    * @return this
    * @task cookie
    */
   final public function setTemporaryCookie($name, $value) {
     return $this->setCookieWithExpiration($name, $value, 0);
   }
 
 
   /**
    * Set a cookie with a given expiration policy.
    *
    * @param string  Cookie name.
    * @param string  Cookie value.
    * @param int     Epoch timestamp for cookie expiration.
    * @return this
    * @task cookie
    */
   final private function setCookieWithExpiration(
     $name,
     $value,
     $expire) {
 
     $is_secure = false;
 
     $base_domain_uri = $this->getCookieDomainURI();
     if (!$base_domain_uri) {
       $configured_as = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
       $accessed_as = $this->getHost();
 
       throw new Exception(
         pht(
           'This Phabricator install is configured as "%s", but you are '.
           'using the domain name "%s" to access a page which is trying to '.
           'set a cookie. Acccess Phabricator on the configured primary '.
           'domain or a configured alternate domain. Phabricator will not '.
           'set cookies on other domains for security reasons.',
           $configured_as,
           $accessed_as));
     }
 
     $base_domain = $base_domain_uri->getDomain();
     $is_secure = ($base_domain_uri->getProtocol() == 'https');
 
     $name = $this->getPrefixedCookieName($name);
 
     if (php_sapi_name() == 'cli') {
       // Do nothing, to avoid triggering "Cannot modify header information"
       // warnings.
 
       // TODO: This is effectively a test for whether we're running in a unit
       // test or not. Move this actual call to HTTPSink?
     } else {
       setcookie(
         $name,
         $value,
         $expire,
         $path = '/',
         $base_domain,
         $is_secure,
         $http_only = true);
     }
 
     $_COOKIE[$name] = $value;
 
     return $this;
   }
 
   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")) {
+    if (!strcasecmp($_SERVER['HTTPS'], 'off')) {
       return false;
     }
     return true;
   }
 
   public function isContinueRequest() {
     return $this->isFormPost() && $this->getStr('__continue__');
   }
 
   public function isPreviewRequest() {
     return $this->isFormPost() && $this->getStr('__preview__');
   }
 
   /**
    * Get application request parameters in a flattened form suitable for
    * inclusion in an HTTP request, excluding parameters with special meanings.
    * This is primarily useful if you want to ask the user for more input and
    * then resubmit their request.
    *
    * @return  dict<string, string>  Original request parameters.
    */
   public function getPassthroughRequestParameters() {
     return self::flattenData($this->getPassthroughRequestData());
   }
 
   /**
    * Get request data other than "magic" parameters.
    *
    * @return dict<string, wild> Request data, with magic filtered out.
    */
   public function getPassthroughRequestData() {
     $data = $this->getRequestData();
 
     // Remove magic parameters like __dialog__ and __ajax__.
     foreach ($data as $key => $value) {
       if (!strncmp($key, '__', 2)) {
         unset($data[$key]);
       }
     }
 
     return $data;
   }
 
 
   /**
    * Flatten an array of key-value pairs (possibly including arrays as values)
    * into a list of key-value pairs suitable for submitting via HTTP request
    * (with arrays flattened).
    *
    * @param   dict<string, wild>    Data to flatten.
    * @return  dict<string, string>  Flat data suitable for inclusion in an HTTP
    *                                request.
    */
   public static function flattenData(array $data) {
     $result = array();
     foreach ($data as $key => $value) {
       if (is_array($value)) {
         foreach (self::flattenData($value) as $fkey => $fvalue) {
           $fkey = '['.preg_replace('/(?=\[)|$/', ']', $fkey, $limit = 1);
           $result[$key.$fkey] = $fvalue;
         }
       } else {
         $result[$key] = (string)$value;
       }
     }
 
     ksort($result);
 
     return $result;
   }
 
 
   /**
    * Read the value of an HTTP header from `$_SERVER`, or a similar datasource.
    *
    * This function accepts a canonical header name, like `"Accept-Encoding"`,
    * and looks up the appropriate value in `$_SERVER` (in this case,
    * `"HTTP_ACCEPT_ENCODING"`).
    *
    * @param   string        Canonical header name, like `"Accept-Encoding"`.
    * @param   wild          Default value to return if header is not present.
    * @param   array?        Read this instead of `$_SERVER`.
    * @return  string|wild   Header value if present, or `$default` if not.
    */
   public static function getHTTPHeader($name, $default = null, $data = null) {
     // PHP mangles HTTP headers by uppercasing them and replacing hyphens with
     // underscores, then prepending 'HTTP_'.
     $php_index = strtoupper($name);
     $php_index = str_replace('-', '_', $php_index);
 
     $try_names = array();
 
     $try_names[] = 'HTTP_'.$php_index;
     if ($php_index == 'CONTENT_TYPE' || $php_index == 'CONTENT_LENGTH') {
       // These headers may be available under alternate names. See
       // http://www.php.net/manual/en/reserved.variables.server.php#110763
       $try_names[] = $php_index;
     }
 
     if ($data === null) {
       $data = $_SERVER;
     }
 
     foreach ($try_names as $try_name) {
       if (array_key_exists($try_name, $data)) {
         return $data[$try_name];
       }
     }
 
     return $default;
   }
 
 }
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index b3abbb103..b15908c2f 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -1,231 +1,231 @@
 <?php
 
 /**
  * @task  routing URI Routing
  * @group aphront
  */
 abstract class AphrontApplicationConfiguration {
 
   private $request;
   private $host;
   private $path;
   private $console;
 
   abstract public function getApplicationName();
   abstract public function getURIMap();
   abstract public function buildRequest();
   abstract public function build404Controller();
   abstract public function buildRedirectController($uri);
 
   final public function setRequest(AphrontRequest $request) {
     $this->request = $request;
     return $this;
   }
 
   final public function getRequest() {
     return $this->request;
   }
 
   final public function getConsole() {
     return $this->console;
   }
 
   final public function setConsole($console) {
     $this->console = $console;
     return $this;
   }
 
   final public function setHost($host) {
     $this->host = $host;
     return $this;
   }
 
   final public function getHost() {
     return $this->host;
   }
 
   final public function setPath($path) {
     $this->path = $path;
     return $this;
   }
 
   final public function getPath() {
     return $this->path;
   }
 
   public function willBuildRequest() {
   }
 
 
 /* -(  URI Routing  )-------------------------------------------------------- */
 
 
   /**
    * Using builtin and application routes, build the appropriate
    * @{class:AphrontController} class for the request. To route a request, we
    * first test if the HTTP_HOST is configured as a valid Phabricator URI. If
    * it isn't, we do a special check to see if it's a custom domain for a blog
    * in the Phame application and if that fails we error. Otherwise, we test
    * the URI against all builtin routes from @{method:getURIMap}, then against
    * all application routes from installed @{class:PhabricatorApplication}s.
    *
    * If we match a route, we construct the controller it points at, build it,
    * and return it.
    *
    * If we fail to match a route, but the current path is missing a trailing
    * "/", we try routing the same path with a trailing "/" and do a redirect
    * if that has a valid route. The idea is to canoncalize URIs for consistency,
    * but avoid breaking noncanonical URIs that we can easily salvage.
    *
    * NOTE: We only redirect on GET. On POST, we'd drop parameters and most
    * likely mutate the request implicitly, and a bad POST usually indicates a
    * programming error rather than a sloppy typist.
    *
    * If the failing path already has a trailing "/", or we can't route the
    * version with a "/", we call @{method:build404Controller}, which build a
    * fallback @{class:AphrontController}.
    *
    * @return pair<AphrontController,dict> Controller and dictionary of request
    *                                      parameters.
    * @task routing
    */
   final public function buildController() {
     $request = $this->getRequest();
 
     if (PhabricatorEnv::getEnvConfig('security.require-https')) {
       if (!$request->isHTTPS()) {
         $https_uri = $request->getRequestURI();
         $https_uri->setDomain($request->getHost());
         $https_uri->setProtocol('https');
         return $this->buildRedirectController($https_uri);
       }
     }
 
     $path         = $request->getPath();
     $host         = $request->getHost();
     $base_uri     = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
     $prod_uri     = PhabricatorEnv::getEnvConfig('phabricator.production-uri');
     $file_uri     = PhabricatorEnv::getEnvConfig(
       'security.alternate-file-domain');
     $conduit_uris = PhabricatorEnv::getEnvConfig('conduit.servers');
     $allowed_uris = PhabricatorEnv::getEnvConfig('phabricator.allowed-uris');
 
     $uris = array_merge(
       array(
         $base_uri,
         $prod_uri,
         $file_uri,
       ),
       $conduit_uris,
       $allowed_uris);
 
     $host_match = false;
     foreach ($uris as $uri) {
       if ($host === id(new PhutilURI($uri))->getDomain()) {
         $host_match = true;
         break;
       }
     }
 
     // NOTE: If the base URI isn't defined yet, don't activate alternate
     // domains.
     if ($base_uri && !$host_match) {
 
       try {
         $blog = id(new PhameBlogQuery())
           ->setViewer(new PhabricatorUser())
           ->withDomain($host)
           ->executeOne();
       } catch (PhabricatorPolicyException $ex) {
         throw new Exception(
-          "This blog is not visible to logged out users, so it can not be ".
-          "visited from a custom domain.");
+          'This blog is not visible to logged out users, so it can not be '.
+          'visited from a custom domain.');
       }
 
       if (!$blog) {
         if ($prod_uri && $prod_uri != $base_uri) {
           $prod_str = ' or '.$prod_uri;
         } else {
           $prod_str = '';
         }
         throw new Exception(
           'Specified domain '.$host.' is not configured for Phabricator '.
           'requests. Please use '.$base_uri.$prod_str.' to visit this instance.'
         );
       }
 
       // TODO: Make this more flexible and modular so any application can
       // do crazy stuff here if it wants.
 
       $path = '/phame/live/'.$blog->getID().'/'.$path;
     }
 
     list($controller, $uri_data) = $this->buildControllerForPath($path);
     if (!$controller) {
       if (!preg_match('@/$@', $path)) {
         // If we failed to match anything but don't have a trailing slash, try
         // to add a trailing slash and issue a redirect if that resolves.
         list($controller, $uri_data) = $this->buildControllerForPath($path.'/');
 
         // NOTE: For POST, just 404 instead of redirecting, since the redirect
         // will be a GET without parameters.
 
         if ($controller && !$request->isHTTPPost()) {
           $slash_uri = $request->getRequestURI()->setPath($path.'/');
           return $this->buildRedirectController($slash_uri);
         }
       }
       return $this->build404Controller();
     }
 
     return array($controller, $uri_data);
   }
 
 
   /**
    * Map a specific path to the corresponding controller. For a description
    * of routing, see @{method:buildController}.
    *
    * @return pair<AphrontController,dict> Controller and dictionary of request
    *                                      parameters.
    * @task routing
    */
   final public function buildControllerForPath($path) {
     $maps = array();
     $maps[] = array(null, $this->getURIMap());
 
     $applications = PhabricatorApplication::getAllInstalledApplications();
     foreach ($applications as $application) {
       $maps[] = array($application, $application->getRoutes());
     }
 
     $current_application = null;
     $controller_class = null;
     foreach ($maps as $map_info) {
       list($application, $map) = $map_info;
 
       $mapper = new AphrontURIMapper($map);
       list($controller_class, $uri_data) = $mapper->mapPath($path);
 
       if ($controller_class) {
         if ($application) {
           $current_application = $application;
         }
         break;
       }
     }
 
     if (!$controller_class) {
       return array(null, null);
     }
 
     $request = $this->getRequest();
 
     $controller = newv($controller_class, array($request));
     if ($current_application) {
       $controller->setCurrentApplication($current_application);
     }
 
     return array($controller, $uri_data);
   }
 }
diff --git a/src/aphront/response/AphrontProxyResponse.php b/src/aphront/response/AphrontProxyResponse.php
index 8e031a977..36f2830e2 100644
--- a/src/aphront/response/AphrontProxyResponse.php
+++ b/src/aphront/response/AphrontProxyResponse.php
@@ -1,74 +1,74 @@
 <?php
 
 /**
  * Base class for responses which augment other types of responses. For example,
  * a response might be substantially an Ajax response, but add structure to the
  * response content. It can do this by extending @{class:AphrontProxyResponse},
  * instantiating an @{class:AphrontAjaxResponse} in @{method:buildProxy}, and
  * then constructing a real @{class:AphrontAjaxResponse} in
  * @{method:reduceProxyResponse}.
  *
  * @group aphront
  */
 abstract class AphrontProxyResponse extends AphrontResponse {
 
   private $proxy;
 
   protected function getProxy() {
     if (!$this->proxy) {
       $this->proxy = $this->buildProxy();
     }
     return $this->proxy;
   }
 
   public function setRequest($request) {
     $this->getProxy()->setRequest($request);
     return $this;
   }
 
   public function getRequest() {
     return $this->getProxy()->getRequest();
   }
 
   public function getHeaders() {
     return $this->getProxy()->getHeaders();
   }
 
   public function setCacheDurationInSeconds($duration) {
     $this->getProxy()->setCacheDurationInSeconds($duration);
     return $this;
   }
 
   public function setLastModified($epoch_timestamp) {
     $this->getProxy()->setLastModified($epoch_timestamp);
     return $this;
   }
 
   public function setHTTPResponseCode($code) {
     $this->getProxy()->setHTTPResponseCode($code);
     return $this;
   }
 
   public function getHTTPResponseCode() {
     return $this->getProxy()->getHTTPResponseCode();
   }
 
   public function setFrameable($frameable) {
     $this->getProxy()->setFrameable($frameable);
     return $this;
   }
 
   public function getCacheHeaders() {
     return $this->getProxy()->getCacheHeaders();
   }
 
   abstract protected function buildProxy();
   abstract public function reduceProxyResponse();
 
   final public function buildResponseString() {
     throw new Exception(
-      "AphrontProxyResponse must implement reduceProxyResponse().");
+      'AphrontProxyResponse must implement reduceProxyResponse().');
   }
 
 
 }
diff --git a/src/aphront/sink/AphrontHTTPSink.php b/src/aphront/sink/AphrontHTTPSink.php
index 15822051e..cddca7b65 100644
--- a/src/aphront/sink/AphrontHTTPSink.php
+++ b/src/aphront/sink/AphrontHTTPSink.php
@@ -1,120 +1,120 @@
 <?php
 
 /**
  * Abstract class which wraps some sort of output mechanism for HTTP responses.
  * Normally this is just @{class:AphrontPHPHTTPSink}, which uses "echo" and
  * "header()" to emit responses.
  *
  * Mostly, this class allows us to do install security or metrics hooks in the
  * output pipeline.
  *
  * @task write  Writing Response Components
  * @task emit   Emitting the Response
  *
  * @group aphront
  */
 abstract class AphrontHTTPSink {
 
 
 /* -(  Writing Response Components  )---------------------------------------- */
 
 
   /**
    * Write an HTTP status code to the output.
    *
    * @param int Numeric HTTP status code.
    * @return void
    */
   final public function writeHTTPStatus($code, $message = '') {
     if (!preg_match('/^\d{3}$/', $code)) {
       throw new Exception("Malformed HTTP status code '{$code}'!");
     }
 
     $code = (int)$code;
     $this->emitHTTPStatus($code, $message);
   }
 
 
   /**
    * Write HTTP headers to the output.
    *
    * @param list<pair> List of <name, value> pairs.
    * @return void
    */
   final public function writeHeaders(array $headers) {
     foreach ($headers as $header) {
       if (!is_array($header) || count($header) !== 2) {
         throw new Exception('Malformed header.');
       }
       list($name, $value) = $header;
 
       if (strpos($name, ':') !== false) {
         throw new Exception(
-          "Declining to emit response with malformed HTTP header name: ".
+          'Declining to emit response with malformed HTTP header name: '.
           $name);
       }
 
       // Attackers may perform an "HTTP response splitting" attack by making
       // the application emit certain types of headers containing newlines:
       //
       //   http://en.wikipedia.org/wiki/HTTP_response_splitting
       //
       // PHP has built-in protections against HTTP response-splitting, but they
       // are of dubious trustworthiness:
       //
       //   http://news.php.net/php.internals/57655
 
       if (preg_match('/[\r\n\0]/', $name.$value)) {
         throw new Exception(
           "Declining to emit response with unsafe HTTP header: ".
           "<'".$name."', '".$value."'>.");
       }
     }
 
     foreach ($headers as $header) {
       list($name, $value) = $header;
       $this->emitHeader($name, $value);
     }
   }
 
 
   /**
    * Write HTTP body data to the output.
    *
    * @param string Body data.
    * @return void
    */
   final public function writeData($data) {
     $this->emitData($data);
   }
 
 
   /**
    * Write an entire @{class:AphrontResponse} to the output.
    *
    * @param AphrontResponse The response object to write.
    * @return void
    */
   final public function writeResponse(AphrontResponse $response) {
     // Do this first, in case it throws.
     $response_string = $response->buildResponseString();
 
     $all_headers = array_merge(
       $response->getHeaders(),
       $response->getCacheHeaders());
 
     $this->writeHTTPStatus(
       $response->getHTTPResponseCode(),
       $response->getHTTPResponseMessage());
     $this->writeHeaders($all_headers);
     $this->writeData($response_string);
   }
 
 
 /* -(  Emitting the Response  )---------------------------------------------- */
 
 
   abstract protected function emitHTTPStatus($code, $message = '');
   abstract protected function emitHeader($name, $value);
   abstract protected function emitData($data);
 }
diff --git a/src/aphront/sink/__tests__/AphrontHTTPSinkTestCase.php b/src/aphront/sink/__tests__/AphrontHTTPSinkTestCase.php
index 4892de96c..05235a77b 100644
--- a/src/aphront/sink/__tests__/AphrontHTTPSinkTestCase.php
+++ b/src/aphront/sink/__tests__/AphrontHTTPSinkTestCase.php
@@ -1,82 +1,82 @@
 <?php
 
 final class AphrontHTTPSinkTestCase extends PhabricatorTestCase {
 
   public function testHTTPSinkBasics() {
     $sink = new AphrontIsolatedHTTPSink();
     $sink->writeHTTPStatus(200);
     $sink->writeHeaders(array(array('X-Test', 'test')));
     $sink->writeData('test');
 
     $this->assertEqual(200, $sink->getEmittedHTTPStatus());
     $this->assertEqual(
       array(array('X-Test', 'test')),
       $sink->getEmittedHeaders());
     $this->assertEqual('test', $sink->getEmittedData());
   }
 
   public function testHTTPSinkStatusCode() {
     $input = $this->tryTestCaseMap(
       array(
         200     => true,
         '201'   => true,
         1       => false,
         1000    => false,
         'apple' => false,
         ''      => false,
       ),
       array($this, 'tryHTTPSinkStatusCode'));
   }
 
   protected function tryHTTPSinkStatusCode($input) {
     $sink = new AphrontIsolatedHTTPSink();
     $sink->writeHTTPStatus($input);
   }
 
   public function testHTTPSinkResponseSplitting() {
     $input = $this->tryTestCaseMap(
       array(
-        "test"      => true,
+        'test'      => true,
         "test\nx"   => false,
         "test\rx"   => false,
         "test\0x"   => false,
       ),
       array($this, 'tryHTTPSinkResponseSplitting'));
   }
 
   protected function tryHTTPSinkResponseSplitting($input) {
     $sink = new AphrontIsolatedHTTPSink();
     $sink->writeHeaders(array(array('X-Test', $input)));
   }
 
   public function testHTTPHeaderNames() {
     $input = $this->tryTestCaseMap(
       array(
         'test'  => true,
         'test:' => false,
       ),
       array($this, 'tryHTTPHeaderNames'));
   }
 
   protected function tryHTTPHeaderNames($input) {
     $sink = new AphrontIsolatedHTTPSink();
     $sink->writeHeaders(array(array($input, 'value')));
   }
 
   public function testJSONContentSniff() {
     $response = id(new AphrontJSONResponse())
       ->setContent(
         array(
           'x' => '<iframe>',
         ));
     $sink = new AphrontIsolatedHTTPSink();
     $sink->writeResponse($response);
 
     $this->assertEqual(
       'for (;;);{"x":"\u003ciframe\u003e"}',
       $sink->getEmittedData(),
-      "JSONResponse should prevent content-sniffing attacks.");
+      'JSONResponse should prevent content-sniffing attacks.');
   }
 
 
 }
diff --git a/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php b/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
index d4b86e73c..c1c815521 100644
--- a/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
+++ b/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
@@ -1,63 +1,63 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_arcanist_projectinfo_Method
   extends ConduitAPI_arcanist_Method {
 
   public function getMethodDescription() {
-    return "Get information about Arcanist projects.";
+    return 'Get information about Arcanist projects.';
   }
 
   public function defineParamTypes() {
     return array(
       'name' => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-ARCANIST-PROJECT' => 'No such project exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $name = $request->getValue('name');
 
     $project = id(new PhabricatorRepositoryArcanistProject())->loadOneWhere(
       'name = %s',
       $name);
 
     if (!$project) {
       throw new ConduitException('ERR-BAD-ARCANIST-PROJECT');
     }
 
     $repository = $project->loadRepository();
 
     $repository_phid = null;
     $tracked = false;
     $encoding = null;
     $dictionary = array();
     if ($repository) {
       $repository_phid = $repository->getPHID();
       $tracked = $repository->isTracked();
       $encoding = $repository->getDetail('encoding');
       $dictionary = $repository->toDictionary();
     }
 
     return array(
       'name'            => $project->getName(),
       'phid'            => $project->getPHID(),
       'repositoryPHID'  => $repository_phid,
       'tracked'         => $tracked,
       'encoding'        => $encoding,
       'repository'      => $dictionary,
     );
   }
 
 }
diff --git a/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php b/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
index 796e744ef..782da6deb 100644
--- a/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
+++ b/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
@@ -1,80 +1,80 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_audit_query_Method extends ConduitAPI_audit_Method {
 
   public function getMethodDescription() {
-    return "Query audit requests.";
+    return 'Query audit requests.';
   }
 
   public function defineParamTypes() {
     $statuses = array(
       'status-any',
       'status-open',
     );
     $status_const = $this->formatStringConstants($statuses);
 
     return array(
       'auditorPHIDs'  => 'optional list<phid>',
       'commitPHIDs'   => 'optional list<phid>',
       'status'        => 'optional '.$status_const.' (default = "status-any")',
       'offset'        => 'optional int',
       'limit'         => 'optional int (default = 100)',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser());
 
     $auditor_phids = $request->getValue('auditorPHIDs', array());
     if ($auditor_phids) {
       $query->withAuditorPHIDs($auditor_phids);
     }
 
     $commit_phids = $request->getValue('commitPHIDs', array());
     if ($commit_phids) {
       $query->withPHIDs($commit_phids);
     }
 
     $status = $request->getValue(
       'status',
       DiffusionCommitQuery::AUDIT_STATUS_ANY);
     $query->withAuditStatus($status);
 
     $query->setOffset($request->getValue('offset', 0));
     $query->setLimit($request->getValue('limit', 100));
 
     $commits = $query->execute();
 
     $results = array();
     foreach ($commits as $commit) {
       $requests = $commit->getAudits();
       foreach ($requests as $request) {
         $results[] = array(
           'id'              => $request->getID(),
           'commitPHID'      => $request->getCommitPHID(),
           'auditorPHID'     => $request->getAuditorPHID(),
           'reasons'         => $request->getAuditReasons(),
           'status'          => $request->getAuditStatus(),
         );
       }
     }
 
     return $results;
   }
 
 
 }
diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
index 25ef287a2..b157b4d2f 100644
--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
@@ -1,568 +1,568 @@
 <?php
 
 final class PhabricatorAuditCommentEditor extends PhabricatorEditor {
 
   private $commit;
 
   private $attachInlineComments;
   private $auditors = array();
   private $ccs = array();
 
   private $noEmail;
 
   public function __construct(PhabricatorRepositoryCommit $commit) {
     $this->commit = $commit;
     return $this;
   }
 
   public function addAuditors(array $auditor_phids) {
     $this->auditors = array_merge($this->auditors, $auditor_phids);
     return $this;
   }
 
   public function addCCs(array $cc_phids) {
     $this->ccs = array_merge($this->ccs, $cc_phids);
     return $this;
   }
 
   public function setAttachInlineComments($attach_inline_comments) {
     $this->attachInlineComments = $attach_inline_comments;
     return $this;
   }
 
   public function setNoEmail($no_email) {
     $this->noEmail = $no_email;
     return $this;
   }
 
   public function addComment(PhabricatorAuditComment $comment) {
 
     $commit = $this->commit;
     $actor = $this->getActor();
 
     $other_comments = id(new PhabricatorAuditComment())->loadAllWhere(
       'targetPHID = %s',
       $commit->getPHID());
 
     $inline_comments = array();
     if ($this->attachInlineComments) {
       $inline_comments = id(new PhabricatorAuditInlineComment())->loadAllWhere(
         'authorPHID = %s AND commitPHID = %s
           AND auditCommentID IS NULL',
         $actor->getPHID(),
         $commit->getPHID());
     }
 
     $comment
       ->setActorPHID($actor->getPHID())
       ->setTargetPHID($commit->getPHID())
       ->save();
 
     $content_blocks = array($comment->getContent());
 
     if ($inline_comments) {
       foreach ($inline_comments as $inline) {
         $inline->setAuditCommentID($comment->getID());
         $inline->save();
         $content_blocks[] = $inline->getContent();
       }
     }
 
     $ccs = $this->ccs;
     $auditors = $this->auditors;
 
     $metadata = $comment->getMetadata();
     $metacc = array();
 
     // Find any "@mentions" in the content blocks.
     $mention_ccs = PhabricatorMarkupEngine::extractPHIDsFromMentions(
       $this->getActor(),
       $content_blocks);
     if ($mention_ccs) {
       $metacc = idx(
         $metadata,
         PhabricatorAuditComment::METADATA_ADDED_CCS,
         array());
       foreach ($mention_ccs as $cc_phid) {
         $metacc[] = $cc_phid;
       }
     }
 
     if ($metacc) {
       $ccs = array_merge($ccs, $metacc);
     }
 
     // When an actor submits an audit comment, we update all the audit requests
     // they have authority over to reflect the most recent status. The general
     // idea here is that if audit has triggered for, e.g., several packages, but
     // a user owns all of them, they can clear the audit requirement in one go
     // without auditing the commit for each trigger.
 
     $audit_phids = self::loadAuditPHIDsForUser($actor);
     $audit_phids = array_fill_keys($audit_phids, true);
 
     $requests = id(new PhabricatorRepositoryAuditRequest())
       ->loadAllWhere(
         'commitPHID = %s',
         $commit->getPHID());
 
     $action = $comment->getAction();
 
 
     // TODO: We should validate the action, currently we allow anyone to, e.g.,
     // close an audit if they muck with form parameters. I'll followup with this
     // and handle the no-effect cases (e.g., closing and already-closed audit).
 
 
     $actor_is_author = ($actor->getPHID() == $commit->getAuthorPHID());
 
     if ($action == PhabricatorAuditActionConstants::CLOSE) {
       if (!PhabricatorEnv::getEnvConfig('audit.can-author-close-audit')) {
           throw new Exception('Cannot Close Audit without enabling'.
           'audit.can-author-close-audit');
       }
       // "Close" means wipe out all the concerns.
       $concerned_status = PhabricatorAuditStatusConstants::CONCERNED;
       foreach ($requests as $request) {
         if ($request->getAuditStatus() == $concerned_status) {
           $request->setAuditStatus(PhabricatorAuditStatusConstants::CLOSED);
           $request->save();
         }
       }
     } else if ($action == PhabricatorAuditActionConstants::RESIGN) {
       // "Resign" has unusual rules for writing user rows, only affects the
       // user row (never package/project rows), and always affects the user
       // row (other actions don't, if they were able to affect a package/project
       // row).
       $actor_request = null;
       foreach ($requests as $request) {
         if ($request->getAuditorPHID() == $actor->getPHID()) {
           $actor_request = $request;
           break;
         }
       }
       if (!$actor_request) {
         $actor_request = id(new PhabricatorRepositoryAuditRequest())
           ->setCommitPHID($commit->getPHID())
           ->setAuditorPHID($actor->getPHID())
-          ->setAuditReasons(array("Resigned"));
+          ->setAuditReasons(array('Resigned'));
       }
 
       $actor_request
         ->setAuditStatus(PhabricatorAuditStatusConstants::RESIGNED)
         ->save();
 
       $requests[] = $actor_request;
     } else {
       $have_any_requests = false;
       foreach ($requests as $request) {
         if (empty($audit_phids[$request->getAuditorPHID()])) {
           continue;
         }
 
         $request_is_for_actor =
           ($request->getAuditorPHID() == $actor->getPHID());
 
         $have_any_requests = true;
         $new_status = null;
         switch ($action) {
           case PhabricatorAuditActionConstants::COMMENT:
           case PhabricatorAuditActionConstants::ADD_CCS:
           case PhabricatorAuditActionConstants::ADD_AUDITORS:
             // Commenting or adding cc's/auditors doesn't change status.
             break;
           case PhabricatorAuditActionConstants::ACCEPT:
             if (!$actor_is_author || $request_is_for_actor) {
               // When modifying your own commits, you act only on behalf of
               // yourself, not your packages/projects -- the idea being that
               // you can't accept your own commits.
               $new_status = PhabricatorAuditStatusConstants::ACCEPTED;
             }
             break;
           case PhabricatorAuditActionConstants::CONCERN:
             if (!$actor_is_author || $request_is_for_actor) {
               // See above.
               $new_status = PhabricatorAuditStatusConstants::CONCERNED;
             }
             break;
           default:
             throw new Exception("Unknown action '{$action}'!");
         }
         if ($new_status !== null) {
           $request->setAuditStatus($new_status);
           $request->save();
         }
       }
 
       // If the actor has no current authority over any audit trigger, make a
       // new one to represent their audit state.
       if (!$have_any_requests) {
         $new_status = null;
         switch ($action) {
           case PhabricatorAuditActionConstants::COMMENT:
           case PhabricatorAuditActionConstants::ADD_CCS:
           case PhabricatorAuditActionConstants::ADD_AUDITORS:
             $new_status = PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED;
             break;
           case PhabricatorAuditActionConstants::ACCEPT:
             $new_status = PhabricatorAuditStatusConstants::ACCEPTED;
             break;
           case PhabricatorAuditActionConstants::CONCERN:
             $new_status = PhabricatorAuditStatusConstants::CONCERNED;
             break;
           case PhabricatorAuditActionConstants::CLOSE:
             // Impossible to reach this block with 'close'.
           default:
             throw new Exception("Unknown or invalid action '{$action}'!");
         }
 
         $request = id(new PhabricatorRepositoryAuditRequest())
           ->setCommitPHID($commit->getPHID())
           ->setAuditorPHID($actor->getPHID())
           ->setAuditStatus($new_status)
-          ->setAuditReasons(array("Voluntary Participant"))
+          ->setAuditReasons(array('Voluntary Participant'))
           ->save();
         $requests[] = $request;
       }
     }
 
     $requests_by_auditor = mpull($requests, null, 'getAuditorPHID');
     $requests_phids = array_keys($requests_by_auditor);
 
     $ccs = array_diff($ccs, $requests_phids);
     $auditors = array_diff($auditors, $requests_phids);
 
     if ($action == PhabricatorAuditActionConstants::ADD_CCS) {
       if ($ccs) {
         $metadata[PhabricatorAuditComment::METADATA_ADDED_CCS] = $ccs;
         $comment->setMetaData($metadata);
       } else {
         $comment->setAction(PhabricatorAuditActionConstants::COMMENT);
       }
     }
 
     if ($action == PhabricatorAuditActionConstants::ADD_AUDITORS) {
       if ($auditors) {
         $metadata[PhabricatorAuditComment::METADATA_ADDED_AUDITORS]
           = $auditors;
         $comment->setMetaData($metadata);
       } else {
         $comment->setAction(PhabricatorAuditActionConstants::COMMENT);
       }
     }
 
     $comment->save();
 
     if ($auditors) {
       foreach ($auditors as $auditor_phid) {
         $audit_requested = PhabricatorAuditStatusConstants::AUDIT_REQUESTED;
         $requests[] = id (new PhabricatorRepositoryAuditRequest())
           ->setCommitPHID($commit->getPHID())
           ->setAuditorPHID($auditor_phid)
           ->setAuditStatus($audit_requested)
           ->setAuditReasons(
             array('Added by ' . $actor->getUsername()))
           ->save();
       }
     }
 
     if ($ccs) {
       foreach ($ccs as $cc_phid) {
         $audit_cc = PhabricatorAuditStatusConstants::CC;
         $requests[] = id (new PhabricatorRepositoryAuditRequest())
           ->setCommitPHID($commit->getPHID())
           ->setAuditorPHID($cc_phid)
           ->setAuditStatus($audit_cc)
           ->setAuditReasons(
             array('Added by ' . $actor->getUsername()))
           ->save();
       }
     }
 
     $commit->updateAuditStatus($requests);
     $commit->save();
 
     $feed_dont_publish_phids = array();
     foreach ($requests as $request) {
       $status = $request->getAuditStatus();
       switch ($status) {
       case PhabricatorAuditStatusConstants::RESIGNED:
       case PhabricatorAuditStatusConstants::NONE:
       case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
       case PhabricatorAuditStatusConstants::CC:
         $feed_dont_publish_phids[$request->getAuditorPHID()] = 1;
         break;
       default:
         unset($feed_dont_publish_phids[$request->getAuditorPHID()]);
         break;
       }
     }
     $feed_dont_publish_phids = array_keys($feed_dont_publish_phids);
 
     $feed_phids = array_diff($requests_phids, $feed_dont_publish_phids);
     $this->publishFeedStory($comment, $feed_phids);
 
     id(new PhabricatorSearchIndexer())
       ->queueDocumentForIndexing($commit->getPHID());
 
     if (!$this->noEmail) {
       $this->sendMail($comment, $other_comments, $inline_comments, $requests);
     }
   }
 
 
   /**
    * Load the PHIDs for all objects the user has the authority to act as an
    * audit for. This includes themselves, and any packages they are an owner
    * of.
    */
   public static function loadAuditPHIDsForUser(PhabricatorUser $user) {
     $phids = array();
 
     // TODO: This method doesn't really use the right viewer, but in practice we
     // never issue this query of this type on behalf of another user and are
     // unlikely to do so in the future. This entire method should be refactored
     // into a Query class, however, and then we should use a proper viewer.
 
     // The user can audit on their own behalf.
     $phids[$user->getPHID()] = true;
 
     $owned_packages = id(new PhabricatorOwnersPackageQuery())
       ->setViewer($user)
       ->withOwnerPHIDs(array($user->getPHID()))
       ->execute();
     foreach ($owned_packages as $package) {
       $phids[$package->getPHID()] = true;
     }
 
     // The user can audit on behalf of all projects they are a member of.
     $projects = id(new PhabricatorProjectQuery())
       ->setViewer($user)
       ->withMemberPHIDs(array($user->getPHID()))
       ->execute();
     foreach ($projects as $project) {
       $phids[$project->getPHID()] = true;
     }
 
     return array_keys($phids);
   }
 
   private function publishFeedStory(
     PhabricatorAuditComment $comment,
     array $more_phids) {
 
     $commit = $this->commit;
     $actor = $this->getActor();
 
     $related_phids = array_merge(
       array(
         $actor->getPHID(),
         $commit->getPHID(),
       ),
       $more_phids);
 
     id(new PhabricatorFeedStoryPublisher())
       ->setRelatedPHIDs($related_phids)
       ->setStoryAuthorPHID($actor->getPHID())
       ->setStoryTime(time())
       ->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_AUDIT)
       ->setStoryData(
         array(
           'commitPHID'    => $commit->getPHID(),
           'action'        => $comment->getAction(),
           'content'       => $comment->getContent(),
         ))
       ->publish();
   }
 
   private function sendMail(
     PhabricatorAuditComment $comment,
     array $other_comments,
     array $inline_comments,
     array $requests) {
 
     assert_instances_of($other_comments, 'PhabricatorAuditComment');
     assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');
 
     $commit = $this->commit;
 
     $data = $commit->loadCommitData();
     $summary = $data->getSummary();
 
     $commit_phid = $commit->getPHID();
     $phids = array($commit_phid);
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getActor())
       ->withPHIDs($phids)
       ->execute();
     $handle = $handles[$commit_phid];
 
     $name = $handle->getName();
 
     $map = array(
       PhabricatorAuditActionConstants::CONCERN  => 'Raised Concern',
       PhabricatorAuditActionConstants::ACCEPT   => 'Accepted',
       PhabricatorAuditActionConstants::RESIGN   => 'Resigned',
       PhabricatorAuditActionConstants::CLOSE    => 'Closed',
       PhabricatorAuditActionConstants::ADD_CCS => 'Added CCs',
       PhabricatorAuditActionConstants::ADD_AUDITORS => 'Added Auditors',
     );
     $verb = idx($map, $comment->getAction(), 'Commented On');
 
     $reply_handler = self::newReplyHandlerForCommit($commit);
 
     $prefix = PhabricatorEnv::getEnvConfig('metamta.diffusion.subject-prefix');
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($this->getActor())
       ->withIDs(array($commit->getRepositoryID()))
       ->executeOne();
     $threading = self::getMailThreading($repository, $commit);
     list($thread_id, $thread_topic) = $threading;
 
     $body = $this->renderMailBody(
       $comment,
       "{$name}: {$summary}",
       $handle,
       $reply_handler,
       $inline_comments);
 
     $email_to = array();
     $email_cc = array();
 
     $email_to[$comment->getActorPHID()] = true;
 
     $author_phid = $data->getCommitDetail('authorPHID');
     if ($author_phid) {
       $email_to[$author_phid] = true;
     }
 
     foreach ($other_comments as $other_comment) {
       $email_cc[$other_comment->getActorPHID()] = true;
     }
 
     foreach ($requests as $request) {
       switch ($request->getAuditStatus()) {
         case PhabricatorAuditStatusConstants::CC:
         case PhabricatorAuditStatusConstants::AUDIT_REQUIRED:
           $email_cc[$request->getAuditorPHID()] = true;
           break;
         case PhabricatorAuditStatusConstants::RESIGNED:
           unset($email_cc[$request->getAuditorPHID()]);
           break;
         case PhabricatorAuditStatusConstants::CONCERNED:
         case PhabricatorAuditStatusConstants::AUDIT_REQUESTED:
           $email_to[$request->getAuditorPHID()] = true;
           break;
       }
     }
 
     $email_to = array_keys($email_to);
     $email_cc = array_keys($email_cc);
 
     $phids = array_merge($email_to, $email_cc);
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getActor())
       ->withPHIDs($phids)
       ->execute();
 
     // NOTE: Always set $is_new to false, because the "first" mail in the
     // thread is the Herald notification of the commit.
     $is_new = false;
 
     $template = id(new PhabricatorMetaMTAMail())
       ->setSubject("{$name}: {$summary}")
       ->setSubjectPrefix($prefix)
       ->setVarySubjectPrefix("[{$verb}]")
       ->setFrom($comment->getActorPHID())
       ->setThreadID($thread_id, $is_new)
       ->addHeader('Thread-Topic', $thread_topic)
       ->setRelatedPHID($commit->getPHID())
       ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
       ->setIsBulk(true)
       ->setBody($body);
 
     $mails = $reply_handler->multiplexMail(
       $template,
       array_select_keys($handles, $email_to),
       array_select_keys($handles, $email_cc));
 
     foreach ($mails as $mail) {
       $mail->saveAndSend();
     }
   }
 
   public static function getMailThreading(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     return array(
       'diffusion-audit-'.$commit->getPHID(),
       'Commit r'.$repository->getCallsign().$commit->getCommitIdentifier(),
     );
   }
 
   public static function newReplyHandlerForCommit($commit) {
     $reply_handler = PhabricatorEnv::newObjectFromConfig(
       'metamta.diffusion.reply-handler');
     $reply_handler->setMailReceiver($commit);
     return $reply_handler;
   }
 
   private function renderMailBody(
     PhabricatorAuditComment $comment,
     $cname,
     PhabricatorObjectHandle $handle,
     PhabricatorMailReplyHandler $reply_handler,
     array $inline_comments) {
     assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');
 
     $commit = $this->commit;
     $actor = $this->getActor();
     $name = $actor->getUsername();
 
     $verb = PhabricatorAuditActionConstants::getActionPastTenseVerb(
       $comment->getAction());
 
     $body = new PhabricatorMetaMTAMailBody();
     $body->addRawSection("{$name} {$verb} commit {$cname}.");
     $body->addRawSection($comment->getContent());
 
     if ($inline_comments) {
       $block = array();
 
       $path_map = id(new DiffusionPathQuery())
         ->withPathIDs(mpull($inline_comments, 'getPathID'))
         ->execute();
       $path_map = ipull($path_map, 'path', 'id');
 
       foreach ($inline_comments as $inline) {
         $path = idx($path_map, $inline->getPathID());
         if ($path === null) {
           continue;
         }
 
         $start = $inline->getLineNumber();
         $len   = $inline->getLineLength();
         if ($len) {
           $range = $start.'-'.($start + $len);
         } else {
           $range = $start;
         }
 
         $content = $inline->getContent();
         $block[] = "{$path}:{$range} {$content}";
       }
 
       $body->addTextSection(pht('INLINE COMMENTS'), implode("\n", $block));
     }
 
     $body->addTextSection(
       pht('COMMIT'),
       PhabricatorEnv::getProductionURI($handle->getURI()));
     $body->addReplySection($reply_handler->getReplyHandlerInstructions());
 
     return $body->render();
   }
 
 }
diff --git a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
index 2b09771af..82df0c494 100644
--- a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
+++ b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
@@ -1,51 +1,51 @@
 <?php
 
 final class PhabricatorAuditReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PhabricatorRepositoryCommit)) {
-      throw new Exception("Mail receiver is not a commit!");
+      throw new Exception('Mail receiver is not a commit!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'C');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('C');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.diffusion.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
-      return pht("Reply to comment.");
+      return pht('Reply to comment.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $commit = $this->getMailReceiver();
     $actor = $this->getActor();
 
     // TODO: Support !raise, !accept, etc.
     // TODO: Content sources.
 
     $comment = id(new PhabricatorAuditComment())
       ->setAction(PhabricatorAuditActionConstants::COMMENT)
       ->setContent($mail->getCleanTextBody());
 
     $editor = new PhabricatorAuditCommentEditor($commit);
     $editor->setActor($actor);
     $editor->setExcludeMailRecipientPHIDs(
       $this->getExcludeMailRecipientPHIDs());
     $editor->addComment($comment);
   }
 
 }
diff --git a/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php b/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
index 5bfbf0e5c..af951c754 100644
--- a/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
+++ b/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
@@ -1,269 +1,269 @@
 <?php
 
 final class PhabricatorAuditManagementDeleteWorkflow
   extends PhabricatorAuditManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('delete')
       ->setExamples('**delete** [--dry-run] ...')
       ->setSynopsis('Delete audit requests matching parameters.')
       ->setArguments(
         array(
           array(
             'name' => 'dry-run',
             'help' => 'Show what would be deleted, but do not actually delete '.
                       'anything.',
           ),
           array(
             'name' => 'users',
             'param' => 'names',
             'help' => 'Select only audits by a given list of users.',
           ),
           array(
             'name' => 'repositories',
             'param' => 'repos',
             'help' => 'Select only audits in a given list of repositories.',
           ),
           array(
             'name' => 'commits',
             'param' => 'commits',
             'help' => 'Select only audits for the given commits.',
           ),
           array(
             'name' => 'min-commit-date',
             'param' => 'date',
             'help' => 'Select only audits for commits on or after the given '.
                       'date.',
           ),
           array(
             'name' => 'max-commit-date',
             'param' => 'date',
             'help' => 'Select only audits for commits on or before the given '.
                       'date.',
           ),
           array(
             'name' => 'status',
             'param' => 'status',
             'help' => 'Select only audits in the given status. By default, '.
                       'only open audits are selected.',
           ),
           array(
             'name' => 'ids',
             'param' => 'ids',
             'help' => 'Select only audits with the given IDs.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $viewer = $this->getViewer();
     $users = $this->loadUsers($args->getArg('users'));
     $repos = $this->loadRepos($args->getArg('repositories'));
     $commits = $this->loadCommits($args->getArg('commits'));
     $ids = $this->parseList($args->getArg('ids'));
 
     $status = $args->getArg('status');
     if (!$status) {
       $status = DiffusionCommitQuery::AUDIT_STATUS_OPEN;
     }
 
     $min_date = $this->loadDate($args->getArg('min-commit-date'));
     $max_date = $this->loadDate($args->getArg('max-commit-date'));
     if ($min_date && $max_date && ($min_date > $max_date)) {
       throw new PhutilArgumentUsageException(
-        "Specified max date must come after specified min date.");
+        'Specified max date must come after specified min date.');
     }
 
     $is_dry_run = $args->getArg('dry-run');
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($this->getViewer())
       ->needAuditRequests(true);
 
     if ($status) {
       $query->withAuditStatus($status);
     }
 
     if ($ids) {
       $query->withAuditIDs($ids);
     }
 
     if ($repos) {
       $query->withRepositoryIDs(mpull($repos, 'getID'));
     }
 
     if ($users) {
       $query->withAuditorPHIDs(mpull($users, 'getPHID'));
     }
 
     if ($commits) {
       $query->withPHIDs(mpull($commits, 'getPHID'));
     }
 
     $commits = $query->execute();
     $commits = mpull($commits, null, 'getPHID');
     $audits = array();
     foreach ($commits as $commit) {
       $curr_audits = $commit->getAudits();
       foreach ($audits as $key => $audit) {
         if ($min_date && $commit->getEpoch() < $min_date) {
           unset($audits[$key]);
           continue;
         }
 
         if ($max_date && $commit->getEpoch() > $max_date) {
           unset($audits[$key]);
           continue;
         }
       }
       $audits[] = $curr_audits;
     }
     $audits = array_mergev($audits);
 
     $console = PhutilConsole::getConsole();
 
     if (!$audits) {
-      $console->writeErr("%s\n", pht("No audits match the query."));
+      $console->writeErr("%s\n", pht('No audits match the query.'));
       return 0;
     }
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs(mpull($audits, 'getAuditorPHID'))
       ->execute();
 
 
     foreach ($audits as $audit) {
       $commit = $commits[$audit->getCommitPHID()];
 
       $console->writeOut(
         "%s\n",
         sprintf(
-          "%10d %-16s %-16s %s: %s",
+          '%10d %-16s %-16s %s: %s',
           $audit->getID(),
           $handles[$audit->getAuditorPHID()]->getName(),
           PhabricatorAuditStatusConstants::getStatusName(
             $audit->getAuditStatus()),
           $commit->getRepository()->formatCommitName(
             $commit->getCommitIdentifier()),
           trim($commit->getSummary())));
     }
 
     if (!$is_dry_run) {
       $message = pht(
         'Really delete these %d audit(s)? They will be permanently deleted '.
         'and can not be recovered.',
         count($audits));
       if ($console->confirm($message)) {
         foreach ($audits as $audit) {
           $id = $audit->getID();
-          $console->writeOut("%s\n", pht("Deleting audit %d...", $id));
+          $console->writeOut("%s\n", pht('Deleting audit %d...', $id));
           $audit->delete();
         }
       }
     }
 
     return 0;
   }
 
   private function loadUsers($users) {
     $users = $this->parseList($users);
     if (!$users) {
       return null;
     }
 
     $objects = id(new PhabricatorPeopleQuery())
       ->setViewer($this->getViewer())
       ->withUsernames($users)
       ->execute();
     $objects = mpull($objects, null, 'getUsername');
 
     foreach ($users as $name) {
       if (empty($objects[$name])) {
         throw new PhutilArgumentUsageException(
           pht('No such user with username "%s"!', $name));
       }
     }
 
     return $objects;
   }
 
   private function parseList($list) {
     $list = preg_split('/\s*,\s*/', $list);
 
     foreach ($list as $key => $item) {
       $list[$key] = trim($item);
     }
 
     foreach ($list as $key => $item) {
       if (!strlen($item)) {
         unset($list[$key]);
       }
     }
 
     return $list;
   }
 
   private function loadRepos($callsigns) {
     $callsigns = $this->parseList($callsigns);
     if (!$callsigns) {
       return null;
     }
 
     $repos = id(new PhabricatorRepositoryQuery())
       ->setViewer($this->getViewer())
       ->withCallsigns($callsigns)
       ->execute();
     $repos = mpull($repos, null, 'getCallsign');
 
     foreach ($callsigns as $sign) {
       if (empty($repos[$sign])) {
         throw new PhutilArgumentUsageException(
           pht('No such repository with callsign "%s"!', $sign));
       }
     }
 
     return $repos;
   }
 
   private function loadDate($date) {
     if (!$date) {
       return null;
     }
 
     $epoch = strtotime($date);
     if (!$epoch || $epoch < 1) {
       throw new PhutilArgumentUsageException(
         pht(
           'Unable to parse date "%s". Use a format like "2000-01-01".',
           $date));
     }
 
     return $epoch;
   }
 
   private function loadCommits($commits) {
     $names = $this->parseList($commits);
     if (!$names) {
       return null;
     }
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($this->getViewer())
       ->withIdentifiers($names);
 
     $commits = $query->execute();
 
     $map = $query->getIdentifierMap();
     foreach ($names as $name) {
       if (empty($map[$name])) {
         throw new PhutilArgumentUsageException(
           pht('No such commit "%s"!', $name));
       }
     }
 
     return $commits;
   }
 
 }
diff --git a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
index 5834984a6..fb0dea8a4 100644
--- a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
+++ b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php
@@ -1,88 +1,88 @@
 <?php
 
 final class PhabricatorAuthConfirmLinkController
   extends PhabricatorAuthController {
 
   private $accountKey;
 
   public function willProcessRequest(array $data) {
     $this->accountKey = idx($data, 'akey');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $result = $this->loadAccountForRegistrationOrLinking($this->accountKey);
     list($account, $provider, $response) = $result;
 
     if ($response) {
       return $response;
     }
 
     if (!$provider->shouldAllowAccountLink()) {
       return $this->renderError(pht('This account is not linkable.'));
     }
 
     $panel_uri = '/settings/panel/external/';
 
     if ($request->isFormPost()) {
       $account->setUserPHID($viewer->getPHID());
       $account->save();
 
       $this->clearRegistrationCookies();
 
       // TODO: Send the user email about the new account link.
 
       return id(new AphrontRedirectResponse())->setURI($panel_uri);
     }
 
     // TODO: Provide more information about the external account. Clicking
     // through this form blindly is dangerous.
 
     // TODO: If the user has password authentication, require them to retype
     // their password here.
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->setTitle(pht('Confirm %s Account Link', $provider->getProviderName()))
       ->addCancelButton($panel_uri)
       ->addSubmitButton(pht('Confirm Account Link'));
 
     $form = id(new PHUIFormLayoutView())
       ->setFullWidth(true)
       ->appendChild(
         phutil_tag(
           'div',
           array(
             'class' => 'aphront-form-instructions',
           ),
           pht(
-            "Confirm the link with this %s account. This account will be ".
-            "able to log in to your Phabricator account.",
+            'Confirm the link with this %s account. This account will be '.
+            'able to log in to your Phabricator account.',
             $provider->getProviderName())))
       ->appendChild(
         id(new PhabricatorAuthAccountView())
           ->setUser($viewer)
           ->setExternalAccount($account)
           ->setAuthProvider($provider));
 
     $dialog->appendChild($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Confirm Link'), $panel_uri);
     $crumbs->addTextCrumb($provider->getProviderName());
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $dialog,
       ),
       array(
         'title' => pht('Confirm External Account Link'),
         'device' => true,
       ));
   }
 
 
 }
diff --git a/src/applications/auth/controller/PhabricatorAuthLoginController.php b/src/applications/auth/controller/PhabricatorAuthLoginController.php
index 804a2731d..77941207e 100644
--- a/src/applications/auth/controller/PhabricatorAuthLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthLoginController.php
@@ -1,252 +1,252 @@
 <?php
 
 final class PhabricatorAuthLoginController
   extends PhabricatorAuthController {
 
   private $providerKey;
   private $extraURIData;
   private $provider;
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function shouldAllowRestrictedParameter($parameter_name) {
     // Whitelist the OAuth 'code' parameter.
 
     if ($parameter_name == 'code') {
       return true;
     }
     return parent::shouldAllowRestrictedParameter($parameter_name);
   }
 
   public function willProcessRequest(array $data) {
     $this->providerKey = $data['pkey'];
     $this->extraURIData = idx($data, 'extra');
   }
 
   public function getExtraURIData() {
     return $this->extraURIData;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $response = $this->loadProvider();
     if ($response) {
       return $response;
     }
 
     $provider = $this->provider;
 
     try {
       list($account, $response) = $provider->processLoginRequest($this);
     } catch (PhutilAuthUserAbortedException $ex) {
       if ($viewer->isLoggedIn()) {
         // If a logged-in user cancels, take them back to the external accounts
         // panel.
         $next_uri = '/settings/panel/external/';
       } else {
         // If a logged-out user cancels, take them back to the auth start page.
         $next_uri = '/';
       }
 
       // User explicitly hit "Cancel".
       $dialog = id(new AphrontDialogView())
         ->setUser($viewer)
         ->setTitle(pht('Authentication Canceled'))
         ->appendChild(
           pht('You canceled authentication.'))
         ->addCancelButton($next_uri, pht('Continue'));
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     if ($response) {
       return $response;
     }
 
     if (!$account) {
       throw new Exception(
-        "Auth provider failed to load an account from processLoginRequest()!");
+        'Auth provider failed to load an account from processLoginRequest()!');
     }
 
     if ($account->getUserPHID()) {
       // The account is already attached to a Phabricator user, so this is
       // either a login or a bad account link request.
       if (!$viewer->isLoggedIn()) {
         if ($provider->shouldAllowLogin()) {
           return $this->processLoginUser($account);
         } else {
           return $this->renderError(
             pht(
               'The external account ("%s") you just authenticated with is '.
               'not configured to allow logins on this Phabricator install. '.
               'An administrator may have recently disabled it.',
               $provider->getProviderName()));
         }
       } else if ($viewer->getPHID() == $account->getUserPHID()) {
         // This is either an attempt to re-link an existing and already
         // linked account (which is silly) or a refresh of an external account
         // (e.g., an OAuth account).
         return id(new AphrontRedirectResponse())
           ->setURI('/settings/panel/external/');
       } else {
         return $this->renderError(
           pht(
             'The external account ("%s") you just used to login is alerady '.
             'associated with another Phabricator user account. Login to the '.
             'other Phabricator account and unlink the external account before '.
             'linking it to a new Phabricator account.',
             $provider->getProviderName()));
       }
     } else {
       // The account is not yet attached to a Phabricator user, so this is
       // either a registration or an account link request.
       if (!$viewer->isLoggedIn()) {
         if ($provider->shouldAllowRegistration()) {
           return $this->processRegisterUser($account);
         } else {
           return $this->renderError(
             pht(
               'The external account ("%s") you just authenticated with is '.
               'not configured to allow registration on this Phabricator '.
               'install. An administrator may have recently disabled it.',
               $provider->getProviderName()));
         }
       } else {
         if ($provider->shouldAllowAccountLink()) {
           return $this->processLinkUser($account);
         } else {
           return $this->renderError(
             pht(
               'The external account ("%s") you just authenticated with is '.
               'not configured to allow account linking on this Phabricator '.
               'install. An administrator may have recently disabled it.',
               $provider->getProviderName()));
         }
       }
     }
 
     // This should be unreachable, but fail explicitly if we get here somehow.
     return new Aphront400Response();
   }
 
   private function processLoginUser(PhabricatorExternalAccount $account) {
     $user = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $account->getUserPHID());
 
     if (!$user) {
       return $this->renderError(
         pht(
           'The external account you just logged in with is not associated '.
           'with a valid Phabricator user.'));
     }
 
     return $this->loginUser($user);
   }
 
   private function processRegisterUser(PhabricatorExternalAccount $account) {
     $account_secret = $account->getAccountSecret();
     $register_uri = $this->getApplicationURI('register/'.$account_secret.'/');
     return $this->setAccountKeyAndContinue($account, $register_uri);
   }
 
   private function processLinkUser(PhabricatorExternalAccount $account) {
     $account_secret = $account->getAccountSecret();
     $confirm_uri = $this->getApplicationURI('confirmlink/'.$account_secret.'/');
     return $this->setAccountKeyAndContinue($account, $confirm_uri);
   }
 
   private function setAccountKeyAndContinue(
     PhabricatorExternalAccount $account,
     $next_uri) {
 
     if ($account->getUserPHID()) {
-      throw new Exception("Account is already registered or linked.");
+      throw new Exception('Account is already registered or linked.');
     }
 
     // Regenerate the registration secret key, set it on the external account,
     // set a cookie on the user's machine, and redirect them to registration.
     // See PhabricatorAuthRegisterController for discussion of the registration
     // key.
 
     $registration_key = Filesystem::readRandomCharacters(32);
     $account->setProperty(
       'registrationKey',
       PhabricatorHash::digest($registration_key));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $account->save();
     unset($unguarded);
 
     $this->getRequest()->setTemporaryCookie(
       PhabricatorCookies::COOKIE_REGISTRATION,
       $registration_key);
 
     return id(new AphrontRedirectResponse())->setURI($next_uri);
   }
 
   private function loadProvider() {
     $provider = PhabricatorAuthProvider::getEnabledProviderByKey(
       $this->providerKey);
 
     if (!$provider) {
       return $this->renderError(
         pht(
           'The account you are attempting to login with uses a nonexistent '.
           'or disabled authentication provider (with key "%s"). An '.
           'administrator may have recently disabled this provider.',
           $this->providerKey));
     }
 
     $this->provider = $provider;
 
     return null;
   }
 
   protected function renderError($message) {
     return $this->renderErrorPage(
       pht('Login Failed'),
       array($message));
   }
 
   public function buildProviderPageResponse(
     PhabricatorAuthProvider $provider,
     $content) {
 
     $crumbs = $this->buildApplicationCrumbs();
 
     if ($this->getRequest()->getUser()->isLoggedIn()) {
       $crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI());
     } else {
       $crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/'));
     }
 
     $crumbs->addTextCrumb($provider->getProviderName());
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $content,
       ),
       array(
         'title' => pht('Login'),
         'device' => true,
       ));
   }
 
   public function buildProviderErrorResponse(
     PhabricatorAuthProvider $provider,
     $message) {
 
     $message = pht(
       'Authentication provider ("%s") encountered an error during login. %s',
       $provider->getProviderName(),
       $message);
 
     return $this->renderError($message);
   }
 
 }
diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
index ffcb42d64..1bcb1414b 100644
--- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php
+++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
@@ -1,588 +1,588 @@
 <?php
 
 final class PhabricatorAuthRegisterController
   extends PhabricatorAuthController {
 
   private $accountKey;
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function willProcessRequest(array $data) {
     $this->accountKey = idx($data, 'akey');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
 
     if ($request->getUser()->isLoggedIn()) {
       return $this->renderError(pht('You are already logged in.'));
     }
 
     $is_setup = false;
     if (strlen($this->accountKey)) {
       $result = $this->loadAccountForRegistrationOrLinking($this->accountKey);
       list($account, $provider, $response) = $result;
       $is_default = false;
     } else if ($this->isFirstTimeSetup()) {
       list($account, $provider, $response) = $this->loadSetupAccount();
       $is_default = true;
       $is_setup = true;
     } else {
       list($account, $provider, $response) = $this->loadDefaultAccount();
       $is_default = true;
     }
 
     if ($response) {
       return $response;
     }
 
     if (!$provider->shouldAllowRegistration()) {
 
       // TODO: This is a routine error if you click "Login" on an external
       // auth source which doesn't allow registration. The error should be
       // more tailored.
 
       return $this->renderError(
         pht(
           'The account you are attempting to register with uses an '.
           'authentication provider ("%s") which does not allow registration. '.
           'An administrator may have recently disabled registration with this '.
           'provider.',
           $provider->getProviderName()));
     }
 
     $user = new PhabricatorUser();
 
     $default_username = $account->getUsername();
     $default_realname = $account->getRealName();
 
     $default_email = $account->getEmail();
     if (!PhabricatorUserEmail::isValidAddress($default_email)) {
       $default_email = null;
     }
 
     if ($default_email !== null) {
       // If the account source provided an email, but it's not allowed by
       // the configuration, roadblock the user. Previously, we let the user
       // pick a valid email address instead, but this does not align well with
       // user expectation and it's not clear the cases it enables are valuable.
       // See discussion in T3472.
       if (!PhabricatorUserEmail::isAllowedAddress($default_email)) {
         return $this->renderError(
           array(
             pht(
               'The account you are attempting to register with has an invalid '.
               'email address (%s). This Phabricator install only allows '.
               'registration with specific email addresses:',
               $default_email),
             phutil_tag('br'),
             phutil_tag('br'),
             PhabricatorUserEmail::describeAllowedAddresses(),
           ));
       }
 
       // If the account source provided an email, but another account already
       // has that email, just pretend we didn't get an email.
 
       // TODO: See T3340.
       // TODO: See T3472.
 
       if ($default_email !== null) {
         $same_email = id(new PhabricatorUserEmail())->loadOneWhere(
           'address = %s',
           $default_email);
         if ($same_email) {
           $default_email = null;
         }
       }
     }
 
     $profile = id(new PhabricatorRegistrationProfile())
       ->setDefaultUsername($default_username)
       ->setDefaultEmail($default_email)
       ->setDefaultRealName($default_realname)
       ->setCanEditUsername(true)
       ->setCanEditEmail(($default_email === null))
       ->setCanEditRealName(true)
       ->setShouldVerifyEmail(false);
 
     $event_type = PhabricatorEventType::TYPE_AUTH_WILLREGISTERUSER;
     $event_data = array(
       'account' => $account,
       'profile' => $profile,
     );
 
     $event = id(new PhabricatorEvent($event_type, $event_data))
       ->setUser($user);
     PhutilEventEngine::dispatchEvent($event);
 
     $default_username = $profile->getDefaultUsername();
     $default_email = $profile->getDefaultEmail();
     $default_realname = $profile->getDefaultRealName();
 
     $can_edit_username = $profile->getCanEditUsername();
     $can_edit_email = $profile->getCanEditEmail();
     $can_edit_realname = $profile->getCanEditRealName();
 
     $must_set_password = $provider->shouldRequireRegistrationPassword();
 
     $can_edit_anything = $profile->getCanEditAnything() || $must_set_password;
     $force_verify = $profile->getShouldVerifyEmail();
 
     // Automatically verify the administrator's email address during first-time
     // setup.
     if ($is_setup) {
       $force_verify = true;
     }
 
     $value_username = $default_username;
     $value_realname = $default_realname;
     $value_email = $default_email;
     $value_password = null;
 
     $errors = array();
 
     $require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');
 
     $e_username = strlen($value_username) ? null : true;
     $e_realname = $require_real_name ? true : null;
     $e_email = strlen($value_email) ? null : true;
     $e_password = true;
     $e_captcha = true;
 
     $min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
     $min_len = (int)$min_len;
 
     if ($request->isFormPost() || !$can_edit_anything) {
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
 
       if ($must_set_password) {
         $e_captcha = pht('Again');
 
         $captcha_ok = AphrontFormRecaptchaControl::processCaptcha($request);
         if (!$captcha_ok) {
-          $errors[] = pht("Captcha response is incorrect, try again.");
+          $errors[] = pht('Captcha response is incorrect, try again.');
           $e_captcha = pht('Invalid');
         }
       }
 
       if ($can_edit_username) {
         $value_username = $request->getStr('username');
         if (!strlen($value_username)) {
           $e_username = pht('Required');
           $errors[] = pht('Username is required.');
         } else if (!PhabricatorUser::validateUsername($value_username)) {
           $e_username = pht('Invalid');
           $errors[] = PhabricatorUser::describeValidUsername();
         } else {
           $e_username = null;
         }
       }
 
       if ($must_set_password) {
         $value_password = $request->getStr('password');
         $value_confirm = $request->getStr('confirm');
         if (!strlen($value_password)) {
           $e_password = pht('Required');
           $errors[] = pht('You must choose a password.');
         } else if ($value_password !== $value_confirm) {
           $e_password = pht('No Match');
           $errors[] = pht('Password and confirmation must match.');
         } else if (strlen($value_password) < $min_len) {
           $e_password = pht('Too Short');
           $errors[] = pht(
             'Password is too short (must be at least %d characters long).',
             $min_len);
         } else if (
           PhabricatorCommonPasswords::isCommonPassword($value_password)) {
 
           $e_password = pht('Very Weak');
           $errors[] = pht(
             'Password is pathologically weak. This password is one of the '.
             'most common passwords in use, and is extremely easy for '.
             'attackers to guess. You must choose a stronger password.');
         } else {
           $e_password = null;
         }
       }
 
       if ($can_edit_email) {
         $value_email = $request->getStr('email');
         if (!strlen($value_email)) {
           $e_email = pht('Required');
           $errors[] = pht('Email is required.');
         } else if (!PhabricatorUserEmail::isValidAddress($value_email)) {
           $e_email = pht('Invalid');
           $errors[] = PhabricatorUserEmail::describeValidAddresses();
         } else if (!PhabricatorUserEmail::isAllowedAddress($value_email)) {
           $e_email = pht('Disallowed');
           $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
         } else {
           $e_email = null;
         }
       }
 
       if ($can_edit_realname) {
         $value_realname = $request->getStr('realName');
         if (!strlen($value_realname) && $require_real_name) {
           $e_realname = pht('Required');
           $errors[] = pht('Real name is required.');
         } else {
           $e_realname = null;
         }
       }
 
       if (!$errors) {
         $image = $this->loadProfilePicture($account);
         if ($image) {
           $user->setProfileImagePHID($image->getPHID());
         }
 
         try {
           if ($force_verify) {
             $verify_email = true;
           } else {
             $verify_email =
               ($account->getEmailVerified()) &&
               ($value_email === $default_email);
           }
 
           if ($provider->shouldTrustEmails() &&
               $value_email === $default_email) {
             $verify_email = true;
           }
 
           $email_obj = id(new PhabricatorUserEmail())
             ->setAddress($value_email)
             ->setIsVerified((int)$verify_email);
 
           $user->setUsername($value_username);
           $user->setRealname($value_realname);
 
           if ($is_setup) {
             $must_approve = false;
           } else {
             $must_approve = PhabricatorEnv::getEnvConfig(
               'auth.require-approval');
           }
 
           if ($must_approve) {
             $user->setIsApproved(0);
           } else {
             $user->setIsApproved(1);
           }
 
           $user->openTransaction();
 
             $editor = id(new PhabricatorUserEditor())
               ->setActor($user);
 
             $editor->createNewUser($user, $email_obj);
             if ($must_set_password) {
               $envelope = new PhutilOpaqueEnvelope($value_password);
               $editor->changePassword($user, $envelope);
             }
 
             if ($is_setup) {
               $editor->makeAdminUser($user, true);
             }
 
             $account->setUserPHID($user->getPHID());
             $provider->willRegisterAccount($account);
             $account->save();
 
           $user->saveTransaction();
 
           if (!$email_obj->getIsVerified()) {
             $email_obj->sendVerificationEmail($user);
           }
 
           if ($must_approve) {
             $this->sendWaitingForApprovalEmail($user);
           }
 
           return $this->loginUser($user);
         } catch (AphrontQueryDuplicateKeyException $exception) {
           $same_username = id(new PhabricatorUser())->loadOneWhere(
             'userName = %s',
             $user->getUserName());
 
           $same_email = id(new PhabricatorUserEmail())->loadOneWhere(
             'address = %s',
             $value_email);
 
           if ($same_username) {
             $e_username = pht('Duplicate');
             $errors[] = pht('Another user already has that username.');
           }
 
           if ($same_email) {
             // TODO: See T3340.
             $e_email = pht('Duplicate');
             $errors[] = pht('Another user already has that email.');
           }
 
           if (!$same_username && !$same_email) {
             throw $exception;
           }
         }
       }
 
       unset($unguarded);
     }
 
     $form = id(new AphrontFormView())
       ->setUser($request->getUser());
 
     if (!$is_default) {
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('External Account'))
           ->setValue(
             id(new PhabricatorAuthAccountView())
               ->setUser($request->getUser())
               ->setExternalAccount($account)
               ->setAuthProvider($provider)));
     }
 
 
     if ($can_edit_username) {
       $form->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Phabricator Username'))
           ->setName('username')
           ->setValue($value_username)
           ->setError($e_username));
     } else {
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Phabricator Username'))
           ->setValue($value_username)
           ->setError($e_username));
     }
 
     if ($must_set_password) {
       $form->appendChild(
         id(new AphrontFormPasswordControl())
           ->setLabel(pht('Password'))
           ->setName('password')
           ->setError($e_password)
           ->setCaption(
             $min_len
               ? pht('Minimum length of %d characters.', $min_len)
               : null));
       $form->appendChild(
         id(new AphrontFormPasswordControl())
           ->setLabel(pht('Confirm Password'))
           ->setName('confirm')
           ->setError($e_password));
     }
 
     if ($can_edit_email) {
       $form->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Email'))
           ->setName('email')
           ->setValue($value_email)
           ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
           ->setError($e_email));
     }
 
     if ($can_edit_realname) {
       $form->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Real Name'))
           ->setName('realName')
           ->setValue($value_realname)
           ->setError($e_realname));
     }
 
     if ($must_set_password) {
       $form->appendChild(
         id(new AphrontFormRecaptchaControl())
           ->setLabel(pht('Captcha'))
           ->setError($e_captcha));
     }
 
     $submit = id(new AphrontFormSubmitControl());
 
     if ($is_setup) {
       $submit
         ->setValue(pht('Create Admin Account'));
     } else {
       $submit
         ->addCancelButton($this->getApplicationURI('start/'))
         ->setValue(pht('Register Phabricator Account'));
     }
 
 
     $form->appendChild($submit);
 
     $crumbs = $this->buildApplicationCrumbs();
 
     if ($is_setup) {
       $crumbs->addTextCrumb(pht('Setup Admin Account'));
         $title = pht('Welcome to Phabricator');
     } else {
       $crumbs->addTextCrumb(pht('Register'));
       $crumbs->addTextCrumb($provider->getProviderName());
         $title = pht('Phabricator Registration');
     }
 
     $welcome_view = null;
     if ($is_setup) {
       $welcome_view = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
         ->setTitle(pht('Welcome to Phabricator'))
         ->appendChild(
           pht(
             'Installation is complete. Register your administrator account '.
             'below to log in. You will be able to configure options and add '.
             'other authentication mechanisms (like LDAP or OAuth) later on.'));
     }
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setForm($form)
       ->setFormErrors($errors);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $welcome_view,
         $object_box,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function loadDefaultAccount() {
     $providers = PhabricatorAuthProvider::getAllEnabledProviders();
     $account = null;
     $provider = null;
     $response = null;
 
     foreach ($providers as $key => $candidate_provider) {
       if (!$candidate_provider->shouldAllowRegistration()) {
         unset($providers[$key]);
         continue;
       }
       if (!$candidate_provider->isDefaultRegistrationProvider()) {
         unset($providers[$key]);
       }
     }
 
     if (!$providers) {
       $response = $this->renderError(
         pht(
-          "There are no configured default registration providers."));
+          'There are no configured default registration providers.'));
       return array($account, $provider, $response);
     } else if (count($providers) > 1) {
       $response = $this->renderError(
         pht(
-          "There are too many configured default registration providers."));
+          'There are too many configured default registration providers.'));
       return array($account, $provider, $response);
     }
 
     $provider = head($providers);
     $account = $provider->getDefaultExternalAccount();
 
     return array($account, $provider, $response);
   }
 
   private function loadSetupAccount() {
     $provider = new PhabricatorAuthProviderPassword();
     $provider->attachProviderConfig(
       id(new PhabricatorAuthProviderConfig())
         ->setShouldAllowRegistration(1)
         ->setShouldAllowLogin(1)
         ->setIsEnabled(true));
 
     $account = $provider->getDefaultExternalAccount();
     $response = null;
     return array($account, $provider, $response);
   }
 
   private function loadProfilePicture(PhabricatorExternalAccount $account) {
     $phid = $account->getProfileImagePHID();
     if (!$phid) {
       return null;
     }
 
     // NOTE: Use of omnipotent user is okay here because the registering user
     // can not control the field value, and we can't use their user object to
     // do meaningful policy checks anyway since they have not registered yet.
     // Reaching this means the user holds the account secret key and the
     // registration secret key, and thus has permission to view the image.
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($phid))
       ->executeOne();
     if (!$file) {
       return null;
     }
 
     try {
       $xformer = new PhabricatorImageTransformer();
       return $xformer->executeProfileTransform(
         $file,
         $width = 50,
         $min_height = 50,
         $max_height = 50);
     } catch (Exception $ex) {
       phlog($ex);
       return null;
     }
   }
 
   protected function renderError($message) {
     return $this->renderErrorPage(
       pht('Registration Failed'),
       array($message));
   }
 
   private function sendWaitingForApprovalEmail(PhabricatorUser $user) {
     $title = '[Phabricator] '.pht(
       'New User "%s" Awaiting Approval',
       $user->getUsername());
 
     $body = new PhabricatorMetaMTAMailBody();
 
     $body->addRawSection(
       pht(
         'Newly registered user "%s" is awaiting account approval by an '.
         'administrator.',
         $user->getUsername()));
 
     $body->addTextSection(
       pht('APPROVAL QUEUE'),
       PhabricatorEnv::getProductionURI(
         '/people/query/approval/'));
 
     $body->addTextSection(
       pht('DISABLE APPROVAL QUEUE'),
       PhabricatorEnv::getProductionURI(
         '/config/edit/auth.require-approval/'));
 
     $admins = id(new PhabricatorPeopleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withIsAdmin(true)
       ->execute();
 
     if (!$admins) {
       return;
     }
 
     $mail = id(new PhabricatorMetaMTAMail())
       ->addTos(mpull($admins, 'getPHID'))
       ->setSubject($title)
       ->setBody($body->render())
       ->saveAndSend();
   }
 
 }
diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php
index bcb0fef83..b2a559e63 100644
--- a/src/applications/auth/controller/PhabricatorAuthStartController.php
+++ b/src/applications/auth/controller/PhabricatorAuthStartController.php
@@ -1,212 +1,212 @@
 <?php
 
 final class PhabricatorAuthStartController
   extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     if ($viewer->isLoggedIn()) {
       // Kick the user home if they are already logged in.
       return id(new AphrontRedirectResponse())->setURI('/');
     }
 
     if ($request->isAjax()) {
       return $this->processAjaxRequest();
     }
 
     if ($request->isConduit()) {
       return $this->processConduitRequest();
     }
 
     // If the user gets this far, they aren't logged in, so if they have a
     // user session token we can conclude that it's invalid: if it was valid,
     // they'd have been logged in above and never made it here. Try to clear
     // it and warn the user they may need to nuke their cookies.
 
     $session_token = $request->getCookie(PhabricatorCookies::COOKIE_SESSION);
 
     if (strlen($session_token)) {
       $kind = PhabricatorAuthSessionEngine::getSessionKindFromToken(
         $session_token);
       switch ($kind) {
         case PhabricatorAuthSessionEngine::KIND_ANONYMOUS:
           // If this is an anonymous session. It's expected that they won't
           // be logged in, so we can just continue.
           break;
         default:
           // The session cookie is invalid, so clear it.
           $request->clearCookie(PhabricatorCookies::COOKIE_USERNAME);
           $request->clearCookie(PhabricatorCookies::COOKIE_SESSION);
 
           return $this->renderError(
             pht(
-              "Your login session is invalid. Try reloading the page and ".
-              "logging in again. If that does not work, clear your browser ".
-              "cookies."));
+              'Your login session is invalid. Try reloading the page and '.
+              'logging in again. If that does not work, clear your browser '.
+              'cookies.'));
       }
     }
 
     $providers = PhabricatorAuthProvider::getAllEnabledProviders();
     foreach ($providers as $key => $provider) {
       if (!$provider->shouldAllowLogin()) {
         unset($providers[$key]);
       }
     }
 
     if (!$providers) {
       if ($this->isFirstTimeSetup()) {
         // If this is a fresh install, let the user register their admin
         // account.
         return id(new AphrontRedirectResponse())
           ->setURI($this->getApplicationURI('/register/'));
       }
 
       return $this->renderError(
         pht(
-          "This Phabricator install is not configured with any enabled ".
-          "authentication providers which can be used to log in. If you ".
-          "have accidentally locked yourself out by disabling all providers, ".
-          "you can use `phabricator/bin/auth recover <username>` to ".
-          "recover access to an administrative account."));
+          'This Phabricator install is not configured with any enabled '.
+          'authentication providers which can be used to log in. If you '.
+          'have accidentally locked yourself out by disabling all providers, '.
+          'you can use `phabricator/bin/auth recover <username>` to '.
+          'recover access to an administrative account.'));
     }
 
     $next_uri = $request->getStr('next');
     if (!$next_uri) {
       $next_uri_path = $this->getRequest()->getPath();
       if ($next_uri_path == '/auth/start/') {
         $next_uri = '/';
       } else {
         $next_uri = $this->getRequest()->getRequestURI();
       }
     }
 
     if (!$request->isFormPost()) {
       PhabricatorCookies::setNextURICookie($request, $next_uri);
       PhabricatorCookies::setClientIDCookie($request);
     }
 
     $not_buttons = array();
     $are_buttons = array();
     $providers = msort($providers, 'getLoginOrder');
     foreach ($providers as $provider) {
       if ($provider->isLoginFormAButton()) {
         $are_buttons[] = $provider->buildLoginForm($this);
       } else {
         $not_buttons[] = $provider->buildLoginForm($this);
       }
     }
 
     $out = array();
     $out[] = $not_buttons;
     if ($are_buttons) {
       require_celerity_resource('auth-css');
 
       foreach ($are_buttons as $key => $button) {
         $are_buttons[$key] = phutil_tag(
           'div',
           array(
             'class' => 'phabricator-login-button mmb',
           ),
           $button);
       }
 
       // If we only have one button, add a second pretend button so that we
       // always have two columns. This makes it easier to get the alignments
       // looking reasonable.
       if (count($are_buttons) == 1) {
         $are_buttons[] = null;
       }
 
       $button_columns = id(new AphrontMultiColumnView())
         ->setFluidLayout(true);
       $are_buttons = array_chunk($are_buttons, ceil(count($are_buttons) / 2));
       foreach ($are_buttons as $column) {
         $button_columns->addColumn($column);
       }
 
       $out[] = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-login-buttons',
         ),
         $button_columns);
     }
 
     $login_message = PhabricatorEnv::getEnvConfig('auth.login-message');
     $login_message = phutil_safe_html($login_message);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Login'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $login_message,
         $out,
       ),
       array(
         'title' => pht('Login to Phabricator'),
         'device' => true,
       ));
   }
 
 
   private function processAjaxRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     // We end up here if the user clicks a workflow link that they need to
     // login to use. We give them a dialog saying "You need to login...".
 
     if ($request->isDialogFormPost()) {
       return id(new AphrontRedirectResponse())->setURI(
         $request->getRequestURI());
     }
 
     $dialog = new AphrontDialogView();
     $dialog->setUser($viewer);
     $dialog->setTitle(pht('Login Required'));
     $dialog->appendChild(pht('You must login to continue.'));
     $dialog->addSubmitButton(pht('Login'));
     $dialog->addCancelButton('/');
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 
   private function processConduitRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     // A common source of errors in Conduit client configuration is getting
     // the request path wrong. The client will end up here, so make some
     // effort to give them a comprehensible error message.
 
     $request_path = $this->getRequest()->getPath();
     $conduit_path = '/api/<method>';
     $example_path = '/api/conduit.ping';
 
     $message = pht(
       'ERROR: You are making a Conduit API request to "%s", but the correct '.
       'HTTP request path to use in order to access a COnduit method is "%s" '.
       '(for example, "%s"). Check your configuration.',
       $request_path,
       $conduit_path,
       $example_path);
 
     return id(new AphrontPlainTextResponse())->setContent($message);
   }
 
   protected function renderError($message) {
     return $this->renderErrorPage(
       pht('Authentication Failure'),
       array($message));
   }
 
 }
diff --git a/src/applications/auth/controller/PhabricatorAuthUnlinkController.php b/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
index a6b1e06f6..822f203bc 100644
--- a/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
+++ b/src/applications/auth/controller/PhabricatorAuthUnlinkController.php
@@ -1,140 +1,140 @@
 <?php
 
 final class PhabricatorAuthUnlinkController
   extends PhabricatorAuthController {
 
   private $providerKey;
 
   public function willProcessRequest(array $data) {
     $this->providerKey = $data['pkey'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     list($type, $domain) = explode(':', $this->providerKey, 2);
 
     // Check that this account link actually exists. We don't require the
     // provider to exist because we want users to be able to delete links to
     // dead accounts if they want.
     $account = id(new PhabricatorExternalAccount())->loadOneWhere(
       'accountType = %s AND accountDomain = %s AND userPHID = %s',
       $type,
       $domain,
       $viewer->getPHID());
     if (!$account) {
       return $this->renderNoAccountErrorDialog();
     }
 
     // Check that the provider (if it exists) allows accounts to be unlinked.
     $provider_key = $this->providerKey;
     $provider = PhabricatorAuthProvider::getEnabledProviderByKey($provider_key);
     if ($provider) {
       if (!$provider->shouldAllowAccountUnlink()) {
         return $this->renderNotUnlinkableErrorDialog($provider);
       }
     }
 
     // Check that this account isn't the last account which can be used to
     // login. We prevent you from removing the last account.
     if ($account->isUsableForLogin()) {
       $other_accounts = id(new PhabricatorExternalAccount())->loadAllWhere(
         'userPHID = %s',
         $viewer->getPHID());
 
       $valid_accounts = 0;
       foreach ($other_accounts as $other_account) {
         if ($other_account->isUsableForLogin()) {
           $valid_accounts++;
         }
       }
 
       if ($valid_accounts < 2) {
         return $this->renderLastUsableAccountErrorDialog();
       }
     }
 
     if ($request->isDialogFormPost()) {
       $account->delete();
       return id(new AphrontRedirectResponse())->setURI($this->getDoneURI());
     }
 
     return $this->renderConfirmDialog($account);
   }
 
   private function getDoneURI() {
     return '/settings/panel/external/';
   }
 
   private function renderNoAccountErrorDialog() {
     $dialog = id(new AphrontDialogView())
       ->setUser($this->getRequest()->getUser())
       ->setTitle(pht('No Such Account'))
       ->appendChild(
         pht(
-          "You can not unlink this account because it is not linked."))
+          'You can not unlink this account because it is not linked.'))
       ->addCancelButton($this->getDoneURI());
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function renderNotUnlinkableErrorDialog(
     PhabricatorAuthProvider $provider) {
 
     $dialog = id(new AphrontDialogView())
       ->setUser($this->getRequest()->getUser())
       ->setTitle(pht('Permanent Account Link'))
       ->appendChild(
         pht(
-          "You can not unlink this account because the administrator has ".
-          "configured Phabricator to make links to %s accounts permanent.",
+          'You can not unlink this account because the administrator has '.
+          'configured Phabricator to make links to %s accounts permanent.',
           $provider->getProviderName()))
       ->addCancelButton($this->getDoneURI());
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function renderLastUsableAccountErrorDialog() {
     $dialog = id(new AphrontDialogView())
       ->setUser($this->getRequest()->getUser())
       ->setTitle(pht('Last Valid Account'))
       ->appendChild(
         pht(
-          "You can not unlink this account because you have no other ".
-          "valid login accounts. If you removed it, you would be unable ".
-          "to login. Add another authentication method before removing ".
-          "this one."))
+          'You can not unlink this account because you have no other '.
+          'valid login accounts. If you removed it, you would be unable '.
+          'to login. Add another authentication method before removing '.
+          'this one.'))
       ->addCancelButton($this->getDoneURI());
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function renderConfirmDialog() {
     $provider_key = $this->providerKey;
     $provider = PhabricatorAuthProvider::getEnabledProviderByKey($provider_key);
 
     if ($provider) {
       $title = pht('Unlink "%s" Account?', $provider->getProviderName());
       $body = pht(
         'You will no longer be able to use your %s account to '.
         'log in to Phabricator.',
         $provider->getProviderName());
     } else {
       $title = pht('Unlink Account?');
       $body = pht(
         'You will no longer be able to use this account to log in '.
         'to Phabricator.');
     }
 
     $dialog = id(new AphrontDialogView())
       ->setUser($this->getRequest()->getUser())
       ->setTitle($title)
       ->appendChild($body)
       ->addSubmitButton(pht('Unlink Account'))
       ->addCancelButton($this->getDoneURI());
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/auth/controller/PhabricatorAuthValidateController.php b/src/applications/auth/controller/PhabricatorAuthValidateController.php
index 124984400..445c46655 100644
--- a/src/applications/auth/controller/PhabricatorAuthValidateController.php
+++ b/src/applications/auth/controller/PhabricatorAuthValidateController.php
@@ -1,71 +1,71 @@
 <?php
 
 final class PhabricatorAuthValidateController
   extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function shouldAllowPartialSessions() {
     return true;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $failures = array();
 
     if (!strlen($request->getStr('expect'))) {
       return $this->renderErrors(
         array(
           pht(
             'Login validation is missing expected parameter ("%s").',
             'phusr')));
     }
 
     $expect_phusr = $request->getStr('expect');
     $actual_phusr = $request->getCookie(PhabricatorCookies::COOKIE_USERNAME);
     if ($actual_phusr != $expect_phusr) {
       if ($actual_phusr) {
         $failures[] = pht(
           "Attempted to set '%s' cookie to '%s', but your browser sent back ".
           "a cookie with the value '%s'. Clear your browser's cookies and ".
           "try again.",
           'phusr',
           $expect_phusr,
           $actual_phusr);
       } else {
         $failures[] = pht(
           "Attempted to set '%s' cookie to '%s', but your browser did not ".
           "accept the cookie. Check that cookies are enabled, clear them, ".
           "and try again.",
           'phusr',
           $expect_phusr);
       }
     }
 
     if (!$failures) {
       if (!$viewer->getPHID()) {
         $failures[] = pht(
-          "Login cookie was set correctly, but your login session is not ".
-          "valid. Try clearing cookies and logging in again.");
+          'Login cookie was set correctly, but your login session is not '.
+          'valid. Try clearing cookies and logging in again.');
       }
     }
 
     if ($failures) {
       return $this->renderErrors($failures);
     }
 
     $finish_uri = $this->getApplicationURI('finish/');
     return id(new AphrontRedirectResponse())->setURI($finish_uri);
   }
 
   private function renderErrors(array $messages) {
     return $this->renderErrorPage(
       pht('Login Failure'),
       $messages);
   }
 
 }
diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php
index ba4a82929..857a5dcbc 100644
--- a/src/applications/auth/controller/PhabricatorEmailLoginController.php
+++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php
@@ -1,156 +1,156 @@
 <?php
 
 final class PhabricatorEmailLoginController
   extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
 
     if (!PhabricatorAuthProviderPassword::getPasswordProvider()) {
       return new Aphront400Response();
     }
 
     $e_email = true;
     $e_captcha = true;
     $errors = array();
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     if ($request->isFormPost()) {
       $e_email = null;
       $e_captcha = pht('Again');
 
       $captcha_ok = AphrontFormRecaptchaControl::processCaptcha($request);
       if (!$captcha_ok) {
-        $errors[] = pht("Captcha response is incorrect, try again.");
+        $errors[] = pht('Captcha response is incorrect, try again.');
         $e_captcha = pht('Invalid');
       }
 
       $email = $request->getStr('email');
       if (!strlen($email)) {
-       $errors[] = pht("You must provide an email address.");
+       $errors[] = pht('You must provide an email address.');
        $e_email = pht('Required');
       }
 
       if (!$errors) {
         // NOTE: Don't validate the email unless the captcha is good; this makes
         // it expensive to fish for valid email addresses while giving the user
         // a better error if they goof their email.
 
         $target_email = id(new PhabricatorUserEmail())->loadOneWhere(
           'address = %s',
           $email);
 
         $target_user = null;
         if ($target_email) {
           $target_user = id(new PhabricatorUser())->loadOneWhere(
             'phid = %s',
             $target_email->getUserPHID());
         }
 
         if (!$target_user) {
           $errors[] =
-            pht("There is no account associated with that email address.");
-          $e_email = pht("Invalid");
+            pht('There is no account associated with that email address.');
+          $e_email = pht('Invalid');
         }
 
         if (!$errors) {
           $engine = new PhabricatorAuthSessionEngine();
           $uri = $engine->getOneTimeLoginURI(
             $target_user,
             null,
             PhabricatorAuthSessionEngine::ONETIME_RESET);
 
           if ($is_serious) {
             $body = <<<EOBODY
 You can use this link to reset your Phabricator password:
 
   {$uri}
 
 EOBODY;
           } else {
             $body = <<<EOBODY
 Condolences on forgetting your password. You can use this link to reset it:
 
   {$uri}
 
 After you set a new password, consider writing it down on a sticky note and
 attaching it to your monitor so you don't forget again! Choosing a very short,
 easy-to-remember password like "cat" or "1234" might also help.
 
 Best Wishes,
 Phabricator
 
 EOBODY;
           }
 
           // NOTE: Don't set the user as 'from', or they may not receive the
           // mail if they have the "don't send me email about my own actions"
           // preference set.
 
           $mail = id(new PhabricatorMetaMTAMail())
             ->setSubject(pht('[Phabricator] Password Reset'))
             ->addRawTos(array($target_email->getAddress()))
             ->setBody($body)
             ->saveAndSend();
 
           return $this->newDialog()
             ->setTitle(pht('Check Your Email'))
             ->setShortTitle(pht('Email Sent'))
             ->appendParagraph(
               pht('An email has been sent with a link you can use to login.'))
             ->addCancelButton('/', pht('Done'));
         }
       }
 
     }
 
     $error_view = null;
     if ($errors) {
       $error_view = new AphrontErrorView();
       $error_view->setErrors($errors);
     }
 
     $email_auth = new PHUIFormLayoutView();
     $email_auth->appendChild($error_view);
     $email_auth
       ->setUser($request->getUser())
       ->setFullWidth(true)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Email'))
           ->setName('email')
           ->setValue($request->getStr('email'))
           ->setError($e_email))
       ->appendChild(
         id(new AphrontFormRecaptchaControl())
           ->setLabel(pht('Captcha'))
           ->setError($e_captcha));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Reset Password'));
 
     $dialog = new AphrontDialogView();
     $dialog->setUser($request->getUser());
     $dialog->setTitle(pht(
       'Forgot Password / Email Login'));
     $dialog->appendChild($email_auth);
     $dialog->addSubmitButton(pht('Send Email'));
     $dialog->setSubmitURI('/login/email/');
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $dialog,
       ),
       array(
         'title' => pht('Forgot Password'),
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/auth/controller/config/PhabricatorAuthEditController.php b/src/applications/auth/controller/config/PhabricatorAuthEditController.php
index 846225b8e..f807c8a92 100644
--- a/src/applications/auth/controller/config/PhabricatorAuthEditController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthEditController.php
@@ -1,342 +1,342 @@
 <?php
 
 final class PhabricatorAuthEditController
   extends PhabricatorAuthProviderConfigController {
 
   private $providerClass;
   private $configID;
 
   public function willProcessRequest(array $data) {
     $this->providerClass = idx($data, 'className');
     $this->configID = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     if ($this->configID) {
       $config = id(new PhabricatorAuthProviderConfigQuery())
         ->setViewer($viewer)
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->withIDs(array($this->configID))
         ->executeOne();
       if (!$config) {
         return new Aphront404Response();
       }
 
       $provider = $config->getProvider();
       if (!$provider) {
         return new Aphront404Response();
       }
 
       $is_new = false;
     } else {
       $providers = PhabricatorAuthProvider::getAllBaseProviders();
       foreach ($providers as $candidate_provider) {
         if (get_class($candidate_provider) === $this->providerClass) {
           $provider = $candidate_provider;
           break;
         }
       }
 
       if (!$provider) {
         return new Aphront404Response();
       }
 
       // TODO: When we have multi-auth providers, support them here.
 
       $configs = id(new PhabricatorAuthProviderConfigQuery())
         ->setViewer($viewer)
         ->withProviderClasses(array(get_class($provider)))
         ->execute();
 
       if ($configs) {
         $id = head($configs)->getID();
         $dialog = id(new AphrontDialogView())
           ->setUser($viewer)
           ->setMethod('GET')
           ->setSubmitURI($this->getApplicationURI('config/edit/'.$id.'/'))
           ->setTitle(pht('Provider Already Configured'))
           ->appendChild(
             pht(
               'This provider ("%s") already exists, and you can not add more '.
               'than one instance of it. You can edit the existing provider, '.
               'or you can choose a different provider.',
               $provider->getProviderName()))
           ->addCancelButton($this->getApplicationURI('config/new/'))
           ->addSubmitButton(pht('Edit Existing Provider'));
 
         return id(new AphrontDialogResponse())->setDialog($dialog);
       }
 
       $config = $provider->getDefaultProviderConfig();
       $provider->attachProviderConfig($config);
 
       $is_new = true;
     }
 
     $errors = array();
 
     $v_registration = $config->getShouldAllowRegistration();
     $v_link = $config->getShouldAllowLink();
     $v_unlink = $config->getShouldAllowUnlink();
     $v_trust_email = $config->getShouldTrustEmails();
 
     if ($request->isFormPost()) {
 
       $properties = $provider->readFormValuesFromRequest($request);
       list($errors, $issues, $properties) = $provider->processEditForm(
         $request,
         $properties);
 
       $xactions = array();
 
       if (!$errors) {
         if ($is_new) {
           if (!strlen($config->getProviderType())) {
             $config->setProviderType($provider->getProviderType());
           }
           if (!strlen($config->getProviderDomain())) {
             $config->setProviderDomain($provider->getProviderDomain());
           }
         }
 
         $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
           ->setTransactionType(
             PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION)
           ->setNewValue($request->getInt('allowRegistration', 0));
 
         $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
           ->setTransactionType(
             PhabricatorAuthProviderConfigTransaction::TYPE_LINK)
           ->setNewValue($request->getInt('allowLink', 0));
 
         $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
           ->setTransactionType(
             PhabricatorAuthProviderConfigTransaction::TYPE_UNLINK)
           ->setNewValue($request->getInt('allowUnlink', 0));
 
         $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
           ->setTransactionType(
             PhabricatorAuthProviderConfigTransaction::TYPE_TRUST_EMAILS)
           ->setNewValue($request->getInt('trustEmails', 0));
 
         foreach ($properties as $key => $value) {
           $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
             ->setTransactionType(
               PhabricatorAuthProviderConfigTransaction::TYPE_PROPERTY)
             ->setMetadataValue('auth:property', $key)
             ->setNewValue($value);
         }
 
         if ($is_new) {
           $config->save();
         }
 
         $editor = id(new PhabricatorAuthProviderConfigEditor())
           ->setActor($viewer)
           ->setContentSourceFromRequest($request)
           ->setContinueOnNoEffect(true)
           ->applyTransactions($config, $xactions);
 
 
         if ($provider->hasSetupStep() && $is_new) {
           $id = $config->getID();
           $next_uri = $this->getApplicationURI('config/edit/'.$id.'/');
         } else {
           $next_uri = $this->getApplicationURI();
         }
 
         return id(new AphrontRedirectResponse())->setURI($next_uri);
       }
     } else {
       $properties = $provider->readFormValuesFromProvider();
       $issues = array();
     }
 
     if ($is_new) {
       $button = pht('Add Provider');
       $crumb = pht('Add Provider');
       $title = pht('Add Authentication Provider');
       $cancel_uri = $this->getApplicationURI('/config/new/');
     } else {
       $button = pht('Save');
       $crumb = pht('Edit Provider');
       $title = pht('Edit Authentication Provider');
       $cancel_uri = $this->getApplicationURI();
     }
 
     $config_name = 'auth.email-domains';
     $config_href = '/config/edit/'.$config_name.'/';
 
     $email_domains = PhabricatorEnv::getEnvConfig($config_name);
     if ($email_domains) {
       $registration_warning = pht(
-        "Users will only be able to register with a verified email address ".
-        "at one of the configured [[ %s | %s ]] domains: **%s**",
+        'Users will only be able to register with a verified email address '.
+        'at one of the configured [[ %s | %s ]] domains: **%s**',
         $config_href,
         $config_name,
         implode(', ', $email_domains));
     } else {
       $registration_warning = pht(
         "NOTE: Any user who can browse to this install's login page will be ".
         "able to register a Phabricator account. To restrict who can register ".
         "an account, configure [[ %s | %s ]].",
         $config_href,
         $config_name);
     }
 
     $str_registration = array(
       phutil_tag('strong', array(), pht('Allow Registration:')),
       ' ',
       pht(
         'Allow users to register new Phabricator accounts using this '.
         'provider. If you disable registration, users can still use this '.
         'provider to log in to existing accounts, but will not be able to '.
         'create new accounts.'),
     );
 
     $str_link = hsprintf(
       '<strong>%s:</strong> %s',
       pht('Allow Linking Accounts'),
       pht(
         'Allow users to link account credentials for this provider to '.
         'existing Phabricator accounts. There is normally no reason to '.
         'disable this unless you are trying to move away from a provider '.
         'and want to stop users from creating new account links.'));
 
     $str_unlink = hsprintf(
       '<strong>%s:</strong> %s',
       pht('Allow Unlinking Accounts'),
       pht(
         'Allow users to unlink account credentials for this provider from '.
         'existing Phabricator accounts. If you disable this, Phabricator '.
         'accounts will be permanently bound to provider accounts.'));
 
     $str_trusted_email = hsprintf(
       '<strong>%s:</strong> %s',
       pht('Trust Email Addresses'),
       pht(
         'Phabricator will skip email verification for accounts registered '.
         'through this provider.'));
 
     $status_tag = id(new PHUITagView())
       ->setType(PHUITagView::TYPE_STATE);
     if ($is_new) {
       $status_tag
         ->setName(pht('New Provider'))
         ->setBackgroundColor('blue');
     } else if ($config->getIsEnabled()) {
       $status_tag
         ->setName(pht('Enabled'))
         ->setBackgroundColor('green');
     } else {
       $status_tag
         ->setName(pht('Disabled'))
         ->setBackgroundColor('red');
     }
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Provider'))
           ->setValue($provider->getProviderName()))
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Status'))
           ->setValue($status_tag))
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->setLabel(pht('Allow'))
           ->addCheckbox(
             'allowRegistration',
             1,
             $str_registration,
             $v_registration))
       ->appendRemarkupInstructions($registration_warning)
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'allowLink',
             1,
             $str_link,
             $v_link))
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'allowUnlink',
             1,
             $str_unlink,
             $v_unlink));
 
     if ($provider->shouldAllowEmailTrustConfiguration()) {
       $form->appendChild(
         id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'trustEmails',
             1,
             $str_trusted_email,
             $v_trust_email));
     }
 
     $provider->extendEditForm($request, $form, $properties, $issues);
 
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($cancel_uri)
           ->setValue($button));
 
     $help = $provider->getConfigurationHelp();
     if ($help) {
       $form->appendChild(id(new PHUIFormDividerControl()));
       $form->appendRemarkupInstructions($help);
     }
 
     $footer = $provider->renderConfigurationFooter();
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($crumb);
 
     $xaction_view = null;
     if (!$is_new) {
       $xactions = id(new PhabricatorAuthProviderConfigTransactionQuery())
         ->withObjectPHIDs(array($config->getPHID()))
         ->setViewer($viewer)
         ->execute();
 
       foreach ($xactions as $xaction) {
         $xaction->setProvider($provider);
       }
 
       $xaction_view = id(new PhabricatorApplicationTransactionView())
         ->setUser($viewer)
         ->setObjectPHID($config->getPHID())
         ->setTransactions($xactions);
     }
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
         $footer,
         $xaction_view,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php
index 795ceeba4..85ff0b1e0 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php
@@ -1,67 +1,67 @@
 <?php
 
 final class PhabricatorAuthManagementLDAPWorkflow
   extends PhabricatorAuthManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('ldap')
       ->setExamples('**ldap**')
       ->setSynopsis(
         pht('Analyze and diagnose issues with LDAP configuration.'));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $console->getServer()->setEnableLog(true);
 
     $provider = PhabricatorAuthProviderLDAP::getLDAPProvider();
     if (!$provider) {
       $console->writeOut(
         "%s\n",
-        "The LDAP authentication provider is not enabled.");
+        'The LDAP authentication provider is not enabled.');
       exit(1);
     }
 
     if (!function_exists('ldap_connect')) {
       $console->writeOut(
         "%s\n",
-        "The LDAP extension is not enabled.");
+        'The LDAP extension is not enabled.');
       exit(1);
     }
 
     $adapter = $provider->getAdapter();
 
     $console->writeOut("%s\n", pht('Enter LDAP Credentials'));
-    $username = phutil_console_prompt("LDAP Username: ");
+    $username = phutil_console_prompt('LDAP Username: ');
     if (!strlen($username)) {
       throw new PhutilArgumentUsageException(
-        pht("You must enter an LDAP username."));
+        pht('You must enter an LDAP username.'));
     }
 
     phutil_passthru('stty -echo');
-    $password = phutil_console_prompt("LDAP Password: ");
+    $password = phutil_console_prompt('LDAP Password: ');
     phutil_passthru('stty echo');
 
     if (!strlen($password)) {
       throw new PhutilArgumentUsageException(
-        pht("You must enter an LDAP password."));
+        pht('You must enter an LDAP password.'));
     }
 
     $adapter->setLoginUsername($username);
     $adapter->setLoginPassword(new PhutilOpaqueEnvelope($password));
 
     $console->writeOut("\n");
     $console->writeOut("%s\n", pht('Connecting to LDAP...'));
 
     $account_id = $adapter->getAccountID();
     if ($account_id) {
       $console->writeOut("%s\n", pht('Found LDAP Account: %s', $account_id));
     } else {
       $console->writeOut("%s\n", pht('Unable to find LDAP account!'));
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/auth/management/PhabricatorAuthManagementRefreshWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRefreshWorkflow.php
index 97e02193c..fa7bb8536 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementRefreshWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementRefreshWorkflow.php
@@ -1,151 +1,151 @@
 <?php
 
 final class PhabricatorAuthManagementRefreshWorkflow
   extends PhabricatorAuthManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('refresh')
       ->setExamples('**refresh**')
       ->setSynopsis(
         pht(
           'Refresh OAuth access tokens. This is primarily useful for '.
           'development and debugging.'))
       ->setArguments(
         array(
           array(
             'name' => 'user',
             'param' => 'user',
             'help' => 'Refresh tokens for a given user.',
           ),
           array(
             'name' => 'type',
             'param' => 'provider',
             'help' => 'Refresh tokens for a given provider type.',
           ),
           array(
             'name' => 'domain',
             'param' => 'domain',
             'help' => 'Refresh tokens for a given domain.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $query = id(new PhabricatorExternalAccountQuery())
       ->setViewer($viewer);
 
     $username = $args->getArg('user');
     if (strlen($username)) {
       $user = id(new PhabricatorPeopleQuery())
         ->setViewer($viewer)
         ->withUsernames(array($username))
         ->executeOne();
       if ($user) {
         $query->withUserPHIDs(array($user->getPHID()));
       } else {
         throw new PhutilArgumentUsageException(
           pht('No such user "%s"!', $username));
       }
     }
 
 
     $type = $args->getArg('type');
     if (strlen($type)) {
       $query->withAccountTypes(array($type));
     }
 
     $domain = $args->getArg('domain');
     if (strlen($domain)) {
       $query->withAccountDomains(array($domain));
     }
 
     $accounts = $query->execute();
 
     if (!$accounts) {
       throw new PhutilArgumentUsageException(
-        pht("No accounts match the arguments!"));
+        pht('No accounts match the arguments!'));
     } else {
       $console->writeOut(
         "%s\n",
         pht(
-          "Found %s account(s) to refresh.",
+          'Found %s account(s) to refresh.',
           new PhutilNumber(count($accounts))));
     }
 
     $providers = PhabricatorAuthProvider::getAllEnabledProviders();
 
     foreach ($accounts as $account) {
       $console->writeOut(
         "%s\n",
         pht(
-          "Refreshing account #%d (%s/%s).",
+          'Refreshing account #%d (%s/%s).',
           $account->getID(),
           $account->getAccountType(),
           $account->getAccountDomain()));
 
       $key = $account->getProviderKey();
       if (empty($providers[$key])) {
         $console->writeOut(
           "> %s\n",
-          pht("Skipping, provider is not enabled or does not exist."));
+          pht('Skipping, provider is not enabled or does not exist.'));
         continue;
       }
 
       $provider = $providers[$key];
       if (!($provider instanceof PhabricatorAuthProviderOAuth2)) {
         $console->writeOut(
           "> %s\n",
-          pht("Skipping, provider is not an OAuth2 provider."));
+          pht('Skipping, provider is not an OAuth2 provider.'));
         continue;
       }
 
       $adapter = $provider->getAdapter();
       if (!$adapter->supportsTokenRefresh()) {
         $console->writeOut(
           "> %s\n",
-          pht("Skipping, provider does not support token refresh."));
+          pht('Skipping, provider does not support token refresh.'));
         continue;
       }
 
       $refresh_token = $account->getProperty('oauth.token.refresh');
       if (!$refresh_token) {
         $console->writeOut(
           "> %s\n",
-          pht("Skipping, provider has no stored refresh token."));
+          pht('Skipping, provider has no stored refresh token.'));
         continue;
       }
 
       $console->writeOut(
         "+ %s\n",
         pht(
-          "Refreshing token, current token expires in %s seconds.",
+          'Refreshing token, current token expires in %s seconds.',
           new PhutilNumber(
             $account->getProperty('oauth.token.access.expires') - time())));
 
       $token = $provider->getOAuthAccessToken($account, $force_refresh = true);
       if (!$token) {
         $console->writeOut(
           "* %s\n",
           pht('Unable to refresh token!'));
         continue;
       }
 
       $console->writeOut(
         "+ %s\n",
         pht(
-          "Refreshed token, new token expires in %s seconds.",
+          'Refreshed token, new token expires in %s seconds.',
           new PhutilNumber(
             $account->getProperty('oauth.token.access.expires') - time())));
 
     }
 
-    $console->writeOut("%s\n", pht("Done."));
+    $console->writeOut("%s\n", pht('Done.'));
 
     return 0;
   }
 
 }
diff --git a/src/applications/auth/management/PhabricatorAuthManagementStripWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementStripWorkflow.php
index 740ee4f0d..f6d057b57 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementStripWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementStripWorkflow.php
@@ -1,173 +1,173 @@
 <?php
 
 final class PhabricatorAuthManagementStripWorkflow
   extends PhabricatorAuthManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('strip')
       ->setExamples('**strip** [--user username] [--type type]')
       ->setSynopsis(
         pht(
           'Remove multi-factor authentication from an account.'))
       ->setArguments(
         array(
           array(
             'name' => 'user',
             'param' => 'username',
             'repeat' => true,
             'help' => pht('Strip factors from specified users.'),
           ),
           array(
             'name' => 'all-users',
             'help' => pht('Strip factors from all users.'),
           ),
           array(
             'name' => 'type',
             'param' => 'factortype',
             'repeat' => true,
             'help' => pht('Strip a specific factor type.'),
           ),
           array(
             'name' => 'all-types',
             'help' => pht('Strip all factors, regardless of type.'),
           ),
           array(
             'name' => 'force',
             'help' => pht('Strip factors without prompting.'),
           ),
           array(
             'name' => 'dry-run',
             'help' => pht('Show factors, but do not strip them.'),
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $usernames = $args->getArg('user');
     $all_users = $args->getArg('all-users');
 
     if ($usernames && $all_users) {
       throw new PhutilArgumentUsageException(
         pht(
           'Specify either specific users with --user, or all users with '.
           '--all-users, but not both.'));
     } else if (!$usernames && !$all_users) {
       throw new PhutilArgumentUsageException(
         pht(
           'Use --user to specify which user to strip factors from, or '.
           '--all-users to strip factors from all users.'));
     } else if ($usernames) {
       $users = id(new PhabricatorPeopleQuery())
         ->setViewer($this->getViewer())
         ->withUsernames($usernames)
         ->execute();
 
       $users_by_username = mpull($users, null, 'getUsername');
       foreach ($usernames as $username) {
         if (empty($users_by_username[$username])) {
           throw new PhutilArgumentUsageException(
             pht(
               'No user exists with username "%s".',
               $username));
         }
       }
     } else {
       $users = null;
     }
 
     $types = $args->getArg('type');
     $all_types = $args->getArg('all-types');
     if ($types && $all_types) {
       throw new PhutilArgumentUsageException(
         pht(
           'Specify either specific factors with --type, or all factors with '.
           '--all-types, but not both.'));
     } else if (!$types && !$all_types) {
       throw new PhutilArgumentUsageException(
         pht(
           'Use --type to specify which factor to strip, or --all-types to '.
           'strip all factors. Use `auth list-factors` to show the available '.
           'factor types.'));
     }
 
     if ($users && $types) {
       $factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
         'userPHID IN (%Ls) AND factorKey IN (%Ls)',
         mpull($users, 'getPHID'),
         $types);
     } else if ($users) {
       $factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
         'userPHID IN (%Ls)',
         mpull($users, 'getPHID'));
     } else if ($types) {
       $factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
         'factorKey IN (%Ls)',
         $types);
     } else {
       $factors = id(new PhabricatorAuthFactorConfig())->loadAll();
     }
 
     if (!$factors) {
       throw new PhutilArgumentUsageException(
         pht('There are no matching factors to strip.'));
     }
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs(mpull($factors, 'getUserPHID'))
       ->execute();
 
     $console = PhutilConsole::getConsole();
 
-    $console->writeOut("%s\n\n", pht("These auth factors will be stripped:"));
+    $console->writeOut("%s\n\n", pht('These auth factors will be stripped:'));
 
     foreach ($factors as $factor) {
       $impl = $factor->getImplementation();
       $console->writeOut(
         "    %s\t%s\t%s\n",
         $handles[$factor->getUserPHID()]->getName(),
         $factor->getFactorKey(),
         ($impl
           ? $impl->getFactorName()
           : '?'));
     }
 
     $is_dry_run = $args->getArg('dry-run');
     if ($is_dry_run) {
       $console->writeOut(
         "\n%s\n",
         pht('End of dry run.'));
 
       return 0;
     }
 
     $force = $args->getArg('force');
     if (!$force) {
       if (!$console->confirm(pht('Strip these authentication factors?'))) {
         throw new PhutilArgumentUsageException(
           pht('User aborted the workflow.'));
       }
     }
 
     $console->writeOut("%s\n", pht('Stripping authentication factors...'));
 
     foreach ($factors as $factor) {
       $user = id(new PhabricatorPeopleQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs(array($factor->getUserPHID()))
         ->executeOne();
 
       $factor->delete();
 
       if ($user) {
         $user->updateMultiFactorEnrollment();
       }
     }
 
     $console->writeOut("%s\n", pht('Done.'));
 
     return 0;
   }
 
 }
diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
index 9b44b294f..0381f4822 100644
--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -1,492 +1,492 @@
 <?php
 
 abstract class PhabricatorAuthProvider {
 
   private $providerConfig;
 
   public function attachProviderConfig(PhabricatorAuthProviderConfig $config) {
     $this->providerConfig = $config;
     return $this;
   }
 
   public function hasProviderConfig() {
     return (bool)$this->providerConfig;
   }
 
   public function getProviderConfig() {
     if ($this->providerConfig === null) {
       throw new Exception(
-        "Call attachProviderConfig() before getProviderConfig()!");
+        'Call attachProviderConfig() before getProviderConfig()!');
     }
     return $this->providerConfig;
   }
 
   public function getConfigurationHelp() {
     return null;
   }
 
   public function getDefaultProviderConfig() {
     return id(new PhabricatorAuthProviderConfig())
       ->setProviderClass(get_class($this))
       ->setIsEnabled(1)
       ->setShouldAllowLogin(1)
       ->setShouldAllowRegistration(1)
       ->setShouldAllowLink(1)
       ->setShouldAllowUnlink(1);
   }
 
   public function getNameForCreate() {
     return $this->getProviderName();
   }
 
   public function getDescriptionForCreate() {
     return null;
   }
 
   public function getProviderKey() {
     return $this->getAdapter()->getAdapterKey();
   }
 
   public function getProviderType() {
     return $this->getAdapter()->getAdapterType();
   }
 
   public function getProviderDomain() {
     return $this->getAdapter()->getAdapterDomain();
   }
 
   public static function getAllBaseProviders() {
     static $providers;
 
     if ($providers === null) {
       $objects = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
         ->loadObjects();
       $providers = $objects;
     }
 
     return $providers;
   }
 
   public static function getAllProviders() {
     static $providers;
 
     if ($providers === null) {
       $objects = self::getAllBaseProviders();
 
       $configs = id(new PhabricatorAuthProviderConfigQuery())
         ->setViewer(PhabricatorUser::getOmnipotentUser())
         ->execute();
 
       $providers = array();
       foreach ($configs as $config) {
         if (!isset($objects[$config->getProviderClass()])) {
           // This configuration is for a provider which is not installed.
           continue;
         }
 
         $object = clone $objects[$config->getProviderClass()];
         $object->attachProviderConfig($config);
 
         $key = $object->getProviderKey();
         if (isset($providers[$key])) {
           throw new Exception(
             pht(
               "Two authentication providers use the same provider key ".
               "('%s'). Each provider must be identified by a unique ".
               "key.",
               $key));
         }
         $providers[$key] = $object;
       }
     }
 
     return $providers;
   }
 
   public static function getAllEnabledProviders() {
     $providers = self::getAllProviders();
     foreach ($providers as $key => $provider) {
       if (!$provider->isEnabled()) {
         unset($providers[$key]);
       }
     }
     return $providers;
   }
 
   public static function getEnabledProviderByKey($provider_key) {
     return idx(self::getAllEnabledProviders(), $provider_key);
   }
 
   abstract public function getProviderName();
   abstract public function getAdapter();
 
   public function isEnabled() {
     return $this->getProviderConfig()->getIsEnabled();
   }
 
   public function shouldAllowLogin() {
     return $this->getProviderConfig()->getShouldAllowLogin();
   }
 
   public function shouldAllowRegistration() {
     return $this->getProviderConfig()->getShouldAllowRegistration();
   }
 
   public function shouldAllowAccountLink() {
     return $this->getProviderConfig()->getShouldAllowLink();
   }
 
   public function shouldAllowAccountUnlink() {
     return $this->getProviderConfig()->getShouldAllowUnlink();
   }
 
   public function shouldTrustEmails() {
     return $this->shouldAllowEmailTrustConfiguration() &&
            $this->getProviderConfig()->getShouldTrustEmails();
   }
 
   /**
    * Should we allow the adapter to be marked as "trusted"
    * This is true for all adapters except those that allow the user to type in
    * emails (@see PhabricatorAuthProviderPassword)
    */
   public function shouldAllowEmailTrustConfiguration() {
     return true;
   }
 
   public function buildLoginForm(
     PhabricatorAuthStartController $controller) {
     return $this->renderLoginForm($controller->getRequest(), $mode = 'start');
   }
 
   abstract public function processLoginRequest(
     PhabricatorAuthLoginController $controller);
 
   public function buildLinkForm(
     PhabricatorAuthLinkController $controller) {
     return $this->renderLoginForm($controller->getRequest(), $mode = 'link');
   }
 
   public function shouldAllowAccountRefresh() {
     return true;
   }
 
   public function buildRefreshForm(
     PhabricatorAuthLinkController $controller) {
     return $this->renderLoginForm($controller->getRequest(), $mode = 'refresh');
   }
 
   protected function renderLoginForm(
     AphrontRequest $request,
     $mode) {
-    throw new Exception("Not implemented!");
+    throw new Exception('Not implemented!');
   }
 
   public function createProviders() {
     return array($this);
   }
 
   protected function willSaveAccount(PhabricatorExternalAccount $account) {
     return;
   }
 
   public function willRegisterAccount(PhabricatorExternalAccount $account) {
     return;
   }
 
   protected function loadOrCreateAccount($account_id) {
     if (!strlen($account_id)) {
       throw new Exception(
-        "loadOrCreateAccount(...): empty account ID!");
+        'loadOrCreateAccount(...): empty account ID!');
     }
 
     $adapter = $this->getAdapter();
     $adapter_class = get_class($adapter);
 
     if (!strlen($adapter->getAdapterType())) {
       throw new Exception(
         "AuthAdapter (of class '{$adapter_class}') has an invalid ".
         "implementation: no adapter type.");
     }
 
     if (!strlen($adapter->getAdapterDomain())) {
       throw new Exception(
         "AuthAdapter (of class '{$adapter_class}') has an invalid ".
         "implementation: no adapter domain.");
     }
 
     $account = id(new PhabricatorExternalAccount())->loadOneWhere(
       'accountType = %s AND accountDomain = %s AND accountID = %s',
       $adapter->getAdapterType(),
       $adapter->getAdapterDomain(),
       $account_id);
     if (!$account) {
       $account = id(new PhabricatorExternalAccount())
         ->setAccountType($adapter->getAdapterType())
         ->setAccountDomain($adapter->getAdapterDomain())
         ->setAccountID($account_id);
     }
 
     $account->setUsername($adapter->getAccountName());
     $account->setRealName($adapter->getAccountRealName());
     $account->setEmail($adapter->getAccountEmail());
     $account->setAccountURI($adapter->getAccountURI());
 
     $account->setProfileImagePHID(null);
     $image_uri = $adapter->getAccountImageURI();
     if ($image_uri) {
       try {
         $name = PhabricatorSlug::normalize($this->getProviderName());
         $name = $name.'-profile.jpg';
 
         // TODO: If the image has not changed, we do not need to make a new
         // file entry for it, but there's no convenient way to do this with
         // PhabricatorFile right now. The storage will get shared, so the impact
         // here is negligible.
         $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
           $image_file = PhabricatorFile::newFromFileDownload(
             $image_uri,
             array(
               'name' => $name,
             ));
         unset($unguarded);
 
         if ($image_file) {
           $account->setProfileImagePHID($image_file->getPHID());
         }
       } catch (Exception $ex) {
         // Log this but proceed, it's not especially important that we
         // be able to pull profile images.
         phlog($ex);
       }
     }
 
     $this->willSaveAccount($account);
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $account->save();
     unset($unguarded);
 
     return $account;
   }
 
   public function getLoginURI() {
     $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth');
     return $app->getApplicationURI('/login/'.$this->getProviderKey().'/');
   }
 
   public function getSettingsURI() {
     return '/settings/panel/external/';
   }
 
   public function getStartURI() {
     $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth');
     $uri = $app->getApplicationURI('/start/');
     return $uri;
   }
 
   public function isDefaultRegistrationProvider() {
     return false;
   }
 
   public function shouldRequireRegistrationPassword() {
     return false;
   }
 
   public function getDefaultExternalAccount() {
-    throw new Exception("Not implemented!");
+    throw new Exception('Not implemented!');
   }
 
   public function getLoginOrder() {
     return '500-'.$this->getProviderName();
   }
 
   protected function getLoginIcon() {
     return 'Generic';
   }
 
   public function isLoginFormAButton() {
     return false;
   }
 
   public function renderConfigPropertyTransactionTitle(
     PhabricatorAuthProviderConfigTransaction $xaction) {
 
     return null;
   }
 
   public function readFormValuesFromProvider() {
     return array();
   }
 
   public function readFormValuesFromRequest(AphrontRequest $request) {
     return array();
   }
 
   public function processEditForm(
     AphrontRequest $request,
     array $values) {
 
     $errors = array();
     $issues = array();
 
     return array($errors, $issues, $values);
   }
 
   public function extendEditForm(
     AphrontRequest $request,
     AphrontFormView $form,
     array $values,
     array $issues) {
     return;
   }
 
   public function willRenderLinkedAccount(
     PhabricatorUser $viewer,
     PHUIObjectItemView $item,
     PhabricatorExternalAccount $account) {
 
     $account_view = id(new PhabricatorAuthAccountView())
       ->setExternalAccount($account)
       ->setAuthProvider($this);
 
     $item->appendChild(
       phutil_tag(
         'div',
         array(
           'class' => 'mmr mml mst mmb',
         ),
         $account_view));
   }
 
 
   /**
    * Return true to use a two-step configuration (setup, configure) instead of
    * the default single-step configuration. In practice, this means that
    * creating a new provider instance will redirect back to the edit page
    * instead of the provider list.
    *
    * @return bool True if this provider uses two-step configuration.
    */
   public function hasSetupStep() {
     return false;
   }
 
 
   /**
    * Render a standard login/register button element.
    *
    * The `$attributes` parameter takes these keys:
    *
    *   - `uri`: URI the button should take the user to when clicked.
    *   - `method`: Optional HTTP method the button should use, defaults to GET.
    *
    * @param   AphrontRequest  HTTP request.
    * @param   string          Request mode string.
    * @param   map             Additional parameters, see above.
    * @return  wild            Login button.
    */
   protected function renderStandardLoginButton(
     AphrontRequest $request,
     $mode,
     array $attributes = array()) {
 
     PhutilTypeSpec::checkMap(
       $attributes,
       array(
         'method' => 'optional string',
         'uri' => 'string',
         'sigil' => 'optional string',
       ));
 
     $viewer = $request->getUser();
     $adapter = $this->getAdapter();
 
     if ($mode == 'link') {
       $button_text = pht('Link External Account');
     } else if ($mode == 'refresh') {
       $button_text = pht('Refresh Account Link');
     } else if ($this->shouldAllowRegistration()) {
       $button_text = pht('Login or Register');
     } else {
       $button_text = pht('Login');
     }
 
     $icon = id(new PHUIIconView())
       ->setSpriteSheet(PHUIIconView::SPRITE_LOGIN)
       ->setSpriteIcon($this->getLoginIcon());
 
     $button = id(new PHUIButtonView())
       ->setSize(PHUIButtonView::BIG)
       ->setColor(PHUIButtonView::GREY)
       ->setIcon($icon)
       ->setText($button_text)
       ->setSubtext($this->getProviderName());
 
     $uri = $attributes['uri'];
     $uri = new PhutilURI($uri);
     $params = $uri->getQueryParams();
     $uri->setQueryParams(array());
 
     $content = array($button);
 
     foreach ($params as $key => $value) {
       $content[] = phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => $key,
           'value' => $value,
         ));
     }
 
     return phabricator_form(
       $viewer,
       array(
         'method' => idx($attributes, 'method', 'GET'),
         'action' => (string)$uri,
         'sigil'  => idx($attributes, 'sigil'),
       ),
       $content);
   }
 
   public function renderConfigurationFooter() {
     return null;
   }
 
   protected function getAuthCSRFCode(AphrontRequest $request) {
     $phcid = $request->getCookie(PhabricatorCookies::COOKIE_CLIENTID);
     if (!strlen($phcid)) {
       throw new Exception(
         pht(
           'Your browser did not submit a "%s" cookie with client state '.
           'information in the request. Check that cookies are enabled. '.
           'If this problem persists, you may need to clear your cookies.',
           PhabricatorCookies::COOKIE_CLIENTID));
     }
 
     return PhabricatorHash::digest($phcid);
   }
 
   protected function verifyAuthCSRFCode(AphrontRequest $request, $actual) {
     $expect = $this->getAuthCSRFCode($request);
 
     if (!strlen($actual)) {
       throw new Exception(
         pht(
           'The authentication provider did not return a client state '.
           'parameter in its response, but one was expected. If this '.
           'problem persists, you may need to clear your cookies.'));
     }
 
     if ($actual !== $expect) {
       throw new Exception(
         pht(
           'The authentication provider did not return the correct client '.
           'state parameter in its response. If this problem persists, you may '.
           'need to clear your cookies.'));
     }
   }
 
 }
diff --git a/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php b/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php
index ecaf17167..77e6351a6 100644
--- a/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php
+++ b/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php
@@ -1,477 +1,477 @@
 <?php
 
 final class PhabricatorAuthProviderLDAP
   extends PhabricatorAuthProvider {
 
   private $adapter;
 
   public function getProviderName() {
     return pht('LDAP');
   }
 
   public function getDescriptionForCreate() {
     return pht(
       'Configure a connection to an LDAP server so that users can use their '.
       'LDAP credentials to log in to Phabricator.');
   }
 
   public function getDefaultProviderConfig() {
     return parent::getDefaultProviderConfig()
       ->setProperty(self::KEY_PORT, 389)
       ->setProperty(self::KEY_VERSION, 3);
   }
 
   public function getAdapter() {
     if (!$this->adapter) {
       $conf = $this->getProviderConfig();
 
       $realname_attributes = $conf->getProperty(self::KEY_REALNAME_ATTRIBUTES);
       if (!is_array($realname_attributes)) {
         $realname_attributes = array();
       }
 
       $search_attributes = $conf->getProperty(self::KEY_SEARCH_ATTRIBUTES);
       $search_attributes = phutil_split_lines($search_attributes, false);
       $search_attributes = array_filter($search_attributes);
 
       $adapter = id(new PhutilAuthAdapterLDAP())
         ->setHostname(
           $conf->getProperty(self::KEY_HOSTNAME))
         ->setPort(
           $conf->getProperty(self::KEY_PORT))
         ->setBaseDistinguishedName(
           $conf->getProperty(self::KEY_DISTINGUISHED_NAME))
         ->setSearchAttributes($search_attributes)
         ->setUsernameAttribute(
           $conf->getProperty(self::KEY_USERNAME_ATTRIBUTE))
         ->setRealNameAttributes($realname_attributes)
         ->setLDAPVersion(
           $conf->getProperty(self::KEY_VERSION))
         ->setLDAPReferrals(
           $conf->getProperty(self::KEY_REFERRALS))
         ->setLDAPStartTLS(
           $conf->getProperty(self::KEY_START_TLS))
         ->setAlwaysSearch($conf->getProperty(self::KEY_ALWAYS_SEARCH))
         ->setAnonymousUsername(
           $conf->getProperty(self::KEY_ANONYMOUS_USERNAME))
         ->setAnonymousPassword(
           new PhutilOpaqueEnvelope(
             $conf->getProperty(self::KEY_ANONYMOUS_PASSWORD)))
         ->setActiveDirectoryDomain(
           $conf->getProperty(self::KEY_ACTIVEDIRECTORY_DOMAIN));
       $this->adapter = $adapter;
     }
     return $this->adapter;
   }
 
   protected function renderLoginForm(AphrontRequest $request, $mode) {
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setSubmitURI($this->getLoginURI())
       ->setUser($viewer);
 
     if ($mode == 'link') {
       $dialog->setTitle(pht('Link LDAP Account'));
       $dialog->addSubmitButton(pht('Link Accounts'));
       $dialog->addCancelButton($this->getSettingsURI());
     } else if ($mode == 'refresh') {
       $dialog->setTitle(pht('Refresh LDAP Account'));
       $dialog->addSubmitButton(pht('Refresh Account'));
       $dialog->addCancelButton($this->getSettingsURI());
     } else {
       if ($this->shouldAllowRegistration()) {
         $dialog->setTitle(pht('Login or Register with LDAP'));
         $dialog->addSubmitButton(pht('Login or Register'));
       } else {
         $dialog->setTitle(pht('Login with LDAP'));
         $dialog->addSubmitButton(pht('Login'));
       }
       if ($mode == 'login') {
         $dialog->addCancelButton($this->getStartURI());
       }
     }
 
     $v_user = $request->getStr('ldap_username');
 
     $e_user = null;
     $e_pass = null;
 
     $errors = array();
     if ($request->isHTTPPost()) {
       // NOTE: This is intentionally vague so as not to disclose whether a
       // given username exists.
       $e_user = pht('Invalid');
       $e_pass = pht('Invalid');
       $errors[] = pht('Username or password are incorrect.');
     }
 
     $form = id(new PHUIFormLayoutView())
       ->setUser($viewer)
       ->setFullWidth(true)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel('LDAP Username')
           ->setName('ldap_username')
           ->setValue($v_user)
           ->setError($e_user))
       ->appendChild(
         id(new AphrontFormPasswordControl())
           ->setLabel('LDAP Password')
           ->setName('ldap_password')
           ->setError($e_pass));
 
     if ($errors) {
       $errors = id(new AphrontErrorView())->setErrors($errors);
     }
 
     $dialog->appendChild($errors);
     $dialog->appendChild($form);
 
 
     return $dialog;
   }
 
   public function processLoginRequest(
     PhabricatorAuthLoginController $controller) {
 
     $request = $controller->getRequest();
     $viewer = $request->getUser();
     $response = null;
     $account = null;
 
     $username = $request->getStr('ldap_username');
     $password = $request->getStr('ldap_password');
     $has_password = strlen($password);
     $password = new PhutilOpaqueEnvelope($password);
 
     if (!strlen($username) || !$has_password) {
       $response = $controller->buildProviderPageResponse(
         $this,
         $this->renderLoginForm($request, 'login'));
       return array($account, $response);
     }
 
     if ($request->isFormPost()) {
       try {
         if (strlen($username) && $has_password) {
           $adapter = $this->getAdapter();
           $adapter->setLoginUsername($username);
           $adapter->setLoginPassword($password);
 
           // TODO: This calls ldap_bind() eventually, which dumps cleartext
           // passwords to the error log. See note in PhutilAuthAdapterLDAP.
           // See T3351.
 
           DarkConsoleErrorLogPluginAPI::enableDiscardMode();
             $account_id = $adapter->getAccountID();
           DarkConsoleErrorLogPluginAPI::disableDiscardMode();
         } else {
-          throw new Exception("Username and password are required!");
+          throw new Exception('Username and password are required!');
         }
       } catch (PhutilAuthCredentialException $ex) {
         $response = $controller->buildProviderPageResponse(
           $this,
           $this->renderLoginForm($request, 'login'));
         return array($account, $response);
       } catch (Exception $ex) {
         // TODO: Make this cleaner.
         throw $ex;
       }
     }
 
     return array($this->loadOrCreateAccount($account_id), $response);
   }
 
 
   const KEY_HOSTNAME                = 'ldap:host';
   const KEY_PORT                    = 'ldap:port';
   const KEY_DISTINGUISHED_NAME      = 'ldap:dn';
   const KEY_SEARCH_ATTRIBUTES       = 'ldap:search-attribute';
   const KEY_USERNAME_ATTRIBUTE      = 'ldap:username-attribute';
   const KEY_REALNAME_ATTRIBUTES     = 'ldap:realname-attributes';
   const KEY_VERSION                 = 'ldap:version';
   const KEY_REFERRALS               = 'ldap:referrals';
   const KEY_START_TLS               = 'ldap:start-tls';
   const KEY_ANONYMOUS_USERNAME      = 'ldap:anoynmous-username';
   const KEY_ANONYMOUS_PASSWORD      = 'ldap:anonymous-password';
   const KEY_ALWAYS_SEARCH           = 'ldap:always-search';
   const KEY_ACTIVEDIRECTORY_DOMAIN  = 'ldap:activedirectory-domain';
 
   private function getPropertyKeys() {
     return array_keys($this->getPropertyLabels());
   }
 
   private function getPropertyLabels() {
     return array(
       self::KEY_HOSTNAME => pht('LDAP Hostname'),
       self::KEY_PORT => pht('LDAP Port'),
       self::KEY_DISTINGUISHED_NAME => pht('Base Distinguished Name'),
       self::KEY_SEARCH_ATTRIBUTES => pht('Search Attributes'),
       self::KEY_ALWAYS_SEARCH => pht('Always Search'),
       self::KEY_ANONYMOUS_USERNAME => pht('Anonymous Username'),
       self::KEY_ANONYMOUS_PASSWORD => pht('Anonymous Password'),
       self::KEY_USERNAME_ATTRIBUTE => pht('Username Attribute'),
       self::KEY_REALNAME_ATTRIBUTES => pht('Realname Attributes'),
       self::KEY_VERSION => pht('LDAP Version'),
       self::KEY_REFERRALS => pht('Enable Referrals'),
       self::KEY_START_TLS => pht('Use TLS'),
       self::KEY_ACTIVEDIRECTORY_DOMAIN => pht('ActiveDirectory Domain'),
     );
   }
 
   public function readFormValuesFromProvider() {
     $properties = array();
     foreach ($this->getPropertyLabels() as $key => $ignored) {
       $properties[$key] = $this->getProviderConfig()->getProperty($key);
     }
     return $properties;
   }
 
   public function readFormValuesFromRequest(AphrontRequest $request) {
     $values = array();
     foreach ($this->getPropertyKeys() as $key) {
       switch ($key) {
         case self::KEY_REALNAME_ATTRIBUTES:
           $values[$key] = $request->getStrList($key, array());
           break;
         default:
           $values[$key] = $request->getStr($key);
           break;
       }
     }
 
     return $values;
   }
 
   public function processEditForm(
     AphrontRequest $request,
     array $values) {
     $errors = array();
     $issues = array();
     return array($errors, $issues, $values);
   }
 
   public function extendEditForm(
     AphrontRequest $request,
     AphrontFormView $form,
     array $values,
     array $issues) {
 
     $labels = $this->getPropertyLabels();
 
     $captions = array(
       self::KEY_HOSTNAME =>
         pht('Example: %s%sFor LDAPS, use: %s',
           phutil_tag('tt', array(), pht('ldap.example.com')),
           phutil_tag('br'),
           phutil_tag('tt', array(), pht('ldaps://ldaps.example.com/'))),
       self::KEY_DISTINGUISHED_NAME =>
         pht('Example: %s',
           phutil_tag('tt', array(), pht('ou=People, dc=example, dc=com'))),
       self::KEY_USERNAME_ATTRIBUTE =>
         pht('Example: %s',
           phutil_tag('tt', array(), pht('sn'))),
       self::KEY_REALNAME_ATTRIBUTES =>
         pht('Example: %s',
           phutil_tag('tt', array(), pht('firstname, lastname'))),
       self::KEY_REFERRALS =>
         pht('Follow referrals. Disable this for Windows AD 2003.'),
       self::KEY_START_TLS =>
         pht('Start TLS after binding to the LDAP server.'),
       self::KEY_ALWAYS_SEARCH =>
         pht('Always bind and search, even without a username and password.'),
     );
 
     $types = array(
       self::KEY_REFERRALS           => 'checkbox',
       self::KEY_START_TLS           => 'checkbox',
       self::KEY_SEARCH_ATTRIBUTES   => 'textarea',
       self::KEY_REALNAME_ATTRIBUTES => 'list',
       self::KEY_ANONYMOUS_PASSWORD  => 'password',
       self::KEY_ALWAYS_SEARCH       => 'checkbox',
     );
 
     $instructions = array(
       self::KEY_SEARCH_ATTRIBUTES   => pht(
         "When a user types their LDAP username and password into Phabricator, ".
         "Phabricator can either bind to LDAP with those credentials directly ".
         "(which is simpler, but not as powerful) or bind to LDAP with ".
         "anonymous credentials, then search for record matching the supplied ".
         "credentials (which is more complicated, but more powerful).\n\n".
         "For many installs, direct binding is sufficient. However, you may ".
         "want to search first if:\n\n".
         "  - You want users to be able to login with either their username ".
         "    or their email address.\n".
         "  - The login/username is not part of the distinguished name in ".
         "    your LDAP records.\n".
         "  - You want to restrict logins to a subset of users (like only ".
         "    those in certain departments).\n".
         "  - Your LDAP server is configured in some other way that prevents ".
         "    direct binding from working correctly.\n\n".
         "**To bind directly**, enter the LDAP attribute corresponding to the ".
         "login name into the **Search Attributes** box below. Often, this is ".
         "something like `sn` or `uid`. This is the simplest configuration, ".
         "but will only work if the username is part of the distinguished ".
         "name, and won't let you apply complex restrictions to logins.\n\n".
         "  lang=text,name=Simple Direct Binding\n".
         "  sn\n\n".
         "**To search first**, provide an anonymous username and password ".
         "below (or check the **Always Search** checkbox), then enter one ".
         "or more search queries into this field, one per line. ".
         "After binding, these queries will be used to identify the ".
         "record associated with the login name the user typed.\n\n".
         "Searches will be tried in order until a matching record is found. ".
         "Each query can be a simple attribute name (like `sn` or `mail`), ".
         "which will search for a matching record, or it can be a complex ".
         "query that uses the string `\${login}` to represent the login ".
         "name.\n\n".
         "A common simple configuration is just an attribute name, like ".
         "`sn`, which will work the same way direct binding works:\n\n".
         "  lang=text,name=Simple Example\n".
         "  sn\n\n".
         "A slightly more complex configuration might let the user login with ".
         "either their login name or email address:\n\n".
         "  lang=text,name=Match Several Attributes\n".
         "  mail\n".
         "  sn\n\n".
         "If your LDAP directory is more complex, or you want to perform ".
         "sophisticated filtering, you can use more complex queries. Depending ".
         "on your directory structure, this example might allow users to login ".
         "with either their email address or username, but only if they're in ".
         "specific departments:\n\n".
         "  lang=text,name=Complex Example\n".
         "  (&(mail=\${login})(|(departmentNumber=1)(departmentNumber=2)))\n".
         "  (&(sn=\${login})(|(departmentNumber=1)(departmentNumber=2)))\n\n".
         "All of the attribute names used here are just examples: your LDAP ".
         "server may use different attribute names."),
       self::KEY_ALWAYS_SEARCH => pht(
-        "To search for an LDAP record before authenticating, either check ".
-        "the **Always Search** checkbox or enter an anonymous ".
-        "username and password to use to perform the search."),
+        'To search for an LDAP record before authenticating, either check '.
+        'the **Always Search** checkbox or enter an anonymous '.
+        'username and password to use to perform the search.'),
       self::KEY_USERNAME_ATTRIBUTE => pht(
-        "Optionally, specify a username attribute to use to prefill usernames ".
-        "when registering a new account. This is purely cosmetic and does not ".
-        "affect the login process, but you can configure it to make sure ".
-        "users get the same default username as their LDAP username, so ".
-        "usernames remain consistent across systems."),
+        'Optionally, specify a username attribute to use to prefill usernames '.
+        'when registering a new account. This is purely cosmetic and does not '.
+        'affect the login process, but you can configure it to make sure '.
+        'users get the same default username as their LDAP username, so '.
+        'usernames remain consistent across systems.'),
       self::KEY_REALNAME_ATTRIBUTES => pht(
-        "Optionally, specify one or more comma-separated attributes to use to ".
-        "prefill the \"Real Name\" field when registering a new account. This ".
-        "is purely cosmetic and does not affect the login process, but can ".
-        "make registration a little easier."),
+        'Optionally, specify one or more comma-separated attributes to use to '.
+        'prefill the "Real Name" field when registering a new account. This '.
+        'is purely cosmetic and does not affect the login process, but can '.
+        'make registration a little easier.'),
     );
 
     foreach ($labels as $key => $label) {
       $caption = idx($captions, $key);
       $type = idx($types, $key);
       $value = idx($values, $key);
 
       $control = null;
       switch ($type) {
         case 'checkbox':
           $control = id(new AphrontFormCheckboxControl())
             ->addCheckbox(
               $key,
               1,
               hsprintf('<strong>%s:</strong> %s', $label, $caption),
               $value);
           break;
         case 'list':
           $control = id(new AphrontFormTextControl())
             ->setName($key)
             ->setLabel($label)
             ->setCaption($caption)
             ->setValue($value ? implode(', ', $value) : null);
           break;
         case 'password':
           $control = id(new AphrontFormPasswordControl())
             ->setName($key)
             ->setLabel($label)
             ->setCaption($caption)
             ->setValue($value);
           break;
         case 'textarea':
           $control = id(new AphrontFormTextAreaControl())
             ->setName($key)
             ->setLabel($label)
             ->setCaption($caption)
             ->setValue($value);
           break;
         default:
           $control = id(new AphrontFormTextControl())
             ->setName($key)
             ->setLabel($label)
             ->setCaption($caption)
             ->setValue($value);
           break;
       }
 
       $instruction_text = idx($instructions, $key);
       if (strlen($instruction_text)) {
         $form->appendRemarkupInstructions($instruction_text);
       }
 
       $form->appendChild($control);
     }
   }
 
   public function renderConfigPropertyTransactionTitle(
     PhabricatorAuthProviderConfigTransaction $xaction) {
 
     $author_phid = $xaction->getAuthorPHID();
     $old = $xaction->getOldValue();
     $new = $xaction->getNewValue();
     $key = $xaction->getMetadataValue(
       PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);
 
     $labels = $this->getPropertyLabels();
     if (isset($labels[$key])) {
       $label = $labels[$key];
 
       $mask = false;
       switch ($key) {
         case self::KEY_ANONYMOUS_PASSWORD:
           $mask = true;
           break;
       }
 
       if ($mask) {
         return pht(
           '%s updated the "%s" value.',
           $xaction->renderHandleLink($author_phid),
           $label);
       }
 
       if ($old === null || $old === '') {
         return pht(
           '%s set the "%s" value to "%s".',
           $xaction->renderHandleLink($author_phid),
           $label,
           $new);
       } else {
         return pht(
           '%s changed the "%s" value from "%s" to "%s".',
           $xaction->renderHandleLink($author_phid),
           $label,
           $old,
           $new);
       }
     }
 
     return parent::renderConfigPropertyTransactionTitle($xaction);
   }
 
   public static function getLDAPProvider() {
     $providers = self::getAllEnabledProviders();
 
     foreach ($providers as $provider) {
       if ($provider instanceof PhabricatorAuthProviderLDAP) {
         return $provider;
       }
     }
 
     return null;
   }
 
 }
diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php b/src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php
index ded2ff79e..0388e475f 100644
--- a/src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php
+++ b/src/applications/auth/provider/PhabricatorAuthProviderOAuth2.php
@@ -1,266 +1,266 @@
 <?php
 
 abstract class PhabricatorAuthProviderOAuth2
   extends PhabricatorAuthProviderOAuth {
 
   const PROPERTY_APP_ID = 'oauth:app:id';
   const PROPERTY_APP_SECRET = 'oauth:app:secret';
 
   protected function getIDKey() {
     return self::PROPERTY_APP_ID;
   }
 
   protected function getSecretKey() {
     return self::PROPERTY_APP_SECRET;
   }
 
 
   protected function configureAdapter(PhutilAuthAdapterOAuth $adapter) {
     $config = $this->getProviderConfig();
     $adapter->setClientID($config->getProperty(self::PROPERTY_APP_ID));
     $adapter->setClientSecret(
       new PhutilOpaqueEnvelope(
         $config->getProperty(self::PROPERTY_APP_SECRET)));
     $adapter->setRedirectURI(PhabricatorEnv::getURI($this->getLoginURI()));
     return $adapter;
   }
 
   protected function renderLoginForm(AphrontRequest $request, $mode) {
     $adapter = $this->getAdapter();
     $adapter->setState($this->getAuthCSRFCode($request));
 
     $scope = $request->getStr('scope');
     if ($scope) {
       $adapter->setScope($scope);
     }
 
     $attributes = array(
       'method' => 'GET',
       'uri' => $adapter->getAuthenticateURI(),
     );
 
     return $this->renderStandardLoginButton($request, $mode, $attributes);
   }
 
   public function processLoginRequest(
     PhabricatorAuthLoginController $controller) {
 
     $request = $controller->getRequest();
     $adapter = $this->getAdapter();
     $account = null;
     $response = null;
 
     $error = $request->getStr('error');
     if ($error) {
       $response = $controller->buildProviderErrorResponse(
         $this,
         pht(
           'The OAuth provider returned an error: %s',
           $error));
 
       return array($account, $response);
     }
 
     $this->verifyAuthCSRFCode($request, $request->getStr('state'));
 
     $code = $request->getStr('code');
     if (!strlen($code)) {
       $response = $controller->buildProviderErrorResponse(
         $this,
         pht(
           'The OAuth provider did not return a "code" parameter in its '.
           'response.'));
 
       return array($account, $response);
     }
 
     $adapter->setCode($code);
 
     // NOTE: As a side effect, this will cause the OAuth adapter to request
     // an access token.
 
     try {
       $account_id = $adapter->getAccountID();
     } catch (Exception $ex) {
       // TODO: Handle this in a more user-friendly way.
       throw $ex;
     }
 
     if (!strlen($account_id)) {
       $response = $controller->buildProviderErrorResponse(
         $this,
         pht(
           'The OAuth provider failed to retrieve an account ID.'));
 
       return array($account, $response);
     }
 
     return array($this->loadOrCreateAccount($account_id), $response);
   }
 
   public function processEditForm(
     AphrontRequest $request,
     array $values) {
 
     return $this->processOAuthEditForm(
       $request,
       $values,
       pht('Application ID is required.'),
       pht('Application secret is required.'));
   }
 
   public function extendEditForm(
     AphrontRequest $request,
     AphrontFormView $form,
     array $values,
     array $issues) {
 
     return $this->extendOAuthEditForm(
       $request,
       $form,
       $values,
       $issues,
       pht('OAuth App ID'),
       pht('OAuth App Secret'));
   }
 
   public function renderConfigPropertyTransactionTitle(
     PhabricatorAuthProviderConfigTransaction $xaction) {
 
     $author_phid = $xaction->getAuthorPHID();
     $old = $xaction->getOldValue();
     $new = $xaction->getNewValue();
     $key = $xaction->getMetadataValue(
       PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);
 
     switch ($key) {
       case self::PROPERTY_APP_ID:
         if (strlen($old)) {
           return pht(
             '%s updated the OAuth application ID for this provider from '.
             '"%s" to "%s".',
             $xaction->renderHandleLink($author_phid),
             $old,
             $new);
         } else {
           return pht(
             '%s set the OAuth application ID for this provider to '.
             '"%s".',
             $xaction->renderHandleLink($author_phid),
             $new);
         }
       case self::PROPERTY_APP_SECRET:
         if (strlen($old)) {
           return pht(
             '%s updated the OAuth application secret for this provider.',
             $xaction->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s set the OAuth application secret for this provider.',
             $xaction->renderHandleLink($author_phid));
         }
       case self::PROPERTY_APP_NOTE:
         if (strlen($old)) {
           return pht(
             '%s updated the OAuth application notes for this provider.',
             $xaction->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s set the OAuth application notes for this provider.',
             $xaction->renderHandleLink($author_phid));
         }
 
     }
 
     return parent::renderConfigPropertyTransactionTitle($xaction);
   }
 
   protected function synchronizeOAuthAccount(
     PhabricatorExternalAccount $account) {
     $adapter = $this->getAdapter();
 
     $oauth_token = $adapter->getAccessToken();
     $account->setProperty('oauth.token.access', $oauth_token);
 
     if ($adapter->supportsTokenRefresh()) {
       $refresh_token = $adapter->getRefreshToken();
       $account->setProperty('oauth.token.refresh', $refresh_token);
     } else {
       $account->setProperty('oauth.token.refresh', null);
     }
 
     $expires = $adapter->getAccessTokenExpires();
     $account->setProperty('oauth.token.access.expires', $expires);
   }
 
   public function getOAuthAccessToken(
     PhabricatorExternalAccount $account,
     $force_refresh = false) {
 
     if ($account->getProviderKey() !== $this->getProviderKey()) {
-      throw new Exception("Account does not match provider!");
+      throw new Exception('Account does not match provider!');
     }
 
     if (!$force_refresh) {
       $access_expires = $account->getProperty('oauth.token.access.expires');
       $access_token = $account->getProperty('oauth.token.access');
 
       // Don't return a token with fewer than this many seconds remaining until
       // it expires.
       $shortest_token = 60;
       if ($access_token) {
         if ($access_expires === null ||
             $access_expires > (time() + $shortest_token)) {
           return $access_token;
         }
       }
     }
 
     $refresh_token = $account->getProperty('oauth.token.refresh');
     if ($refresh_token) {
       $adapter = $this->getAdapter();
       if ($adapter->supportsTokenRefresh()) {
         $adapter->refreshAccessToken($refresh_token);
 
         $this->synchronizeOAuthAccount($account);
         $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
           $account->save();
         unset($unguarded);
 
         return $account->getProperty('oauth.token.access');
       }
     }
 
     return null;
   }
 
   public function willRenderLinkedAccount(
     PhabricatorUser $viewer,
     PHUIObjectItemView $item,
     PhabricatorExternalAccount $account) {
 
     // Get a valid token, possibly refreshing it.
     $oauth_token = $this->getOAuthAccessToken($account);
 
     $item->addAttribute(pht('OAuth2 Account'));
 
     if ($oauth_token) {
       $oauth_expires = $account->getProperty('oauth.token.access.expires');
       if ($oauth_expires) {
         $item->addAttribute(
           pht(
             'Active OAuth Token (Expires: %s)',
             phabricator_datetime($oauth_expires, $viewer)));
       } else {
         $item->addAttribute(
           pht(
             'Active OAuth Token'));
       }
     } else {
       $item->addAttribute(pht('No OAuth Access Token'));
     }
 
     parent::willRenderLinkedAccount($viewer, $item, $account);
   }
 
 }
diff --git a/src/applications/auth/provider/PhabricatorAuthProviderPersona.php b/src/applications/auth/provider/PhabricatorAuthProviderPersona.php
index dca32ed3d..0e89c2cbc 100644
--- a/src/applications/auth/provider/PhabricatorAuthProviderPersona.php
+++ b/src/applications/auth/provider/PhabricatorAuthProviderPersona.php
@@ -1,83 +1,83 @@
 <?php
 
 final class PhabricatorAuthProviderPersona
   extends PhabricatorAuthProvider {
 
   private $adapter;
 
   public function getProviderName() {
     return pht('Persona');
   }
 
   public function getDescriptionForCreate() {
     return pht(
       'Allow users to login or register using Mozilla Persona.');
   }
 
   public function getAdapter() {
     if (!$this->adapter) {
       $adapter = new PhutilAuthAdapterPersona();
       $this->adapter = $adapter;
     }
     return $this->adapter;
   }
 
   protected function renderLoginForm(
     AphrontRequest $request,
     $mode) {
 
     Javelin::initBehavior(
       'persona-login',
       array(
         'loginURI' => PhabricatorEnv::getURI($this->getLoginURI()),
       ));
 
     return $this->renderStandardLoginButton(
       $request,
       $mode,
       array(
         'uri' => $this->getLoginURI(),
         'sigil' => 'persona-login-form',
       ));
   }
 
   public function isLoginFormAButton() {
     return true;
   }
 
   public function processLoginRequest(
     PhabricatorAuthLoginController $controller) {
 
     $request = $controller->getRequest();
     $adapter = $this->getAdapter();
 
     $account = null;
     $response = null;
 
     if (!$request->isAjax()) {
-      throw new Exception("Expected this request to come via Ajax.");
+      throw new Exception('Expected this request to come via Ajax.');
     }
 
     $assertion = $request->getStr('assertion');
     if (!$assertion) {
-      throw new Exception("Expected identity assertion.");
+      throw new Exception('Expected identity assertion.');
     }
 
     $adapter->setAssertion($assertion);
     $adapter->setAudience(PhabricatorEnv::getURI('/'));
 
     try {
       $account_id = $adapter->getAccountID();
     } catch (Exception $ex) {
       // TODO: Handle this in a more user-friendly way.
       throw $ex;
     }
 
     return array($this->loadOrCreateAccount($account_id), $response);
   }
 
   protected function getLoginIcon() {
     return 'Persona';
   }
 
 }
diff --git a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
index f9cf6879d..154116b5a 100644
--- a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
+++ b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
@@ -1,154 +1,154 @@
 <?php
 
 final class PhabricatorAuthProviderConfigTransaction
   extends PhabricatorApplicationTransaction {
 
   const TYPE_ENABLE         = 'config:enable';
   const TYPE_REGISTRATION   = 'config:registration';
   const TYPE_LINK           = 'config:link';
   const TYPE_UNLINK         = 'config:unlink';
-  const TYPE_TRUST_EMAILS   = "config:trustEmails";
+  const TYPE_TRUST_EMAILS   = 'config:trustEmails';
   const TYPE_PROPERTY       = 'config:property';
 
   const PROPERTY_KEY        = 'auth:property';
 
   private $provider;
 
   public function setProvider(PhabricatorAuthProvider $provider) {
     $this->provider = $provider;
     return $this;
   }
 
   public function getProvider() {
     return $this->provider;
   }
 
   public function getApplicationName() {
     return 'auth';
   }
 
   public function getApplicationTransactionType() {
     return PhabricatorPHIDConstants::PHID_TYPE_AUTH;
   }
 
   public function getApplicationTransactionCommentObject() {
     return null;
   }
 
   public function getIcon() {
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_ENABLE:
         if ($new) {
           return 'fa-play';
         } else {
           return 'fa-pause';
         }
     }
 
     return parent::getIcon();
   }
 
   public function getColor() {
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_ENABLE:
         if ($new) {
           return 'green';
         } else {
           return 'red';
         }
     }
 
     return parent::getColor();
   }
 
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_ENABLE:
         if ($old === null) {
           return pht(
             '%s created this provider.',
             $this->renderHandleLink($author_phid));
         } else if ($new) {
           return pht(
             '%s enabled this provider.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s disabled this provider.',
             $this->renderHandleLink($author_phid));
         }
         break;
       case self::TYPE_REGISTRATION:
         if ($new) {
           return pht(
             '%s enabled registration.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s disabled registration.',
             $this->renderHandleLink($author_phid));
         }
         break;
       case self::TYPE_LINK:
         if ($new) {
           return pht(
             '%s enabled accont linking.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s disabled account linking.',
             $this->renderHandleLink($author_phid));
         }
         break;
       case self::TYPE_UNLINK:
         if ($new) {
           return pht(
             '%s enabled account unlinking.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s disabled account unlinking.',
             $this->renderHandleLink($author_phid));
         }
         break;
       case self::TYPE_TRUST_EMAILS:
         if ($new) {
           return pht(
             '%s enabled email trust.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s disabled email trust.',
             $this->renderHandleLink($author_phid));
         }
         break;
       case self::TYPE_PROPERTY:
         $provider = $this->getProvider();
         if ($provider) {
           $title = $provider->renderConfigPropertyTransactionTitle($this);
           if (strlen($title)) {
             return $title;
           }
         }
 
         return pht(
           '%s edited a property of this provider.',
           $this->renderHandleLink($author_phid));
         break;
     }
 
     return parent::getTitle();
   }
 
 }
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 8db15f466..af1ed6ec2 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -1,533 +1,533 @@
 <?php
 
 abstract class PhabricatorController extends AphrontController {
 
   private $handles;
 
   public function shouldRequireLogin() {
     return true;
   }
 
   public function shouldRequireAdmin() {
     return false;
   }
 
   public function shouldRequireEnabledUser() {
     return true;
   }
 
   public function shouldAllowPublic() {
     return false;
   }
 
   public function shouldAllowPartialSessions() {
     return false;
   }
 
   public function shouldRequireEmailVerification() {
     return PhabricatorUserEmail::isEmailVerificationRequired();
   }
 
   public function shouldAllowRestrictedParameter($parameter_name) {
     return false;
   }
 
   public function shouldRequireMultiFactorEnrollment() {
     if (!$this->shouldRequireLogin()) {
       return false;
     }
 
     if (!$this->shouldRequireEnabledUser()) {
       return false;
     }
 
     if ($this->shouldAllowPartialSessions()) {
       return false;
     }
 
     $user = $this->getRequest()->getUser();
     if (!$user->getIsStandardUser()) {
       return false;
     }
 
     return PhabricatorEnv::getEnvConfig('security.require-multi-factor-auth');
   }
 
   public function willBeginExecution() {
     $request = $this->getRequest();
 
     if ($request->getUser()) {
       // NOTE: Unit tests can set a user explicitly. Normal requests are not
       // permitted to do this.
       PhabricatorTestCase::assertExecutingUnitTests();
       $user = $request->getUser();
     } else {
       $user = new PhabricatorUser();
       $session_engine = new PhabricatorAuthSessionEngine();
 
       $phsid = $request->getCookie(PhabricatorCookies::COOKIE_SESSION);
       if (strlen($phsid)) {
         $session_user = $session_engine->loadUserForSession(
           PhabricatorAuthSession::TYPE_WEB,
           $phsid);
         if ($session_user) {
           $user = $session_user;
         }
       } else {
         // If the client doesn't have a session token, generate an anonymous
         // session. This is used to provide CSRF protection to logged-out users.
         $phsid = $session_engine->establishSession(
           PhabricatorAuthSession::TYPE_WEB,
           null,
           $partial = false);
 
         // This may be a resource request, in which case we just don't set
         // the cookie.
         if ($request->canSetCookies()) {
           $request->setCookie(PhabricatorCookies::COOKIE_SESSION, $phsid);
         }
       }
 
 
       if (!$user->isLoggedIn()) {
         $user->attachAlternateCSRFString(PhabricatorHash::digest($phsid));
       }
 
       $request->setUser($user);
     }
 
     $translation = $user->getTranslation();
     if ($translation &&
         $translation != PhabricatorEnv::getEnvConfig('translation.provider')) {
       $translation = newv($translation, array());
       PhutilTranslator::getInstance()
         ->setLanguage($translation->getLanguage())
         ->addTranslations($translation->getTranslations());
     }
 
     $preferences = $user->loadPreferences();
     if (PhabricatorEnv::getEnvConfig('darkconsole.enabled')) {
       $dark_console = PhabricatorUserPreferences::PREFERENCE_DARK_CONSOLE;
       if ($preferences->getPreference($dark_console) ||
          PhabricatorEnv::getEnvConfig('darkconsole.always-on')) {
         $console = new DarkConsoleCore();
         $request->getApplicationConfiguration()->setConsole($console);
       }
     }
 
     // NOTE: We want to set up the user first so we can render a real page
     // here, but fire this before any real logic.
     $restricted = array(
       'code',
     );
     foreach ($restricted as $parameter) {
       if ($request->getExists($parameter)) {
         if (!$this->shouldAllowRestrictedParameter($parameter)) {
           throw new Exception(
             pht(
               'Request includes restricted parameter "%s", but this '.
               'controller ("%s") does not whitelist it. Refusing to '.
               'serve this request because it might be part of a redirection '.
               'attack.',
               $parameter,
               get_class($this)));
         }
       }
     }
 
     if ($this->shouldRequireEnabledUser()) {
       if ($user->isLoggedIn() && !$user->getIsApproved()) {
         $controller = new PhabricatorAuthNeedsApprovalController($request);
         return $this->delegateToController($controller);
       }
       if ($user->getIsDisabled()) {
         $controller = new PhabricatorDisabledUserController($request);
         return $this->delegateToController($controller);
       }
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_CONTROLLER_CHECKREQUEST,
       array(
         'request' => $request,
         'controller' => $this,
       ));
     $event->setUser($user);
     PhutilEventEngine::dispatchEvent($event);
     $checker_controller = $event->getValue('controller');
     if ($checker_controller != $this) {
       return $this->delegateToController($checker_controller);
     }
 
     $auth_class = 'PhabricatorApplicationAuth';
     $auth_application = PhabricatorApplication::getByClass($auth_class);
 
     // Require partial sessions to finish login before doing anything.
     if (!$this->shouldAllowPartialSessions()) {
       if ($user->hasSession() &&
           $user->getSession()->getIsPartial()) {
         $login_controller = new PhabricatorAuthFinishController($request);
         $this->setCurrentApplication($auth_application);
         return $this->delegateToController($login_controller);
       }
     }
 
     // Check if the user needs to configure MFA.
     $need_mfa = $this->shouldRequireMultiFactorEnrollment();
     $have_mfa = $user->getIsEnrolledInMultiFactor();
     if ($need_mfa && !$have_mfa) {
       // Check if the cache is just out of date. Otherwise, roadblock the user
       // and require MFA enrollment.
       $user->updateMultiFactorEnrollment();
       if (!$user->getIsEnrolledInMultiFactor()) {
         $mfa_controller = new PhabricatorAuthNeedsMultiFactorController(
           $request);
         $this->setCurrentApplication($auth_application);
         return $this->delegateToController($mfa_controller);
       }
     }
 
     if ($this->shouldRequireLogin()) {
       // This actually means we need either:
       //   - a valid user, or a public controller; and
       //   - permission to see the application.
 
       $allow_public = $this->shouldAllowPublic() &&
                       PhabricatorEnv::getEnvConfig('policy.allow-public');
 
       // If this controller isn't public, and the user isn't logged in, require
       // login.
       if (!$allow_public && !$user->isLoggedIn()) {
         $login_controller = new PhabricatorAuthStartController($request);
         $this->setCurrentApplication($auth_application);
         return $this->delegateToController($login_controller);
       }
 
       if ($user->isLoggedIn()) {
         if ($this->shouldRequireEmailVerification()) {
           if (!$user->getIsEmailVerified()) {
             $controller = new PhabricatorMustVerifyEmailController($request);
             $this->setCurrentApplication($auth_application);
             return $this->delegateToController($controller);
           }
         }
       }
 
       // If the user doesn't have access to the application, don't let them use
       // any of its controllers. We query the application in order to generate
       // a policy exception if the viewer doesn't have permission.
 
       $application = $this->getCurrentApplication();
       if ($application) {
         id(new PhabricatorApplicationQuery())
           ->setViewer($user)
           ->withPHIDs(array($application->getPHID()))
           ->executeOne();
       }
     }
 
     // NOTE: We do this last so that users get a login page instead of a 403
     // if they need to login.
     if ($this->shouldRequireAdmin() && !$user->getIsAdmin()) {
       return new Aphront403Response();
     }
 
   }
 
   public function buildStandardPageView() {
     $view = new PhabricatorStandardPageView();
     $view->setRequest($this->getRequest());
     $view->setController($this);
     return $view;
   }
 
   public function buildStandardPageResponse($view, array $data) {
     $page = $this->buildStandardPageView();
     $page->appendChild($view);
     $response = new AphrontWebpageResponse();
     $response->setContent($page->render());
     return $response;
   }
 
   public function getApplicationURI($path = '') {
     if (!$this->getCurrentApplication()) {
-      throw new Exception("No application!");
+      throw new Exception('No application!');
     }
     return $this->getCurrentApplication()->getApplicationURI($path);
   }
 
   public function buildApplicationPage($view, array $options) {
     $page = $this->buildStandardPageView();
 
     $title = PhabricatorEnv::getEnvConfig('phabricator.serious-business') ?
       'Phabricator' :
       pht('Bacon Ice Cream for Breakfast');
 
     $application = $this->getCurrentApplication();
     $page->setTitle(idx($options, 'title', $title));
     if ($application) {
       $page->setApplicationName($application->getName());
       if ($application->getTitleGlyph()) {
         $page->setGlyph($application->getTitleGlyph());
       }
     }
 
     if (!($view instanceof AphrontSideNavFilterView)) {
       $nav = new AphrontSideNavFilterView();
       $nav->appendChild($view);
       $view = $nav;
     }
 
     $user = $this->getRequest()->getUser();
     $view->setUser($user);
 
     $page->appendChild($view);
 
     $object_phids = idx($options, 'pageObjects', array());
     if ($object_phids) {
       $page->appendPageObjects($object_phids);
       foreach ($object_phids as $object_phid) {
         PhabricatorFeedStoryNotification::updateObjectNotificationViews(
           $user,
           $object_phid);
       }
     }
 
     if (idx($options, 'device')) {
       $page->setDeviceReady(true);
     }
 
     $page->setShowChrome(idx($options, 'chrome', true));
 
     $application_menu = $this->buildApplicationMenu();
     if ($application_menu) {
       $page->setApplicationMenu($application_menu);
     }
 
     $response = new AphrontWebpageResponse();
     return $response->setContent($page->render());
   }
 
   public function didProcessRequest($response) {
     // If a bare DialogView is returned, wrap it in a DialogResponse.
     if ($response instanceof AphrontDialogView) {
       $response = id(new AphrontDialogResponse())->setDialog($response);
     }
 
     $request = $this->getRequest();
     $response->setRequest($request);
 
     $seen = array();
     while ($response instanceof AphrontProxyResponse) {
 
       $hash = spl_object_hash($response);
       if (isset($seen[$hash])) {
         $seen[] = get_class($response);
         throw new Exception(
-          "Cycle while reducing proxy responses: ".
+          'Cycle while reducing proxy responses: '.
           implode(' -> ', $seen));
       }
       $seen[$hash] = get_class($response);
 
       $response = $response->reduceProxyResponse();
     }
 
     if ($response instanceof AphrontDialogResponse) {
       if (!$request->isAjax()) {
         $dialog = $response->getDialog();
 
         $title = $dialog->getTitle();
         $short = $dialog->getShortTitle();
 
         $crumbs = $this->buildApplicationCrumbs();
         $crumbs->addTextCrumb(coalesce($short, $title));
 
         $page_content = array(
           $crumbs,
           $response->buildResponseString(),
         );
 
         $view = id(new PhabricatorStandardPageView())
           ->setRequest($request)
           ->setController($this)
           ->setTitle($title)
           ->appendChild($page_content);
 
         $response = id(new AphrontWebpageResponse())
           ->setContent($view->render())
           ->setHTTPResponseCode($response->getHTTPResponseCode());
       } else {
         $response->getDialog()->setIsStandalone(true);
 
         return id(new AphrontAjaxResponse())
           ->setContent(array(
             'dialog' => $response->buildResponseString(),
           ));
       }
     } else if ($response instanceof AphrontRedirectResponse) {
       if ($request->isAjax()) {
         return id(new AphrontAjaxResponse())
           ->setContent(
             array(
               'redirect' => $response->getURI(),
             ));
       }
     }
 
     return $response;
   }
 
   protected function getHandle($phid) {
     if (empty($this->handles[$phid])) {
       throw new Exception(
         "Attempting to access handle which wasn't loaded: {$phid}");
     }
     return $this->handles[$phid];
   }
 
   protected function loadHandles(array $phids) {
     $phids = array_filter($phids);
     $this->handles = $this->loadViewerHandles($phids);
     return $this;
   }
 
   protected function getLoadedHandles() {
     return $this->handles;
   }
 
   protected function loadViewerHandles(array $phids) {
     return id(new PhabricatorHandleQuery())
       ->setViewer($this->getRequest()->getUser())
       ->withPHIDs($phids)
       ->execute();
   }
 
 
   /**
    * Render a list of links to handles, identified by PHIDs. The handles must
    * already be loaded.
    *
    * @param   list<phid>  List of PHIDs to render links to.
    * @param   string      Style, one of "\n" (to put each item on its own line)
    *                      or "," (to list items inline, separated by commas).
    * @return  string      Rendered list of handle links.
    */
   protected function renderHandlesForPHIDs(array $phids, $style = "\n") {
     $style_map = array(
       "\n"  => phutil_tag('br'),
       ','   => ', ',
     );
 
     if (empty($style_map[$style])) {
       throw new Exception("Unknown handle list style '{$style}'!");
     }
 
     return implode_selected_handle_links($style_map[$style],
       $this->getLoadedHandles(),
       array_filter($phids));
   }
 
   protected function buildApplicationMenu() {
     return null;
   }
 
   protected function buildApplicationCrumbs() {
 
     $crumbs = array();
 
     $application = $this->getCurrentApplication();
     if ($application) {
       $sprite = $application->getIconName();
       if (!$sprite) {
         $sprite = 'application';
       }
 
       $crumbs[] = id(new PhabricatorCrumbView())
         ->setHref($this->getApplicationURI())
         ->setAural($application->getName())
         ->setIcon($sprite);
     }
 
     $view = new PhabricatorCrumbsView();
     foreach ($crumbs as $crumb) {
       $view->addCrumb($crumb);
     }
 
     return $view;
   }
 
   protected function hasApplicationCapability($capability) {
     return PhabricatorPolicyFilter::hasCapability(
       $this->getRequest()->getUser(),
       $this->getCurrentApplication(),
       $capability);
   }
 
   protected function requireApplicationCapability($capability) {
     PhabricatorPolicyFilter::requireCapability(
       $this->getRequest()->getUser(),
       $this->getCurrentApplication(),
       $capability);
   }
 
   protected function explainApplicationCapability(
     $capability,
     $positive_message,
     $negative_message) {
 
     $can_act = $this->hasApplicationCapability($capability);
     if ($can_act) {
       $message = $positive_message;
       $icon_name = 'fa-play-circle-o lightgreytext';
     } else {
       $message = $negative_message;
       $icon_name = 'fa-lock';
     }
 
     $icon = id(new PHUIIconView())
       ->setIconFont($icon_name);
 
     require_celerity_resource('policy-css');
 
     $phid = $this->getCurrentApplication()->getPHID();
     $explain_uri = "/policy/explain/{$phid}/{$capability}/";
 
     $message = phutil_tag(
       'div',
       array(
         'class' => 'policy-capability-explanation',
       ),
       array(
         $icon,
         javelin_tag(
           'a',
           array(
             'href' => $explain_uri,
             'sigil' => 'workflow',
           ),
           $message),
       ));
 
     return array($can_act, $message);
   }
 
   public function getDefaultResourceSource() {
     return 'phabricator';
   }
 
 
   /**
    * Create a new @{class:AphrontDialogView} with defaults filled in.
    *
    * @return AphrontDialogView New dialog.
    */
   protected function newDialog() {
     $submit_uri = new PhutilURI($this->getRequest()->getRequestURI());
     $submit_uri = $submit_uri->getPath();
 
     return id(new AphrontDialogView())
       ->setUser($this->getRequest()->getUser())
       ->setSubmitURI($submit_uri);
   }
 
 }
diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
index 5bc9c32ec..dc6b0713d 100644
--- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
+++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
@@ -1,281 +1,281 @@
 <?php
 
 final class PhabricatorAccessControlTestCase
   extends PhabricatorTestCase {
 
   protected function getPhabricatorTestCaseConfiguration() {
     return array(
       self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
     );
   }
 
   public function testControllerAccessControls() {
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/support/PhabricatorStartup.php';
 
     $application_configuration = new AphrontDefaultApplicationConfiguration();
 
     $host = 'meow.example.com';
 
     $_SERVER['REQUEST_METHOD'] = 'GET';
 
     $request = id(new AphrontRequest($host, '/'))
       ->setApplicationConfiguration($application_configuration)
       ->setRequestData(array());
 
     $controller = new PhabricatorTestController($request);
 
     $u_public = id(new PhabricatorUser())
       ->setUsername('public');
 
     $u_unverified = $this->generateNewTestUser()
       ->setUsername('unverified')
       ->save();
     $u_unverified->setIsEmailVerified(0)->save();
 
     $u_normal = $this->generateNewTestUser()
       ->setUsername('normal')
       ->save();
 
     $u_disabled = $this->generateNewTestUser()
       ->setIsDisabled(true)
       ->setUsername('disabled')
       ->save();
 
     $u_admin = $this->generateNewTestUser()
       ->setIsAdmin(true)
       ->setUsername('admin')
       ->save();
 
     $u_notapproved = $this->generateNewTestUser()
       ->setIsApproved(0)
       ->setUsername('notapproved')
       ->save();
 
     $env = PhabricatorEnv::beginScopedEnv();
     $env->overrideEnvConfig('phabricator.base-uri', 'http://'.$host);
     $env->overrideEnvConfig('policy.allow-public', false);
     $env->overrideEnvConfig('auth.require-email-verification', false);
     $env->overrideEnvConfig('auth.email-domains', array());
     $env->overrideEnvConfig('security.require-multi-factor-auth', false);
 
 
     // Test standard defaults.
 
     $this->checkAccess(
-      "Default",
+      'Default',
       id(clone $controller),
       $request,
       array(
         $u_normal,
         $u_admin,
         $u_unverified,
       ),
       array(
         $u_public,
         $u_disabled,
         $u_notapproved,
       ));
 
 
     // Test email verification.
 
     $env->overrideEnvConfig('auth.require-email-verification', true);
     $this->checkAccess(
-      "Email Verification Required",
+      'Email Verification Required',
       id(clone $controller),
       $request,
       array(
         $u_normal,
         $u_admin,
       ),
       array(
         $u_unverified,
         $u_public,
         $u_disabled,
         $u_notapproved,
       ));
 
     $this->checkAccess(
-      "Email Verification Required, With Exception",
+      'Email Verification Required, With Exception',
       id(clone $controller)->setConfig('email', false),
       $request,
       array(
         $u_normal,
         $u_admin,
         $u_unverified,
       ),
       array(
         $u_public,
         $u_disabled,
         $u_notapproved,
       ));
     $env->overrideEnvConfig('auth.require-email-verification', false);
 
 
     // Test admin access.
 
     $this->checkAccess(
-      "Admin Required",
+      'Admin Required',
       id(clone $controller)->setConfig('admin', true),
       $request,
       array(
         $u_admin,
       ),
       array(
         $u_normal,
         $u_unverified,
         $u_public,
         $u_disabled,
         $u_notapproved,
       ));
 
 
     // Test disabled access.
 
     $this->checkAccess(
-      "Allow Disabled",
+      'Allow Disabled',
       id(clone $controller)->setConfig('enabled', false),
       $request,
       array(
         $u_normal,
         $u_unverified,
         $u_admin,
         $u_disabled,
         $u_notapproved,
       ),
       array(
         $u_public,
       ));
 
 
     // Test no login required.
 
     $this->checkAccess(
-      "No Login Required",
+      'No Login Required',
       id(clone $controller)->setConfig('login', false),
       $request,
       array(
         $u_normal,
         $u_unverified,
         $u_admin,
         $u_public,
       ),
       array(
         $u_disabled,
         $u_notapproved,
       ));
 
 
     // Test public access.
 
     $this->checkAccess(
-      "No Login Required",
+      'No Login Required',
       id(clone $controller)->setConfig('public', true),
       $request,
       array(
         $u_normal,
         $u_unverified,
         $u_admin,
       ),
       array(
         $u_disabled,
         $u_public,
       ));
 
     $env->overrideEnvConfig('policy.allow-public', true);
     $this->checkAccess(
-      "Public + configured",
+      'Public + configured',
       id(clone $controller)->setConfig('public', true),
       $request,
       array(
         $u_normal,
         $u_unverified,
         $u_admin,
         $u_public,
       ),
       array(
         $u_disabled,
         $u_notapproved,
       ));
     $env->overrideEnvConfig('policy.allow-public', false);
 
 
     $app = PhabricatorApplication::getByClass('PhabricatorApplicationTest');
     $app->reset();
     $app->setPolicy(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicies::POLICY_NOONE);
 
     $app_controller = id(clone $controller)->setCurrentApplication($app);
 
     $this->checkAccess(
-      "Application Controller",
+      'Application Controller',
       $app_controller,
       $request,
       array(
       ),
       array(
         $u_normal,
         $u_unverified,
         $u_admin,
         $u_public,
         $u_disabled,
         $u_notapproved,
       ));
 
     $this->checkAccess(
-      "Application Controller",
+      'Application Controller',
       id(clone $app_controller)->setConfig('login', false),
       $request,
       array(
         $u_normal,
         $u_unverified,
         $u_admin,
         $u_public,
       ),
       array(
         $u_disabled,
         $u_notapproved,
       ));
   }
 
   private function checkAccess(
     $label,
     $controller,
     $request,
     array $yes,
     array $no) {
 
     foreach ($yes as $user) {
       $request->setUser($user);
       $uname = $user->getUsername();
 
       try {
         $result = id(clone $controller)->willBeginExecution();
       } catch (Exception $ex) {
         $result = $ex;
       }
 
       $this->assertTrue(
         ($result === null),
         "Expect user '{$uname}' to be allowed access to '{$label}'.");
     }
 
     foreach ($no as $user) {
       $request->setUser($user);
       $uname = $user->getUsername();
 
       try {
         $result = id(clone $controller)->willBeginExecution();
       } catch (Exception $ex) {
         $result = $ex;
       }
 
       $this->assertFalse(
         ($result === null),
         "Expect user '{$uname}' to be denied access to '{$label}'.");
     }
   }
 
 }
diff --git a/src/applications/cache/PhabricatorKeyValueDatabaseCache.php b/src/applications/cache/PhabricatorKeyValueDatabaseCache.php
index aa641ab70..5bdf60f66 100644
--- a/src/applications/cache/PhabricatorKeyValueDatabaseCache.php
+++ b/src/applications/cache/PhabricatorKeyValueDatabaseCache.php
@@ -1,170 +1,170 @@
 <?php
 
 final class PhabricatorKeyValueDatabaseCache
   extends PhutilKeyValueCache {
 
   const CACHE_FORMAT_RAW        = 'raw';
   const CACHE_FORMAT_DEFLATE    = 'deflate';
 
   public function setKeys(array $keys, $ttl = null) {
     if ($keys) {
       $map = $this->digestKeys(array_keys($keys));
       $conn_w = $this->establishConnection('w');
 
       $sql = array();
       foreach ($map as $key => $hash) {
         $value = $keys[$key];
 
         list($format, $storage_value) = $this->willWriteValue($key, $value);
 
         $sql[] = qsprintf(
           $conn_w,
           '(%s, %s, %s, %B, %d, %nd)',
           $hash,
           $key,
           $format,
           $storage_value,
           time(),
           $ttl ? (time() + $ttl) : null);
       }
 
       $guard = AphrontWriteGuard::beginScopedUnguardedWrites();
         foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
             queryfx(
               $conn_w,
               'INSERT INTO %T
                 (cacheKeyHash, cacheKey, cacheFormat, cacheData,
                   cacheCreated, cacheExpires) VALUES %Q
                 ON DUPLICATE KEY UPDATE
                   cacheKey = VALUES(cacheKey),
                   cacheFormat = VALUES(cacheFormat),
                   cacheData = VALUES(cacheData),
                   cacheCreated = VALUES(cacheCreated),
                   cacheExpires = VALUES(cacheExpires)',
               $this->getTableName(),
               $chunk);
         }
       unset($guard);
     }
 
     return $this;
   }
 
   public function getKeys(array $keys) {
     $results = array();
     if ($keys) {
       $map = $this->digestKeys($keys);
 
       $rows = queryfx_all(
         $this->establishConnection('r'),
         'SELECT * FROM %T WHERE cacheKeyHash IN (%Ls)',
         $this->getTableName(),
         $map);
       $rows = ipull($rows, null, 'cacheKey');
 
       foreach ($keys as $key) {
         if (empty($rows[$key])) {
           continue;
         }
 
         $row = $rows[$key];
 
         if ($row['cacheExpires'] && ($row['cacheExpires'] < time())) {
           continue;
         }
 
         try {
           $results[$key] = $this->didReadValue(
             $row['cacheFormat'],
             $row['cacheData']);
         } catch (Exception $ex) {
           // Treat this as a cache miss.
           phlog($ex);
         }
       }
     }
 
     return $results;
   }
 
   public function deleteKeys(array $keys) {
     if ($keys) {
       $map = $this->digestKeys($keys);
       queryfx(
         $this->establishConnection('w'),
         'DELETE FROM %T WHERE cacheKeyHash IN (%Ls)',
         $this->getTableName(),
         $keys);
     }
 
     return $this;
   }
 
   public function destroyCache() {
     queryfx(
       $this->establishConnection('w'),
       'DELETE FROM %T',
       $this->getTableName());
     return $this;
   }
 
 
 /* -(  Raw Cache Access  )--------------------------------------------------- */
 
 
   public function establishConnection($mode) {
     // TODO: This is the only concrete table we have on the database right
     // now.
     return id(new PhabricatorMarkupCache())->establishConnection($mode);
   }
 
   public function getTableName() {
     return 'cache_general';
   }
 
 
 /* -(  Implementation  )----------------------------------------------------- */
 
 
   private function digestKeys(array $keys) {
     $map = array();
     foreach ($keys as $key) {
       $map[$key] = PhabricatorHash::digestForIndex($key);
     }
     return $map;
   }
 
   private function willWriteValue($key, $value) {
     if (!is_string($value)) {
-      throw new Exception("Only strings may be written to the DB cache!");
+      throw new Exception('Only strings may be written to the DB cache!');
     }
 
     static $can_deflate;
     if ($can_deflate === null) {
       $can_deflate = function_exists('gzdeflate') &&
                      PhabricatorEnv::getEnvConfig('cache.enable-deflate');
     }
 
     if ($can_deflate) {
       $deflated = PhabricatorCaches::maybeDeflateData($value);
       if ($deflated !== null) {
         return array(self::CACHE_FORMAT_DEFLATE, $deflated);
       }
     }
 
     return array(self::CACHE_FORMAT_RAW, $value);
   }
 
   private function didReadValue($format, $value) {
     switch ($format) {
       case self::CACHE_FORMAT_RAW:
         return $value;
       case self::CACHE_FORMAT_DEFLATE:
         return PhabricatorCaches::inflateData($value);
       default:
-        throw new Exception("Unknown cache format.");
+        throw new Exception('Unknown cache format.');
     }
   }
 
 
 }
diff --git a/src/applications/cache/management/PhabricatorCacheManagementPurgeWorkflow.php b/src/applications/cache/management/PhabricatorCacheManagementPurgeWorkflow.php
index 709c66ba6..2d6de653b 100644
--- a/src/applications/cache/management/PhabricatorCacheManagementPurgeWorkflow.php
+++ b/src/applications/cache/management/PhabricatorCacheManagementPurgeWorkflow.php
@@ -1,99 +1,99 @@
 <?php
 
 final class PhabricatorCacheManagementPurgeWorkflow
   extends PhabricatorCacheManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('purge')
       ->setSynopsis('Drop data from caches.')
       ->setArguments(
         array(
           array(
             'name'    => 'purge-all',
             'help'    => 'Purge all caches.',
           ),
           array(
             'name'    => 'purge-remarkup',
             'help'    => 'Purge the remarkup cache.',
           ),
           array(
             'name'    => 'purge-changeset',
             'help'    => 'Purge the Differential changeset cache.',
           ),
           array(
             'name'    => 'purge-general',
             'help'    => 'Purge the general cache.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $purge_all = $args->getArg('purge-all');
 
     $purge = array(
       'remarkup'  => $purge_all || $args->getArg('purge-remarkup'),
       'changeset' => $purge_all || $args->getArg('purge-changeset'),
       'general'   => $purge_all || $args->getArg('purge-general'),
     );
 
     if (!array_filter($purge)) {
       $list = array();
       foreach ($purge as $key => $ignored) {
         $list[] = "'--purge-".$key."'";
       }
 
       throw new PhutilArgumentUsageException(
         "Specify which cache or caches to purge, or use '--purge-all'. ".
         "Available caches are: ".implode(', ', $list).". Use '--help' ".
         "for more information.");
     }
 
     if ($purge['remarkup']) {
-      $console->writeOut("Purging remarkup cache...");
+      $console->writeOut('Purging remarkup cache...');
       $this->purgeRemarkupCache();
       $console->writeOut("done.\n");
     }
 
     if ($purge['changeset']) {
-      $console->writeOut("Purging changeset cache...");
+      $console->writeOut('Purging changeset cache...');
       $this->purgeChangesetCache();
       $console->writeOut("done.\n");
     }
 
     if ($purge['general']) {
-      $console->writeOut("Purging general cache...");
+      $console->writeOut('Purging general cache...');
       $this->purgeGeneralCache();
       $console->writeOut("done.\n");
     }
   }
 
   private function purgeRemarkupCache() {
     $conn_w = id(new PhabricatorMarkupCache())->establishConnection('w');
 
     queryfx(
       $conn_w,
       'TRUNCATE TABLE %T',
       id(new PhabricatorMarkupCache())->getTableName());
   }
 
   private function purgeChangesetCache() {
     $conn_w = id(new DifferentialChangeset())->establishConnection('w');
     queryfx(
       $conn_w,
       'TRUNCATE TABLE %T',
       DifferentialChangeset::TABLE_CACHE);
   }
 
   private function purgeGeneralCache() {
     $conn_w = id(new PhabricatorMarkupCache())->establishConnection('w');
 
     queryfx(
       $conn_w,
       'TRUNCATE TABLE %T',
       'cache_general');
   }
 
 }
diff --git a/src/applications/calendar/view/AphrontCalendarEventView.php b/src/applications/calendar/view/AphrontCalendarEventView.php
index 6ab2b9d8e..c34d3c6d5 100644
--- a/src/applications/calendar/view/AphrontCalendarEventView.php
+++ b/src/applications/calendar/view/AphrontCalendarEventView.php
@@ -1,94 +1,94 @@
 <?php
 
 final class AphrontCalendarEventView extends AphrontView {
 
   private $userPHID;
   private $name;
   private $epochStart;
   private $epochEnd;
   private $description;
   private $eventID;
   private $color;
 
   public function setEventID($event_id) {
     $this->eventID = $event_id;
     return $this;
   }
   public function getEventID() {
     return $this->eventID;
   }
 
   public function setUserPHID($user_phid) {
     $this->userPHID = $user_phid;
     return $this;
   }
 
   public function getUserPHID() {
     return $this->userPHID;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function setEpochRange($start, $end) {
     $this->epochStart = $start;
     $this->epochEnd   = $end;
     return $this;
   }
 
   public function getEpochStart() {
     return $this->epochStart;
   }
 
   public function getEpochEnd() {
     return $this->epochEnd;
   }
 
   public function getName() {
     return $this->name;
   }
 
   public function setDescription($description) {
     $this->description = $description;
     return $this;
   }
 
   public function getDescription() {
     return $this->description;
   }
 
   public function setColor($color) {
     $this->color = $color;
     return $this;
   }
   public function getColor() {
     if ($this->color) {
       return $this->color;
     } else {
       return CalendarColors::COLOR_SKY;
     }
   }
 
   public function getAllDay() {
     $time = (60 * 60 * 22);
     if (($this->getEpochEnd() - $this->getEpochStart()) >= $time) {
       return true;
     }
     return false;
   }
 
   public function getMultiDay() {
     $nextday = strtotime('12:00 AM Tomorrow', $this->getEpochStart());
     if ($this->getEpochEnd() > $nextday) {
       return true;
     }
     return false;
   }
 
   public function render() {
-    throw new Exception("Events are only rendered indirectly.");
+    throw new Exception('Events are only rendered indirectly.');
   }
 
 }
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
index b3c01b0d2..cb5328eaa 100644
--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
+++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
@@ -1,64 +1,64 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_chatlog_query_Method
   extends ConduitAPI_chatlog_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Retrieve chatter.";
+    return 'Retrieve chatter.';
   }
 
   public function defineParamTypes() {
     return array(
       'channels' => 'optional list<string>',
       'limit'    => 'optional int (default = 100)',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $query = new PhabricatorChatLogQuery();
 
     $channel_ids = $request->getValue('channelIDs');
     if ($channel_ids) {
       $query->withChannelIDs($channel_ids);
     }
 
     $limit = $request->getValue('limit');
     if (!$limit) {
       $limit = 100;
     }
     $query->setLimit($limit);
 
     $logs = $query->execute();
 
     $results = array();
     foreach ($logs as $log) {
       $results[] = array(
         'channelID'       => $log->getChannelID(),
         'epoch'           => $log->getEpoch(),
         'author'          => $log->getAuthor(),
         'type'            => $log->getType(),
         'message'         => $log->getMessage(),
         'loggedByPHID'    => $log->getLoggedByPHID(),
       );
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
index a72b63526..d31f040b5 100644
--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
+++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
@@ -1,77 +1,77 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_chatlog_record_Method
   extends ConduitAPI_chatlog_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Record chatter.";
+    return 'Record chatter.';
   }
 
   public function defineParamTypes() {
     return array(
       'logs' => 'required list<dict>',
     );
   }
 
   public function defineReturnType() {
     return 'list<id>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $logs = $request->getValue('logs');
     if (!is_array($logs)) {
       $logs = array();
     }
 
     $template = new PhabricatorChatLogEvent();
     $template->setLoggedByPHID($request->getUser()->getPHID());
 
     $objs = array();
     foreach ($logs as $log) {
       $channel_name = idx($log, 'channel');
       $service_name = idx($log, 'serviceName');
       $service_type = idx($log, 'serviceType');
 
       $channel = id(new PhabricatorChatLogChannel())->loadOneWhere(
         'channelName = %s AND serviceName = %s AND serviceType = %s',
         $channel_name,
         $service_name,
         $service_type);
 
       if (!$channel) {
         $channel = id(new PhabricatorChatLogChannel())
           ->setChannelName($channel_name)
           ->setserviceName($service_name)
           ->setServiceType($service_type)
           ->setViewPolicy(PhabricatorPolicies::POLICY_USER)
           ->setEditPolicy(PhabricatorPolicies::POLICY_USER)
           ->save();
       }
 
       $obj = clone $template;
       $obj->setChannelID($channel->getID());
       $obj->setType(idx($log, 'type'));
       $obj->setAuthor(idx($log, 'author'));
       $obj->setEpoch(idx($log, 'epoch'));
       $obj->setMessage(idx($log, 'message'));
       $obj->save();
 
       $objs[] = $obj;
     }
 
     return array_values(mpull($objs, 'getID'));
   }
 
 }
diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
index 1bcdf1bc5..b5e78baf2 100644
--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
@@ -1,330 +1,330 @@
 <?php
 
 final class PhabricatorChatLogChannelLogController
   extends PhabricatorChatLogController {
 
   private $channelID;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->channelID = $data['channelID'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $uri = clone $request->getRequestURI();
     $uri->setQueryParams(array());
 
     $pager = new AphrontCursorPagerView();
     $pager->setURI($uri);
     $pager->setPageSize(250);
 
     $query = id(new PhabricatorChatLogQuery())
       ->setViewer($user)
       ->withChannelIDs(array($this->channelID));
 
     $channel = id(new PhabricatorChatLogChannelQuery())
               ->setViewer($user)
               ->withIDs(array($this->channelID))
               ->executeOne();
 
     if (!$channel) {
       return new Aphront404Response();
     }
 
     list($after, $before, $map) = $this->getPagingParameters($request, $query);
 
     $pager->setAfterID($after);
     $pager->setBeforeID($before);
 
     $logs = $query->executeWithCursorPager($pager);
 
     // Show chat logs oldest-first.
     $logs = array_reverse($logs);
 
 
     // Divide all the logs into blocks, where a block is the same author saying
     // several things in a row. A block ends when another user speaks, or when
     // two minutes pass without the author speaking.
 
     $blocks = array();
     $block = null;
 
     $last_author = null;
     $last_epoch = null;
     foreach ($logs as $log) {
       $this_author = $log->getAuthor();
       $this_epoch  = $log->getEpoch();
 
       // Decide whether we should start a new block or not.
       $new_block = ($this_author !== $last_author) ||
                    ($this_epoch - (60 * 2) > $last_epoch);
 
       if ($new_block) {
         if ($block) {
           $blocks[] = $block;
         }
         $block = array(
           'id'      => $log->getID(),
           'epoch'   => $this_epoch,
           'author'  => $this_author,
           'logs'    => array($log),
         );
       } else {
         $block['logs'][] = $log;
       }
 
       $last_author = $this_author;
       $last_epoch = $this_epoch;
     }
     if ($block) {
       $blocks[] = $block;
     }
 
     // Figure out CSS classes for the blocks. We alternate colors between
     // lines, and highlight the entire block which contains the target ID or
     // date, if applicable.
 
     foreach ($blocks as $key => $block) {
       $classes = array();
       if ($key % 2) {
         $classes[] = 'alternate';
       }
       $ids = mpull($block['logs'], 'getID', 'getID');
       if (array_intersect_key($ids, $map)) {
         $classes[] = 'highlight';
       }
       $blocks[$key]['class'] = $classes ? implode(' ', $classes) : null;
     }
 
 
     require_celerity_resource('phabricator-chatlog-css');
 
     $out = array();
     foreach ($blocks as $block) {
       $author = $block['author'];
       $author = phutil_utf8_shorten($author, 18);
       $author = phutil_tag('td', array('class' => 'author'), $author);
 
       $href = $uri->alter('at', $block['id']);
       $timestamp = $block['epoch'];
       $timestamp = phabricator_datetime($timestamp, $user);
       $timestamp = phutil_tag(
         'a',
           array(
             'href' => $href,
             'class' => 'timestamp'
           ),
         $timestamp);
 
       $message = mpull($block['logs'], 'getMessage');
       $message = implode("\n", $message);
       $message = phutil_tag(
         'td',
           array(
             'class' => 'message'
           ),
           array(
             $timestamp,
             $message));
 
       $out[] = phutil_tag(
         'tr',
         array(
           'class' => $block['class'],
         ),
         array(
           $author,
           $message));
     }
 
     $links = array();
 
     $first_uri = $pager->getFirstPageURI();
     if ($first_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $first_uri,
         ),
-        "\xC2\xAB ". pht("Newest"));
+        "\xC2\xAB ". pht('Newest'));
     }
 
     $prev_uri = $pager->getPrevPageURI();
     if ($prev_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $prev_uri,
         ),
-        "\xE2\x80\xB9 " . pht("Newer"));
+        "\xE2\x80\xB9 " . pht('Newer'));
     }
 
     $next_uri = $pager->getNextPageURI();
     if ($next_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $next_uri,
         ),
-        pht("Older") . " \xE2\x80\xBA");
+        pht('Older') . " \xE2\x80\xBA");
     }
 
     $pager_top = phutil_tag(
       'div',
       array('class' => 'phabricator-chat-log-pager-top'),
       $links);
 
     $pager_bottom = phutil_tag(
       'div',
       array('class' => 'phabricator-chat-log-pager-bottom'),
       $links);
 
     $crumbs = $this
       ->buildApplicationCrumbs()
       ->addTextCrumb($channel->getChannelName(), $uri);
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->setMethod('GET')
       ->setAction($uri)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Date'))
           ->setName('date')
           ->setValue($request->getStr('date')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Jump')));
 
     $filter = new AphrontListFilterView();
     $filter->appendChild($form);
 
     $table = phutil_tag(
       'table',
         array(
           'class' => 'phabricator-chat-log'
         ),
       $out);
 
     $log = phutil_tag(
       'div',
         array(
           'class' => 'phabricator-chat-log-panel'
         ),
         $table);
 
     $jump_link = phutil_tag(
       'a',
         array(
           'href' => '#latest'
         ),
-        pht("Jump to Bottom") . " \xE2\x96\xBE");
+        pht('Jump to Bottom') . " \xE2\x96\xBE");
 
     $jump = phutil_tag(
       'div',
         array(
           'class' => 'phabricator-chat-log-jump'
         ),
         $jump_link);
 
     $jump_target = phutil_tag(
       'div',
         array(
           'id' => 'latest'
         ));
 
     $content = phutil_tag(
       'div',
         array(
           'class' => 'phabricator-chat-log-wrap'
         ),
         array(
           $jump,
           $pager_top,
           $log,
           $jump_target,
           $pager_bottom,
         ));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $filter,
         $content,
       ),
       array(
         'title' => pht('Channel Log'),
         'device' => true,
       ));
   }
 
   /**
    * From request parameters, figure out where we should jump to in the log.
    * We jump to either a date or log ID, but load a few lines of context before
    * it so the user can see the nearby conversation.
    */
   private function getPagingParameters(
     AphrontRequest $request,
     PhabricatorChatLogQuery $query) {
 
     $user = $request->getUser();
 
     $at_id = $request->getInt('at');
     $at_date = $request->getStr('date');
 
     $context_log = null;
     $map = array();
 
     $query = clone $query;
     $query->setLimit(8);
 
     if ($at_id) {
       // Jump to the log in question, and load a few lines of context before
       // it.
       $context_logs = $query
         ->setAfterID($at_id)
         ->execute();
 
       $context_log = last($context_logs);
 
       $map = array(
         $at_id => true,
       );
 
     } else if ($at_date) {
       $timestamp = PhabricatorTime::parseLocalTime($at_date, $user);
 
       if ($timestamp) {
         $context_logs = $query
           ->withMaximumEpoch($timestamp)
           ->execute();
 
         $context_log = last($context_logs);
 
         $target_log = head($context_logs);
         if ($target_log) {
           $map = array(
             $target_log->getID() => true,
           );
         }
       }
     }
 
     if ($context_log) {
       $after = null;
       $before = $context_log->getID() - 1;
     } else {
       $after = $request->getInt('after');
       $before = $request->getInt('before');
     }
 
     return array($after, $before, $map);
   }
 
 }
diff --git a/src/applications/conduit/call/ConduitCall.php b/src/applications/conduit/call/ConduitCall.php
index 40bab071e..99f266ff1 100644
--- a/src/applications/conduit/call/ConduitCall.php
+++ b/src/applications/conduit/call/ConduitCall.php
@@ -1,213 +1,213 @@
 <?php
 
 /**
  * Run a conduit method in-process, without requiring HTTP requests. Usage:
  *
  *   $call = new ConduitCall('method.name', array('param' => 'value'));
  *   $call->setUser($user);
  *   $result = $call->execute();
  *
  */
 final class ConduitCall {
 
   private $method;
   private $request;
   private $user;
   private $servers;
   private $forceLocal;
 
   public function __construct($method, array $params) {
     $this->method     = $method;
     $this->handler    = $this->buildMethodHandler($method);
     $this->servers    = PhabricatorEnv::getEnvConfig('conduit.servers');
     $this->forceLocal = false;
 
     $invalid_params = array_diff_key(
       $params,
       $this->handler->defineParamTypes());
     if ($invalid_params) {
       throw new ConduitException(
         "Method '{$method}' doesn't define these parameters: '" .
         implode("', '", array_keys($invalid_params)) . "'.");
     }
 
     if ($this->servers) {
       $current_host = AphrontRequest::getHTTPHeader('HOST');
       foreach ($this->servers as $server) {
         if ($current_host === id(new PhutilURI($server))->getDomain()) {
           $this->forceLocal = true;
           break;
         }
       }
     }
 
     $this->request = new ConduitAPIRequest($params);
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   public function getUser() {
     return $this->user;
   }
 
   public function setForceLocal($force_local) {
     $this->forceLocal = $force_local;
     return $this;
   }
 
   public function shouldForceLocal() {
     return $this->forceLocal;
   }
 
   public function shouldRequireAuthentication() {
     return $this->handler->shouldRequireAuthentication();
   }
 
   public function shouldAllowUnguardedWrites() {
     return $this->handler->shouldAllowUnguardedWrites();
   }
 
   public function getRequiredScope() {
     return $this->handler->getRequiredScope();
   }
 
   public function getErrorDescription($code) {
     return $this->handler->getErrorDescription($code);
   }
 
   public function execute() {
     $profiler = PhutilServiceProfiler::getInstance();
     $call_id = $profiler->beginServiceCall(
       array(
         'type' => 'conduit',
         'method' => $this->method,
       ));
 
     try {
       $result = $this->executeMethod();
     } catch (Exception $ex) {
       $profiler->endServiceCall($call_id, array());
       throw $ex;
     }
 
     $profiler->endServiceCall($call_id, array());
     return $result;
   }
 
   private function executeMethod() {
     $user = $this->getUser();
     if (!$user) {
       $user = new PhabricatorUser();
     }
 
     $this->request->setUser($user);
 
     if (!$this->shouldRequireAuthentication()) {
       // No auth requirement here.
     } else {
 
       $allow_public = $this->handler->shouldAllowPublic() &&
                       PhabricatorEnv::getEnvConfig('policy.allow-public');
       if (!$allow_public) {
         if (!$user->isLoggedIn() && !$user->isOmnipotent()) {
           // TODO: As per below, this should get centralized and cleaned up.
-          throw new ConduitException("ERR-INVALID-AUTH");
+          throw new ConduitException('ERR-INVALID-AUTH');
         }
       }
 
       // TODO: This would be slightly cleaner by just using a Query, but the
       // Conduit auth workflow requires the Call and User be built separately.
       // Just do it this way for the moment.
       $application = $this->handler->getApplication();
       if ($application) {
         $can_view = PhabricatorPolicyFilter::hasCapability(
           $user,
           $application,
           PhabricatorPolicyCapability::CAN_VIEW);
 
         if (!$can_view) {
           throw new ConduitException(
             pht(
-              "You do not have access to the application which provides this ".
-              "API method."));
+              'You do not have access to the application which provides this '.
+              'API method.'));
         }
       }
     }
 
     if (!$this->shouldForceLocal() && $this->servers) {
       $server = $this->pickRandomServer($this->servers);
       $client = new ConduitClient($server);
       $params = $this->request->getAllParameters();
 
-      $params["__conduit__"]["isProxied"] = true;
+      $params['__conduit__']['isProxied'] = true;
 
       if ($this->handler->shouldRequireAuthentication()) {
         $client->callMethodSynchronous(
         'conduit.connect',
         array(
              'client'            => 'PhabricatorConduit',
              'clientVersion'     => '1.0',
              'user'              => $this->getUser()->getUserName(),
              'certificate'       => $this->getUser()->getConduitCertificate(),
-             '__conduit__'       => $params["__conduit__"],
+             '__conduit__'       => $params['__conduit__'],
         ));
       }
 
       return $client->callMethodSynchronous(
         $this->method,
         $params);
     } else {
       return $this->handler->executeMethod($this->request);
     }
   }
 
   protected function pickRandomServer($servers) {
     return $servers[array_rand($servers)];
   }
 
   protected function buildMethodHandler($method) {
     $method_class = ConduitAPIMethod::getClassNameFromAPIMethodName($method);
 
     // Test if the method exists.
     $ok = false;
     try {
       $ok = class_exists($method_class);
     } catch (Exception $ex) {
       // Discard, we provide a more specific exception below.
     }
     if (!$ok) {
       throw new ConduitException(
         "Conduit method '{$method}' does not exist.");
     }
 
     $class_info = new ReflectionClass($method_class);
     if ($class_info->isAbstract()) {
       throw new ConduitException(
         "Method '{$method}' is not valid; the implementation is an abstract ".
         "base class.");
     }
 
     $method = newv($method_class, array());
 
     if (!($method instanceof ConduitAPIMethod)) {
       throw new ConduitException(
         "Method '{$method_class}' is not valid; the implementation must be ".
         "a subclass of ConduitAPIMethod.");
     }
 
     $application = $method->getApplication();
     if ($application && !$application->isInstalled()) {
       $app_name = $application->getName();
       throw new ConduitException(
         "Method '{$method_class}' belongs to application '{$app_name}', ".
         "which is not installed.");
     }
 
     return $method;
   }
 
 
 }
diff --git a/src/applications/conduit/call/__tests__/ConduitCallTestCase.php b/src/applications/conduit/call/__tests__/ConduitCallTestCase.php
index e33f7866f..d622e0d00 100644
--- a/src/applications/conduit/call/__tests__/ConduitCallTestCase.php
+++ b/src/applications/conduit/call/__tests__/ConduitCallTestCase.php
@@ -1,28 +1,28 @@
 <?php
 
 final class ConduitCallTestCase extends PhabricatorTestCase {
 
   public function testConduitPing() {
     $call = new ConduitCall('conduit.ping', array());
     $call->setForceLocal(true);
     $result = $call->execute();
 
     $this->assertFalse(empty($result));
   }
 
   public function testConduitAuth() {
     $call = new ConduitCall('user.whoami', array(), true);
     $call->setForceLocal(true);
 
     $caught = null;
     try {
       $result = $call->execute();
     } catch (ConduitException $ex) {
       $caught = $ex;
     }
 
     $this->assertTrue(
       ($caught instanceof ConduitException),
-      "user.whoami should require authentication");
+      'user.whoami should require authentication');
   }
 }
diff --git a/src/applications/conduit/config/PhabricatorConduitConfigOptions.php b/src/applications/conduit/config/PhabricatorConduitConfigOptions.php
index 11f00d7ec..3f9fd2d5d 100644
--- a/src/applications/conduit/config/PhabricatorConduitConfigOptions.php
+++ b/src/applications/conduit/config/PhabricatorConduitConfigOptions.php
@@ -1,31 +1,31 @@
 <?php
 
 final class PhabricatorConduitConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Conduit");
+    return pht('Conduit');
   }
 
   public function getDescription() {
-    return pht("Configure conduit.");
+    return pht('Configure conduit.');
   }
 
   public function getOptions() {
     return array(
-      $this->newOption("conduit.servers", "list<string>", array())
+      $this->newOption('conduit.servers', 'list<string>', array())
         ->setLocked(true)
-        ->setSummary(pht("Servers that conduit can connect to."))
+        ->setSummary(pht('Servers that conduit can connect to.'))
         ->setDescription(
             pht(
               "Set an array of servers where conduit can connect to. This is ".
               "an advanced option. Don't touch this unless you know what you ".
               "are doing."))
         ->addExample(
           '["http://phabricator2.example.com/", '.
           '"http://phabricator3.example.com/]"',
            pht('Valid Setting')),
     );
   }
 
 }
diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
index 997a2ac85..f2de9736e 100644
--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
@@ -1,471 +1,471 @@
 <?php
 
 /**
  * @group conduit
  */
 final class PhabricatorConduitAPIController
   extends PhabricatorConduitController {
 
   public function shouldRequireLogin() {
     return false;
   }
 
   private $method;
 
   public function willProcessRequest(array $data) {
     $this->method = $data['method'];
     return $this;
   }
 
   public function processRequest() {
     $time_start = microtime(true);
     $request = $this->getRequest();
 
     $method = $this->method;
 
     $api_request = null;
 
     $log = new PhabricatorConduitMethodCallLog();
     $log->setMethod($method);
     $metadata = array();
 
     try {
 
       $params = $this->decodeConduitParams($request, $method);
       $metadata = idx($params, '__conduit__', array());
       unset($params['__conduit__']);
 
       $call = new ConduitCall(
         $method, $params, idx($metadata, 'isProxied', false));
 
       $result = null;
 
       // TODO: Straighten out the auth pathway here. We shouldn't be creating
       // a ConduitAPIRequest at this level, but some of the auth code expects
       // it. Landing a halfway version of this to unblock T945.
 
       $api_request = new ConduitAPIRequest($params);
 
       $allow_unguarded_writes = false;
       $auth_error = null;
       $conduit_username = '-';
       if ($call->shouldRequireAuthentication()) {
         $metadata['scope'] = $call->getRequiredScope();
         $auth_error = $this->authenticateUser($api_request, $metadata);
         // If we've explicitly authenticated the user here and either done
         // CSRF validation or are using a non-web authentication mechanism.
         $allow_unguarded_writes = true;
 
         if (isset($metadata['actAsUser'])) {
           $this->actAsUser($api_request, $metadata['actAsUser']);
         }
 
         if ($auth_error === null) {
           $conduit_user = $api_request->getUser();
           if ($conduit_user && $conduit_user->getPHID()) {
             $conduit_username = $conduit_user->getUsername();
           }
           $call->setUser($api_request->getUser());
         }
       }
 
       $access_log = PhabricatorAccessLog::getLog();
       if ($access_log) {
         $access_log->setData(
           array(
             'u' => $conduit_username,
             'm' => $method,
           ));
       }
 
       if ($call->shouldAllowUnguardedWrites()) {
         $allow_unguarded_writes = true;
       }
 
       if ($auth_error === null) {
         if ($allow_unguarded_writes) {
           $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         }
 
         try {
           $result = $call->execute();
           $error_code = null;
           $error_info = null;
         } catch (ConduitException $ex) {
           $result = null;
           $error_code = $ex->getMessage();
           if ($ex->getErrorDescription()) {
             $error_info = $ex->getErrorDescription();
           } else {
             $error_info = $call->getErrorDescription($error_code);
           }
         }
         if ($allow_unguarded_writes) {
           unset($unguarded);
         }
       } else {
         list($error_code, $error_info) = $auth_error;
       }
     } catch (Exception $ex) {
       phlog($ex);
       $result = null;
       $error_code = ($ex instanceof ConduitException
         ? 'ERR-CONDUIT-CALL'
         : 'ERR-CONDUIT-CORE');
       $error_info = $ex->getMessage();
     }
 
     $time_end = microtime(true);
 
     $connection_id = null;
     if (idx($metadata, 'connectionID')) {
       $connection_id = $metadata['connectionID'];
     } else if (($method == 'conduit.connect') && $result) {
       $connection_id = idx($result, 'connectionID');
     }
 
     $log
       ->setCallerPHID(
         isset($conduit_user)
           ? $conduit_user->getPHID()
           : null)
       ->setConnectionID($connection_id)
       ->setError((string)$error_code)
       ->setDuration(1000000 * ($time_end - $time_start));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     $log->save();
     unset($unguarded);
 
     $response = id(new ConduitAPIResponse())
       ->setResult($result)
       ->setErrorCode($error_code)
       ->setErrorInfo($error_info);
 
     switch ($request->getStr('output')) {
       case 'human':
         return $this->buildHumanReadableResponse(
           $method,
           $api_request,
           $response->toDictionary());
       case 'json':
       default:
         return id(new AphrontJSONResponse())
           ->setAddJSONShield(false)
           ->setContent($response->toDictionary());
     }
   }
 
   /**
    * Change the api request user to the user that we want to act as.
    * Only admins can use actAsUser
    *
    * @param   ConduitAPIRequest Request being executed.
    * @param   string            The username of the user we want to act as
    */
   private function actAsUser(
     ConduitAPIRequest $api_request,
     $user_name) {
 
     if (!$api_request->getUser()->getIsAdmin()) {
-      throw new Exception("Only administrators can use actAsUser");
+      throw new Exception('Only administrators can use actAsUser');
     }
 
     $user = id(new PhabricatorUser())->loadOneWhere(
       'userName = %s',
       $user_name);
 
     if (!$user) {
       throw new Exception(
         "The actAsUser username '{$user_name}' is not a valid user."
       );
     }
 
     $api_request->setUser($user);
   }
 
   /**
    * Authenticate the client making the request to a Phabricator user account.
    *
    * @param   ConduitAPIRequest Request being executed.
    * @param   dict              Request metadata.
    * @return  null|pair         Null to indicate successful authentication, or
    *                            an error code and error message pair.
    */
   private function authenticateUser(
     ConduitAPIRequest $api_request,
     array $metadata) {
 
     $request = $this->getRequest();
 
     if ($request->getUser()->getPHID()) {
       $request->validateCSRF();
       return $this->validateAuthenticatedUser(
         $api_request,
         $request->getUser());
     }
 
     // handle oauth
     $access_token = $request->getStr('access_token');
     $method_scope = $metadata['scope'];
     if ($access_token &&
         $method_scope != PhabricatorOAuthServerScope::SCOPE_NOT_ACCESSIBLE) {
       $token = id(new PhabricatorOAuthServerAccessToken())
         ->loadOneWhere('token = %s',
                        $access_token);
       if (!$token) {
         return array(
           'ERR-INVALID-AUTH',
           'Access token does not exist.',
         );
       }
 
       $oauth_server = new PhabricatorOAuthServer();
       $valid = $oauth_server->validateAccessToken($token,
                                                   $method_scope);
       if (!$valid) {
         return array(
           'ERR-INVALID-AUTH',
           'Access token is invalid.',
         );
       }
 
       // valid token, so let's log in the user!
       $user_phid = $token->getUserPHID();
       $user = id(new PhabricatorUser())
         ->loadOneWhere('phid = %s',
                        $user_phid);
       if (!$user) {
         return array(
           'ERR-INVALID-AUTH',
           'Access token is for invalid user.',
         );
       }
       return $this->validateAuthenticatedUser(
         $api_request,
         $user);
     }
 
     // Handle sessionless auth. TOOD: This is super messy.
     if (isset($metadata['authUser'])) {
       $user = id(new PhabricatorUser())->loadOneWhere(
         'userName = %s',
         $metadata['authUser']);
       if (!$user) {
         return array(
           'ERR-INVALID-AUTH',
           'Authentication is invalid.',
         );
       }
       $token = idx($metadata, 'authToken');
       $signature = idx($metadata, 'authSignature');
       $certificate = $user->getConduitCertificate();
       if (sha1($token.$certificate) !== $signature) {
         return array(
           'ERR-INVALID-AUTH',
           'Authentication is invalid.',
         );
       }
       return $this->validateAuthenticatedUser(
         $api_request,
         $user);
     }
 
     $session_key = idx($metadata, 'sessionKey');
     if (!$session_key) {
       return array(
         'ERR-INVALID-SESSION',
         'Session key is not present.'
       );
     }
 
     $user = id(new PhabricatorAuthSessionEngine())
       ->loadUserForSession(PhabricatorAuthSession::TYPE_CONDUIT, $session_key);
 
     if (!$user) {
       return array(
         'ERR-INVALID-SESSION',
         'Session key is invalid.',
       );
     }
 
     return $this->validateAuthenticatedUser(
       $api_request,
       $user);
   }
 
   private function validateAuthenticatedUser(
     ConduitAPIRequest $request,
     PhabricatorUser $user) {
 
     if (!$user->isUserActivated()) {
       return array(
         'ERR-USER-DISABLED',
         pht('User account is not activated.'),
       );
     }
 
     $request->setUser($user);
     return null;
   }
 
   private function buildHumanReadableResponse(
     $method,
     ConduitAPIRequest $request = null,
     $result = null) {
 
     $param_rows = array();
     $param_rows[] = array('Method', $this->renderAPIValue($method));
     if ($request) {
       foreach ($request->getAllParameters() as $key => $value) {
         $param_rows[] = array(
           $key,
           $this->renderAPIValue($value),
         );
       }
     }
 
     $param_table = new AphrontTableView($param_rows);
     $param_table->setDeviceReadyTable(true);
     $param_table->setColumnClasses(
       array(
         'header',
         'wide',
       ));
 
     $result_rows = array();
     foreach ($result as $key => $value) {
       $result_rows[] = array(
         $key,
         $this->renderAPIValue($value),
       );
     }
 
     $result_table = new AphrontTableView($result_rows);
     $result_table->setDeviceReadyTable(true);
     $result_table->setColumnClasses(
       array(
         'header',
         'wide',
       ));
 
     $param_panel = new AphrontPanelView();
     $param_panel->setHeader('Method Parameters');
     $param_panel->appendChild($param_table);
 
     $result_panel = new AphrontPanelView();
     $result_panel->setHeader('Method Result');
     $result_panel->appendChild($result_table);
 
     $param_head = id(new PHUIHeaderView())
       ->setHeader(pht('Method Parameters'));
 
     $result_head = id(new PHUIHeaderView())
       ->setHeader(pht('Method Result'));
 
     $method_uri = $this->getApplicationURI('method/'.$method.'/');
 
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb($method, $method_uri)
       ->addTextCrumb(pht('Call'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $param_head,
         $param_table,
         $result_head,
         $result_table,
       ),
       array(
         'title' => 'Method Call Result',
         'device' => true,
       ));
   }
 
   private function renderAPIValue($value) {
     $json = new PhutilJSON();
     if (is_array($value)) {
       $value = $json->encodeFormatted($value);
     }
 
     $value = phutil_tag(
       'pre',
       array('style' => 'white-space: pre-wrap;'),
       $value);
 
     return $value;
   }
 
   private function decodeConduitParams(
     AphrontRequest $request,
     $method) {
 
     // Look for parameters from the Conduit API Console, which are encoded
     // as HTTP POST parameters in an array, e.g.:
     //
     //   params[name]=value&params[name2]=value2
     //
     // The fields are individually JSON encoded, since we require users to
     // enter JSON so that we avoid type ambiguity.
 
     $params = $request->getArr('params', null);
     if ($params !== null) {
       foreach ($params as $key => $value) {
         if ($value == '') {
           // Interpret empty string null (e.g., the user didn't type anything
           // into the box).
           $value = 'null';
         }
         $decoded_value = json_decode($value, true);
         if ($decoded_value === null && strtolower($value) != 'null') {
           // When json_decode() fails, it returns null. This almost certainly
           // indicates that a user was using the web UI and didn't put quotes
           // around a string value. We can either do what we think they meant
           // (treat it as a string) or fail. For now, err on the side of
           // caution and fail. In the future, if we make the Conduit API
           // actually do type checking, it might be reasonable to treat it as
           // a string if the parameter type is string.
           throw new Exception(
             "The value for parameter '{$key}' is not valid JSON. All ".
             "parameters must be encoded as JSON values, including strings ".
             "(which means you need to surround them in double quotes). ".
             "Check your syntax. Value was: {$value}");
         }
         $params[$key] = $decoded_value;
       }
 
       return $params;
     }
 
     // Otherwise, look for a single parameter called 'params' which has the
     // entire param dictionary JSON encoded. This is the usual case for remote
     // requests.
 
     $params_json = $request->getStr('params');
     if (!strlen($params_json)) {
       if ($request->getBool('allowEmptyParams')) {
         // TODO: This is a bit messy, but otherwise you can't call
         // "conduit.ping" from the web console.
         $params = array();
       } else {
         throw new Exception(
           "Request has no 'params' key. This may mean that an extension like ".
           "Suhosin has dropped data from the request. Check the PHP ".
           "configuration on your server. If you are developing a Conduit ".
           "client, you MUST provide a 'params' parameter when making a ".
           "Conduit request, even if the value is empty (e.g., provide '{}').");
       }
     } else {
       $params = json_decode($params_json, true);
       if (!is_array($params)) {
         throw new Exception(
           "Invalid parameter information was passed to method ".
           "'{$method}', could not decode JSON serialization. Data: ".
           $params_json);
       }
     }
 
     return $params;
   }
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
index bbe537650..5547ee37c 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
@@ -1,163 +1,163 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
     return false;
   }
 
   public function shouldAllowUnguardedWrites() {
     return true;
   }
 
   public function getMethodDescription() {
-    return "Connect a session-based client.";
+    return 'Connect a session-based client.';
   }
 
   public function defineParamTypes() {
     return array(
       'client'              => 'required string',
       'clientVersion'       => 'required int',
       'clientDescription'   => 'optional string',
       'user'                => 'optional string',
       'authToken'           => 'optional int',
       'authSignature'       => 'optional string',
       'host'                => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, any>';
   }
 
   public function defineErrorTypes() {
     return array(
-      "ERR-BAD-VERSION" =>
-        "Client/server version mismatch. Upgrade your server or downgrade ".
-        "your client.",
-      "NEW-ARC-VERSION" =>
-        "Client/server version mismatch. Upgrade your client.",
-      "ERR-UNKNOWN-CLIENT" =>
-        "Client is unknown.",
-      "ERR-INVALID-USER" =>
-        "The username you are attempting to authenticate with is not valid.",
-      "ERR-INVALID-CERTIFICATE" =>
-        "Your authentication certificate for this server is invalid.",
-      "ERR-INVALID-TOKEN" =>
+      'ERR-BAD-VERSION' =>
+        'Client/server version mismatch. Upgrade your server or downgrade '.
+        'your client.',
+      'NEW-ARC-VERSION' =>
+        'Client/server version mismatch. Upgrade your client.',
+      'ERR-UNKNOWN-CLIENT' =>
+        'Client is unknown.',
+      'ERR-INVALID-USER' =>
+        'The username you are attempting to authenticate with is not valid.',
+      'ERR-INVALID-CERTIFICATE' =>
+        'Your authentication certificate for this server is invalid.',
+      'ERR-INVALID-TOKEN' =>
         "The challenge token you are authenticating with is outside of the ".
         "allowed time range. Either your system clock is out of whack or ".
         "you're executing a replay attack.",
-      "ERR-NO-CERTIFICATE" => "This server requires authentication.",
+      'ERR-NO-CERTIFICATE' => 'This server requires authentication.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $this->validateHost($request->getValue('host'));
 
     $client = $request->getValue('client');
     $client_version = (int)$request->getValue('clientVersion');
     $client_description = (string)$request->getValue('clientDescription');
     // TODO: This should be character-oriented, not display-oriented.
     // See T3307.
     $client_description = phutil_utf8_shorten($client_description, 255);
     $username = (string)$request->getValue('user');
 
     // Log the connection, regardless of the outcome of checks below.
     $connection = new PhabricatorConduitConnectionLog();
     $connection->setClient($client);
     $connection->setClientVersion($client_version);
     $connection->setClientDescription($client_description);
     $connection->setUsername($username);
     $connection->save();
 
     switch ($client) {
       case 'arc':
         $server_version = 6;
         $supported_versions = array(
           $server_version => true,
           // Client version 5 introduced "user.query" call
           4               => true,
           // Client version 6 introduced "diffusion.getlintmessages" call
           5               => true,
         );
 
         if (empty($supported_versions[$client_version])) {
           if ($server_version < $client_version) {
             $ex = new ConduitException('ERR-BAD-VERSION');
             $ex->setErrorDescription(
               "Your 'arc' client version is '{$client_version}', which ".
               "is newer than the server version, '{$server_version}'. ".
               "Upgrade your Phabricator install.");
           } else {
             $ex = new ConduitException('NEW-ARC-VERSION');
             $ex->setErrorDescription(
               "A new version of arc is available! You need to upgrade ".
               "to connect to this server (you are running version ".
               "{$client_version}, the server is running version ".
               "{$server_version}).");
           }
           throw $ex;
         }
         break;
       default:
         // Allow new clients by default.
         break;
     }
 
     $token = $request->getValue('authToken');
     $signature = $request->getValue('authSignature');
 
     $user = id(new PhabricatorUser())->loadOneWhere(
       'username = %s',
       $username);
     if (!$user) {
       throw new ConduitException('ERR-INVALID-USER');
     }
 
     $session_key = null;
     if ($token && $signature) {
       $threshold = 60 * 15;
       $now = time();
       if (abs($token - $now) > $threshold) {
         throw id(new ConduitException('ERR-INVALID-TOKEN'))
           ->setErrorDescription(
             pht(
-              "The request you submitted is signed with a timestamp, but that ".
-              "timestamp is not within %s of the current time. The ".
-              "signed timestamp is %s (%s), and the current server time is ".
-              "%s (%s). This is a difference of %s seconds, but the ".
-              "timestamp must differ from the server time by no more than ".
-              "%s seconds. Your client or server clock may not be set ".
-              "correctly.",
+              'The request you submitted is signed with a timestamp, but that '.
+              'timestamp is not within %s of the current time. The '.
+              'signed timestamp is %s (%s), and the current server time is '.
+              '%s (%s). This is a difference of %s seconds, but the '.
+              'timestamp must differ from the server time by no more than '.
+              '%s seconds. Your client or server clock may not be set '.
+              'correctly.',
               phabricator_format_relative_time($threshold),
               $token,
               date('r', $token),
               $now,
               date('r', $now),
               ($token - $now),
               $threshold));
       }
       $valid = sha1($token.$user->getConduitCertificate());
       if ($valid != $signature) {
         throw new ConduitException('ERR-INVALID-CERTIFICATE');
       }
       $session_key = id(new PhabricatorAuthSessionEngine())->establishSession(
         PhabricatorAuthSession::TYPE_CONDUIT,
         $user->getPHID(),
         $partial = false);
     } else {
       throw new ConduitException('ERR-NO-CERTIFICATE');
     }
 
     return array(
       'connectionID'  => $connection->getID(),
       'sessionKey'    => $session_key,
       'userPHID'      => $user->getPHID(),
     );
   }
 
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
index 45115795c..c4ffcf189 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
@@ -1,93 +1,93 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_conduit_getcertificate_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
     return false;
   }
 
   public function shouldAllowUnguardedWrites() {
     // This method performs logging and is on the authentication pathway.
     return true;
   }
 
   public function getMethodDescription() {
-    return "Retrieve certificate information for a user.";
+    return 'Retrieve certificate information for a user.';
   }
 
   public function defineParamTypes() {
     return array(
       'token' => 'required string',
       'host'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, any>';
   }
 
   public function defineErrorTypes() {
     return array(
-      "ERR-BAD-TOKEN" => "Token does not exist or has expired.",
-      "ERR-RATE-LIMIT" =>
-        "You have made too many invalid token requests recently. Wait before ".
-        "making more.",
+      'ERR-BAD-TOKEN' => 'Token does not exist or has expired.',
+      'ERR-RATE-LIMIT' =>
+        'You have made too many invalid token requests recently. Wait before '.
+        'making more.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $this->validateHost($request->getValue('host'));
 
     $failed_attempts = PhabricatorUserLog::loadRecentEventsFromThisIP(
       PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE_FAILURE,
       60 * 5);
 
     if (count($failed_attempts) > 5) {
       $this->logFailure($request);
       throw new ConduitException('ERR-RATE-LIMIT');
     }
 
     $token = $request->getValue('token');
     $info = id(new PhabricatorConduitCertificateToken())->loadOneWhere(
       'token = %s',
       trim($token));
 
     if (!$info || $info->getDateCreated() < time() - (60 * 15)) {
       $this->logFailure($request, $info);
       throw new ConduitException('ERR-BAD-TOKEN');
     } else {
       $log = PhabricatorUserLog::initializeNewLog(
           $request->getUser(),
           $info->getUserPHID(),
           PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE)
         ->save();
     }
 
     $user = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $info->getUserPHID());
     if (!$user) {
-      throw new Exception("Certificate token points to an invalid user!");
+      throw new Exception('Certificate token points to an invalid user!');
     }
 
     return array(
       'username'    => $user->getUserName(),
       'certificate' => $user->getConduitCertificate(),
     );
   }
 
   private function logFailure(
       ConduitAPIRequest $request,
       PhabricatorConduitCertificateToken $info = null) {
 
     $log = PhabricatorUserLog::initializeNewLog(
         $request->getUser(),
         $info ? $info->getUserPHID() : '-',
         PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE_FAILURE)
       ->save();
   }
 
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
index 35c95ada3..d05b3cd1a 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
@@ -1,31 +1,31 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_conduit_ping_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
     return false;
   }
 
   public function getMethodDescription() {
-    return "Basic ping for monitoring or a health-check.";
+    return 'Basic ping for monitoring or a health-check.';
   }
 
   public function defineParamTypes() {
     return array();
   }
 
   public function defineReturnType() {
     return 'string';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     return php_uname('n');
   }
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
index 4c64884f1..b8f0f4533 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
@@ -1,41 +1,41 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_conduit_query_Method extends ConduitAPIMethod {
 
   public function getMethodDescription() {
-    return "Returns the parameters of the Conduit methods.";
+    return 'Returns the parameters of the Conduit methods.';
   }
 
   public function defineParamTypes() {
     return array();
   }
 
   public function defineReturnType() {
     return 'dict<dict>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $classes = id(new PhutilSymbolLoader())
       ->setAncestorClass('ConduitAPIMethod')
       ->setType('class')
       ->setConcreteOnly(true)
       ->selectSymbolsWithoutLoading();
 
     $names_to_params = array();
     foreach ($classes as $class) {
-      $method_name = $class["name"];
+      $method_name = $class['name'];
       $obj = newv($method_name, array());
       $names_to_params[$this->getAPIMethodNameFromClassName($method_name)] =
-        array("params" => $obj->defineParamTypes());
+        array('params' => $obj->defineParamTypes());
     }
     return $names_to_params;
   }
 
 }
diff --git a/src/applications/conduit/protocol/ConduitAPIRequest.php b/src/applications/conduit/protocol/ConduitAPIRequest.php
index 64752a85b..1a3fad485 100644
--- a/src/applications/conduit/protocol/ConduitAPIRequest.php
+++ b/src/applications/conduit/protocol/ConduitAPIRequest.php
@@ -1,48 +1,48 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPIRequest {
 
   protected $params;
   private $user;
 
   public function __construct(array $params) {
     $this->params = $params;
   }
 
   public function getValue($key, $default = null) {
     return coalesce(idx($this->params, $key), $default);
   }
 
   public function getAllParameters() {
     return $this->params;
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   /**
    * Retrieve the authentic identity of the user making the request. If a
    * method requires authentication (the default) the user object will always
    * be available. If a method does not require authentication (i.e., overrides
    * shouldRequireAuthentication() to return false) the user object will NEVER
    * be available.
    *
    * @return PhabricatorUser Authentic user, available ONLY if the method
    *                         requires authentication.
    */
   public function getUser() {
     if (!$this->user) {
       throw new Exception(
-        "You can not access the user inside the implementation of a Conduit ".
-        "method which does not require authentication (as per ".
-        "shouldRequireAuthentication()).");
+        'You can not access the user inside the implementation of a Conduit '.
+        'method which does not require authentication (as per '.
+        'shouldRequireAuthentication()).');
     }
     return $this->user;
   }
 
 }
diff --git a/src/applications/conduit/ssh/ConduitSSHWorkflow.php b/src/applications/conduit/ssh/ConduitSSHWorkflow.php
index 74221b51d..17da348e1 100644
--- a/src/applications/conduit/ssh/ConduitSSHWorkflow.php
+++ b/src/applications/conduit/ssh/ConduitSSHWorkflow.php
@@ -1,83 +1,83 @@
 <?php
 
 final class ConduitSSHWorkflow extends PhabricatorSSHWorkflow {
 
   public function didConstruct() {
     $this->setName('conduit');
     $this->setArguments(
       array(
         array(
           'name'      => 'method',
           'wildcard'  => true,
         ),
       ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $time_start = microtime(true);
 
     $methodv = $args->getArg('method');
     if (!$methodv) {
-      throw new Exception("No Conduit method provided.");
+      throw new Exception('No Conduit method provided.');
     } else if (count($methodv) > 1) {
-      throw new Exception("Too many Conduit methods provided.");
+      throw new Exception('Too many Conduit methods provided.');
     }
 
     $method = head($methodv);
 
     $json = $this->readAllInput();
     $raw_params = json_decode($json, true);
     if (!is_array($raw_params)) {
-      throw new Exception("Invalid JSON input.");
+      throw new Exception('Invalid JSON input.');
     }
 
     $params = idx($raw_params, 'params', '[]');
     $params = json_decode($params, true);
     $metadata = idx($params, '__conduit__', array());
     unset($params['__conduit__']);
 
     $call = null;
     $error_code = null;
     $error_info = null;
 
     try {
       $call = new ConduitCall($method, $params);
       $call->setUser($this->getUser());
 
       $result = $call->execute();
     } catch (ConduitException $ex) {
       $result = null;
       $error_code = $ex->getMessage();
       if ($ex->getErrorDescription()) {
         $error_info = $ex->getErrorDescription();
       } else if ($call) {
         $error_info = $call->getErrorDescription($error_code);
       }
     }
 
     $response = id(new ConduitAPIResponse())
       ->setResult($result)
       ->setErrorCode($error_code)
       ->setErrorInfo($error_info);
 
     $json_out = json_encode($response->toDictionary());
     $json_out = $json_out."\n";
 
     $this->getIOChannel()->write($json_out);
 
     // NOTE: Flush here so we can get an accurate result for the duration,
     // if the response is large and the receiver is slow to read it.
     $this->getIOChannel()->flush();
 
     $time_end = microtime(true);
 
     $connection_id = idx($metadata, 'connectionID');
     $log = id(new PhabricatorConduitMethodCallLog())
       ->setCallerPHID($this->getUser()->getPHID())
       ->setConnectionID($connection_id)
       ->setMethod($method)
       ->setError((string)$error_code)
       ->setDuration(1000000 * ($time_end - $time_start))
       ->save();
   }
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckAPC.php b/src/applications/config/check/PhabricatorSetupCheckAPC.php
index 0db31540b..943baf5d7 100644
--- a/src/applications/config/check/PhabricatorSetupCheckAPC.php
+++ b/src/applications/config/check/PhabricatorSetupCheckAPC.php
@@ -1,84 +1,84 @@
 <?php
 
 final class PhabricatorSetupCheckAPC extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     if (!extension_loaded('apc')) {
       $message = pht(
         "Installing the PHP extension 'APC' (Alternative PHP Cache) will ".
         "dramatically improve performance. Note that APC versions 3.1.14 and ".
         "3.1.15 are broken; 3.1.13 is recommended instead.");
 
       $this
         ->newIssue('extension.apc')
         ->setShortName(pht('APC'))
         ->setName(pht("PHP Extension 'APC' Not Installed"))
         ->setMessage($message)
         ->addPHPExtension('apc');
       return;
     }
 
     if (!ini_get('apc.enabled')) {
-      $summary = pht("Enabling APC will dramatically improve performance.");
+      $summary = pht('Enabling APC will dramatically improve performance.');
       $message = pht(
         "The PHP extension 'APC' is installed, but not enabled in your PHP ".
         "configuration. Enabling it will dramatically improve Phabricator ".
         "performance. Edit the 'apc.enabled' setting to enable the extension.");
 
       $this
         ->newIssue('extension.apc.enabled')
         ->setShortName(pht('APC Disabled'))
         ->setName(pht("PHP Extension 'APC' Not Enabled"))
         ->setSummary($summary)
         ->setMessage($message)
         ->addPHPConfig('apc.enabled');
       return;
     }
 
     $is_dev = PhabricatorEnv::getEnvConfig('phabricator.developer-mode');
     $is_stat_enabled = ini_get('apc.stat');
 
     $issue_key = null;
     if ($is_stat_enabled && !$is_dev) {
       $issue_key = 'extension.apc.stat-enabled';
       $short = pht("'apc.stat' Enabled");
       $long = pht("'apc.stat' Enabled in Production");
       $summary = pht(
         "'apc.stat' is currently enabled, but should probably be disabled.");
       $message = pht(
         "'apc.stat' is currently enabled in your PHP configuration. For most ".
         "Phabricator installs, 'apc.stat' should be disabled. This will ".
         "slightly improve performance (PHP will do fewer disk reads) and make ".
         "updates safer (PHP won't read in the middle of a 'git pull').\n\n".
         "(If you are developing for Phabricator, leave 'apc.stat' enabled but ".
         "enable 'phabricator.developer-mode'.)");
     } else if (!$is_stat_enabled && $is_dev) {
       $issue_key = 'extension.apc.stat-disabled';
       $short = pht("'apc.stat' Disabled");
       $long = pht("'apc.stat' Disabled in Development");
       $summary = pht(
         "'apc.stat' is currently disabled, but should probably be enabled ".
         "in development mode.");
       $message = pht(
         "'apc.stat' is disabled in your PHP configuration, but Phabricator is ".
         "set to developer mode. Normally, you should enable 'apc.stat' for ".
         "development installs so you don't need to restart your webserver ".
         "after making changes to the code.\n\n".
         "You can enable 'apc.stat', or disable 'phabricator.developer-mode', ".
         "or safely ignore this warning if you have some reasoning behind ".
         "your current configuration.");
     }
 
     if ($issue_key !== null) {
       $this
         ->newIssue($issue_key)
         ->setShortName($short)
         ->setName($long)
         ->setSummary($summary)
         ->setMessage($message)
         ->addPHPConfig('apc.stat')
         ->addPhabricatorConfig('phabricator.developer-mode');
     }
   }
 
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckBaseURI.php b/src/applications/config/check/PhabricatorSetupCheckBaseURI.php
index 1ad78a617..8863a4af3 100644
--- a/src/applications/config/check/PhabricatorSetupCheckBaseURI.php
+++ b/src/applications/config/check/PhabricatorSetupCheckBaseURI.php
@@ -1,68 +1,68 @@
 <?php
 
 final class PhabricatorSetupCheckBaseURI extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
 
     if (strpos(AphrontRequest::getHTTPHeader('Host'), '.') === false) {
       $summary = pht(
         'The domain does not contain a dot. This is necessary for some web '.
         'browsers to be able to set cookies.');
 
       $message = pht(
         'The domain in the base URI must contain a dot ("."), e.g. '.
         '"http://example.com", not just a bare name like "http://example/". '.
         'Some web browsers will not set cookies on domains with no TLD.');
 
       $this
         ->newIssue('config.phabricator.domain')
         ->setShortName(pht('Dotless Domain'))
         ->setName(pht('No Dot Character in Domain'))
         ->setSummary($summary)
         ->setMessage($message)
         ->setIsFatal(true);
     }
 
     if ($base_uri) {
       return;
     }
 
     $base_uri_guess = PhabricatorEnv::getRequestBaseURI();
 
     $summary = pht(
       'The base URI for this install is not configured. Configuring it will '.
       'improve security and enable features.');
 
     $message = pht(
       'The base URI for this install is not configured. Configuring it will '.
       'improve security and allow background processes (like daemons and '.
       'scripts) to generate links.'.
       "\n\n".
       'You should set the base URI to the URI you will use to access '.
       'Phabricator, like "http://phabricator.example.com/".'.
       "\n\n".
       'Include the protocol (http or https), domain name, and port number if '.
       'you are using a port other than 80 (http) or 443 (https).'.
       "\n\n".
       'Based on this request, it appears that the correct setting is:'.
       "\n\n".
       '%s'.
       "\n\n".
       'To configure the base URI, run the command shown below.',
       $base_uri_guess);
 
     $this
       ->newIssue('config.phabricator.base-uri')
       ->setShortName(pht('No Base URI'))
-      ->setName(pht("Base URI Not Configured"))
+      ->setName(pht('Base URI Not Configured'))
       ->setSummary($summary)
       ->setMessage($message)
       ->addCommand(
         hsprintf(
           '<tt>phabricator/ $</tt> %s',
           csprintf(
             './bin/config set phabricator.base-uri %s',
             $base_uri_guess)));
   }
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
index 88ef4a4da..e7d295c9c 100644
--- a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
+++ b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
@@ -1,197 +1,197 @@
 <?php
 
 final class PhabricatorSetupCheckExtraConfig extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $ancient_config = self::getAncientConfig();
 
     $all_keys = PhabricatorEnv::getAllConfigKeys();
     $all_keys = array_keys($all_keys);
     sort($all_keys);
 
     $defined_keys = PhabricatorApplicationConfigOptions::loadAllOptions();
 
     foreach ($all_keys as $key) {
       if (isset($defined_keys[$key])) {
         continue;
       }
 
       if (isset($ancient_config[$key])) {
         $summary = pht(
           'This option has been removed. You may delete it at your '.
           'convenience.');
         $message = pht(
           "The configuration option '%s' has been removed. You may delete ".
           "it at your convenience.".
           "\n\n%s",
           $key,
           $ancient_config[$key]);
         $short = pht('Obsolete Config');
         $name = pht('Obsolete Configuration Option "%s"', $key);
       } else {
-        $summary = pht("This option is not recognized. It may be misspelled.");
+        $summary = pht('This option is not recognized. It may be misspelled.');
         $message = pht(
           "The configuration option '%s' is not recognized. It may be ".
           "misspelled, or it might have existed in an older version of ".
           "Phabricator. It has no effect, and should be corrected or deleted.",
           $key);
         $short = pht('Unknown Config');
         $name = pht('Unknown Configuration Option "%s"', $key);
       }
 
       $issue = $this->newIssue('config.unknown.'.$key)
         ->setShortName($short)
         ->setName($name)
         ->setSummary($summary);
 
       $stack = PhabricatorEnv::getConfigSourceStack();
       $stack = $stack->getStack();
 
       $found = array();
       $found_local = false;
       $found_database = false;
 
       foreach ($stack as $source_key => $source) {
         $value = $source->getKeys(array($key));
         if ($value) {
           $found[] = $source->getName();
           if ($source instanceof PhabricatorConfigDatabaseSource) {
             $found_database = true;
           }
           if ($source instanceof PhabricatorConfigLocalSource) {
             $found_local = true;
           }
         }
       }
 
       $message = $message."\n\n".pht(
-        "This configuration value is defined in these %d ".
-        "configuration source(s): %s.",
+        'This configuration value is defined in these %d '.
+        'configuration source(s): %s.',
         count($found),
         implode(', ', $found));
       $issue->setMessage($message);
 
       if ($found_local) {
         $command = csprintf('phabricator/ $ ./bin/config delete %s', $key);
         $issue->addCommand($command);
       }
 
       if ($found_database) {
         $issue->addPhabricatorConfig($key);
       }
     }
   }
 
   /**
    * Return a map of deleted config options. Keys are option keys; values are
    * explanations of what happened to the option.
    */
   public static function getAncientConfig() {
     $reason_auth = pht(
       'This option has been migrated to the "Auth" application. Your old '.
       'configuration is still in effect, but now stored in "Auth" instead of '.
       'configuration. Going forward, you can manage authentication from '.
       'the web UI.');
 
     $auth_config = array(
       'controller.oauth-registration',
       'auth.password-auth-enabled',
       'facebook.auth-enabled',
       'facebook.registration-enabled',
       'facebook.auth-permanent',
       'facebook.application-id',
       'facebook.application-secret',
       'facebook.require-https-auth',
       'github.auth-enabled',
       'github.registration-enabled',
       'github.auth-permanent',
       'github.application-id',
       'github.application-secret',
       'google.auth-enabled',
       'google.registration-enabled',
       'google.auth-permanent',
       'google.application-id',
       'google.application-secret',
       'ldap.auth-enabled',
       'ldap.hostname',
       'ldap.port',
       'ldap.base_dn',
       'ldap.search_attribute',
       'ldap.search-first',
       'ldap.username-attribute',
       'ldap.real_name_attributes',
       'ldap.activedirectory_domain',
       'ldap.version',
       'ldap.referrals',
       'ldap.anonymous-user-name',
       'ldap.anonymous-user-password',
       'ldap.start-tls',
       'disqus.auth-enabled',
       'disqus.registration-enabled',
       'disqus.auth-permanent',
       'disqus.application-id',
       'disqus.application-secret',
       'phabricator.oauth-uri',
       'phabricator.auth-enabled',
       'phabricator.registration-enabled',
       'phabricator.auth-permanent',
       'phabricator.application-id',
       'phabricator.application-secret',
     );
 
     $ancient_config = array_fill_keys($auth_config, $reason_auth);
 
     $markup_reason = pht(
       'Custom remarkup rules are now added by subclassing '.
       'PhabricatorRemarkupCustomInlineRule or '.
       'PhabricatorRemarkupCustomBlockRule.');
 
     $session_reason = pht(
       'Sessions now expire and are garbage collected rather than having an '.
       'arbitrary concurrency limit.');
 
     $differential_field_reason = pht(
       'All Differential fields are now managed through the configuration '.
       'option "%s". Use that option to configure which fields are shown.',
       'differential.fields');
 
     $ancient_config += array(
       'phid.external-loaders' =>
         pht(
           'External loaders have been replaced. Extend `PhabricatorPHIDType` '.
           'to implement new PHID and handle types.'),
       'maniphest.custom-task-extensions-class' =>
         pht(
           'Maniphest fields are now loaded automatically. You can configure '.
           'them with `maniphest.fields`.'),
       'maniphest.custom-fields' =>
         pht(
           'Maniphest fields are now defined in '.
           '`maniphest.custom-field-definitions`. Existing definitions have '.
           'been migrated.'),
       'differential.custom-remarkup-rules' => $markup_reason,
       'differential.custom-remarkup-block-rules' => $markup_reason,
       'auth.sshkeys.enabled' => pht(
         'SSH keys are now actually useful, so they are always enabled.'),
       'differential.anonymous-access' => pht(
         'Phabricator now has meaningful global access controls. See '.
         '`policy.allow-public`.'),
       'celerity.resource-path' => pht(
         'An alternate resource map is no longer supported. Instead, use '.
         'multiple maps. See T4222.'),
       'metamta.send-immediately' => pht(
         'Mail is now always delivered by the daemons.'),
       'auth.sessions.conduit' => $session_reason,
       'auth.sessions.web' => $session_reason,
       'tokenizer.ondemand' => pht(
         'Phabricator now manages typeahead strategies automatically.'),
       'differential.revision-custom-detail-renderer' => pht(
         'Obsolete; use standard rendering events instead.'),
       'differential.show-host-field' => $differential_field_reason,
       'differential.show-test-plan-field' => $differential_field_reason,
       'differential.field-selector' => $differential_field_reason,
     );
 
     return $ancient_config;
   }
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckMail.php b/src/applications/config/check/PhabricatorSetupCheckMail.php
index a3347a03b..cc878ca9b 100644
--- a/src/applications/config/check/PhabricatorSetupCheckMail.php
+++ b/src/applications/config/check/PhabricatorSetupCheckMail.php
@@ -1,83 +1,83 @@
 <?php
 
 final class PhabricatorSetupCheckMail extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $adapter = PhabricatorEnv::getEnvConfig('metamta.mail-adapter');
 
     switch ($adapter) {
       case 'PhabricatorMailImplementationPHPMailerLiteAdapter':
         if (!Filesystem::pathExists('/usr/bin/sendmail') &&
             !Filesystem::pathExists('/usr/sbin/sendmail')) {
           $message = pht(
             'Mail is configured to send via sendmail, but this system has '.
             'no sendmail binary. Install sendmail or choose a different '.
             'mail adapter.');
 
           $this->newIssue('config.metamta.mail-adapter')
             ->setShortName(pht('Missing Sendmail'))
             ->setName(pht('No Sendmail Binary Found'))
             ->setMessage($message)
             ->addRelatedPhabricatorConfig('metamta.mail-adapter');
         }
         break;
       case 'PhabricatorMailImplementationAmazonSESAdapter':
         if (PhabricatorEnv::getEnvConfig('metamta.can-send-as-user')) {
           $message = pht(
             'Amazon SES does not support sending email as users. Disable '.
             'send as user, or choose a different mail adapter.');
 
           $this->newIssue('config.can-send-as-user')
             ->setName(pht("SES Can't Send As User"))
             ->setMessage($message)
             ->addRelatedPhabricatorConfig('metamta.mail-adapter')
             ->addPhabricatorConfig('metamta.can-send-as-user');
         }
 
         if (!PhabricatorEnv::getEnvConfig('amazon-ses.access-key')) {
           $message = pht(
             'Amazon SES is selected as the mail adapter, but no SES access '.
             'key is configured. Provide an SES access key, or choose a '.
             'different mail adapter.');
 
           $this->newIssue('config.amazon-ses.access-key')
-            ->setName(pht("Amazon SES Access Key Not Set"))
+            ->setName(pht('Amazon SES Access Key Not Set'))
             ->setMessage($message)
             ->addRelatedPhabricatorConfig('metamta.mail-adapter')
             ->addPhabricatorConfig('amazon-ses.access-key');
         }
 
         if (!PhabricatorEnv::getEnvConfig('amazon-ses.secret-key')) {
           $message = pht(
             'Amazon SES is selected as the mail adapter, but no SES secret '.
             'key is configured. Provide an SES secret key, or choose a '.
             'different mail adapter.');
 
           $this->newIssue('config.amazon-ses.secret-key')
-            ->setName(pht("Amazon SES Secret Key Not Set"))
+            ->setName(pht('Amazon SES Secret Key Not Set'))
             ->setMessage($message)
             ->addRelatedPhabricatorConfig('metamta.mail-adapter')
             ->addPhabricatorConfig('amazon-ses.secret-key');
         }
 
         $address_key = 'metamta.default-address';
         $options = PhabricatorApplicationConfigOptions::loadAllOptions();
         $default = $options[$address_key]->getDefault();
         $value = PhabricatorEnv::getEnvConfig($address_key);
         if ($default === $value) {
           $message = pht(
             'Amazon SES requires verification of the "From" address, but '.
             'you have not configured a "From" address. Configure and verify '.
             'a "From" address, or choose a different mail adapter.');
 
           $this->newIssue('config.metamta.default-address')
-            ->setName(pht("No SES From Address Configured"))
+            ->setName(pht('No SES From Address Configured'))
             ->setMessage($message)
             ->addRelatedPhabricatorConfig('metamta.mail-adapter')
             ->addPhabricatorConfig('metamta.default-address');
         }
         break;
     }
 
   }
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckMySQL.php b/src/applications/config/check/PhabricatorSetupCheckMySQL.php
index b01212a6d..117cc2558 100644
--- a/src/applications/config/check/PhabricatorSetupCheckMySQL.php
+++ b/src/applications/config/check/PhabricatorSetupCheckMySQL.php
@@ -1,64 +1,64 @@
 <?php
 
 final class PhabricatorSetupCheckMySQL extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $conn_raw = id(new PhabricatorUser())->establishConnection('w');
 
     $max_allowed_packet = queryfx_one(
       $conn_raw,
       'SHOW VARIABLES LIKE %s',
       'max_allowed_packet');
     $max_allowed_packet = idx($max_allowed_packet, 'Value', PHP_INT_MAX);
 
     $recommended_minimum = 1024 * 1024;
     if ($max_allowed_packet < $recommended_minimum) {
       $message = pht(
         "MySQL is configured with a very small 'max_allowed_packet' (%d), ".
         "which may cause some large writes to fail. Strongly consider raising ".
         "this to at least %d in your MySQL configuration.",
         $max_allowed_packet,
         $recommended_minimum);
 
       $this->newIssue('mysql.max_allowed_packet')
         ->setName(pht('Small MySQL "max_allowed_packet"'))
         ->setMessage($message);
     }
 
-    $mode_string = queryfx_one($conn_raw, "SELECT @@sql_mode");
+    $mode_string = queryfx_one($conn_raw, 'SELECT @@sql_mode');
     $modes = explode(',', $mode_string['@@sql_mode']);
     if (!in_array('STRICT_ALL_TABLES', $modes)) {
       $summary = pht(
-        "MySQL is not in strict mode, but using strict mode is strongly ".
-        "encouraged.");
+        'MySQL is not in strict mode, but using strict mode is strongly '.
+        'encouraged.');
 
       $message = pht(
         "On your MySQL instance, the global %s is not set to %s. ".
         "It is strongly encouraged that you enable this mode when running ".
         "Phabricator.\n\n".
         "By default MySQL will silently ignore some types of errors, which ".
         "can cause data loss and raise security concerns. Enabling strict ".
         "mode makes MySQL raise an explicit error instead, and prevents this ".
         "entire class of problems from doing any damage.\n\n".
         "You can find more information about this mode (and how to configure ".
         "it) in the MySQL manual. Usually, it is sufficient to add this to ".
         "your %s file (in the %s section) and then restart %s:\n\n".
         "%s\n".
         "(Note that if you run other applications against the same database, ".
         "they may not work in strict mode. Be careful about enabling it in ".
         "these cases.)",
         phutil_tag('tt', array(), 'sql_mode'),
         phutil_tag('tt', array(), 'STRICT_ALL_TABLES'),
         phutil_tag('tt', array(), 'my.cnf'),
         phutil_tag('tt', array(), '[mysqld]'),
         phutil_tag('tt', array(), 'mysqld'),
         phutil_tag('pre', array(), 'sql_mode=STRICT_ALL_TABLES'));
 
       $this->newIssue('mysql.mode')
         ->setName(pht('MySQL STRICT_ALL_TABLES Mode Not Set'))
         ->setSummary($summary)
         ->setMessage($message);
     }
   }
 
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckPath.php b/src/applications/config/check/PhabricatorSetupCheckPath.php
index 6b3c1bfb6..f4c173d15 100644
--- a/src/applications/config/check/PhabricatorSetupCheckPath.php
+++ b/src/applications/config/check/PhabricatorSetupCheckPath.php
@@ -1,125 +1,125 @@
 <?php
 
 final class PhabricatorSetupCheckPath extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     // NOTE: We've already appended `environment.append-paths`, so we don't
     // need to explicitly check for it.
     $path = getenv('PATH');
 
     if (!$path) {
       $summary = pht(
         'The environmental variable $PATH is empty. Phabricator will not '.
         'be able to execute some commands.');
 
       $message = pht(
         'The environmental variable $PATH is empty. Phabricator needs to '.
         'execute some system commands, like `svn`, `git`, `hg`, and `diff`. '.
         'To execute these commands, the binaries must be available in the '.
         'webserver\'s $PATH. You can set additional paths in Phabricator '.
         'configuration.');
 
       $this
         ->newIssue('config.environment.append-paths')
         ->setName(pht('$PATH Not Set'))
         ->setSummary($summary)
         ->setMessage($message)
         ->addPhabricatorConfig('environment.append-paths');
 
       // Bail on checks below.
       return;
     }
 
     // Users are remarkably industrious at misconfiguring software. Try to
     // catch mistaken configuration of PATH.
 
     $path_parts = explode(PATH_SEPARATOR, $path);
     $bad_paths = array();
     foreach ($path_parts as $path_part) {
       if (!strlen($path_part)) {
         continue;
       }
 
       $message = null;
       $not_exists = false;
       foreach (Filesystem::walkToRoot($path_part) as $part) {
         if (!Filesystem::pathExists($part)) {
           $not_exists = $part;
           // Walk up so we can tell if this is a readability issue or not.
           continue;
         } else if (!is_dir(Filesystem::resolvePath($part))) {
           $message = pht(
             "The PATH component '%s' (which resolves as the absolute path ".
             "'%s') is not usable because '%s' is not a directory.",
             $path_part,
             Filesystem::resolvePath($path_part),
             $part);
         } else if (!is_readable($part)) {
           $message = pht(
             "The PATH component '%s' (which resolves as the absolute path ".
             "'%s') is not usable because '%s' is not readable.",
             $path_part,
             Filesystem::resolvePath($path_part),
             $part);
         } else if ($not_exists) {
           $message = pht(
             "The PATH component '%s' (which resolves as the absolute path ".
             "'%s') is not usable because '%s' does not exist.",
             $path_part,
             Filesystem::resolvePath($path_part),
             $not_exists);
         } else {
           // Everything seems good.
           break;
         }
 
         if ($message !== null) {
           break;
         }
       }
 
       if ($message === null) {
         if (!phutil_is_windows() && !@file_exists($path_part.'/.')) {
           $message = pht(
             "The PATH component '%s' (which resolves as the absolute path ".
             "'%s') is not usable because it is not traversable (its '+x' ".
             "permission bit is not set).",
             $path_part,
             Filesystem::resolvePath($path_part));
         }
       }
 
       if ($message !== null) {
         $bad_paths[$path_part] = $message;
       }
     }
 
     if ($bad_paths) {
       foreach ($bad_paths as $path_part => $message) {
         $digest = substr(PhabricatorHash::digest($path_part), 0, 8);
 
         $this
           ->newIssue('config.PATH.'.$digest)
           ->setName(pht('$PATH Component Unusable'))
           ->setSummary(
             pht(
-              "A component of the configured PATH can not be used by ".
-              "the webserver: %s",
+              'A component of the configured PATH can not be used by '.
+              'the webserver: %s',
               $path_part))
           ->setMessage(
             pht(
               "The configured PATH includes a component which is not usable. ".
               "Phabricator will be unable to find or execute binaries located ".
               "here:".
               "\n\n".
               "%s".
               "\n\n".
               "The user that the webserver runs as must be able to read all ".
               "the directories in PATH in order to make use of them.",
               $message))
           ->addPhabricatorConfig('environment.append-paths');
       }
     }
 
   }
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckRepositories.php b/src/applications/config/check/PhabricatorSetupCheckRepositories.php
index 724b538eb..a93813247 100644
--- a/src/applications/config/check/PhabricatorSetupCheckRepositories.php
+++ b/src/applications/config/check/PhabricatorSetupCheckRepositories.php
@@ -1,43 +1,43 @@
 <?php
 
 final class PhabricatorSetupCheckRepositories extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $repo_path = PhabricatorEnv::getEnvConfig('repository.default-local-path');
 
     if (!$repo_path) {
       $summary = pht(
         "The configuration option '%s' is not set.",
         'repository.default-local-path');
       $this->newIssue('repository.default-local-path.empty')
         ->setName(pht('Missing Repository Local Path'))
         ->setSummary($summary)
         ->addPhabricatorConfig('repository.default-local-path');
       return;
     }
 
     if (!Filesystem::pathExists($repo_path)) {
       $summary = pht(
-        "The path for local repositories does not exist, or is not ".
-        "readable by the webserver.");
+        'The path for local repositories does not exist, or is not '.
+        'readable by the webserver.');
       $message = pht(
         "The directory for local repositories (%s) does not exist, or is not ".
         "readable by the webserver. Phabricator uses this directory to store ".
         "information about repositories. If this directory does not exist, ".
         "create it:\n\n".
         "%s\n".
         "If this directory exists, make it readable to the webserver. You ".
         "can also edit the configuration below to use some other directory.",
         phutil_tag('tt', array(), $repo_path),
         phutil_tag('pre', array(), csprintf('$ mkdir -p %s', $repo_path)));
 
       $this->newIssue('repository.default-local-path.empty')
         ->setName(pht('Missing Repository Local Path'))
         ->setSummary($summary)
         ->setMessage($message)
         ->addPhabricatorConfig('repository.default-local-path');
     }
 
   }
 
 }
diff --git a/src/applications/config/check/PhabricatorSetupCheckTimezone.php b/src/applications/config/check/PhabricatorSetupCheckTimezone.php
index ebff55f6f..01ba5e278 100644
--- a/src/applications/config/check/PhabricatorSetupCheckTimezone.php
+++ b/src/applications/config/check/PhabricatorSetupCheckTimezone.php
@@ -1,51 +1,51 @@
 <?php
 
 final class PhabricatorSetupCheckTimezone extends PhabricatorSetupCheck {
 
   protected function executeChecks() {
     $php_value = ini_get('date.timezone');
     if ($php_value) {
       $old = date_default_timezone_get();
       $ok = @date_default_timezone_set($php_value);
       date_default_timezone_set($old);
 
       if (!$ok) {
         $message = pht(
           'Your PHP configuration configuration selects an invalid timezone. '.
           'Select a valid timezone.');
 
         $this
           ->newIssue('php.date.timezone')
           ->setShortName(pht('PHP Timezone'))
           ->setName(pht('PHP Timezone Invalid'))
           ->setMessage($message)
           ->addPHPConfig('date.timezone');
       }
     }
 
     $timezone = nonempty(
       PhabricatorEnv::getEnvConfig('phabricator.timezone'),
       ini_get('date.timezone'));
     if ($timezone) {
       return;
     }
 
     $summary = pht(
-      "Without a configured timezone, PHP will emit warnings when working ".
-      "with dates, and dates and times may not display correctly.");
+      'Without a configured timezone, PHP will emit warnings when working '.
+      'with dates, and dates and times may not display correctly.');
 
     $message = pht(
       "Your configuration fails to specify a server timezone. You can either ".
       "set the PHP configuration value 'date.timezone' or the Phabricator ".
       "configuration value 'phabricator.timezone' to specify one.");
 
     $this
       ->newIssue('config.timezone')
       ->setShortName(pht('Timezone'))
       ->setName(pht('Server Timezone Not Configured'))
       ->setSummary($summary)
       ->setMessage($message)
       ->addPHPConfig('date.timezone')
       ->addPhabricatorConfig('phabricator.timezone');
   }
 }
diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php
index 18815ab83..ab346ccb5 100644
--- a/src/applications/config/controller/PhabricatorConfigEditController.php
+++ b/src/applications/config/controller/PhabricatorConfigEditController.php
@@ -1,549 +1,549 @@
 <?php
 
 final class PhabricatorConfigEditController
   extends PhabricatorConfigController {
 
   private $key;
 
   public function willProcessRequest(array $data) {
     $this->key = $data['key'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
 
     $options = PhabricatorApplicationConfigOptions::loadAllOptions();
     if (empty($options[$this->key])) {
       $ancient = PhabricatorSetupCheckExtraConfig::getAncientConfig();
       if (isset($ancient[$this->key])) {
         $desc = pht(
           "This configuration has been removed. You can safely delete ".
           "it.\n\n%s",
           $ancient[$this->key]);
       } else {
         $desc = pht(
-          "This configuration option is unknown. It may be misspelled, ".
-          "or have existed in a previous version of Phabricator.");
+          'This configuration option is unknown. It may be misspelled, '.
+          'or have existed in a previous version of Phabricator.');
       }
 
       // This may be a dead config entry, which existed in the past but no
       // longer exists. Allow it to be edited so it can be reviewed and
       // deleted.
       $option = id(new PhabricatorConfigOption())
         ->setKey($this->key)
         ->setType('wild')
         ->setDefault(null)
         ->setDescription($desc);
       $group = null;
       $group_uri = $this->getApplicationURI();
     } else {
       $option = $options[$this->key];
       $group = $option->getGroup();
       $group_uri = $this->getApplicationURI('group/'.$group->getKey().'/');
     }
 
     $issue = $request->getStr('issue');
     if ($issue) {
       // If the user came here from an open setup issue, send them back.
       $done_uri = $this->getApplicationURI('issue/'.$issue.'/');
     } else {
       $done_uri = $group_uri;
     }
 
     // Check if the config key is already stored in the database.
     // Grab the value if it is.
     $config_entry = id(new PhabricatorConfigEntry())
       ->loadOneWhere(
         'configKey = %s AND namespace = %s',
         $this->key,
         'default');
     if (!$config_entry) {
       $config_entry = id(new PhabricatorConfigEntry())
         ->setConfigKey($this->key)
         ->setNamespace('default')
         ->setIsDeleted(true);
       $config_entry->setPHID($config_entry->generatePHID());
     }
 
     $e_value = null;
     $errors = array();
     if ($request->isFormPost() && !$option->getLocked()) {
 
       $result = $this->readRequest(
         $option,
         $request);
 
       list($e_value, $value_errors, $display_value, $xaction) = $result;
       $errors = array_merge($errors, $value_errors);
 
       if (!$errors) {
 
         $editor = id(new PhabricatorConfigEditor())
           ->setActor($user)
           ->setContinueOnNoEffect(true)
           ->setContentSourceFromRequest($request);
 
         try {
           $editor->applyTransactions($config_entry, array($xaction));
           return id(new AphrontRedirectResponse())->setURI($done_uri);
         } catch (PhabricatorConfigValidationException $ex) {
           $e_value = pht('Invalid');
           $errors[] = $ex->getMessage();
         }
       }
     } else {
       if ($config_entry->getIsDeleted()) {
         $display_value = null;
       } else {
         $display_value = $this->getDisplayValue(
           $option,
           $config_entry,
           $config_entry->getValue());
       }
     }
 
     $form = new AphrontFormView();
 
     $error_view = null;
     if ($errors) {
       $error_view = id(new AphrontErrorView())
         ->setErrors($errors);
     } else if ($option->getHidden()) {
       $msg = pht(
-        "This configuration is hidden and can not be edited or viewed from ".
-        "the web interface.");
+        'This configuration is hidden and can not be edited or viewed from '.
+        'the web interface.');
 
       $error_view = id(new AphrontErrorView())
         ->setTitle(pht('Configuration Hidden'))
         ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
         ->appendChild(phutil_tag('p', array(), $msg));
     } else if ($option->getLocked()) {
       $msg = pht(
-        "This configuration is locked and can not be edited from the web ".
-        "interface. Use `./bin/config` in `phabricator/` to edit it.");
+        'This configuration is locked and can not be edited from the web '.
+        'interface. Use `./bin/config` in `phabricator/` to edit it.');
 
       $error_view = id(new AphrontErrorView())
         ->setTitle(pht('Configuration Locked'))
         ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
         ->appendChild(phutil_tag('p', array(), $msg));
     }
 
     if ($option->getHidden()) {
       $control = null;
     } else {
       $control = $this->renderControl(
         $option,
         $display_value,
         $e_value);
     }
 
     $engine = new PhabricatorMarkupEngine();
     $engine->setViewer($user);
     $engine->addObject($option, 'description');
     $engine->process();
     $description = phutil_tag(
       'div',
       array(
         'class' => 'phabricator-remarkup',
       ),
       $engine->getOutput($option, 'description'));
 
     $form
       ->setUser($user)
       ->addHiddenInput('issue', $request->getStr('issue'))
       ->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Description'))
           ->setValue($description));
 
     if ($group) {
       $extra = $group->renderContextualDescription(
         $option,
         $request);
       if ($extra !== null) {
         $form->appendChild(
           id(new AphrontFormMarkupControl())
             ->setValue($extra));
       }
     }
 
     $form
       ->appendChild($control);
 
     $submit_control = id(new AphrontFormSubmitControl())
       ->addCancelButton($done_uri);
 
     if (!$option->getLocked()) {
       $submit_control->setValue(pht('Save Config Entry'));
     }
 
     $form->appendChild($submit_control);
 
     $examples = $this->renderExamples($option);
     if ($examples) {
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Examples'))
           ->setValue($examples));
     }
 
     if (!$option->getHidden()) {
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Default'))
           ->setValue($this->renderDefaults($option, $config_entry)));
     }
 
     $title = pht('Edit %s', $this->key);
     $short = pht('Edit');
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setForm($form);
 
     if ($error_view) {
        $form_box->setErrorView($error_view);
     }
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Config'), $this->getApplicationURI());
 
     if ($group) {
       $crumbs->addTextCrumb($group->getName(), $group_uri);
     }
 
     $crumbs->addTextCrumb($this->key, '/config/edit/'.$this->key);
 
     $xactions = id(new PhabricatorConfigTransactionQuery())
       ->withObjectPHIDs(array($config_entry->getPHID()))
       ->setViewer($user)
       ->execute();
 
     $xaction_view = id(new PhabricatorApplicationTransactionView())
       ->setUser($user)
       ->setObjectPHID($config_entry->getPHID())
       ->setTransactions($xactions);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
         $xaction_view,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function readRequest(
     PhabricatorConfigOption $option,
     AphrontRequest $request) {
 
     $xaction = new PhabricatorConfigTransaction();
     $xaction->setTransactionType(PhabricatorConfigTransaction::TYPE_EDIT);
 
     $e_value = null;
     $errors = array();
 
     $value = $request->getStr('value');
     if (!strlen($value)) {
       $value = null;
 
       $xaction->setNewValue(
         array(
           'deleted' => true,
           'value'   => null,
         ));
 
       return array($e_value, $errors, $value, $xaction);
     }
 
     if ($option->isCustomType()) {
       $info = $option->getCustomObject()->readRequest($option, $request);
       list($e_value, $errors, $set_value, $value) = $info;
     } else {
       $type = $option->getType();
       $set_value = null;
 
       switch ($type) {
         case 'int':
           if (preg_match('/^-?[0-9]+$/', trim($value))) {
             $set_value = (int)$value;
           } else {
             $e_value = pht('Invalid');
             $errors[] = pht('Value must be an integer.');
           }
           break;
         case 'string':
         case 'enum':
           $set_value = (string)$value;
           break;
         case 'list<string>':
         case 'list<regex>':
           $set_value = phutil_split_lines(
             $request->getStr('value'),
             $retain_endings = false);
 
           foreach ($set_value as $key => $v) {
             if (!strlen($v)) {
               unset($set_value[$key]);
             }
           }
           $set_value = array_values($set_value);
 
           break;
         case 'set':
           $set_value = array_fill_keys($request->getStrList('value'), true);
           break;
         case 'bool':
           switch ($value) {
             case 'true':
               $set_value = true;
               break;
             case 'false':
               $set_value = false;
               break;
             default:
               $e_value = pht('Invalid');
               $errors[] = pht('Value must be boolean, "true" or "false".');
               break;
           }
           break;
         case 'class':
           if (!class_exists($value)) {
             $e_value = pht('Invalid');
             $errors[] = pht('Class does not exist.');
           } else {
             $base = $option->getBaseClass();
             if (!is_subclass_of($value, $base)) {
               $e_value = pht('Invalid');
               $errors[] = pht('Class is not of valid type.');
             } else {
               $set_value = $value;
             }
           }
           break;
         default:
           $json = json_decode($value, true);
           if ($json === null && strtolower($value) != 'null') {
             $e_value = pht('Invalid');
             $errors[] = pht(
               'The given value must be valid JSON. This means, among '.
               'other things, that you must wrap strings in double-quotes.');
           } else {
             $set_value = $json;
           }
           break;
       }
     }
 
     if (!$errors) {
       $xaction->setNewValue(
         array(
           'deleted' => false,
           'value'   => $set_value,
         ));
     } else {
       $xaction = null;
     }
 
     return array($e_value, $errors, $value, $xaction);
   }
 
   private function getDisplayValue(
     PhabricatorConfigOption $option,
     PhabricatorConfigEntry $entry,
     $value) {
 
     if ($option->isCustomType()) {
       return $option->getCustomObject()->getDisplayValue(
         $option,
         $entry,
         $value);
     } else {
       $type = $option->getType();
       switch ($type) {
         case 'int':
         case 'string':
         case 'enum':
         case 'class':
           return $value;
         case 'bool':
           return $value ? 'true' : 'false';
         case 'list<string>':
         case 'list<regex>':
           return implode("\n", nonempty($value, array()));
         case 'set':
           return implode("\n", nonempty(array_keys($value), array()));
         default:
           return PhabricatorConfigJSON::prettyPrintJSON($value);
       }
     }
   }
 
   private function renderControl(
     PhabricatorConfigOption $option,
     $display_value,
     $e_value) {
 
     if ($option->isCustomType()) {
       $control = $option->getCustomObject()->renderControl(
         $option,
         $display_value,
         $e_value);
     } else {
       $type = $option->getType();
       switch ($type) {
         case 'int':
         case 'string':
           $control = id(new AphrontFormTextControl());
           break;
         case 'bool':
           $control = id(new AphrontFormSelectControl())
             ->setOptions(
               array(
                 ''      => pht('(Use Default)'),
                 'true'  => idx($option->getBoolOptions(), 0),
                 'false' => idx($option->getBoolOptions(), 1),
               ));
           break;
         case 'enum':
           $options = array_mergev(
             array(
               array('' => pht('(Use Default)')),
               $option->getEnumOptions(),
             ));
           $control = id(new AphrontFormSelectControl())
             ->setOptions($options);
           break;
         case 'class':
           $symbols = id(new PhutilSymbolLoader())
             ->setType('class')
             ->setAncestorClass($option->getBaseClass())
             ->setConcreteOnly(true)
             ->selectSymbolsWithoutLoading();
           $names = ipull($symbols, 'name', 'name');
           asort($names);
           $names = array(
             '' => pht('(Use Default)'),
           ) + $names;
 
           $control = id(new AphrontFormSelectControl())
             ->setOptions($names);
           break;
         case 'list<string>':
         case 'list<regex>':
           $control = id(new AphrontFormTextAreaControl())
             ->setCaption(pht('Separate values with newlines.'));
           break;
         case 'set':
           $control = id(new AphrontFormTextAreaControl())
             ->setCaption(pht('Separate values with newlines or commas.'));
           break;
         default:
           $control = id(new AphrontFormTextAreaControl())
             ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
             ->setCustomClass('PhabricatorMonospaced')
             ->setCaption(pht('Enter value in JSON.'));
           break;
       }
 
       $control
         ->setLabel(pht('Value'))
         ->setError($e_value)
         ->setValue($display_value)
         ->setName('value');
     }
 
     if ($option->getLocked()) {
       $control->setDisabled(true);
     }
 
     return $control;
   }
 
   private function renderExamples(PhabricatorConfigOption $option) {
     $examples = $option->getExamples();
     if (!$examples) {
       return null;
     }
 
     $table = array();
     $table[] = phutil_tag('tr', array('class' => 'column-labels'), array(
       phutil_tag('th', array(), pht('Example')),
       phutil_tag('th', array(), pht('Value')),
     ));
     foreach ($examples as $example) {
       list($value, $description) = $example;
 
       if ($value === null) {
         $value = phutil_tag('em', array(), pht('(empty)'));
       } else {
         if (is_array($value)) {
           $value = implode("\n", $value);
         }
       }
 
       $table[] = phutil_tag('tr', array(), array(
         phutil_tag('th', array(), $description),
         phutil_tag('td', array(), $value),
       ));
     }
 
     require_celerity_resource('config-options-css');
 
     return phutil_tag(
       'table',
       array(
         'class' => 'config-option-table',
       ),
       $table);
   }
 
   private function renderDefaults(
     PhabricatorConfigOption $option,
     PhabricatorConfigEntry $entry) {
 
     $stack = PhabricatorEnv::getConfigSourceStack();
     $stack = $stack->getStack();
 
     $table = array();
     $table[] = phutil_tag('tr', array('class' => 'column-labels'), array(
       phutil_tag('th', array(), pht('Source')),
       phutil_tag('th', array(), pht('Value')),
     ));
     foreach ($stack as $key => $source) {
       $value = $source->getKeys(
         array(
           $option->getKey(),
         ));
 
       if (!array_key_exists($option->getKey(), $value)) {
         $value = phutil_tag('em', array(), pht('(empty)'));
       } else {
         $value = $this->getDisplayValue(
           $option,
           $entry,
           $value[$option->getKey()]);
       }
 
       $table[] = phutil_tag('tr', array('class' => 'column-labels'), array(
         phutil_tag('th', array(), $source->getName()),
         phutil_tag('td', array(), $value),
       ));
     }
 
     require_celerity_resource('config-options-css');
 
     return phutil_tag(
       'table',
       array(
         'class' => 'config-option-table',
       ),
       $table);
   }
 
 }
diff --git a/src/applications/config/controller/PhabricatorConfigIgnoreController.php b/src/applications/config/controller/PhabricatorConfigIgnoreController.php
index 72fef3c36..9bc23d345 100644
--- a/src/applications/config/controller/PhabricatorConfigIgnoreController.php
+++ b/src/applications/config/controller/PhabricatorConfigIgnoreController.php
@@ -1,65 +1,65 @@
 <?php
 
 final class PhabricatorConfigIgnoreController
   extends PhabricatorApplicationsController {
 
   private $verb;
   private $issue;
 
   public function willProcessRequest(array $data) {
     $this->verb = $data['verb'];
     $this->issue = $data['key'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $issue_uri = $this->getApplicationURI('issue');
 
     if ($request->isDialogFormPost()) {
       $this->manageApplication();
       return id(new AphrontRedirectResponse())->setURI($issue_uri);
     }
 
     if ($this->verb == 'ignore') {
       $title = pht('Really ignore this setup issue?');
       $submit_title = pht('Ignore');
       $body = pht(
         "You can ignore an issue if you don't want to fix it, or plan to ".
         "fix it later. Ignored issues won't appear on every page but will ".
         "still be shown in the list of open issues.");
     } else if ($this->verb == 'unignore') {
       $title = pht('Unignore this setup issue?');
       $submit_title = pht('Unignore');
       $body = pht(
-        "This issue will no longer be suppressed, and will return to its ".
-        "rightful place as a global setup warning.");
+        'This issue will no longer be suppressed, and will return to its '.
+        'rightful place as a global setup warning.');
     } else {
       throw new Exception('Unrecognized verb: ' . $this->verb);
     }
 
     $dialog = id(new AphrontDialogView())
       ->setUser($request->getUser())
       ->setTitle($title)
       ->appendChild($body)
       ->addSubmitButton($submit_title)
       ->addCancelButton($issue_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   public function manageApplication() {
     $key = 'config.ignore-issues';
     $config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
     $list = $config_entry->getValue();
 
     if (isset($list[$this->issue])) {
       unset($list[$this->issue]);
     } else {
       $list[$this->issue] = true;
     }
 
     PhabricatorConfigEditor::storeNewValue(
      $config_entry, $list, $this->getRequest());
   }
 
 }
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
index 71779d797..9462c1f86 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -1,86 +1,86 @@
 <?php
 
 final class PhabricatorConfigIssueListController
   extends PhabricatorConfigController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $nav = $this->buildSideNavView();
     $nav->selectFilter('issue/');
 
     $issues = PhabricatorSetupCheck::runAllChecks();
     PhabricatorSetupCheck::setOpenSetupIssueCount(
       PhabricatorSetupCheck::countUnignoredIssues($issues));
 
     $list = $this->buildIssueList($issues);
-    $list->setNoDataString(pht("There are no open setup issues."));
+    $list->setNoDataString(pht('There are no open setup issues.'));
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Open Phabricator Setup Issues'));
 
     $nav->appendChild(
       array(
         $header,
         $list,
       ));
 
     $title = pht('Setup Issues');
 
     $crumbs = $this
       ->buildApplicationCrumbs($nav)
       ->addTextCrumb(pht('Setup'), $this->getApplicationURI('issue/'));
 
     $nav->setCrumbs($crumbs);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function buildIssueList(array $issues) {
     assert_instances_of($issues, 'PhabricatorSetupIssue');
     $list = new PHUIObjectItemListView();
     $ignored_items = array();
 
     foreach ($issues as $issue) {
         $href = $this->getApplicationURI('/issue/'.$issue->getIssueKey().'/');
         $item = id(new PHUIObjectItemView())
           ->setHeader($issue->getName())
           ->setHref($href)
           ->addAttribute($issue->getSummary());
       if (!$issue->getIsIgnored()) {
         $item->setBarColor('yellow');
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-eye-slash')
             ->setWorkflow(true)
             ->setName(pht('Ignore'))
             ->setHref('/config/ignore/'.$issue->getIssueKey().'/'));
         $list->addItem($item);
       } else {
         $item->addIcon('none', pht('Ignored'));
         $item->setDisabled(true);
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-eye')
             ->setWorkflow(true)
             ->setName(pht('Unignore'))
             ->setHref('/config/unignore/'.$issue->getIssueKey().'/'));
         $item->setBarColor('none');
         $ignored_items[] = $item;
       }
     }
 
     foreach ($ignored_items as $item) {
       $list->addItem($item);
     }
 
     return $list;
   }
 
 }
diff --git a/src/applications/config/management/PhabricatorConfigManagementDeleteWorkflow.php b/src/applications/config/management/PhabricatorConfigManagementDeleteWorkflow.php
index cf1f05be7..00dbec118 100644
--- a/src/applications/config/management/PhabricatorConfigManagementDeleteWorkflow.php
+++ b/src/applications/config/management/PhabricatorConfigManagementDeleteWorkflow.php
@@ -1,49 +1,49 @@
 <?php
 
 final class PhabricatorConfigManagementDeleteWorkflow
   extends PhabricatorConfigManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('delete')
       ->setExamples('**delete** __key__')
       ->setSynopsis('Delete a local configuration value.')
       ->setArguments(
         array(
           array(
             'name'      => 'args',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $argv = $args->getArg('args');
     if (count($argv) == 0) {
       throw new PhutilArgumentUsageException(
-        "Specify a configuration key to delete.");
+        'Specify a configuration key to delete.');
     }
 
     $key = $argv[0];
 
     if (count($argv) > 1) {
       throw new PhutilArgumentUsageException(
-        "Too many arguments: expected one key.");
+        'Too many arguments: expected one key.');
     }
 
     $config = new PhabricatorConfigLocalSource();
     $values = $config->getKeys(array($key));
     if (!$values) {
       throw new PhutilArgumentUsageException(
         "Configuration key '{$key}' is not set in local configuration!");
     }
 
     $config->deleteKeys(array($key));
 
     $console->writeOut(
       pht("Deleted '%s' from local configuration.", $key)."\n");
   }
 
 }
diff --git a/src/applications/config/management/PhabricatorConfigManagementGetWorkflow.php b/src/applications/config/management/PhabricatorConfigManagementGetWorkflow.php
index 49758e084..09f0b9583 100644
--- a/src/applications/config/management/PhabricatorConfigManagementGetWorkflow.php
+++ b/src/applications/config/management/PhabricatorConfigManagementGetWorkflow.php
@@ -1,62 +1,62 @@
 <?php
 
 final class PhabricatorConfigManagementGetWorkflow
   extends PhabricatorConfigManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('get')
       ->setExamples('**get** __key__')
       ->setSynopsis('Get a local configuration value.')
       ->setArguments(
         array(
           array(
             'name'      => 'args',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $argv = $args->getArg('args');
     if (count($argv) == 0) {
       throw new PhutilArgumentUsageException(
-        "Specify a configuration key to get.");
+        'Specify a configuration key to get.');
     }
 
     $key = $argv[0];
 
     if (count($argv) > 1) {
       throw new PhutilArgumentUsageException(
-        "Too many arguments: expected one key.");
+        'Too many arguments: expected one key.');
     }
 
     $options = PhabricatorApplicationConfigOptions::loadAllOptions();
     if (empty($options[$key])) {
       throw new PhutilArgumentUsageException(
         "No such configuration key '{$key}'! Use `config list` to list all ".
         "keys.");
     }
 
     $config = new PhabricatorConfigLocalSource();
     $values = $config->getKeys(array($key));
 
     $result = array();
     foreach ($values as $key => $value) {
       $result[] = array(
         'key' => $key,
         'source' => 'local',
         'value' => $value,
       );
     }
     $result = array(
       'config' => $result,
     );
 
     $json = new PhutilJSON();
     $console->writeOut($json->encodeFormatted($result));
   }
 
 }
diff --git a/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php b/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
index 61afa1c6e..46464c692 100644
--- a/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
+++ b/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
@@ -1,99 +1,99 @@
 <?php
 
 final class PhabricatorConfigManagementSetWorkflow
   extends PhabricatorConfigManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('set')
       ->setExamples('**set** __key__ __value__')
       ->setSynopsis('Set a local configuration value.')
       ->setArguments(
         array(
           array(
             'name'      => 'args',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $argv = $args->getArg('args');
     if (count($argv) == 0) {
       throw new PhutilArgumentUsageException(
-        "Specify a configuration key and a value to set it to.");
+        'Specify a configuration key and a value to set it to.');
     }
 
     $key = $argv[0];
 
     if (count($argv) == 1) {
       throw new PhutilArgumentUsageException(
         "Specify a value to set the key '{$key}' to.");
     }
 
     $value = $argv[1];
 
     if (count($argv) > 2) {
       throw new PhutilArgumentUsageException(
-        "Too many arguments: expected one key and one value.");
+        'Too many arguments: expected one key and one value.');
     }
 
     $options = PhabricatorApplicationConfigOptions::loadAllOptions();
     if (empty($options[$key])) {
       throw new PhutilArgumentUsageException(
         "No such configuration key '{$key}'! Use `config list` to list all ".
         "keys.");
     }
 
     $option = $options[$key];
 
     $type = $option->getType();
     switch ($type) {
       case 'string':
       case 'class':
       case 'enum':
         $value = (string)$value;
         break;
       case 'int':
         if (!ctype_digit($value)) {
           throw new PhutilArgumentUsageException(
             "Config key '{$key}' is of type '{$type}'. Specify an integer.");
         }
         $value = (int)$value;
         break;
       case 'bool':
         if ($value == 'true') {
           $value = true;
         } else if ($value == 'false') {
           $value = false;
         } else {
           throw new PhutilArgumentUsageException(
             "Config key '{$key}' is of type '{$type}'. ".
             "Specify 'true' or 'false'.");
         }
         break;
       default:
         $value = json_decode($value, true);
         if (!is_array($value)) {
           throw new PhutilArgumentUsageException(
             "Config key '{$key}' is of type '{$type}'. Specify it in JSON.");
         }
         break;
     }
 
     try {
       $option->getGroup()->validateOption($option, $value);
     } catch (PhabricatorConfigValidationException $validation) {
       // Convert this into a usage exception so we don't dump a stack trace.
       throw new PhutilArgumentUsageException($validation->getMessage());
     }
 
     $config = new PhabricatorConfigLocalSource();
     $config->setKeys(array($key => $value));
 
     $console->writeOut(
       pht("Set '%s' in local configuration.", $key)."\n");
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorAWSConfigOptions.php b/src/applications/config/option/PhabricatorAWSConfigOptions.php
index 88042c410..51e242a7b 100644
--- a/src/applications/config/option/PhabricatorAWSConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAWSConfigOptions.php
@@ -1,45 +1,45 @@
 <?php
 
 final class PhabricatorAWSConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Amazon Web Services");
+    return pht('Amazon Web Services');
   }
 
   public function getDescription() {
-    return pht("Configure integration with AWS (EC2, SES, S3, etc).");
+    return pht('Configure integration with AWS (EC2, SES, S3, etc).');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('amazon-ses.access-key', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Access key for Amazon SES.')),
       $this->newOption('amazon-ses.secret-key', 'string', null)
         ->setMasked(true)
         ->setDescription(pht('Secret key for Amazon SES.')),
       $this->newOption('amazon-s3.access-key', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Access key for Amazon S3.')),
       $this->newOption('amazon-s3.secret-key', 'string', null)
         ->setMasked(true)
         ->setDescription(pht('Secret key for Amazon S3.')),
       $this->newOption('amazon-s3.endpoint', 'string', null)
         ->setLocked(true)
         ->setDescription(
           pht(
             'Explicit S3 endpoint to use. Leave empty to have Phabricator '.
             'select and endpoint. Normally, you do not need to set this.'))
         ->addExample(null, 'Use default endpoint')
         ->addExample('s3.amazon.com', 'Use specific endpoint'),
       $this->newOption('amazon-ec2.access-key', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Access key for Amazon EC2.')),
       $this->newOption('amazon-ec2.secret-key', 'string', null)
         ->setMasked(true)
         ->setDescription(pht('Secret key for Amazon EC2.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
index f03056b72..c413088fa 100644
--- a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
@@ -1,125 +1,125 @@
 <?php
 
 final class PhabricatorAccessLogConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Access Logs");
+    return pht('Access Logs');
   }
 
   public function getDescription() {
-    return pht("Configure the access logs, which log HTTP/SSH requests.");
+    return pht('Configure the access logs, which log HTTP/SSH requests.');
   }
 
   public function getOptions() {
     $common_map = array(
-      'C' => pht("The controller or workflow which handled the request."),
-      'c' => pht("The HTTP response code or process exit code."),
-      'D' => pht("The request date."),
-      'e' => pht("Epoch timestamp."),
+      'C' => pht('The controller or workflow which handled the request.'),
+      'c' => pht('The HTTP response code or process exit code.'),
+      'D' => pht('The request date.'),
+      'e' => pht('Epoch timestamp.'),
       'h' => pht("The webserver's host name."),
-      'p' => pht("The PID of the server process."),
-      'r' => pht("The remote IP."),
-      'T' => pht("The request duration, in microseconds."),
-      'U' => pht("The request path, or request target."),
-      'm' => pht("For conduit, the Conduit method which was invoked."),
-      'u' => pht("The logged-in username, if one is logged in."),
-      'P' => pht("The logged-in user PHID, if one is logged in."),
-      'i' => pht("Request input, in bytes."),
-      'o' => pht("Request output, in bytes."),
+      'p' => pht('The PID of the server process.'),
+      'r' => pht('The remote IP.'),
+      'T' => pht('The request duration, in microseconds.'),
+      'U' => pht('The request path, or request target.'),
+      'm' => pht('For conduit, the Conduit method which was invoked.'),
+      'u' => pht('The logged-in username, if one is logged in.'),
+      'P' => pht('The logged-in user PHID, if one is logged in.'),
+      'i' => pht('Request input, in bytes.'),
+      'o' => pht('Request output, in bytes.'),
     );
 
     $http_map = $common_map + array(
-      'R' => pht("The HTTP referrer."),
-      'M' => pht("The HTTP method."),
+      'R' => pht('The HTTP referrer.'),
+      'M' => pht('The HTTP method.'),
     );
 
     $ssh_map = $common_map + array(
-      's' => pht("The system user."),
-      'S' => pht("The system sudo user."),
+      's' => pht('The system user.'),
+      'S' => pht('The system sudo user.'),
     );
 
     $http_desc = pht(
-      "Format for the HTTP access log. Use {{log.access.path}} to set the ".
-      "path. Available variables are:");
+      'Format for the HTTP access log. Use {{log.access.path}} to set the '.
+      'path. Available variables are:');
     $http_desc .= "\n\n";
     $http_desc .= $this->renderMapHelp($http_map);
 
     $ssh_desc = pht(
-      "Format for the SSH access log. Use {{log.ssh.path}} to set the ".
-      "path. Available variables are:");
+      'Format for the SSH access log. Use {{log.ssh.path}} to set the '.
+      'path. Available variables are:');
     $ssh_desc .= "\n\n";
     $ssh_desc .= $this->renderMapHelp($ssh_map);
 
     return array(
       $this->newOption('log.access.path', 'string', null)
         ->setLocked(true)
-        ->setSummary(pht("Access log location."))
+        ->setSummary(pht('Access log location.'))
         ->setDescription(
           pht(
             "To enable the Phabricator access log, specify a path. The ".
             "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).\n\n".
             "If not set, no log will be written."))
         ->addExample(
           null,
           pht('Disable access log.'))
         ->addExample(
           '/var/log/phabricator/access.log',
           pht('Write access log here.')),
       $this->newOption(
         'log.access.format',
         // NOTE: This is 'wild' intead of 'string' so "\t" and such can be
         // specified.
         'wild',
         "[%D]\t%p\t%h\t%r\t%u\t%C\t%m\t%U\t%R\t%c\t%T")
         ->setLocked(true)
-        ->setSummary(pht("Access log format."))
+        ->setSummary(pht('Access log format.'))
         ->setDescription($http_desc),
       $this->newOption('log.ssh.path', 'string', null)
         ->setLocked(true)
-        ->setSummary(pht("SSH log location."))
+        ->setSummary(pht('SSH log location.'))
         ->setDescription(
           pht(
             "To enable the Phabricator SSH log, specify a path. The ".
             "access log can provide more detailed information about SSH ".
             "access than a normal SSH log (for instance, it can show ".
             "logged-in users, commands, and other application data).\n\n".
             "If not set, no log will be written."))
         ->addExample(
           null,
           pht('Disable SSH log.'))
         ->addExample(
           '/var/log/phabricator/ssh.log',
           pht('Write SSH log here.')),
       $this->newOption(
         'log.ssh.format',
         'wild',
         "[%D]\t%p\t%h\t%r\t%s\t%S\t%u\t%C\t%U\t%c\t%T\t%i\t%o")
         ->setLocked(true)
-        ->setSummary(pht("SSH log format."))
+        ->setSummary(pht('SSH log format.'))
         ->setDescription($ssh_desc),
     );
   }
 
   private function renderMapHelp(array $map) {
     $desc = '';
     foreach ($map as $key => $kdesc) {
       $desc .= "  - `%".$key."` ".$kdesc."\n";
     }
     $desc .= "\n";
     $desc .= pht(
       "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 '-'");
     $desc .= "\n\n";
     $desc .= pht(
       "Note that the default format is subject to change in the future, so ".
       "if you rely on the log's format, specify it explicitly.");
 
     return $desc;
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
index 7e761085a..d002ca417 100644
--- a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
@@ -1,102 +1,102 @@
 <?php
 
 final class PhabricatorAuthenticationConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Authentication");
+    return pht('Authentication');
   }
 
   public function getDescription() {
-    return pht("Options relating to authentication.");
+    return pht('Options relating to authentication.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('auth.require-email-verification', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Require email verification"),
+            pht('Require email verification'),
             pht("Don't require email verification")
           ))
         ->setSummary(
-          pht("Require email verification before a user can log in."))
+          pht('Require email verification before a user can log in.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('auth.require-approval', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Require Administrators to Approve Accounts"),
+            pht('Require Administrators to Approve Accounts'),
             pht("Don't Require Manual Approval"),
           ))
         ->setSummary(
-          pht("Require administrators to approve new accounts."))
+          pht('Require administrators to approve new accounts.'))
         ->setDescription(
           pht(
             "Newly registered Phabricator accounts can either be placed ".
             "into a manual approval queue for administrative review, or ".
             "automatically activated immediately. The approval queue is ".
             "enabled by default because it gives you greater control over ".
             "who can register an account and access Phabricator.\n\n".
             "If your install is completely public, or on a VPN, or users can ".
             "only register with a trusted provider like LDAP, or you've ".
             "otherwise configured Phabricator to prevent unauthorized ".
             "registration, you can disable the queue to reduce administrative ".
             "overhead.\n\n".
             "NOTE: Before you disable the queue, make sure ".
             "{{auth.email-domains}} is configured correctly for your ".
             "install!")),
       $this->newOption('auth.email-domains', 'list<string>', array())
-        ->setSummary(pht("Only allow registration from particular domains."))
+        ->setSummary(pht('Only allow registration from particular domains.'))
         ->setDescription(
           pht(
             "You can restrict allowed email addresses to certain domains ".
             "(like `yourcompany.com`) by setting a list of allowed domains ".
             "here.\n\nUsers 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}}.\n\n".
             "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`."))
         ->addExample(
           "yourcompany.com\nmail.yourcompany.com",
           pht('Valid Setting')),
       $this->newOption('auth.login-message', 'string', null)
         ->setLocked(true)
-        ->setSummary(pht("A block of HTML displayed on the login screen."))
+        ->setSummary(pht('A block of HTML displayed on the login screen.'))
         ->setDescription(
           pht(
             "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.")),
       $this->newOption('account.editable', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Allow editing"),
-            pht("Prevent editing")
+            pht('Allow editing'),
+            pht('Prevent editing')
           ))
         ->setSummary(
           pht(
-            "Determines whether or not basic account information is ".
-            "editable."))
+            'Determines whether or not basic account information is '.
+            'editable.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('account.minimum-password-length', 'int', 8)
-        ->setSummary(pht("Minimum password length."))
+        ->setSummary(pht('Minimum password length.'))
         ->setDescription(
           pht(
-            "When users set or reset a password, it must have at least this ".
-            "many characters.")),
+            'When users set or reset a password, it must have at least this '.
+            'many characters.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorConfigOption.php b/src/applications/config/option/PhabricatorConfigOption.php
index a0d3c4d86..1c0c090b0 100644
--- a/src/applications/config/option/PhabricatorConfigOption.php
+++ b/src/applications/config/option/PhabricatorConfigOption.php
@@ -1,245 +1,245 @@
 <?php
 
 final class PhabricatorConfigOption
   extends Phobject
   implements PhabricatorMarkupInterface {
 
   private $key;
   private $default;
   private $summary;
   private $description;
   private $type;
   private $boolOptions;
   private $enumOptions;
   private $group;
   private $examples;
   private $locked;
   private $hidden;
   private $masked;
   private $baseClass;
   private $customData;
   private $customObject;
 
   public function setBaseClass($base_class) {
     $this->baseClass = $base_class;
     return $this;
   }
 
   public function getBaseClass() {
     return $this->baseClass;
   }
 
   public function setMasked($masked) {
     $this->masked = $masked;
     return $this;
   }
 
   public function getMasked() {
     if ($this->masked) {
       return true;
     }
 
     if ($this->getHidden()) {
       return true;
     }
 
     return idx(
       PhabricatorEnv::getEnvConfig('config.mask'),
       $this->getKey(),
       false);
   }
 
   public function setHidden($hidden) {
     $this->hidden = $hidden;
     return $this;
   }
 
   public function getHidden() {
     if ($this->hidden) {
       return true;
     }
 
     return idx(
       PhabricatorEnv::getEnvConfig('config.hide'),
       $this->getKey(),
       false);
   }
 
   public function setLocked($locked) {
     $this->locked = $locked;
     return $this;
   }
 
   public function getLocked() {
     if ($this->locked) {
       return true;
     }
 
     if ($this->getHidden()) {
       return true;
     }
 
     return idx(
       PhabricatorEnv::getEnvConfig('config.lock'),
       $this->getKey(),
       false);
   }
 
   public function addExample($value, $description) {
     $this->examples[] = array($value, $description);
     return $this;
   }
 
   public function getExamples() {
     return $this->examples;
   }
 
   public function setGroup(PhabricatorApplicationConfigOptions $group) {
     $this->group = $group;
     return $this;
   }
 
   public function getGroup() {
     return $this->group;
   }
 
   public function setBoolOptions(array $options) {
     $this->boolOptions = $options;
     return $this;
   }
 
   public function getBoolOptions() {
     if ($this->boolOptions) {
       return $this->boolOptions;
     }
     return array(
       pht('True'),
       pht('False'),
     );
   }
 
   public function setEnumOptions(array $options) {
     $this->enumOptions = $options;
     return $this;
   }
 
   public function getEnumOptions() {
     if ($this->enumOptions) {
       return $this->enumOptions;
     }
 
     throw new Exception(
       'Call setEnumOptions() before trying to access them!');
   }
 
   public function setKey($key) {
     $this->key = $key;
     return $this;
   }
 
   public function getKey() {
     return $this->key;
   }
 
   public function setDefault($default) {
     $this->default = $default;
     return $this;
   }
 
   public function getDefault() {
     return $this->default;
   }
 
   public function setSummary($summary) {
     $this->summary = $summary;
     return $this;
   }
 
   public function getSummary() {
     if (empty($this->summary)) {
       return $this->getDescription();
     }
     return $this->summary;
   }
 
   public function setDescription($description) {
     $this->description = $description;
     return $this;
   }
 
   public function getDescription() {
     return $this->description;
   }
 
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
   public function getType() {
     return $this->type;
   }
 
   public function isCustomType() {
     return !strncmp($this->getType(), 'custom:', 7);
   }
 
   public function getCustomObject() {
     if (!$this->customObject) {
       if (!$this->isCustomType()) {
-        throw new Exception("This option does not have a custom type!");
+        throw new Exception('This option does not have a custom type!');
       }
       $this->customObject = newv(substr($this->getType(), 7), array());
     }
     return $this->customObject;
   }
 
   public function getCustomData() {
     return $this->customData;
   }
 
   public function setCustomData($data) {
     $this->customData = $data;
     return $this;
   }
 
 /* -(  PhabricatorMarkupInterface  )----------------------------------------- */
 
   public function getMarkupFieldKey($field) {
     return $this->getKey().':'.$field;
   }
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newMarkupEngine(array());
   }
 
   public function getMarkupText($field) {
     switch ($field) {
       case 'description':
         $text = $this->getDescription();
         break;
       case 'summary':
         $text = $this->getSummary();
         break;
     }
 
     // TODO: We should probably implement this as a real Markup rule, but
     // markup rules are a bit of a mess right now and it doesn't hurt us to
     // fake this.
     $text = preg_replace(
       '/{{([^}]+)}}/',
       '[[/config/edit/\\1/ | \\1]]',
       $text);
 
     return $text;
   }
 
   public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
     return $output;
   }
 
   public function shouldUseMarkupCache($field) {
     return false;
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
index 184def155..56975bd66 100644
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -1,254 +1,254 @@
 <?php
 
 final class PhabricatorCoreConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Core");
+    return pht('Core');
   }
 
   public function getDescription() {
-    return pht("Configure core options, including URIs.");
+    return pht('Configure core options, including URIs.');
   }
 
   public function getOptions() {
     if (phutil_is_windows()) {
       $paths = array();
     } else {
       $paths = array(
         '/bin',
         '/usr/bin',
         '/usr/local/bin',
       );
     }
 
     $path = getenv('PATH');
 
     return array(
       $this->newOption('phabricator.base-uri', 'string', null)
         ->setLocked(true)
-        ->setSummary(pht("URI where Phabricator is installed."))
+        ->setSummary(pht('URI where Phabricator is installed.'))
         ->setDescription(
           pht(
-            "Set the URI where Phabricator is installed. Setting this ".
-            "improves security by preventing cookies from being set on other ".
-            "domains, and allows daemons to send emails with links that have ".
-            "the correct domain."))
+            'Set the URI where Phabricator is installed. Setting this '.
+            'improves security by preventing cookies from being set on other '.
+            'domains, and allows daemons to send emails with links that have '.
+            'the correct domain.'))
         ->addExample('http://phabricator.example.com/', pht('Valid Setting')),
       $this->newOption('phabricator.production-uri', 'string', null)
         ->setSummary(
-          pht("Primary install URI, for multi-environment installs."))
+          pht('Primary install URI, for multi-environment installs.'))
         ->setDescription(
           pht(
-            "If you have multiple Phabricator environments (like a ".
-            "development/staging environment for working on testing ".
-            "Phabricator, and a production environment for deploying it), ".
-            "set the production environment URI here so that emails and other ".
-            "durable URIs will always generate with links pointing at the ".
-            "production environment. If unset, defaults to ".
-            "{{phabricator.base-uri}}. Most installs do not need to set ".
-            "this option."))
+            'If you have multiple Phabricator environments (like a '.
+            'development/staging environment for working on testing '.
+            'Phabricator, and a production environment for deploying it), '.
+            'set the production environment URI here so that emails and other '.
+            'durable URIs will always generate with links pointing at the '.
+            'production environment. If unset, defaults to '.
+            '{{phabricator.base-uri}}. Most installs do not need to set '.
+            'this option.'))
         ->addExample('http://phabricator.example.com/', pht('Valid Setting')),
       $this->newOption('phabricator.allowed-uris', 'list<string>', array())
         ->setLocked(true)
-        ->setSummary(pht("Alternative URIs that can access Phabricator."))
+        ->setSummary(pht('Alternative URIs that can access Phabricator.'))
         ->setDescription(
           pht(
             "These alternative URIs will be able to access 'normal' pages ".
               "on your Phabricator install. Other features such as OAuth ".
               "won't work. The major use case for this is moving installs ".
               "across domains."))
         ->addExample(
           "http://phabricator2.example.com/\n".
           "http://phabricator3.example.com/",
           pht('Valid Setting')),
       $this->newOption('phabricator.timezone', 'string', null)
         ->setSummary(
-          pht("The timezone Phabricator should use."))
+          pht('The timezone Phabricator should use.'))
         ->setDescription(
           pht(
             "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."))
         ->addExample('America/New_York', pht('US East (EDT)'))
         ->addExample('America/Chicago', pht('US Central (CDT)'))
         ->addExample('America/Boise', pht('US Mountain (MDT)'))
         ->addExample('America/Los_Angeles', pht('US West (PDT)')),
       $this->newOption('phabricator.cookie-prefix', 'string', null)
         ->setSummary(
-          pht("Set a string Phabricator should use to prefix ".
-              "cookie names"))
+          pht('Set a string Phabricator should use to prefix '.
+              'cookie names'))
         ->setDescription(
           pht(
-            "Cookies set for x.com are also sent for y.x.com. Assuming ".
-            "Phabricator instances are running on both domains, this will ".
-            "create a collision preventing you from logging in."))
+            'Cookies set for x.com are also sent for y.x.com. Assuming '.
+            'Phabricator instances are running on both domains, this will '.
+            'create a collision preventing you from logging in.'))
         ->addExample('dev', pht('Prefix cookie with "dev"')),
       $this->newOption('phabricator.show-beta-applications', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Install Beta Applications'),
             pht('Uninstall Beta Applications')
           ))
         ->setSummary(
           pht(
             'Install applications which are still under development.'))
         ->setDescription(
           pht(
             "Phabricator includes 'Beta' applications which are in an early ".
             "stage of development. They range from very rough prototypes to ".
             "relatively complete (but unpolished) applications.\n\n".
             "By default, Beta applications are not installed. You can enable ".
             "this option to install them if you're interested in previewing ".
             "upcoming features.\n\n".
             "After enabling Beta applications, you can selectively uninstall ".
             "them (like normal applications).")),
       $this->newOption('phabricator.serious-business', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Serious business'),
             pht('Shenanigans'), // That should be interesting to translate. :P
           ))
         ->setSummary(
-          pht("Allows you to remove levity and jokes from the UI."))
+          pht('Allows you to remove levity and jokes from the UI.'))
         ->setDescription(
           pht(
             'By default, Phabricator includes some flavor text in the UI, '.
             'like a prompt to "Weigh In" rather than "Add Comment" in '.
             'Maniphest. If you\'d prefer more traditional UI strings like '.
             '"Add Comment", you can set this flag to disable most of the '.
             'extra flavor.')),
        $this->newOption('environment.append-paths', 'list<string>', $paths)
         ->setSummary(
-          pht("These paths get appended to your \$PATH envrionment variable."))
+          pht('These paths get appended to your \$PATH envrionment variable.'))
         ->setDescription(
           pht(
             "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.\n\n".
             "Note that you can also put binaries in ".
             "`phabricator/support/bin/` (for example, by symlinking them).\n\n".
             "The current value of PATH after configuration is applied is:\n\n".
             "  lang=text\n".
             "  %s", $path))
         ->setLocked(true)
         ->addExample('/usr/local/bin', pht('Add One Path'))
         ->addExample("/usr/bin\n/usr/local/bin", pht('Add Multiple Paths')),
       $this->newOption('config.lock', 'set', array())
         ->setLocked(true)
         ->setDescription(pht('Additional configuration options to lock.')),
       $this->newOption('config.hide', 'set', array())
         ->setLocked(true)
         ->setDescription(pht('Additional configuration options to hide.')),
       $this->newOption('config.mask', 'set', array())
         ->setLocked(true)
         ->setDescription(pht('Additional configuration options to mask.')),
       $this->newOption('config.ignore-issues', 'set', array())
         ->setLocked(true)
         ->setDescription(pht('Setup issues to ignore.')),
       $this->newOption('phabricator.env', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Internal.')),
       $this->newOption('test.value', 'wild', null)
         ->setLocked(true)
         ->setDescription(pht('Unit test value.')),
       $this->newOption('phabricator.uninstalled-applications', 'set', array())
         ->setLocked(true)
         ->setDescription(
           pht('Array containing list of Uninstalled applications.')),
       $this->newOption('phabricator.application-settings', 'wild', array())
         ->setLocked(true)
         ->setDescription(
           pht('Customized settings for Phabricator applications.')),
       $this->newOption('welcome.html', 'string', null)
         ->setLocked(true)
         ->setDescription(
           pht('Custom HTML to show on the main Phabricator dashboard.')),
       $this->newOption('phabricator.cache-namespace', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Cache namespace.')),
       $this->newOption('phabricator.allow-email-users', 'bool', false)
         ->setBoolOptions(
             array(
               pht('Allow'),
               pht('Disallow'),
               ))->setDescription(
                  pht(
                    'Allow non-members to interact with tasks over email.')),
       );
 
   }
 
   protected function didValidateOption(
     PhabricatorConfigOption $option,
     $value) {
 
     $key = $option->getKey();
     if ($key == 'phabricator.base-uri' ||
         $key == 'phabricator.production-uri') {
 
       $uri = new PhutilURI($value);
       $protocol = $uri->getProtocol();
       if ($protocol !== 'http' && $protocol !== 'https') {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The URI must start with ".
             "'http://' or 'https://'.",
             $key));
       }
 
       $domain = $uri->getDomain();
       if (strpos($domain, '.') === false) {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The URI must contain a dot ('.'), ".
             "like 'http://example.com/', not just a bare name like ".
             "'http://example/'. Some web browsers will not set cookies on ".
             "domains with no TLD.",
             $key));
       }
 
       $path = $uri->getPath();
       if ($path !== '' && $path !== '/') {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The URI must NOT have a path, ".
             "e.g. 'http://phabricator.example.com/' is OK, but ".
             "'http://example.com/phabricator/' is not. Phabricator must be ".
             "installed on an entire domain; it can not be installed on a ".
             "path.",
             $key));
       }
     }
 
 
     if ($key === 'phabricator.timezone') {
       $old = date_default_timezone_get();
       $ok = @date_default_timezone_set($value);
       @date_default_timezone_set($old);
 
       if (!$ok) {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The timezone identifier must ".
             "be a valid timezone identifier recognized by PHP, like ".
             "'America/Los_Angeles'. You can find a list of valid identifiers ".
             "here: %s",
             $key,
             'http://php.net/manual/timezones.php'));
       }
     }
 
 
 
   }
 
 
 }
diff --git a/src/applications/config/option/PhabricatorDeveloperConfigOptions.php b/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
index 95f841b4e..9f26ba6bb 100644
--- a/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
+++ b/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
@@ -1,127 +1,127 @@
 <?php
 
 final class PhabricatorDeveloperConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Developer / Debugging");
+    return pht('Developer / Debugging');
   }
 
   public function getDescription() {
-    return pht("Options for Phabricator developers, including debugging.");
+    return pht('Options for Phabricator developers, including debugging.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('darkconsole.enabled', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Enable DarkConsole"),
-            pht("Disable DarkConsole"),
+            pht('Enable DarkConsole'),
+            pht('Disable DarkConsole'),
           ))
         ->setSummary(pht("Enable Phabricator's debugging console."))
         ->setDescription(
           pht(
             "DarkConsole is a development and profiling tool built into ".
             "Phabricator's web interface. You should leave it disabled unless ".
             "you are developing or debugging Phabricator.\n\n".
             "Once you activate DarkConsole for the install, **you need to ".
             "enable it for your account before it will actually appear on ".
             "pages.** You can do this in Settings > Developer Settings.\n\n".
             "DarkConsole exposes potentially sensitive data (like queries, ".
             "stack traces, and configuration) so you generally should not ".
             "turn it on in production.")),
       $this->newOption('darkconsole.always-on', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Always Activate DarkConsole"),
-            pht("Require DarkConsole Activation"),
+            pht('Always Activate DarkConsole'),
+            pht('Require DarkConsole Activation'),
           ))
-        ->setSummary(pht("Activate DarkConsole on every page."))
+        ->setSummary(pht('Activate DarkConsole on every page.'))
         ->setDescription(
           pht(
             "This option allows you to enable DarkConsole on every page, ".
             "even for logged-out users. This is only really useful if you ".
             "need to debug something on a logged-out page. You should not ".
             "enable this option in production.\n\n".
             "You must enable DarkConsole by setting {{darkconsole.enabled}} ".
             "before this option will have any effect.")),
       $this->newOption('debug.stop-on-redirect', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Stop Before HTTP Redirect"),
-            pht("Use Normal HTTP Redirects"),
+            pht('Stop Before HTTP Redirect'),
+            pht('Use Normal HTTP Redirects'),
           ))
         ->setSummary(
           pht(
-            "Confirm before redirecting so DarkConsole can be examined."))
+            'Confirm before redirecting so DarkConsole can be examined.'))
         ->setDescription(
           pht(
-            "Normally, Phabricator issues HTTP redirects after a successful ".
-            "POST. This can make it difficult to debug things which happen ".
-            "while processing the POST, because service and profiling ".
-            "information are lost. By setting this configuration option, ".
-            "Phabricator will show a page instead of automatically ".
-            "redirecting, allowing you to examine service and profiling ".
-            "information. It also makes the UX awful, so you should only ".
-            "enable it when debugging.")),
+            'Normally, Phabricator issues HTTP redirects after a successful '.
+            'POST. This can make it difficult to debug things which happen '.
+            'while processing the POST, because service and profiling '.
+            'information are lost. By setting this configuration option, '.
+            'Phabricator will show a page instead of automatically '.
+            'redirecting, allowing you to examine service and profiling '.
+            'information. It also makes the UX awful, so you should only '.
+            'enable it when debugging.')),
       $this->newOption('debug.profile-rate', 'int', 0)
         ->addExample(0,     pht('No profiling'))
         ->addExample(1,     pht('Profile every request (slow)'))
         ->addExample(1000,  pht('Profile 0.1%% of all requests'))
-        ->setSummary(pht("Automatically profile some percentage of pages."))
+        ->setSummary(pht('Automatically profile some percentage of pages.'))
         ->setDescription(
           pht(
             "Normally, Phabricator profiles pages only when explicitly ".
             "requested via DarkConsole. However, it may be useful to profile ".
             "some pages automatically.\n\n".
             "Set this option to a positive integer N to profile 1 / N pages ".
             "automatically. For example, setting it to 1 will profile every ".
             "page, while setting it to 1000 will profile 1 page per 1000 ".
             "requests (i.e., 0.1%% of requests).\n\n".
             "Since profiling is slow and generates a lot of data, you should ".
             "set this to 0 in production (to disable it) or to a large number ".
             "(to collect a few samples, if you're interested in having some ".
             "data to look at eventually). In development, it may be useful to ".
             "set it to 1 in order to debug performance problems.\n\n".
             "NOTE: You must install XHProf for profiling to work.")),
       $this->newOption('phabricator.developer-mode', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Enable developer mode'),
             pht('Disable developer mode'),
           ))
-          ->setSummary(pht("Enable verbose error reporting and disk reads."))
+          ->setSummary(pht('Enable verbose error reporting and disk reads.'))
           ->setDescription(
             pht(
-              "This option enables verbose error reporting (stack traces, ".
-              "error callouts) and forces disk reads of static assets on ".
-              "every reload.")),
+              'This option enables verbose error reporting (stack traces, '.
+              'error callouts) and forces disk reads of static assets on '.
+              'every reload.')),
       $this->newOption('celerity.minify', 'bool', true)
         ->setBoolOptions(
           array(
             pht('Minify static resources.'),
             pht("Don't minify static resources."),
           ))
-        ->setSummary(pht("Minify static Celerity resources."))
+        ->setSummary(pht('Minify static Celerity resources.'))
         ->setDescription(
           pht(
-            "Minify static resources by removing whitespace and comments. You ".
-            "should enable this in production, but disable it in ".
-            "development.")),
+            'Minify static resources by removing whitespace and comments. You '.
+            'should enable this in production, but disable it in '.
+            'development.')),
       $this->newOption('cache.enable-deflate', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Enable deflate compression"),
-            pht("Disable deflate compression"),
+            pht('Enable deflate compression'),
+            pht('Disable deflate compression'),
           ))
         ->setSummary(
-          pht("Toggle gzdeflate()-based compression for some caches."))
+          pht('Toggle gzdeflate()-based compression for some caches.'))
         ->setDescription(
           pht(
-            "Set this to false to disable the use of gzdeflate()-based ".
-            "compression in some caches. This may give you less performant ".
-            "(but more debuggable) caching.")),
+            'Set this to false to disable the use of gzdeflate()-based '.
+            'compression in some caches. This may give you less performant '.
+            '(but more debuggable) caching.')),
     );
   }
 }
diff --git a/src/applications/config/option/PhabricatorDisqusConfigOptions.php b/src/applications/config/option/PhabricatorDisqusConfigOptions.php
index d3a06eba3..c85e3a7eb 100644
--- a/src/applications/config/option/PhabricatorDisqusConfigOptions.php
+++ b/src/applications/config/option/PhabricatorDisqusConfigOptions.php
@@ -1,27 +1,27 @@
 <?php
 
 final class PhabricatorDisqusConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Integration with Disqus");
+    return pht('Integration with Disqus');
   }
 
   public function getDescription() {
-    return pht("Disqus authentication and integration options.");
+    return pht('Disqus authentication and integration options.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('disqus.shortname', 'string', null)
-        ->setSummary(pht("Shortname for Disqus comment widget."))
+        ->setSummary(pht('Shortname for Disqus comment widget.'))
         ->setDescription(
           pht(
             "Website shortname to use for Disqus comment widget in Phame. ".
             "For more information, see:\n\n".
             "[[http://docs.disqus.com/help/4/ | Disqus Quick Start Guide]]\n".
             "[[http://docs.disqus.com/help/68/ | Information on Shortnames]]")),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php b/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
index 3c6678cf2..0c5783f3d 100644
--- a/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
+++ b/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
@@ -1,42 +1,42 @@
 <?php
 
 final class PhabricatorExtendingPhabricatorConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Extending Phabricator");
+    return pht('Extending Phabricator');
   }
 
   public function getDescription() {
-    return pht("Make Phabricator even cooler!");
+    return pht('Make Phabricator even cooler!');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('load-libraries', 'list<string>', array())
         ->setLocked(true)
-        ->setSummary(pht("Paths to additional phutil libraries to load."))
+        ->setSummary(pht('Paths to additional phutil libraries to load.'))
         ->addExample('/srv/our-libs/sekrit-phutil', pht('Valid Setting')),
       $this->newOption('events.listeners', 'list<string>', array())
         ->setLocked(true)
         ->setSummary(
-          pht("Listeners receive callbacks when interesting things occur."))
+          pht('Listeners receive callbacks when interesting things occur.'))
         ->setDescription(
           pht(
-            "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."))
+            '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.'))
         ->addExample('MyEventListener', pht('Valid Setting')),
        $this->newOption(
          'aphront.default-application-configuration-class',
          'class',
          'AphrontDefaultApplicationConfiguration')
         ->setLocked(true)
         ->setBaseClass('AphrontApplicationConfiguration')
         // TODO: This could probably use some better documentation.
-        ->setDescription(pht("Application configuration class.")),
+        ->setDescription(pht('Application configuration class.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php b/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php
index 3f5a42c62..24fd1a401 100644
--- a/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php
+++ b/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php
@@ -1,55 +1,55 @@
 <?php
 
 final class PhabricatorGarbageCollectorConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Garbage Collector");
+    return pht('Garbage Collector');
   }
 
   public function getDescription() {
-    return pht("Configure the GC for old logs, caches, etc.");
+    return pht('Configure the GC for old logs, caches, etc.');
   }
 
   public function getOptions() {
 
     $options = array(
       'gcdaemon.ttl.herald-transcripts' => array(
         30,
         pht('Number of seconds to retain Herald transcripts for.')),
       'gcdaemon.ttl.daemon-logs' => array(
         7,
         pht('Number of seconds to retain Daemon logs for.')),
       'gcdaemon.ttl.differential-parse-cache' => array(
         14,
         pht('Number of seconds to retain Differential parse caches for.')),
       'gcdaemon.ttl.markup-cache' => array(
         30,
         pht('Number of seconds to retain Markup cache entries for.')),
       'gcdaemon.ttl.task-archive' => array(
         14,
         pht('Number of seconds to retain archived background tasks for.')),
       'gcdaemon.ttl.general-cache' => array(
         30,
         pht('Number of seconds to retain general cache entries for.')),
       'gcdaemon.ttl.conduit-logs' => array(
         180,
         pht('Number of seconds to retain Conduit call logs for.'))
     );
 
     $result = array();
     foreach ($options as $key => $spec) {
       list($default_days, $description) = $spec;
       $result[] = $this
         ->newOption($key, 'int', $default_days * (24 * 60 * 60))
         ->setDescription($description)
         ->addExample((7 * 24 * 60 * 60), pht('Retain for 1 week'))
         ->addExample((14 * 24 * 60 * 60), pht('Retain for 2 weeks'))
         ->addExample((30 * 24 * 60 * 60), pht('Retain for 30 days'))
         ->addExample((60 * 24 * 60 * 60), pht('Retain for 60 days'))
         ->addExample(0, pht('Retain indefinitely'));
     }
     return $result;
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorMailgunConfigOptions.php b/src/applications/config/option/PhabricatorMailgunConfigOptions.php
index 7c5b62922..cd1beb155 100644
--- a/src/applications/config/option/PhabricatorMailgunConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMailgunConfigOptions.php
@@ -1,29 +1,29 @@
 <?php
 
 final class PhabricatorMailgunConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Integration with Mailgun");
+    return pht('Integration with Mailgun');
   }
 
   public function getDescription() {
-    return pht("Configure Mailgun integration.");
+    return pht('Configure Mailgun integration.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('mailgun.domain', 'string', null)
         ->setLocked(true)
         ->setDescription(
           pht(
             'Mailgun domain name. See https://mailgun.com/cp/domains'))
         ->addExample('mycompany.com', 'Use specific domain'),
       $this->newOption('mailgun.api-key', 'string', null)
         ->setMasked(true)
         ->setDescription(pht('Mailgun API key.')),
     );
 
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
index 18ae3d27c..8eb0b5c85 100644
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -1,338 +1,338 @@
 <?php
 
 final class PhabricatorMetaMTAConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Mail");
+    return pht('Mail');
   }
 
   public function getDescription() {
-    return pht("Configure Mail.");
+    return pht('Configure Mail.');
   }
 
   public function getOptions() {
     $send_as_user_desc = $this->deformat(pht(<<<EODOC
 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 probably
     should not enable this or all of your outgoing email might vanish into SFP
     blackholes.
   - If your install is anything else, you're safer leaving this off, at least
     initially, since the risk in turning it on is that your outgoing mail will
     never arrive.
 EODOC
 ));
 
     $one_mail_per_recipient_desc = $this->deformat(pht(<<<EODOC
 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".
 EODOC
 ));
 
     $herald_hints_description = $this->deformat(pht(<<<EODOC
 You can disable the Herald hints in email if users prefer smaller messages.
 These are the links under the header "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.
 EODOC
 ));
 
     $reply_hints_description = $this->deformat(pht(<<<EODOC
 You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
 smaller messages. The actions themselves will still work properly.
 EODOC
 ));
 
     $recipient_hints_description = $this->deformat(pht(<<<EODOC
 You can disable the "To:" and "Cc:" footers in mail if users prefer smaller
 messages.
 EODOC
 ));
 
     $bulk_description = $this->deformat(pht(<<<EODOC
 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.
 EODOC
 ));
 
     $re_prefix_description = $this->deformat(pht(<<<EODOC
 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.
 EODOC
 ));
 
     $vary_subjects_description = $this->deformat(pht(<<<EODOC
 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.
 EODOC
 ));
 
     $reply_to_description = $this->deformat(pht(<<<EODOC
 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 this is still **COMPLETELY INSECURE**.
 EODOC
 ));
 
     $adapter_description = $this->deformat(pht(<<<EODOC
 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. A number of other mailers are available (e.g., SES, SendGrid, SMTP,
 custom mailers), consult "Configuring Outbound Email" in the documentation for
 details.
 EODOC
 ));
 
     $placeholder_description = $this->deformat(pht(<<<EODOC
 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.
 EODOC
 ));
 
     $public_replies_description = $this->deformat(pht(<<<EODOC
 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.
 EODOC
 ));
 
     $single_description = $this->deformat(pht(<<<EODOC
 If you want to use a single mailbox for Phabricator reply mail, you can use this
 and set a common prefix for reply addresses generated 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`
 user's mailbox. Set this to the left part of the email address and it will be
 prepended to all generated reply addresses.
 
 For example, if you want to use `phabricator@example.com`, this should be set
 to `phabricator`.
 EODOC
 ));
 
     $address_description = $this->deformat(pht(<<<EODOC
 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`.
 EODOC
 ));
 
     return array(
       $this->newOption(
         'metamta.default-address',
         'string',
         'noreply@phabricator.example.com')
         ->setDescription(pht('Default "From" address.')),
       $this->newOption(
         'metamta.domain',
         'string',
         'phabricator.example.com')
         ->setDescription(pht('Domain used to generate Message-IDs.')),
       $this->newOption(
         'metamta.mail-adapter',
         'class',
         'PhabricatorMailImplementationPHPMailerLiteAdapter')
         ->setBaseClass('PhabricatorMailImplementationAdapter')
         ->setSummary(pht('Control how mail is sent.'))
         ->setDescription($adapter_description),
       $this->newOption(
         'metamta.one-mail-per-recipient',
         'bool',
         true)
         ->setBoolOptions(
           array(
-            pht("Send Mail To Each Recipient"),
-            pht("Send Mail To All Recipients"),
+            pht('Send Mail To Each Recipient'),
+            pht('Send Mail To All Recipients'),
           ))
         ->setSummary(
           pht(
             'Controls whether Phabricator sends one email with multiple '.
             'recipients in the "To:" line, or multiple emails, each with a '.
             'single recipient in the "To:" line.'))
         ->setDescription($one_mail_per_recipient_desc),
       $this->newOption('metamta.can-send-as-user', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Send as User Taking Action"),
-            pht("Send as Phabricator"),
+            pht('Send as User Taking Action'),
+            pht('Send as Phabricator'),
           ))
         ->setSummary(
           pht(
             'Controls whether Phabricator sends email "From" users.'))
         ->setDescription($send_as_user_desc),
       $this->newOption(
         'metamta.reply-handler-domain',
         'string',
         'phabricator.example.com')
         ->setDescription(pht(
           'Domain used for reply email addresses. Some applications can '.
           'configure this domain.')),
       $this->newOption('metamta.reply.show-hints', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Show Reply Handler Hints"),
-            pht("No Reply Handler Hints"),
+            pht('Show Reply Handler Hints'),
+            pht('No Reply Handler Hints'),
           ))
         ->setSummary(pht('Show hints about reply handler actions in email.'))
         ->setDescription($reply_hints_description),
       $this->newOption('metamta.herald.show-hints', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Show Herald Hints"),
-            pht("No Herald Hints"),
+            pht('Show Herald Hints'),
+            pht('No Herald Hints'),
           ))
         ->setSummary(pht('Show hints about Herald rules in email.'))
         ->setDescription($herald_hints_description),
       $this->newOption('metamta.recipients.show-hints', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Show Recipient Hints"),
-            pht("No Recipient Hints"),
+            pht('Show Recipient Hints'),
+            pht('No Recipient Hints'),
           ))
         ->setSummary(pht('Show "To:" and "Cc:" footer hints in email.'))
         ->setDescription($recipient_hints_description),
       $this->newOption('metamta.precedence-bulk', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Add "Precedence: bulk" Header'),
             pht('No "Precedence: bulk" Header'),
           ))
         ->setSummary(pht('Control the "Precedence: bulk" header.'))
         ->setDescription($bulk_description),
       $this->newOption('metamta.re-prefix', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Force "Re:" Subject Prefix'),
             pht('No "Re:" Subject Prefix'),
           ))
         ->setSummary(pht('Control "Re:" subject prefix, for Mail.app.'))
         ->setDescription($re_prefix_description),
       $this->newOption('metamta.vary-subjects', 'bool', true)
         ->setBoolOptions(
           array(
             pht('Allow Varied Subjects'),
             pht('Always Use the Same Thread Subject'),
           ))
         ->setSummary(pht('Control subject variance, for some mail clients.'))
         ->setDescription($vary_subjects_description),
       $this->newOption('metamta.insecure-auth-with-reply-to', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow Insecure Reply-To Auth'),
             pht('Disallow Reply-To Auth'),
           ))
         ->setSummary(pht('Trust "Reply-To" headers for authentication.'))
         ->setDescription($reply_to_description),
       $this->newOption('metamta.placeholder-to-recipient', 'string', null)
         ->setSummary(pht('Placeholder for mail with only CCs.'))
         ->setDescription($placeholder_description),
       $this->newOption('metamta.public-replies', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Use Public Replies (Less Secure)'),
             pht('Use Private Replies (More Secure)'),
           ))
         ->setSummary(
           pht(
             'Phabricator can use less-secure but mailing list friendly public '.
             'reply addresses.'))
         ->setDescription($public_replies_description),
       $this->newOption('metamta.single-reply-handler-prefix', 'string', null)
         ->setSummary(
           pht('Allow Phabricator to use a single mailbox for all replies.'))
         ->setDescription($single_description),
       $this->newOption('metamta.user-address-format', 'enum', 'full')
         ->setEnumOptions(
           array(
             'short' => 'short',
             'real' => 'real',
             'full' => 'full',
           ))
         ->setSummary(pht('Control how Phabricator renders user names in mail.'))
         ->setDescription($address_description)
         ->addExample('gwashington <gwashington@example.com>', 'short')
         ->addExample('George Washington <gwashington@example.com>', 'real')
         ->addExample(
           'gwashington (George Washington) <gwashington@example.com>',
           'full'),
       $this->newOption('metamta.email-body-limit', 'int', 524288)
         ->setDescription(
           pht(
             'You can set a limit for the maximum byte size of outbound mail. '.
             'Mail which is larger than this limit will be truncated before '.
             'being sent. This can be useful if your MTA rejects mail which '.
             'exceeds some limit (this is reasonably common). Specify a value '.
             'in bytes.'))
         ->setSummary(pht('Global cap for size of generated emails (bytes).'))
         ->addExample(524288, pht('Truncate at 512KB'))
         ->addExample(1048576, pht('Truncate at 1MB'))
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorMySQLConfigOptions.php b/src/applications/config/option/PhabricatorMySQLConfigOptions.php
index e19348880..61dddf853 100644
--- a/src/applications/config/option/PhabricatorMySQLConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMySQLConfigOptions.php
@@ -1,79 +1,79 @@
 <?php
 
 final class PhabricatorMySQLConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("MySQL");
+    return pht('MySQL');
   }
 
   public function getDescription() {
-    return pht("Database configuration.");
+    return pht('Database configuration.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('mysql.host', 'string', 'localhost')
         ->setLocked(true)
         ->setDescription(
-          pht("MySQL database hostname."))
+          pht('MySQL database hostname.'))
         ->addExample('localhost', pht('MySQL on this machine'))
         ->addExample('db.example.com:3300', pht('Nonstandard port')),
       $this->newOption('mysql.user', 'string', 'root')
         ->setLocked(true)
         ->setDescription(
-          pht("MySQL username to use when connecting to the database.")),
+          pht('MySQL username to use when connecting to the database.')),
       $this->newOption('mysql.pass', 'string', null)
         ->setHidden(true)
         ->setDescription(
-          pht("MySQL password to use when connecting to the database.")),
+          pht('MySQL password to use when connecting to the database.')),
       $this->newOption(
         'mysql.configuration-provider',
         'class',
         'DefaultDatabaseConfigurationProvider')
         ->setLocked(true)
         ->setBaseClass('DatabaseConfigurationProvider')
         ->setSummary(
           pht('Configure database configuration class.'))
         ->setDescription(
           pht(
-            "Phabricator chooses which database to connect to through a ".
-            "swappable configuration provider. You almost certainly do not ".
-            "need to change this.")),
+            'Phabricator chooses which database to connect to through a '.
+            'swappable configuration provider. You almost certainly do not '.
+            'need to change this.')),
       $this->newOption(
         'mysql.implementation',
         'class',
         (extension_loaded('mysqli')
           ? 'AphrontMySQLiDatabaseConnection'
           : 'AphrontMySQLDatabaseConnection'))
         ->setLocked(true)
         ->setBaseClass('AphrontMySQLDatabaseConnectionBase')
         ->setSummary(
           pht('Configure database connection class.'))
         ->setDescription(
           pht(
-            "Phabricator connects to MySQL through a swappable abstraction ".
-            "layer. You can choose an alternate implementation by setting ".
-            "this option. To provide your own implementation, extend ".
-            "`AphrontMySQLDatabaseConnectionBase`. It is very unlikely that ".
-            "you need to change this.")),
+            'Phabricator connects to MySQL through a swappable abstraction '.
+            'layer. You can choose an alternate implementation by setting '.
+            'this option. To provide your own implementation, extend '.
+            '`AphrontMySQLDatabaseConnectionBase`. It is very unlikely that '.
+            'you need to change this.')),
       $this->newOption('storage.default-namespace', 'string', 'phabricator')
         ->setLocked(true)
         ->setSummary(
-          pht("The namespace that Phabricator databases should use."))
+          pht('The namespace that Phabricator databases should use.'))
         ->setDescription(
           pht(
             "Phabricator puts databases in a namespace, which defaults 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.")),
         $this->newOption('mysql.port', 'string', null)
         ->setLocked(true)
         ->setDescription(
-          pht("MySQL port to use when connecting to the database.")),
+          pht('MySQL port to use when connecting to the database.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorNotificationConfigOptions.php b/src/applications/config/option/PhabricatorNotificationConfigOptions.php
index bb8f2c70b..eb750a65b 100644
--- a/src/applications/config/option/PhabricatorNotificationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorNotificationConfigOptions.php
@@ -1,59 +1,59 @@
 <?php
 
 final class PhabricatorNotificationConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Notifications");
+    return pht('Notifications');
   }
 
   public function getDescription() {
-    return pht("Configure real-time notifications.");
+    return pht('Configure real-time notifications.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('notification.enabled', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Enable Real-Time Notifications"),
-            pht("Disable Real-Time Notifications"),
+            pht('Enable Real-Time Notifications'),
+            pht('Disable Real-Time Notifications'),
           ))
         ->setSummary(pht('Enable real-time notifications.'))
         ->setDescription(
           pht(
             "Enable real-time notifications. You must also run a Node.js ".
             "based notification server for this to work. Consult the ".
             "documentation in 'Notifications User Guide: Setup and ".
             "Configuration' for instructions.")),
       $this->newOption(
         'notification.client-uri',
         'string',
         'http://localhost:22280/')
         ->setDescription(pht('Location of the client server.')),
       $this->newOption(
         'notification.server-uri',
         'string',
         'http://localhost:22281/')
         ->setDescription(pht('Location of the notification receiver server.')),
       $this->newOption('notification.user', 'string', null)
         ->setSummary(pht('Drop permissions to a less-privileged user.'))
         ->setDescription(
           pht(
-            "The notifcation server must be started as root so it can bind ".
-            "to privileged ports, but if you specify a system user here it ".
-            "will drop permissions to that user after binding to the ports ".
-            "it needs.")),
+            'The notifcation server must be started as root so it can bind '.
+            'to privileged ports, but if you specify a system user here it '.
+            'will drop permissions to that user after binding to the ports '.
+            'it needs.')),
       $this->newOption('notification.log', 'string', '/var/log/aphlict.log')
         ->setDescription(pht('Location of the server log file.')),
       $this->newOption(
         'notification.pidfile',
         'string',
         '/var/run/aphlict.pid')
         ->setDescription(pht('Location of the server PID file.')),
       $this->newOption('notification.debug', 'bool', false)
         ->setDescription(pht('Enable debug output in the browser.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorPHDConfigOptions.php b/src/applications/config/option/PhabricatorPHDConfigOptions.php
index a15844f4d..e106e78de 100644
--- a/src/applications/config/option/PhabricatorPHDConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHDConfigOptions.php
@@ -1,69 +1,69 @@
 <?php
 
 final class PhabricatorPHDConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Daemons");
+    return pht('Daemons');
   }
 
   public function getDescription() {
-    return pht("Options relating to PHD (daemons).");
+    return pht('Options relating to PHD (daemons).');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('phd.pid-directory', 'string', '/var/tmp/phd/pid')
         ->setDescription(
           pht(
-            "Directory that phd should use to track running daemons.")),
+            'Directory that phd should use to track running daemons.')),
       $this->newOption('phd.log-directory', 'string', '/var/tmp/phd/log')
         ->setDescription(
           pht(
-            "Directory that the daemons should use to store log files.")),
+            'Directory that the daemons should use to store log files.')),
       $this->newOption('phd.start-taskmasters', 'int', 4)
-        ->setSummary(pht("Number of TaskMaster daemons to start by default."))
+        ->setSummary(pht('Number of TaskMaster daemons to start by default.'))
         ->setDescription(
           pht(
             "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'.")),
       $this->newOption('phd.verbose', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Verbose mode"),
-            pht("Normal mode"),
+            pht('Verbose mode'),
+            pht('Normal mode'),
           ))
         ->setSummary(pht("Launch daemons in 'verbose' mode by default."))
         ->setDescription(
           pht(
             "Launch daemons in 'verbose' mode by default. This creates a lot ".
             "of output, but can help debug issues. Daemons launched in debug ".
             "mode with 'phd debug' are always launched in verbose mode. See ".
             "also 'phd.trace'.")),
       $this->newOption('phd.user', 'string', null)
         ->setLocked(true)
-        ->setSummary(pht("System user to run daemons as."))
+        ->setSummary(pht('System user to run daemons as.'))
         ->setDescription(
           pht(
-            "Specify a system user to run the daemons as. Primarily, this ".
-            "user will own the working copies of any repositories that ".
-            "Phabricator imports or manages. This option is new and ".
-            "experimental.")),
+            'Specify a system user to run the daemons as. Primarily, this '.
+            'user will own the working copies of any repositories that '.
+            'Phabricator imports or manages. This option is new and '.
+            'experimental.')),
       $this->newOption('phd.trace', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Trace mode"),
-            pht("Normal mode"),
+            pht('Trace mode'),
+            pht('Normal mode'),
           ))
         ->setSummary(pht("Launch daemons in 'trace' mode by default."))
         ->setDescription(
           pht(
             "Launch daemons in 'trace' mode by default. This creates an ".
             "ENORMOUS amount of output, but can help debug issues. Daemons ".
             "launched in debug mode with 'phd debug' are always launched in ".
             "trace mdoe. See also 'phd.verbose'.")),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
index c49ae1c2f..d4918f934 100644
--- a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
@@ -1,50 +1,50 @@
 <?php
 
 final class PhabricatorPHPMailerConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("PHPMailer");
+    return pht('PHPMailer');
   }
 
   public function getDescription() {
-    return pht("Configure PHPMailer.");
+    return pht('Configure PHPMailer.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('phpmailer.mailer', 'string', 'smtp')
         ->setLocked(true)
-        ->setSummary(pht("Configure mailer used by PHPMailer."))
+        ->setSummary(pht('Configure mailer used by PHPMailer.'))
         ->setDescription(
           pht(
             "If you're using PHPMailer to send email, provide the mailer and ".
             "options here. PHPMailer is much more enormous than ".
             "PHPMailerLite, and provides more mailers and greater enormity. ".
             "You need it when you want to use SMTP instead of sendmail as the ".
             "mailer.")),
       $this->newOption('phpmailer.smtp-host', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Host for SMTP.')),
       $this->newOption('phpmailer.smtp-port', 'int', 25)
         ->setLocked(true)
         ->setDescription(pht('Port for SMTP.')),
       // TODO: Implement "enum"? Valid values are empty, 'tls', or 'ssl'.
       $this->newOption('phpmailer.smtp-protocol', 'string', null)
         ->setLocked(true)
         ->setSummary(pht('Configure TLS or SSL for SMTP.'))
         ->setDescription(
           pht(
             "Using PHPMailer with SMTP, you can set this to one of 'tls' or ".
             "'ssl' to use TLS or SSL, respectively. Leave it blank for ".
             "vanilla SMTP. If you're sending via Gmail, set it to 'ssl'.")),
       $this->newOption('phpmailer.smtp-user', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Username for SMTP.')),
       $this->newOption('phpmailer.smtp-password', 'string', null)
         ->setMasked(true)
         ->setDescription(pht('Password for SMTP.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
index 5aef7058c..ef3ccf2af 100644
--- a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
+++ b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
@@ -1,39 +1,39 @@
 <?php
 
 final class PhabricatorRecaptchaConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Integration with Recaptcha");
+    return pht('Integration with Recaptcha');
   }
 
   public function getDescription() {
-    return pht("Configure Recaptcha captchas.");
+    return pht('Configure Recaptcha captchas.');
   }
 
   public function getOptions() {
 
     return array(
       $this->newOption('recaptcha.enabled', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Enable Recaptcha"),
-            pht("Disable Recaptcha"),
+            pht('Enable Recaptcha'),
+            pht('Disable Recaptcha'),
           ))
         ->setSummary(pht('Enable captchas with Recaptcha.'))
         ->setDescription(
           pht(
-            "Enable recaptcha to require users solve captchas after a few ".
-            "failed login attempts. This hinders brute-force attacks against ".
-            "user passwords. For more information, see http://recaptcha.net/")),
+            'Enable recaptcha to require users solve captchas after a few '.
+            'failed login attempts. This hinders brute-force attacks against '.
+            'user passwords. For more information, see http://recaptcha.net/')),
       $this->newOption('recaptcha.public-key', 'string', null)
         ->setDescription(
           pht('Recaptcha public key, obtained by signing up for Recaptcha.')),
       $this->newOption('recaptcha.private-key', 'string', null)
         ->setMasked(true)
         ->setDescription(
           pht('Recaptcha private key, obtained by signing up for Recaptcha.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorSecurityConfigOptions.php b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
index 56cffb414..7e5150a28 100644
--- a/src/applications/config/option/PhabricatorSecurityConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
@@ -1,273 +1,273 @@
 <?php
 
 final class PhabricatorSecurityConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Security");
+    return pht('Security');
   }
 
   public function getDescription() {
-    return pht("Security options.");
+    return pht('Security options.');
   }
 
   public function getOptions() {
     $support_href = PhabricatorEnv::getDoclink('Give Feedback! Get Support!');
 
     return array(
       $this->newOption('security.alternate-file-domain', 'string', null)
         ->setLocked(true)
-        ->setSummary(pht("Alternate domain to serve files from."))
+        ->setSummary(pht('Alternate domain to serve files from.'))
         ->setDescription(
           pht(
             "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.\n\n".
 
             "To avoid this, you should configure a second domain in the same ".
             "way you have the primary domain configured (i.e., 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.\n\n".
 
             "It is **STRONGLY RECOMMENDED** that you configure this. Your ".
             "install is **NOT SECURE** unless you do so."))
         ->addExample('http://www.phabricator-files.com/', pht('Valid Setting')),
       $this->newOption(
         'security.hmac-key',
         'string',
         '[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw')
         ->setMasked(true)
         ->setLocked(true)
         ->setSummary(
-          pht("Key for HMAC digests."))
+          pht('Key for HMAC digests.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('security.require-https', 'bool', false)
         ->setLocked(true)
         ->setSummary(
-          pht("Force users to connect via HTTPS instead of HTTP."))
+          pht('Force users to connect via HTTPS instead of HTTP.'))
         ->setDescription(
           pht(
             "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.\n\n".
 
             "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.\n\n".
 
             "IMPORTANT: 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."))
         ->setBoolOptions(
           array(
             pht('Force HTTPS'),
             pht('Allow HTTP'),
           )),
       $this->newOption('security.require-multi-factor-auth', 'bool', false)
         ->setLocked(true)
         ->setSummary(
           pht('Require all users to configure multi-factor authentication.'))
         ->setDescription(
           pht(
             'By default, Phabricator allows users to add multi-factor '.
             'authentication to their accounts, but does not require it. '.
             'By enabling this option, you can force all users to add '.
             'at least one authentication factor before they can use their '.
             'accounts.'))
         ->setBoolOptions(
           array(
             pht('Multi-Factor Required'),
             pht('Multi-Factor Optional'),
           )),
       $this->newOption(
         'phabricator.csrf-key',
         'string',
         '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3')
         ->setMasked(true)
         ->setLocked(true)
         ->setSummary(
-          pht("Hashed with other inputs to generate CSRF tokens."))
+          pht('Hashed with other inputs to generate CSRF tokens.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
        $this->newOption(
          'phabricator.mail-key',
          'string',
          '5ce3e7e8787f6e40dfae861da315a5cdf1018f12')
         ->setMasked(true)
         ->setLocked(true)
         ->setSummary(
-          pht("Hashed with other inputs to generate mail tokens."))
+          pht('Hashed with other inputs to generate mail tokens.'))
         ->setDescription(
           pht(
             "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.")),
        $this->newOption(
         'uri.allowed-protocols',
         'set',
         array(
           'http' => true,
           'https' => true,
           'mailto' => true,
         ))
         ->setSummary(
-          pht("Determines which URI protocols are auto-linked."))
+          pht('Determines which URI protocols are auto-linked.'))
         ->setDescription(
           pht(
             "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."))
         ->addExample("http\nhttps", pht('Valid Setting'))
         ->setLocked(true),
       $this->newOption(
         'uri.allowed-editor-protocols',
         'set',
         array(
           'http' => true,
           'https' => true,
 
           // This handler is installed by Textmate.
           'txmt' => true,
 
           // This handler is for MacVim.
           'mvim' => true,
 
           // Unofficial handler for Vim.
           'vim' => true,
 
           // Unofficial handler for Sublime.
           'subl' => true,
 
           // Unofficial handler for Emacs.
           'emacs' => true,
 
           // This isn't a standard handler installed by an application, but
           // is a reasonable name for a user-installed handler.
           'editor' => true,
         ))
         ->setSummary(pht('Whitelists editor protocols for "Open in Editor".'))
         ->setDescription(
           pht(
             "Users can configure a URI pattern to open files in a text ".
             "editor. The URI must use a protocol on this whitelist.\n\n".
             "(If you use an editor which defines a protocol not on this ".
             "list, [[ %s | let us know ]] and we'll update the defaults.)",
             $support_href))
         ->setLocked(true),
        $this->newOption(
          'celerity.resource-hash',
          'string',
          'd9455ea150622ee044f7931dabfa52aa')
         ->setSummary(
-          pht("An input to the hash function when building resource hashes."))
+          pht('An input to the hash function when building resource hashes.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
        $this->newOption('remarkup.enable-embedded-youtube', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Embed YouTube videos"),
+            pht('Embed YouTube videos'),
             pht("Don't embed YouTube videos"),
           ))
         ->setSummary(
-          pht("Determines whether or not YouTube videos get embedded."))
+          pht('Determines whether or not YouTube videos get embedded.'))
         ->setDescription(
           pht(
             "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).")),
         $this->newOption('security.allow-outbound-http', 'bool', true)
           ->setBoolOptions(
             array(
-              pht("Allow"),
-              pht("Disallow"),
+              pht('Allow'),
+              pht('Disallow'),
             ))
           ->setLocked(true)
           ->setSummary(
-            pht("Allow outbound HTTP requests"))
+            pht('Allow outbound HTTP requests'))
           ->setDescription(
             pht(
-              "If you enable this, you are allowing Phabricator to ".
-              "potentially make requests to external servers.")),
+              'If you enable this, you are allowing Phabricator to '.
+              'potentially make requests to external servers.')),
     );
   }
 
   protected function didValidateOption(
     PhabricatorConfigOption $option,
     $value) {
 
     $key = $option->getKey();
     if ($key == 'security.alternate-file-domain') {
 
       $uri = new PhutilURI($value);
       $protocol = $uri->getProtocol();
       if ($protocol !== 'http' && $protocol !== 'https') {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The URI must start with ".
             "'http://' or 'https://'.",
             $key));
       }
 
       $domain = $uri->getDomain();
       if (strpos($domain, '.') === false) {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The URI must contain a dot ('.'), ".
             "like 'http://example.com/', not just a bare name like ".
             "'http://example/'. Some web browsers will not set cookies on ".
             "domains with no TLD.",
             $key));
       }
 
       $path = $uri->getPath();
       if ($path !== '' && $path !== '/') {
         throw new PhabricatorConfigValidationException(
           pht(
             "Config option '%s' is invalid. The URI must NOT have a path, ".
             "e.g. 'http://phabricator.example.com/' is OK, but ".
             "'http://example.com/phabricator/' is not. Phabricator must be ".
             "installed on an entire domain; it can not be installed on a ".
             "path.",
             $key));
       }
     }
   }
 
 
 }
diff --git a/src/applications/config/option/PhabricatorSendGridConfigOptions.php b/src/applications/config/option/PhabricatorSendGridConfigOptions.php
index 898268b59..04f54e12c 100644
--- a/src/applications/config/option/PhabricatorSendGridConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSendGridConfigOptions.php
@@ -1,25 +1,25 @@
 <?php
 
 final class PhabricatorSendGridConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Integration with SendGrid");
+    return pht('Integration with SendGrid');
   }
 
   public function getDescription() {
-    return pht("Configure SendGrid integration.");
+    return pht('Configure SendGrid integration.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('sendgrid.api-user', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('SendGrid API username.')),
       $this->newOption('sendgrid.api-key', 'string', null)
         ->setMasked(true)
         ->setDescription(pht('SendGrid API key.')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php b/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
index 4ce4725fa..00474a5e8 100644
--- a/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
@@ -1,135 +1,135 @@
 <?php
 
 final class PhabricatorSyntaxHighlightingConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Syntax Highlighting");
+    return pht('Syntax Highlighting');
   }
 
   public function getDescription() {
-    return pht("Options relating to syntax highlighting source code.");
+    return pht('Options relating to syntax highlighting source code.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'syntax-highlighter.engine',
         'class',
         'PhutilDefaultSyntaxHighlighterEngine')
         ->setBaseClass('PhutilSyntaxHighlighterEngine')
-        ->setSummary(pht("Default non-pygments syntax highlighter engine."))
+        ->setSummary(pht('Default non-pygments syntax highlighter engine.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('pygments.enabled', 'bool', false)
         ->setSummary(
-          pht("Should Phabricator shell out to Pygments to highlight code?"))
+          pht('Should Phabricator shell out to Pygments to highlight code?'))
         ->setDescription(
           pht(
             "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.")),
       $this->newOption(
         'pygments.dropdown-choices',
         'wild',
         array(
           'apacheconf' => 'Apache Configuration',
           'bash' => 'Bash Scripting',
           'brainfuck' => 'Brainf*ck',
           'c' => 'C',
           'coffee-script' => 'CoffeeScript',
           'cpp' => 'C++',
           'css' => 'CSS',
           'd' => 'D',
           'diff' => 'Diff',
           'django' => 'Django Templating',
           'erb' => 'Embedded Ruby/ERB',
           'erlang' => 'Erlang',
           'go' => 'Golang',
           'groovy' => 'Groovy',
           'haskell' => 'Haskell',
           'html' => 'HTML',
           'invisible' => 'Invisible',
           'java' => 'Java',
           'js' => 'Javascript',
           'json' => 'JSON',
           'mysql' => 'MySQL',
           'objc' => 'Objective-C',
           'perl' => 'Perl',
           'php' => 'PHP',
           'puppet' => 'Puppet',
           'rest' => 'reStructuredText',
           'text' => 'Plain Text',
           'python' => 'Python',
           'rainbow' => 'Rainbow',
           'remarkup' => 'Remarkup',
           'ruby' => 'Ruby',
           'xml' => 'XML',
           'yaml' => 'YAML',
         ))
         ->setSummary(
-          pht("Set the language list which appears in dropdowns."))
+          pht('Set the language list which appears in dropdowns.'))
         ->setDescription(
           pht(
-            "In places that we display a dropdown to syntax-highlight code, ".
-            "this is where that list is defined.")),
+            'In places that we display a dropdown to syntax-highlight code, '.
+            'this is where that list is defined.')),
       $this->newOption(
         'syntax.filemap',
         'wild',
         array(
           '@\.arcconfig$@' => 'js',
           '@\.arclint$@' => 'js',
           '@\.divinerconfig$@' => 'js',
         ))
         ->setSummary(
-          pht("Override what language files (based on filename) highlight as."))
+          pht('Override what language files (based on filename) highlight as.'))
         ->setDescription(
           pht(
-            "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."))
+            '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.'))
       ->addExample('{"@\\.xyz$@": "php"}', pht('Highlight *.xyz as PHP.'))
       ->addExample(
         '{"@/httpd\\.conf@": "apacheconf"}',
         pht('Highlight httpd.conf as "apacheconf".'))
       ->addExample(
         '{"@\\.([^.]+)\\.bak$@": 1}',
         pht(
           "Treat all '*.x.bak' file as '.x'. NOTE: We map to capturing group ".
           "1 by specifying the mapping as '1'")),
       $this->newOption(
         'style.monospace',
         'string',
         '10px "Menlo", "Consolas", "Monaco", monospace')
         ->setLocked(true)
         ->setSummary(
-          pht("Default monospace font."))
+          pht('Default monospace font.'))
         ->setDescription(
           pht(
             "Set the default monospaced font style for users who haven't set ".
             "a custom style.")),
       $this->newOption(
         'style.monospace.windows',
         'string',
         '11px "Menlo", "Consolas", "Monaco", monospace')
         ->setLocked(true)
         ->setSummary(
-          pht("Default monospace font for clients on Windows."))
+          pht('Default monospace font for clients on Windows.'))
         ->setDescription(
           pht(
             "Set the default monospaced font style for users who haven't set ".
             "a custom style and are using Windows.")),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorTranslationsConfigOptions.php b/src/applications/config/option/PhabricatorTranslationsConfigOptions.php
index e3392a130..5144bb3f1 100644
--- a/src/applications/config/option/PhabricatorTranslationsConfigOptions.php
+++ b/src/applications/config/option/PhabricatorTranslationsConfigOptions.php
@@ -1,43 +1,43 @@
 <?php
 
 final class PhabricatorTranslationsConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Translations");
+    return pht('Translations');
   }
 
   public function getDescription() {
-    return pht("Options relating to translations.");
+    return pht('Options relating to translations.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'translation.provider',
         'class',
         'PhabricatorEnglishTranslation')
         ->setBaseClass('PhabricatorTranslation')
-        ->setSummary(pht("Translation class that should be used for strings."))
+        ->setSummary(pht('Translation class that should be used for strings.'))
         ->setDescription(
           pht(
-            "This allows customizing texts used in Phabricator. The class ".
-            "must extend PhabricatorTranslation."))
+            'This allows customizing texts used in Phabricator. The class '.
+            'must extend PhabricatorTranslation.'))
         ->addExample('PhabricatorEnglishTranslation', pht('Valid Setting')),
       // TODO: This should be dict<string,string> I think, but that doesn't
       // exist yet.
       $this->newOption('translation.override', 'wild', array())
-        ->setSummary(pht("Override translations."))
+        ->setSummary(pht('Override translations.'))
         ->setDescription(
           pht(
             "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."))
         ->addExample(
           '{"some string": "my alternative"}',
           pht('Valid Setting')),
     );
   }
 
 }
diff --git a/src/applications/config/option/PhabricatorUIConfigOptions.php b/src/applications/config/option/PhabricatorUIConfigOptions.php
index 83c9f054c..01a55b792 100644
--- a/src/applications/config/option/PhabricatorUIConfigOptions.php
+++ b/src/applications/config/option/PhabricatorUIConfigOptions.php
@@ -1,32 +1,32 @@
 <?php
 
 final class PhabricatorUIConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("User Interface");
+    return pht('User Interface');
   }
 
   public function getDescription() {
-    return pht("Configure the Phabricator UI, including colors.");
+    return pht('Configure the Phabricator UI, including colors.');
   }
 
   public function getOptions() {
     $manifest = PHUIIconView::getSheetManifest('main-header');
 
     $options = array();
     foreach (array_keys($manifest) as $sprite_name) {
       $key = substr($sprite_name, strlen('main-header-'));
       $options[$key] = $key;
     }
 
     return array(
       $this->newOption('ui.header-color', 'enum', 'dark')
         ->setDescription(
           pht(
             'Sets the color of the main header.'))
         ->setEnumOptions($options),
     );
   }
 
 }
diff --git a/src/applications/config/response/PhabricatorConfigResponse.php b/src/applications/config/response/PhabricatorConfigResponse.php
index 5ae68f2c6..cc0449896 100644
--- a/src/applications/config/response/PhabricatorConfigResponse.php
+++ b/src/applications/config/response/PhabricatorConfigResponse.php
@@ -1,59 +1,59 @@
 <?php
 
 final class PhabricatorConfigResponse extends AphrontHTMLResponse {
 
   private $view;
 
   public function setView(PhabricatorSetupIssueView $view) {
     $this->view = $view;
     return $this;
   }
 
   public function buildResponseString() {
     // Check to make sure we aren't requesting this via ajax or conduit
     if (isset($_REQUEST['__ajax__']) || isset($_REQUEST['__conduit__'])) {
       // We don't want to flood the console with html, just return a simple
       // message for now.
       return pht(
-        "This install has a fatal setup error, access the internet web ".
-        "version to view details and resolve it.");
+        'This install has a fatal setup error, access the internet web '.
+        'version to view details and resolve it.');
     }
 
     $resources = $this->buildResources();
 
     $view = $this->view->render();
 
     return hsprintf(
       '<!DOCTYPE html>'.
       '<html>'.
         '<head>'.
           '<meta charset="UTF-8" />'.
           '<title>Phabricator Setup</title>'.
           '%s'.
         '</head>'.
         '<body class="setup-fatal">%s</body>'.
       '</html>',
       $resources,
       $view);
   }
 
   private function buildResources() {
     $css = array(
       'application/config/config-template.css',
       'application/config/setup-issue.css',
     );
 
     $webroot = dirname(phutil_get_library_root('phabricator')).'/webroot/';
 
     $resources = array();
     foreach ($css as $path) {
       $resources[] = phutil_tag(
         'style',
         array('type' => 'text/css'),
         phutil_safe_html(Filesystem::readFile($webroot.'/rsrc/css/'.$path)));
     }
     return phutil_implode_html("\n", $resources);
   }
 
 
 }
diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
index ef8914e5b..ca575adc8 100644
--- a/src/applications/config/view/PhabricatorSetupIssueView.php
+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
@@ -1,382 +1,382 @@
 <?php
 
 final class PhabricatorSetupIssueView extends AphrontView {
 
   private $issue;
 
   public function setIssue(PhabricatorSetupIssue $issue) {
     $this->issue = $issue;
     return $this;
   }
 
   public function getIssue() {
     return $this->issue;
   }
 
   public function render() {
     $issue = $this->getIssue();
 
     $description = array();
     $description[] = phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-instructions',
       ),
       phutil_escape_html_newlines($issue->getMessage()));
 
     $configs = $issue->getPHPConfig();
     if ($configs) {
       $description[] = $this->renderPHPConfig($configs);
     }
 
     $configs = $issue->getPhabricatorConfig();
     if ($configs) {
       $description[] = $this->renderPhabricatorConfig($configs);
     }
 
     $related_configs = $issue->getRelatedPhabricatorConfig();
     if ($related_configs) {
       $description[] = $this->renderPhabricatorConfig($related_configs,
         $related = true);
     }
 
     $commands = $issue->getCommands();
     if ($commands) {
-      $run_these = pht("Run these %d command(s):", count($commands));
+      $run_these = pht('Run these %d command(s):', count($commands));
       $description[] = phutil_tag(
         'div',
         array(
           'class' => 'setup-issue-config',
         ),
         array(
           phutil_tag('p', array(), $run_these),
           phutil_tag('pre', array(), phutil_implode_html("\n", $commands)),
         ));
     }
 
     $extensions = $issue->getPHPExtensions();
     if ($extensions) {
       $install_these = pht(
-        "Install these %d PHP extension(s):", count($extensions));
+        'Install these %d PHP extension(s):', count($extensions));
 
       $install_info = pht(
-        "You can usually install a PHP extension using %s or %s. Common ".
-        "package names are %s or %s. Try commands like these:",
+        'You can usually install a PHP extension using %s or %s. Common '.
+        'package names are %s or %s. Try commands like these:',
         phutil_tag('tt', array(), 'apt-get'),
         phutil_tag('tt', array(), 'yum'),
         hsprintf('<tt>php-<em>%s</em></tt>', pht('extname')),
         hsprintf('<tt>php5-<em>%s</em></tt>', pht('extname')));
 
       // TODO: We should do a better job of detecting how to install extensions
       // on the current system.
       $install_commands = hsprintf(
         "\$ sudo apt-get install php5-<em>extname</em>  ".
         "# Debian / Ubuntu\n".
         "\$ sudo yum install php-<em>extname</em>       ".
         "# Red Hat / Derivatives");
 
       $fallback_info = pht(
         "If those commands don't work, try Google. The process of installing ".
         "PHP extensions is not specific to Phabricator, and any instructions ".
         "you can find for installing them on your system should work. On Mac ".
         "OS X, you might want to try Homebrew.");
 
       $restart_info = pht(
-        "After installing new PHP extensions, <strong>restart your webserver ".
-        "for the changes to take effect</strong>.",
+        'After installing new PHP extensions, <strong>restart your webserver '.
+        'for the changes to take effect</strong>.',
         hsprintf(''));
 
       $description[] = phutil_tag(
         'div',
         array(
           'class' => 'setup-issue-config',
         ),
         array(
           phutil_tag('p', array(), $install_these),
           phutil_tag('pre', array(), implode("\n", $extensions)),
           phutil_tag('p', array(), $install_info),
           phutil_tag('pre', array(), $install_commands),
           phutil_tag('p', array(), $fallback_info),
           phutil_tag('p', array(), $restart_info),
         ));
 
     }
 
     $next = phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-next',
       ),
       pht('To continue, resolve this problem and reload the page.'));
 
     $name = phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-name',
       ),
       $issue->getName());
 
     $issue = phutil_tag(
       'div',
       array(
         'class' => 'setup-issue',
       ),
       array(
         $name,
         $description,
         $next,
       ));
 
     $debug_info = phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-debug',
       ),
       pht('Host: %s', php_uname('n')));
 
     return phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-shell',
       ),
       array(
         $issue,
         $debug_info,
       ));
   }
 
   private function renderPhabricatorConfig(array $configs, $related = false) {
     $issue = $this->getIssue();
 
     $table_info = phutil_tag(
       'p',
       array(),
       pht(
-        "The current Phabricator configuration has these %d value(s):",
+        'The current Phabricator configuration has these %d value(s):',
         count($configs)));
 
     $options = PhabricatorApplicationConfigOptions::loadAllOptions();
     $hidden = array();
     foreach ($options as $key => $option) {
       if ($option->getHidden()) {
         $hidden[$key] = true;
       }
     }
 
     $table = null;
     $dict = array();
     foreach ($configs as $key) {
       if (isset($hidden[$key])) {
         $dict[$key] = null;
       } else {
         $dict[$key] = PhabricatorEnv::getUnrepairedEnvConfig($key);
       }
     }
 
     $table = $this->renderValueTable($dict, $hidden);
 
     if ($this->getIssue()->getIsFatal()) {
       $update_info = phutil_tag(
         'p',
         array(),
         pht(
-          "To update these %d value(s), run these command(s) from the command ".
-          "line:",
+          'To update these %d value(s), run these command(s) from the command '.
+          'line:',
           count($configs)));
 
       $update = array();
       foreach ($configs as $key) {
         $update[] = hsprintf(
           '<tt>phabricator/ $</tt> ./bin/config set %s <em>value</em>',
           $key);
       }
       $update = phutil_tag('pre', array(), phutil_implode_html("\n", $update));
     } else {
       $update = array();
       foreach ($configs as $config) {
         if (idx($options, $config) && $options[$config]->getLocked()) {
           continue;
         }
         $link = phutil_tag(
           'a',
           array(
             'href' => '/config/edit/'.$config.'/?issue='.$issue->getIssueKey(),
           ),
           pht('Edit %s', $config));
         $update[] = phutil_tag('li', array(), $link);
       }
       if ($update) {
         $update = phutil_tag('ul', array(), $update);
         if (!$related) {
 
           $update_info = phutil_tag(
           'p',
           array(),
-          pht("You can update these %d value(s) here:", count($configs)));
+          pht('You can update these %d value(s) here:', count($configs)));
         } else {
           $update_info = phutil_tag(
           'p',
           array(),
-          pht("These %d configuration value(s) are related:", count($configs)));
+          pht('These %d configuration value(s) are related:', count($configs)));
         }
       } else {
         $update = null;
         $update_info = null;
       }
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-config',
       ),
       array(
         $table_info,
         $table,
         $update_info,
         $update,
       ));
   }
 
   private function renderPHPConfig(array $configs) {
     $table_info = phutil_tag(
       'p',
       array(),
       pht(
-        "The current PHP configuration has these %d value(s):",
+        'The current PHP configuration has these %d value(s):',
         count($configs)));
 
     $dict = array();
     foreach ($configs as $key) {
       $dict[$key] = ini_get($key);
     }
 
     $table = $this->renderValueTable($dict);
 
     ob_start();
       phpinfo();
     $phpinfo = ob_get_clean();
 
 
     $rex = '@Loaded Configuration File\s*</td><td class="v">(.*?)</td>@i';
     $matches = null;
 
     $ini_loc = null;
     if (preg_match($rex, $phpinfo, $matches)) {
       $ini_loc = trim($matches[1]);
     }
 
     $rex = '@Additional \.ini files parsed\s*</td><td class="v">(.*?)</td>@i';
 
     $more_loc = array();
     if (preg_match($rex, $phpinfo, $matches)) {
       $more_loc = trim($matches[1]);
       if ($more_loc == '(none)') {
         $more_loc = array();
       } else {
         $more_loc = preg_split('/\s*,\s*/', $more_loc);
       }
     }
 
     $info = array();
     if (!$ini_loc) {
       $info[] = phutil_tag(
         'p',
         array(),
         pht(
-          "To update these %d value(s), edit your PHP configuration file.",
+          'To update these %d value(s), edit your PHP configuration file.',
           count($configs)));
     } else {
       $info[] = phutil_tag(
         'p',
         array(),
         pht(
-          "To update these %d value(s), edit your PHP configuration file, ".
-          "located here:",
+          'To update these %d value(s), edit your PHP configuration file, '.
+          'located here:',
           count($configs)));
       $info[] = phutil_tag(
         'pre',
         array(),
         $ini_loc);
     }
 
     if ($more_loc) {
       $info[] = phutil_tag(
         'p',
         array(),
         pht(
-          "PHP also loaded these configuration file(s):",
+          'PHP also loaded these configuration file(s):',
           count($more_loc)));
       $info[] = phutil_tag(
         'pre',
         array(),
         implode("\n", $more_loc));
     }
 
     $info[] = phutil_tag(
       'p',
       array(),
       pht(
         'You can find more information about PHP configuration values in the '.
         '%s.',
         phutil_tag(
           'a',
           array(
             'href' => 'http://php.net/manual/ini.list.php',
             'target' => '_blank',
           ),
           pht('PHP Documentation'))));
 
     $info[] = phutil_tag(
       'p',
       array(),
       pht(
-        "After editing the PHP configuration, <strong>restart your ".
-        "webserver for the changes to take effect</strong>.",
+        'After editing the PHP configuration, <strong>restart your '.
+        'webserver for the changes to take effect</strong>.',
         hsprintf('')));
 
     return phutil_tag(
       'div',
       array(
         'class' => 'setup-issue-config',
       ),
       array(
         $table_info,
         $table,
         $info,
       ));
   }
 
   private function renderValueTable(array $dict, array $hidden = array()) {
     $rows = array();
     foreach ($dict as $key => $value) {
       if (isset($hidden[$key])) {
         $value = phutil_tag('em', array(), 'hidden');
       } else {
         $value = $this->renderValueForDisplay($value);
       }
 
       $cols = array(
         phutil_tag('th', array(), $key),
         phutil_tag('td', array(), $value),
       );
       $rows[] = phutil_tag('tr', array(), $cols);
     }
     return phutil_tag('table', array(), $rows);
   }
 
   private function renderValueForDisplay($value) {
     if ($value === null) {
       return phutil_tag('em', array(), 'null');
     } else if ($value === false) {
       return phutil_tag('em', array(), 'false');
     } else if ($value === true) {
       return phutil_tag('em', array(), 'true');
     } else if ($value === '') {
       return phutil_tag('em', array(), 'empty string');
     } else {
       return PhabricatorConfigJSON::prettyPrintJSON($value);
     }
   }
 
 }
diff --git a/src/applications/conpherence/mail/ConpherenceReplyHandler.php b/src/applications/conpherence/mail/ConpherenceReplyHandler.php
index 6c57db070..3a8df69cb 100644
--- a/src/applications/conpherence/mail/ConpherenceReplyHandler.php
+++ b/src/applications/conpherence/mail/ConpherenceReplyHandler.php
@@ -1,94 +1,94 @@
 <?php
 
 final class ConpherenceReplyHandler extends PhabricatorMailReplyHandler {
 
   private $mailAddedParticipantPHIDs;
 
   public function setMailAddedParticipantPHIDs(array $phids) {
     $this->mailAddedParticipantPHIDs = $phids;
     return $this;
   }
   public function getMailAddedParticipantPHIDs() {
     return $this->mailAddedParticipantPHIDs;
   }
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof ConpherenceThread)) {
-      throw new Exception("Mail receiver is not a ConpherenceThread!");
+      throw new Exception('Mail receiver is not a ConpherenceThread!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'E');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('E');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht('Reply to comment and attach files.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $conpherence = $this->getMailReceiver();
     $user = $this->getActor();
     if (!$conpherence->getPHID()) {
       $conpherence
         ->attachParticipants(array())
         ->attachFilePHIDs(array());
     } else {
       $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE;
       $file_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $conpherence->getPHID(),
         $edge_type);
       $conpherence->attachFilePHIDs($file_phids);
       $participants = id(new ConpherenceParticipant())
         ->loadAllWhere('conpherencePHID = %s', $conpherence->getPHID());
       $participants = mpull($participants, null, 'getParticipantPHID');
       $conpherence->attachParticipants($participants);
     }
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $editor = id(new ConpherenceEditor())
       ->setActor($user)
       ->setContentSource($content_source)
       ->setParentMessageID($mail->getMessageID());
 
     $body = $mail->getCleanTextBody();
     $file_phids = $mail->getAttachments();
     $body = $this->enhanceBodyWithAttachments(
       $body,
       $file_phids,
       '{F%d}');
 
     $xactions = array();
     if ($this->getMailAddedParticipantPHIDs()) {
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(ConpherenceTransactionType::TYPE_PARTICIPANTS)
         ->setNewValue(array('+' => $this->getMailAddedParticipantPHIDs()));
     }
 
     $xactions = array_merge(
       $xactions,
       $editor->generateTransactionsFromText(
         $user,
         $conpherence,
         $body));
 
     $editor->applyTransactions($conpherence, $xactions);
 
     return $conpherence;
   }
 
 }
diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
index 3dde719f3..3efed163a 100644
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -1,200 +1,200 @@
 <?php
 
 /**
  * @group conpherence
  */
 final class ConpherenceThread extends ConpherenceDAO
   implements PhabricatorPolicyInterface {
 
   protected $title;
   protected $messageCount;
   protected $recentParticipantPHIDs = array();
   protected $mailKey;
 
   private $participants = self::ATTACHABLE;
   private $transactions = self::ATTACHABLE;
   private $handles = self::ATTACHABLE;
   private $filePHIDs = self::ATTACHABLE;
   private $widgetData = self::ATTACHABLE;
   private $images = array();
 
   public static function initializeNewThread(PhabricatorUser $sender) {
     return id(new ConpherenceThread())
       ->setMessageCount(0)
       ->setTitle('');
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'recentParticipantPHIDs' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorConpherencePHIDTypeThread::TYPECONST);
   }
 
   public function save() {
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
   public function attachParticipants(array $participants) {
     assert_instances_of($participants, 'ConpherenceParticipant');
     $this->participants = $participants;
     return $this;
   }
   public function getParticipants() {
     return $this->assertAttached($this->participants);
   }
   public function getParticipant($phid) {
     $participants = $this->getParticipants();
     return $participants[$phid];
   }
   public function getParticipantPHIDs() {
     $participants = $this->getParticipants();
     return array_keys($participants);
   }
 
   public function attachHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
   public function getHandles() {
     return $this->assertAttached($this->handles);
   }
 
   public function attachTransactions(array $transactions) {
     assert_instances_of($transactions, 'ConpherenceTransaction');
     $this->transactions = $transactions;
     return $this;
   }
   public function getTransactions() {
     return $this->assertAttached($this->transactions);
   }
 
   public function getTransactionsFrom($begin = 0, $amount = null) {
     $length = count($this->transactions);
 
     return array_slice(
       $this->getTransactions(),
       $length - $begin - $amount,
       $amount);
   }
 
   public function attachFilePHIDs(array $file_phids) {
     $this->filePHIDs = $file_phids;
     return $this;
   }
   public function getFilePHIDs() {
     return $this->assertAttached($this->filePHIDs);
   }
 
   public function attachWidgetData(array $widget_data) {
     $this->widgetData = $widget_data;
     return $this;
   }
   public function getWidgetData() {
     return $this->assertAttached($this->widgetData);
   }
 
   public function getDisplayData(PhabricatorUser $user) {
     $recent_phids = $this->getRecentParticipantPHIDs();
     $handles = $this->getHandles();
 
     // luck has little to do with it really; most recent participant who isn't
     // the user....
     $lucky_phid = null;
     $lucky_index = null;
     foreach ($recent_phids as $index => $phid) {
       if ($phid == $user->getPHID()) {
         continue;
       }
       $lucky_phid = $phid;
       break;
     }
     reset($recent_phids);
 
     if ($lucky_phid) {
       $lucky_handle = $handles[$lucky_phid];
     // this will be just the user talking to themselves. weirdos.
     } else {
       $lucky_handle = reset($handles);
     }
 
     $title = $js_title = $this->getTitle();
     if (!$title) {
       $title = $lucky_handle->getName();
       $js_title = pht('[No Title]');
     }
     $img_src = $lucky_handle->getImageURI();
 
     $count = 0;
     $final = false;
     $subtitle = null;
     foreach ($recent_phids as $phid) {
       if ($phid == $user->getPHID()) {
         continue;
       }
       $handle = $handles[$phid];
       if ($subtitle) {
         if ($final) {
           $subtitle .= '...';
           break;
         } else {
           $subtitle .= ', ';
         }
       }
       $subtitle .= $handle->getName();
       $count++;
       $final = $count == 3;
     }
 
     $participants = $this->getParticipants();
     $user_participation = $participants[$user->getPHID()];
     $unread_count = $this->getMessageCount() -
       $user_participation->getSeenMessageCount();
 
     return array(
       'title' => $title,
       'js_title' => $js_title,
       'subtitle' => $subtitle,
       'unread_count' => $unread_count,
       'epoch' => $this->getDateModified(),
       'image' => $img_src,
     );
   }
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_NOONE;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
     // this bad boy isn't even created yet so go nuts $user
     if (!$this->getID()) {
       return true;
     }
     $participants = $this->getParticipants();
     return isset($participants[$user->getPHID()]);
   }
 
   public function describeAutomaticCapability($capability) {
-    return pht("Participants in a thread can always view and edit it.");
+    return pht('Participants in a thread can always view and edit it.');
   }
 
 }
diff --git a/src/applications/countdown/view/PhabricatorCountdownView.php b/src/applications/countdown/view/PhabricatorCountdownView.php
index 1f4b96114..11f43825d 100644
--- a/src/applications/countdown/view/PhabricatorCountdownView.php
+++ b/src/applications/countdown/view/PhabricatorCountdownView.php
@@ -1,79 +1,79 @@
 <?php
 
 final class PhabricatorCountdownView extends AphrontTagView {
 
   private $countdown;
   private $headless;
 
 
   public function setHeadless($headless) {
     $this->headless = $headless;
     return $this;
   }
 
   public function setCountdown(PhabricatorCountdown $countdown) {
     $this->countdown = $countdown;
     return $this;
   }
 
 
   public function getTagContent() {
     $countdown = $this->countdown;
 
     require_celerity_resource('phabricator-countdown-css');
 
     $header = null;
     if (!$this->headless) {
       $header = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-timer-header',
         ),
         array(
-          "C".$countdown->getID(),
+          'C'.$countdown->getID(),
           ' ',
           phutil_tag(
             'a',
             array(
               'href' => '/countdown/'.$countdown->getID(),
             ),
             $countdown->getTitle()),
         ));
     }
 
 
     $ths = array(
       phutil_tag('th', array(), pht('Days')),
       phutil_tag('th', array(), pht('Hours')),
       phutil_tag('th', array(), pht('Minutes')),
       phutil_tag('th', array(), pht('Seconds')),
     );
 
     $dashes = array(
       javelin_tag('td', array('sigil' => 'phabricator-timer-days'), '-'),
       javelin_tag('td', array('sigil' => 'phabricator-timer-hours'), '-'),
       javelin_tag('td', array('sigil' => 'phabricator-timer-minutes'), '-'),
       javelin_tag('td', array('sigil' => 'phabricator-timer-seconds'), '-'),
     );
 
     $container = celerity_generate_unique_node_id();
     $content = phutil_tag(
       'div',
       array('class' => 'phabricator-timer', 'id' => $container),
       array(
         $header,
         phutil_tag('table', array('class' => 'phabricator-timer-table'), array(
           phutil_tag('tr', array(), $ths),
           phutil_tag('tr', array(), $dashes),
         )),
       ));
 
     Javelin::initBehavior('countdown-timer', array(
       'timestamp' => $countdown->getEpoch(),
       'container' => $container,
     ));
 
     return $content;
   }
 
 }
diff --git a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
index 169df03d8..3b40b5e5a 100644
--- a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
+++ b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
@@ -1,268 +1,268 @@
 <?php
 
 final class PhabricatorWorkerTaskDetailController
   extends PhabricatorDaemonController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $task = id(new PhabricatorWorkerActiveTask())->load($this->id);
     if (!$task) {
       $task = id(new PhabricatorWorkerArchiveTask())->load($this->id);
     }
 
     if (!$task) {
       $title = pht('Task Does Not Exist');
 
       $error_view = new AphrontErrorView();
       $error_view->setTitle(pht('No Such Task'));
       $error_view->appendChild(phutil_tag(
         'p',
         array(),
         pht('This task may have recently been garbage collected.')));
       $error_view->setSeverity(AphrontErrorView::SEVERITY_NODATA);
 
       $content = $error_view;
     } else {
       $title = pht('Task %d', $task->getID());
 
       $header = id(new PHUIHeaderView())
         ->setHeader(pht('Task %d (%s)',
           $task->getID(),
           $task->getTaskClass()));
 
       $actions = $this->buildActionListView($task);
       $properties = $this->buildPropertyListView($task, $actions);
 
       $object_box = id(new PHUIObjectBoxView())
         ->setHeader($header)
         ->addPropertyList($properties);
 
 
       $retry_head = id(new PHUIHeaderView())
         ->setHeader(pht('Retries'));
 
       $retry_info = $this->buildRetryListView($task);
 
       $retry_box = id(new PHUIObjectBoxView())
         ->setHeader($retry_head)
         ->addPropertyList($retry_info);
 
       $content = array(
         $object_box,
         $retry_box,
       );
     }
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $content,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function buildActionListView(PhabricatorWorkerTask $task) {
     $request = $this->getRequest();
     $user = $request->getUser();
     $id = $task->getID();
 
     $view = id(new PhabricatorActionListView())
       ->setUser($user)
       ->setObjectURI($request->getRequestURI());
 
     if ($task->isArchived()) {
       $result_success = PhabricatorWorkerArchiveTask::RESULT_SUCCESS;
       $can_retry = ($task->getResult() != $result_success);
 
       $view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Retry Task'))
           ->setHref($this->getApplicationURI('/task/'.$id.'/retry/'))
           ->setIcon('fa-refresh')
           ->setWorkflow(true)
           ->setDisabled(!$can_retry));
     } else {
       $view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Cancel Task'))
           ->setHref($this->getApplicationURI('/task/'.$id.'/cancel/'))
           ->setIcon('fa-times')
           ->setWorkflow(true));
     }
 
     $can_release = (!$task->isArchived()) &&
                    ($task->getLeaseOwner());
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Free Lease'))
         ->setHref($this->getApplicationURI('/task/'.$id.'/release/'))
         ->setIcon('fa-unlock')
         ->setWorkflow(true)
         ->setDisabled(!$can_release));
 
     return $view;
   }
 
   private function buildPropertyListView(
     PhabricatorWorkerTask $task,
     PhabricatorActionListView $actions) {
 
     $viewer = $this->getRequest()->getUser();
 
     $view = new PHUIPropertyListView();
     $view->setActionList($actions);
 
     if ($task->isArchived()) {
       switch ($task->getResult()) {
         case PhabricatorWorkerArchiveTask::RESULT_SUCCESS:
           $status = pht('Complete');
           break;
         case PhabricatorWorkerArchiveTask::RESULT_FAILURE:
           $status = pht('Failed');
           break;
         case PhabricatorWorkerArchiveTask::RESULT_CANCELLED:
           $status = pht('Cancelled');
           break;
         default:
-          throw new Exception("Unknown task status!");
+          throw new Exception('Unknown task status!');
       }
     } else {
       $status = pht('Queued');
     }
 
     $view->addProperty(
       pht('Task Status'),
       $status);
 
     $view->addProperty(
       pht('Task Class'),
       $task->getTaskClass());
 
     if ($task->getLeaseExpires()) {
       if ($task->getLeaseExpires() > time()) {
         $lease_status = pht('Leased');
       } else {
         $lease_status = pht('Lease Expired');
       }
     } else {
       $lease_status = phutil_tag('em', array(), pht('Not Leased'));
     }
 
     $view->addProperty(
       pht('Lease Status'),
       $lease_status);
 
     $view->addProperty(
       pht('Lease Owner'),
       $task->getLeaseOwner()
         ? $task->getLeaseOwner()
         : phutil_tag('em', array(), pht('None')));
 
     if ($task->getLeaseExpires() && $task->getLeaseOwner()) {
       $expires = ($task->getLeaseExpires() - time());
       $expires = phabricator_format_relative_time_detailed($expires);
     } else {
       $expires = phutil_tag('em', array(), pht('None'));
     }
 
     $view->addProperty(
       pht('Lease Expires'),
       $expires);
 
     if ($task->isArchived()) {
       $duration = number_format($task->getDuration()).' us';
     } else {
       $duration = phutil_tag('em', array(), pht('Not Completed'));
     }
 
     $view->addProperty(
       pht('Duration'),
       $duration);
 
     $data = id(new PhabricatorWorkerTaskData())->load($task->getDataID());
     $task->setData($data->getData());
     $worker = $task->getWorkerInstance();
     $data = $worker->renderForDisplay($viewer);
 
     $view->addProperty(
       pht('Data'),
       $data);
 
     return $view;
   }
 
   private function buildRetryListView(PhabricatorWorkerTask $task) {
     $view = new PHUIPropertyListView();
 
     $data = id(new PhabricatorWorkerTaskData())->load($task->getDataID());
     $task->setData($data->getData());
     $worker = $task->getWorkerInstance();
 
     $view->addProperty(
       pht('Failure Count'),
       $task->getFailureCount());
 
     $retry_count = $worker->getMaximumRetryCount();
     if ($retry_count === null) {
       $max_retries = phutil_tag('em', array(), pht('Retries Forever'));
       $retry_count = INF;
     } else {
       $max_retries = $retry_count;
     }
 
     $view->addProperty(
       pht('Maximum Retries'),
       $max_retries);
 
     $projection = clone $task;
     $projection->makeEphemeral();
 
     $next = array();
     for ($ii = $task->getFailureCount(); $ii < $retry_count; $ii++) {
       $projection->setFailureCount($ii);
       $next[] = $worker->getWaitBeforeRetry($projection);
       if (count($next) > 10) {
         break;
       }
     }
 
     if ($next) {
       $cumulative = 0;
       foreach ($next as $key => $duration) {
         if ($duration === null) {
           $duration = 60;
         }
         $cumulative += $duration;
         $next[$key] = phabricator_format_relative_time($cumulative);
       }
       if ($ii != $retry_count) {
         $next[] = '...';
       }
       $retries_in = implode(', ', $next);
     } else {
       $retries_in = pht('No More Retries');
     }
 
     $view->addProperty(
       pht('Retries After'),
       $retries_in);
 
     return $view;
   }
 
 }
diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementListWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementListWorkflow.php
index 56263f32c..5f9ce9d95 100644
--- a/src/applications/daemon/management/PhabricatorDaemonManagementListWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementListWorkflow.php
@@ -1,31 +1,31 @@
 <?php
 
 final class PhabricatorDaemonManagementListWorkflow
   extends PhabricatorDaemonManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('list')
       ->setSynopsis(pht('Show a list of available daemons.'))
       ->setArguments(array());
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $symbols = $this->loadAvailableDaemonClasses();
     $symbols = igroup($symbols, 'library');
 
     foreach ($symbols as $library => $symbol_list) {
-      $console->writeOut(pht("Daemons in library __%s__:", $library)."\n");
+      $console->writeOut(pht('Daemons in library __%s__:', $library)."\n");
       foreach ($symbol_list as $symbol) {
         $console->writeOut("    %s\n", $symbol['name']);
       }
       $console->writeOut("\n");
     }
 
     return 0;
   }
 
 
 }
diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementStatusWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementStatusWorkflow.php
index ef0d857c7..dbccce3dc 100644
--- a/src/applications/daemon/management/PhabricatorDaemonManagementStatusWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementStatusWorkflow.php
@@ -1,52 +1,52 @@
 <?php
 
 final class PhabricatorDaemonManagementStatusWorkflow
   extends PhabricatorDaemonManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('status')
       ->setSynopsis(pht('Show status of running daemons.'))
       ->setArguments(array());
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $daemons = $this->loadRunningDaemons();
 
     if (!$daemons) {
       $console->writeErr(
         "%s\n",
-        pht("There are no running Phabricator daemons."));
+        pht('There are no running Phabricator daemons.'));
       return 1;
     }
 
     $status = 0;
     printf(
       "%-5s\t%-24s\t%-50s%s\n",
       'PID',
       'Started',
       'Daemon',
       'Arguments');
     foreach ($daemons as $daemon) {
       $name = $daemon->getName();
       if (!$daemon->isRunning()) {
         $daemon->updateStatus(PhabricatorDaemonLog::STATUS_DEAD);
         $status = 2;
         $name = '<DEAD> '.$name;
       }
       printf(
         "%5s\t%-24s\t%-50s%s\n",
         $daemon->getPID(),
         $daemon->getEpochStarted()
           ? date('M j Y, g:i:s A', $daemon->getEpochStarted())
           : null,
         $name,
         csprintf('%LR', $daemon->getArgv()));
     }
 
     return $status;
   }
 
 
 }
diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
index d37cc4763..54546c303 100644
--- a/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
@@ -1,376 +1,376 @@
 <?php
 
 abstract class PhabricatorDaemonManagementWorkflow
   extends PhabricatorManagementWorkflow {
 
   protected function loadAvailableDaemonClasses() {
     $loader = new PhutilSymbolLoader();
     return $loader
       ->setAncestorClass('PhutilDaemon')
       ->setConcreteOnly(true)
       ->selectSymbolsWithoutLoading();
   }
 
   public function getPIDDirectory() {
     $path = PhabricatorEnv::getEnvConfig('phd.pid-directory');
     return $this->getControlDirectory($path);
   }
 
   public function getLogDirectory() {
     $path = PhabricatorEnv::getEnvConfig('phd.log-directory');
     return $this->getControlDirectory($path);
   }
 
   private function getControlDirectory($path) {
     if (!Filesystem::pathExists($path)) {
       list($err) = exec_manual('mkdir -p %s', $path);
       if ($err) {
         throw new Exception(
           "phd requires the directory '{$path}' to exist, but it does not ".
           "exist and could not be created. Create this directory or update ".
           "'phd.pid-directory' / 'phd.log-directory' in your configuration ".
           "to point to an existing directory.");
       }
     }
     return $path;
   }
 
   public function loadRunningDaemons() {
     $results = array();
 
     $pid_dir = $this->getPIDDirectory();
     $pid_files = Filesystem::listDirectory($pid_dir);
     if (!$pid_files) {
       return $results;
     }
 
     foreach ($pid_files as $pid_file) {
       $pid_data = Filesystem::readFile($pid_dir.'/'.$pid_file);
       $dict = json_decode($pid_data, true);
       if (!is_array($dict)) {
         // Just return a hanging reference, since control code needs to be
         // robust against unusual system states.
         $dict = array();
       }
       $ref = PhabricatorDaemonReference::newFromDictionary($dict);
       $ref->setPIDFile($pid_dir.'/'.$pid_file);
       $results[] = $ref;
     }
 
     return $results;
   }
 
   private function findDaemonClass($substring) {
     $symbols = $this->loadAvailableDaemonClasses();
 
     $symbols = ipull($symbols, 'name');
     $match = array();
     foreach ($symbols as $symbol) {
       if (stripos($symbol, $substring) !== false) {
         if (strtolower($symbol) == strtolower($substring)) {
           $match = array($symbol);
           break;
         } else {
           $match[] = $symbol;
         }
       }
     }
 
     if (count($match) == 0) {
       throw new PhutilArgumentUsageException(
         pht(
           "No daemons match '%s'! Use 'phd list' for a list of avialable ".
           "daemons.",
           $substring));
     } else if (count($match) > 1) {
       throw new PhutilArgumentUsageException(
         pht(
           "Specify a daemon unambiguously. Multiple daemons match '%s': %s.",
           $substring,
           implode(', ', $match)));
     }
 
     return head($match);
   }
 
 
   protected function launchDaemon($class, array $argv, $debug) {
     $daemon = $this->findDaemonClass($class);
     $console = PhutilConsole::getConsole();
 
     if ($debug) {
       if ($argv) {
         $console->writeOut(
           pht(
             "Launching daemon \"%s\" in debug mode (not daemonized) ".
             "with arguments %s.\n",
             $daemon,
             csprintf('%LR', $argv)));
       } else {
         $console->writeOut(
           pht(
             "Launching daemon \"%s\" in debug mode (not daemonized).\n",
             $daemon));
       }
     } else {
       if ($argv) {
         $console->writeOut(
           pht(
             "Launching daemon \"%s\" with arguments %s.\n",
             $daemon,
             csprintf('%LR', $argv)));
       } else {
         $console->writeOut(
           pht(
             "Launching daemon \"%s\".\n",
             $daemon));
       }
     }
 
     foreach ($argv as $key => $arg) {
       $argv[$key] = escapeshellarg($arg);
     }
 
     $flags = array();
     if ($debug || PhabricatorEnv::getEnvConfig('phd.trace')) {
       $flags[] = '--trace';
     }
 
     if ($debug || PhabricatorEnv::getEnvConfig('phd.verbose')) {
       $flags[] = '--verbose';
     }
 
     if (!$debug) {
       $flags[] = '--daemonize';
     }
 
     if (!$debug) {
       $log_file = $this->getLogDirectory().'/daemons.log';
       $flags[] = csprintf('--log=%s', $log_file);
     }
 
     $pid_dir = $this->getPIDDirectory();
 
     // TODO: This should be a much better user experience.
     Filesystem::assertExists($pid_dir);
     Filesystem::assertIsDirectory($pid_dir);
     Filesystem::assertWritable($pid_dir);
 
     $flags[] = csprintf('--phd=%s', $pid_dir);
 
     $command = csprintf(
       './phd-daemon %s %C %C',
       $daemon,
       implode(' ', $flags),
       implode(' ', $argv));
 
     $phabricator_root = dirname(phutil_get_library_root('phabricator'));
     $daemon_script_dir = $phabricator_root.'/scripts/daemon/';
 
     if ($debug) {
       // Don't terminate when the user sends ^C; it will be sent to the
       // subprocess which will terminate normally.
       pcntl_signal(
         SIGINT,
         array(__CLASS__, 'ignoreSignal'));
 
       echo "\n    phabricator/scripts/daemon/ \$ {$command}\n\n";
 
       phutil_passthru('(cd %s && exec %C)', $daemon_script_dir, $command);
     } else {
       $future = new ExecFuture('exec %C', $command);
       // Play games to keep 'ps' looking reasonable.
       $future->setCWD($daemon_script_dir);
       $future->resolvex();
     }
   }
 
   public static function ignoreSignal($signo) {
     return;
   }
 
   public static function requireExtensions() {
     self::mustHaveExtension('pcntl');
     self::mustHaveExtension('posix');
   }
 
   private static function mustHaveExtension($ext) {
     if (!extension_loaded($ext)) {
       echo "ERROR: The PHP extension '{$ext}' is not installed. You must ".
            "install it to run daemons on this machine.\n";
       exit(1);
     }
 
     $extension = new ReflectionExtension($ext);
     foreach ($extension->getFunctions() as $function) {
       $function = $function->name;
       if (!function_exists($function)) {
         echo "ERROR: The PHP function {$function}() is disabled. You must ".
              "enable it to run daemons on this machine.\n";
         exit(1);
       }
     }
   }
 
   protected function willLaunchDaemons() {
     $console = PhutilConsole::getConsole();
     $console->writeErr(pht('Preparing to launch daemons.')."\n");
 
     $log_dir = $this->getLogDirectory().'/daemons.log';
     $console->writeErr(pht("NOTE: Logs will appear in '%s'.", $log_dir)."\n\n");
   }
 
 
 /* -(  Commands  )----------------------------------------------------------- */
 
 
   protected function executeStartCommand($keep_leases = false) {
     $console = PhutilConsole::getConsole();
 
     $running = $this->loadRunningDaemons();
 
     // This may include daemons which were launched but which are no longer
     // running; check that we actually have active daemons before failing.
     foreach ($running as $daemon) {
       if ($daemon->isRunning()) {
         $message = pht(
           "phd start: Unable to start daemons because daemons are already ".
           "running.\n".
           "You can view running daemons with 'phd status'.\n".
           "You can stop running daemons with 'phd stop'.\n".
           "You can use 'phd restart' to stop all daemons before starting new ".
           "daemons.");
 
         $console->writeErr("%s\n", $message);
         exit(1);
       }
     }
 
     if ($keep_leases) {
       $console->writeErr("%s\n", pht('Not touching active task queue leases.'));
     } else {
       $console->writeErr("%s\n", pht('Freeing active task leases...'));
       $count = $this->freeActiveLeases();
       $console->writeErr(
         "%s\n",
         pht('Freed %s task lease(s).', new PhutilNumber($count)));
     }
 
     $daemons = array(
       array('PhabricatorRepositoryPullLocalDaemon', array()),
       array('PhabricatorGarbageCollectorDaemon', array()),
     );
 
     $taskmasters = PhabricatorEnv::getEnvConfig('phd.start-taskmasters');
     for ($ii = 0; $ii < $taskmasters; $ii++) {
       $daemons[] = array('PhabricatorTaskmasterDaemon', array());
     }
 
     $this->willLaunchDaemons();
 
     foreach ($daemons as $spec) {
       list($name, $argv) = $spec;
       $this->launchDaemon($name, $argv, $is_debug = false);
     }
 
-    $console->writeErr(pht("Done.")."\n");
+    $console->writeErr(pht('Done.')."\n");
 
     return 0;
   }
 
 
   protected function executeStopCommand(array $pids) {
     $console = PhutilConsole::getConsole();
 
     $daemons = $this->loadRunningDaemons();
     if (!$daemons) {
       $console->writeErr(pht('There are no running Phabricator daemons.')."\n");
       return 0;
     }
 
     $daemons = mpull($daemons, null, 'getPID');
 
     $running = array();
     if (!$pids) {
       $running = $daemons;
     } else {
       // We were given a PID or set of PIDs to kill.
       foreach ($pids as $key => $pid) {
         if (!preg_match('/^\d+$/', $pid)) {
           $console->writeErr(pht("PID '%s' is not a valid PID.", $pid)."\n");
           continue;
         } else if (empty($daemons[$pid])) {
           $console->writeErr(
             pht(
               "PID '%s' is not a Phabricator daemon PID. It will not ".
               "be killed.",
               $pid)."\n");
           continue;
         } else {
           $running[] = $daemons[$pid];
         }
       }
     }
 
     if (empty($running)) {
-      $console->writeErr(pht("No daemons to kill.")."\n");
+      $console->writeErr(pht('No daemons to kill.')."\n");
       return 0;
     }
 
     $all_daemons = $running;
     foreach ($running as $key => $daemon) {
       $pid = $daemon->getPID();
       $name = $daemon->getName();
 
       $console->writeErr(pht("Stopping daemon '%s' (%s)...", $name, $pid)."\n");
       if (!$daemon->isRunning()) {
-        $console->writeErr(pht("Daemon is not running.")."\n");
+        $console->writeErr(pht('Daemon is not running.')."\n");
         unset($running[$key]);
         $daemon->updateStatus(PhabricatorDaemonLog::STATUS_EXITED);
       } else {
         posix_kill($pid, SIGINT);
       }
     }
 
     $start = time();
     do {
       foreach ($running as $key => $daemon) {
         $pid = $daemon->getPID();
         if (!$daemon->isRunning()) {
           $console->writeOut(pht('Daemon %s exited normally.', $pid)."\n");
           unset($running[$key]);
         }
       }
       if (empty($running)) {
         break;
       }
       usleep(100000);
     } while (time() < $start + 15);
 
     foreach ($running as $key => $daemon) {
       $pid = $daemon->getPID();
       $console->writeErr(pht('Sending daemon %s a SIGKILL.', $pid)."\n");
       posix_kill($pid, SIGKILL);
     }
 
     foreach ($all_daemons as $daemon) {
       if ($daemon->getPIDFile()) {
         Filesystem::remove($daemon->getPIDFile());
       }
     }
 
     return 0;
   }
 
   private function freeActiveLeases() {
     $task_table = id(new PhabricatorWorkerActiveTask());
     $conn_w = $task_table->establishConnection('w');
     queryfx(
       $conn_w,
       'UPDATE %T SET leaseExpires = UNIX_TIMESTAMP()
         WHERE leaseExpires > UNIX_TIMESTAMP()',
       $task_table->getTableName());
     return $conn_w->getAffectedRows();
   }
 
 }
diff --git a/src/applications/daemon/view/PhabricatorDaemonLogEventsView.php b/src/applications/daemon/view/PhabricatorDaemonLogEventsView.php
index bb7c288aa..a3598bfe2 100644
--- a/src/applications/daemon/view/PhabricatorDaemonLogEventsView.php
+++ b/src/applications/daemon/view/PhabricatorDaemonLogEventsView.php
@@ -1,134 +1,134 @@
 <?php
 
 final class PhabricatorDaemonLogEventsView extends AphrontView {
 
   private $events;
   private $combinedLog;
   private $showFullMessage;
 
 
   public function setShowFullMessage($show_full_message) {
     $this->showFullMessage = $show_full_message;
     return $this;
   }
 
   public function setEvents(array $events) {
     assert_instances_of($events, 'PhabricatorDaemonLogEvent');
     $this->events = $events;
     return $this;
   }
 
   public function setCombinedLog($is_combined) {
     $this->combinedLog = $is_combined;
     return $this;
   }
 
   public function render() {
     $rows = array();
 
     if (!$this->user) {
-      throw new Exception("Call setUser() before rendering!");
+      throw new Exception('Call setUser() before rendering!');
     }
 
     foreach ($this->events as $event) {
 
       // Limit display log size. If a daemon gets stuck in an output loop this
       // page can be like >100MB if we don't truncate stuff. Try to do cheap
       // line-based truncation first, and fall back to expensive UTF-8 character
       // truncation if that doesn't get things short enough.
 
       $message = $event->getMessage();
       $more = null;
 
       if (!$this->showFullMessage) {
         $more_lines = null;
         $more_chars = null;
         $line_limit = 12;
         if (substr_count($message, "\n") > $line_limit) {
           $message = explode("\n", $message);
           $more_lines = count($message) - $line_limit;
           $message = array_slice($message, 0, $line_limit);
           $message = implode("\n", $message);
         }
 
         $char_limit = 8192;
         if (strlen($message) > $char_limit) {
           $message = phutil_utf8v($message);
           $more_chars = count($message) - $char_limit;
           $message = array_slice($message, 0, $char_limit);
           $message = implode('', $message);
         }
 
         if ($more_chars) {
           $more = new PhutilNumber($more_chars);
-          $more = pht("Show %d more character(s)...", $more);
+          $more = pht('Show %d more character(s)...', $more);
         } else if ($more_lines) {
           $more = new PhutilNumber($more_lines);
-          $more = pht("Show %d more line(s)...", $more);
+          $more = pht('Show %d more line(s)...', $more);
         }
 
         if ($more) {
           $id = $event->getID();
           $more = array(
             "\n...\n",
             phutil_tag(
               'a',
               array(
                 'href' => "/daemon/event/{$id}/",
               ),
               $more),
           );
         }
       }
 
       $row = array(
         $event->getLogType(),
         phabricator_date($event->getEpoch(), $this->user),
         phabricator_time($event->getEpoch(), $this->user),
         array(
           $message,
           $more,
         ),
       );
 
       if ($this->combinedLog) {
         array_unshift(
           $row,
           phutil_tag(
             'a',
             array(
               'href' => '/daemon/log/'.$event->getLogID().'/',
             ),
             'Daemon '.$event->getLogID()));
       }
 
       $rows[] = $row;
     }
 
     $classes = array(
       '',
       '',
       'right',
       'wide prewrap',
     );
 
     $headers = array(
       'Type',
       'Date',
       'Time',
       'Message',
     );
 
     if ($this->combinedLog) {
       array_unshift($classes, 'pri');
       array_unshift($headers, 'Daemon');
     }
 
     $log_table = new AphrontTableView($rows);
     $log_table->setHeaders($headers);
     $log_table->setColumnClasses($classes);
 
     return $log_table->render();
   }
 
 }
diff --git a/src/applications/daemon/view/PhabricatorDaemonLogListView.php b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
index 41d341ec6..754da49de 100644
--- a/src/applications/daemon/view/PhabricatorDaemonLogListView.php
+++ b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
@@ -1,76 +1,76 @@
 <?php
 
 final class PhabricatorDaemonLogListView extends AphrontView {
 
   private $daemonLogs;
 
   public function setDaemonLogs(array $daemon_logs) {
     assert_instances_of($daemon_logs, 'PhabricatorDaemonLog');
     $this->daemonLogs = $daemon_logs;
     return $this;
   }
 
   public function render() {
     $rows = array();
 
     if (!$this->user) {
-      throw new Exception("Call setUser() before rendering!");
+      throw new Exception('Call setUser() before rendering!');
     }
 
     $list = id(new PHUIObjectItemListView())
       ->setFlush(true);
     foreach ($this->daemonLogs as $log) {
       $id = $log->getID();
       $epoch = $log->getDateCreated();
 
       $item = id(new PHUIObjectItemView())
-        ->setObjectName(pht("Daemon %s", $id))
+        ->setObjectName(pht('Daemon %s', $id))
         ->setHeader($log->getDaemon())
         ->setHref("/daemon/log/{$id}/")
         ->addIcon('none', phabricator_datetime($epoch, $this->user));
 
       $status = $log->getStatus();
       switch ($status) {
         case PhabricatorDaemonLog::STATUS_RUNNING:
           $item->setBarColor('green');
           $item->addAttribute(pht('This daemon is running.'));
           break;
         case PhabricatorDaemonLog::STATUS_DEAD:
           $item->setBarColor('red');
           $item->addAttribute(
             pht(
               'This daemon is lost or exited uncleanly, and is presumed '.
               'dead.'));
           $item->addIcon('delete', pht('Dead'));
           break;
         case PhabricatorDaemonLog::STATUS_EXITED:
           $item->setDisabled(true);
           $item->addAttribute(pht('This daemon exited cleanly.'));
           $item->addIcon('enable-grey', pht('Exited'));
           break;
         case PhabricatorDaemonLog::STATUS_WAIT:
           $item->setBarColor('blue');
           $item->addAttribute(
             pht(
               'This daemon encountered an error recently and is waiting a '.
               'moment to restart.'));
           $item->addIcon('perflab-grey', pht('Waiting'));
           break;
         case PhabricatorDaemonLog::STATUS_UNKNOWN:
         default:
           $item->setBarColor('orange');
           $item->addAttribute(
             pht(
               'This daemon has not reported its status recently. It may '.
               'have exited uncleanly.'));
           $item->addIcon('warning', pht('Unknown'));
           break;
       }
 
       $list->addItem($item);
     }
 
     return $list;
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
index 5a62601ee..19c3bb3aa 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
@@ -1,59 +1,59 @@
 <?php
 
 final class ConduitAPI_differential_close_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return pht("Close a Differential revision.");
+    return pht('Close a Differential revision.');
   }
 
   public function defineParamTypes() {
     return array(
       'revisionID' => 'required int',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND' => 'Revision was not found.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $id = $request->getValue('revisionID');
 
     $revision = id(new DifferentialRevisionQuery())
       ->withIDs(array($id))
       ->setViewer($viewer)
       ->needReviewerStatus(true)
       ->executeOne();
     if (!$revision) {
       throw new ConduitException('ERR_NOT_FOUND');
     }
 
     $xactions = array();
     $xactions[] = id(new DifferentialTransaction())
       ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
       ->setNewValue(DifferentialAction::ACTION_CLOSE);
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_CONDUIT,
       array());
 
     $editor = id(new DifferentialTransactionEditor())
       ->setActor($viewer)
       ->setContentSourceFromConduitRequest($request)
       ->setContinueOnMissingFields(true)
       ->setContinueOnNoEffect(true);
 
     $editor->applyTransactions($revision, $xactions);
 
     return;
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
index 726d5171f..bfad64481 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
@@ -1,88 +1,88 @@
 <?php
 
 final class ConduitAPI_differential_createcomment_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return pht("Add a comment to a Differential revision.");
+    return pht('Add a comment to a Differential revision.');
   }
 
   public function defineParamTypes() {
     return array(
       'revision_id'    => 'required revisionid',
       'message'        => 'optional string',
       'action'         => 'optional string',
       'silent'         => 'optional bool',
       'attach_inlines' => 'optional bool',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_REVISION' => 'Bad revision ID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
 
     $revision = id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withIDs(array($request->getValue('revision_id')))
       ->needReviewerStatus(true)
       ->needReviewerAuthority(true)
       ->executeOne();
     if (!$revision) {
       throw new ConduitException('ERR_BAD_REVISION');
     }
 
     $xactions = array();
 
     $action = $request->getValue('action');
     if ($action && ($action != 'comment') && ($action != 'none')) {
       $xactions[] = id(new DifferentialTransaction())
         ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
         ->setNewValue($action);
     }
 
     $content = $request->getValue('message');
     if (strlen($content)) {
       $xactions[] = id(new DifferentialTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new DifferentialTransactionComment())
             ->setContent($content));
     }
 
     if ($request->getValue('attach_inlines')) {
       $type_inline = DifferentialTransaction::TYPE_INLINE;
       $inlines = DifferentialTransactionQuery::loadUnsubmittedInlineComments(
         $viewer,
         $revision);
       foreach ($inlines as $inline) {
         $xactions[] = id(new DifferentialTransaction())
           ->setTransactionType($type_inline)
           ->attachComment($inline);
       }
     }
 
     $editor = id(new DifferentialTransactionEditor())
       ->setActor($viewer)
       ->setDisableEmail($request->getValue('silent'))
       ->setContentSourceFromConduitRequest($request)
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true);
 
     $editor->applyTransactions($revision, $xactions);
 
     return array(
       'revisionid'  => $revision->getID(),
       'uri'         => PhabricatorEnv::getURI('/D'.$revision->getID()),
     );
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
index 8232f1450..2722bb6df 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
@@ -1,188 +1,188 @@
 <?php
 
 final class ConduitAPI_differential_creatediff_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Create a new Differential diff.";
+    return 'Create a new Differential diff.';
   }
 
   public function defineParamTypes() {
 
     $vcs_const = $this->formatStringConstants(
       array(
         'svn',
         'git',
         'hg',
       ));
 
     $status_const = $this->formatStringConstants(
       array(
         'none',
         'skip',
         'okay',
         'warn',
         'fail',
         'postponed',
       ));
 
     return array(
       'changes'                   => 'required list<dict>',
       'sourceMachine'             => 'required string',
       'sourcePath'                => 'required string',
       'branch'                    => 'required string',
       'bookmark'                  => 'optional string',
       'sourceControlSystem'       => 'required '.$vcs_const,
       'sourceControlPath'         => 'required string',
       'sourceControlBaseRevision' => 'required string',
       'creationMethod'            => 'optional string',
       'arcanistProject'           => 'optional string',
       'lintStatus'                => 'required '.$status_const,
       'unitStatus'                => 'required '.$status_const,
       'repositoryPHID'            => 'optional phid',
 
       'parentRevisionID'          => 'deprecated',
       'authorPHID'                => 'deprecated',
       'repositoryUUID'            => 'deprecated',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $change_data = $request->getValue('changes');
 
     $changes = array();
     foreach ($change_data as $dict) {
       $changes[] = ArcanistDiffChange::newFromDictionary($dict);
     }
 
     $diff = DifferentialDiff::newFromRawChanges($changes);
     $diff->setSourcePath($request->getValue('sourcePath'));
     $diff->setSourceMachine($request->getValue('sourceMachine'));
 
     $diff->setBranch($request->getValue('branch'));
     $diff->setCreationMethod($request->getValue('creationMethod'));
     $diff->setAuthorPHID($viewer->getPHID());
     $diff->setBookmark($request->getValue('bookmark'));
 
     // TODO: Remove this eventually; for now continue writing the UUID. Note
     // that we'll overwrite it below if we identify a repository, and `arc`
     // no longer sends it. This stuff is retained for backward compatibility.
     $diff->setRepositoryUUID($request->getValue('repositoryUUID'));
 
     $repository_phid = $request->getValue('repositoryPHID');
     if ($repository_phid) {
       $repository = id(new PhabricatorRepositoryQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($repository_phid))
         ->executeOne();
       if ($repository) {
         $diff->setRepositoryPHID($repository->getPHID());
         $diff->setRepositoryUUID($repository->getUUID());
       }
     }
 
     $system = $request->getValue('sourceControlSystem');
     $diff->setSourceControlSystem($system);
     $diff->setSourceControlPath($request->getValue('sourceControlPath'));
     $diff->setSourceControlBaseRevision(
       $request->getValue('sourceControlBaseRevision'));
 
     $project_name = $request->getValue('arcanistProject');
     $project_phid = null;
     if ($project_name) {
       $arcanist_project = id(new PhabricatorRepositoryArcanistProject())
         ->loadOneWhere(
           'name = %s',
           $project_name);
       if (!$arcanist_project) {
         $arcanist_project = new PhabricatorRepositoryArcanistProject();
         $arcanist_project->setName($project_name);
         $arcanist_project->save();
       }
       $project_phid = $arcanist_project->getPHID();
     }
 
     $diff->setArcanistProjectPHID($project_phid);
 
     switch ($request->getValue('lintStatus')) {
       case 'skip':
         $diff->setLintStatus(DifferentialLintStatus::LINT_SKIP);
         break;
       case 'okay':
         $diff->setLintStatus(DifferentialLintStatus::LINT_OKAY);
         break;
       case 'warn':
         $diff->setLintStatus(DifferentialLintStatus::LINT_WARN);
         break;
       case 'fail':
         $diff->setLintStatus(DifferentialLintStatus::LINT_FAIL);
         break;
       case 'postponed':
         $diff->setLintStatus(DifferentialLintStatus::LINT_POSTPONED);
         break;
       case 'none':
       default:
         $diff->setLintStatus(DifferentialLintStatus::LINT_NONE);
         break;
     }
 
     switch ($request->getValue('unitStatus')) {
       case 'skip':
         $diff->setUnitStatus(DifferentialUnitStatus::UNIT_SKIP);
         break;
       case 'okay':
         $diff->setUnitStatus(DifferentialUnitStatus::UNIT_OKAY);
         break;
       case 'warn':
         $diff->setUnitStatus(DifferentialUnitStatus::UNIT_WARN);
         break;
       case 'fail':
         $diff->setUnitStatus(DifferentialUnitStatus::UNIT_FAIL);
         break;
       case 'postponed':
         $diff->setUnitStatus(DifferentialUnitStatus::UNIT_POSTPONED);
         break;
       case 'none':
       default:
         $diff->setUnitStatus(DifferentialUnitStatus::UNIT_NONE);
         break;
     }
 
     $diff->save();
 
     // If we didn't get an explicit `repositoryPHID` (which means the client is
     // old, or couldn't figure out which repository the working copy belongs
     // to), apply heuristics to try to figure it out.
 
     if (!$repository_phid) {
       $repository = id(new DifferentialRepositoryLookup())
         ->setDiff($diff)
         ->setViewer($viewer)
         ->lookupRepository();
       if ($repository) {
         $diff->setRepositoryPHID($repository->getPHID());
         $diff->setRepositoryUUID($repository->getUUID());
         $diff->save();
       }
     }
 
     $path = '/differential/diff/'.$diff->getID().'/';
     $uri = PhabricatorEnv::getURI($path);
 
     return array(
       'diffid' => $diff->getID(),
       'uri'    => $uri,
     );
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
index 96478f5a1..08b524fc0 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
@@ -1,105 +1,105 @@
 <?php
 
 final class ConduitAPI_differential_createinline_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Add an inline comment to a Differential revision.";
+    return 'Add an inline comment to a Differential revision.';
   }
 
   public function defineParamTypes() {
     return array(
       'revisionID' => 'optional revisionid',
       'diffID'     => 'optional diffid',
       'filePath'   => 'required string',
       'isNewFile'  => 'required bool',
       'lineNumber' => 'required int',
       'lineLength' => 'optional int',
       'content'    => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-REVISION' => 'Bad revision ID.',
       'ERR-BAD-DIFF'     => 'Bad diff ID, or diff does not belong to revision.',
       'ERR-NEED-DIFF'    => 'Neither revision ID nor diff ID was provided.',
       'ERR-NEED-FILE'    => 'A file path was not provided.',
       'ERR-BAD-FILE'     => "Requested file doesn't exist in this revision."
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $rid = $request->getValue('revisionID');
     $did = $request->getValue('diffID');
 
     if ($rid) {
       // Given both a revision and a diff, check that they match.
       // Given only a revision, find the active diff.
       $revision = id(new DifferentialRevisionQuery())
         ->setViewer($request->getUser())
         ->withIDs(array($rid))
         ->executeOne();
       if (!$revision) {
         throw new ConduitException('ERR-BAD-REVISION');
       }
 
       if (!$did) { // did not!
         $diff = $revision->loadActiveDiff();
         $did = $diff->getID();
       } else { // did too!
         $diff = id(new DifferentialDiff())->load($did);
         if (!$diff || $diff->getRevisionID() != $rid) {
           throw new ConduitException('ERR-BAD-DIFF');
         }
       }
     } else if ($did) {
       // Given only a diff, find the parent revision.
       $diff = id(new DifferentialDiff())->load($did);
       if (!$diff) {
         throw new ConduitException('ERR-BAD-DIFF');
       }
       $rid = $diff->getRevisionID();
     } else {
       // Given neither, bail.
       throw new ConduitException('ERR-NEED-DIFF');
     }
 
     $file = $request->getValue('filePath');
     if (!$file) {
       throw new ConduitException('ERR-NEED-FILE');
     }
     $changes = id(new DifferentialChangeset())->loadAllWhere(
       'diffID = %d',
       $did);
     $cid = null;
     foreach ($changes as $id => $change) {
       if ($file == $change->getFilename()) {
         $cid = $id;
       }
     }
     if ($cid == null) {
       throw new ConduitException('ERR-BAD-FILE');
     }
 
     $inline = id(new DifferentialInlineComment())
       ->setRevisionID($rid)
       ->setChangesetID($cid)
       ->setAuthorPHID($request->getUser()->getPHID())
       ->setContent($request->getValue('content'))
       ->setIsNewFile($request->getValue('isNewFile'))
       ->setLineNumber($request->getValue('lineNumber'))
       ->setLineLength($request->getValue('lineLength', 0))
       ->save();
 
     // Load everything again, just to be safe.
     $changeset = id(new DifferentialChangeset())
       ->load($inline->getChangesetID());
     return $this->buildInlineInfoDictionary($inline, $changeset);
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
index 05f71da35..2387cf284 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
@@ -1,63 +1,63 @@
 <?php
 
 final class ConduitAPI_differential_createrawdiff_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return pht("Create a new Differential diff from a raw diff source.");
+    return pht('Create a new Differential diff from a raw diff source.');
   }
 
   public function defineParamTypes() {
     return array(
       'diff' => 'required string',
       'repositoryPHID' => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $raw_diff = $request->getValue('diff');
 
     $repository_phid = $request->getValue('repositoryPHID');
     if ($repository_phid) {
       $repository = id(new PhabricatorRepositoryQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($repository_phid))
         ->executeOne();
       if (!$repository) {
         throw new Exception(
           pht('No such repository "%s"!', $repository_phid));
       }
     } else {
       $repository = null;
     }
 
     $parser = new ArcanistDiffParser();
     $changes = $parser->parseDiff($raw_diff);
     $diff = DifferentialDiff::newFromRawChanges($changes);
 
     $diff->setLintStatus(DifferentialLintStatus::LINT_SKIP);
     $diff->setUnitStatus(DifferentialUnitStatus::UNIT_SKIP);
 
     $diff->setAuthorPHID($viewer->getPHID());
     $diff->setCreationMethod('web');
 
     if ($repository) {
       $diff->setRepositoryPHID($repository->getPHID());
     }
 
     $diff->save();
 
     return $this->buildDiffInfoDictionary($diff);
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php
index deb4999b0..36b99ffc3 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php
@@ -1,57 +1,57 @@
 <?php
 
 final class ConduitAPI_differential_createrevision_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return pht("Create a new Differential revision.");
+    return pht('Create a new Differential revision.');
   }
 
   public function defineParamTypes() {
     return array(
       // TODO: Arcanist passes this; prevent fatals after D4191 until Conduit
       // version 7 or newer.
       'user'   => 'ignored',
       'diffid' => 'required diffid',
       'fields' => 'required dict',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_DIFF' => 'Bad diff ID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
 
     $diff = id(new DifferentialDiffQuery())
       ->setViewer($viewer)
       ->withIDs(array($request->getValue('diffid')))
       ->executeOne();
     if (!$diff) {
       throw new ConduitException('ERR_BAD_DIFF');
     }
 
     $revision = DifferentialRevision::initializeNewRevision($viewer);
     $revision->attachReviewerStatus(array());
 
     $this->applyFieldEdit(
       $request,
       $revision,
       $diff,
       $request->getValue('fields', array()),
       $message = null);
 
     return array(
       'revisionid'  => $revision->getID(),
       'uri'         => PhabricatorEnv::getURI('/D'.$revision->getID()),
     );
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
index 2275845c7..f58c5e293 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
@@ -1,102 +1,102 @@
 <?php
 
 final class ConduitAPI_differential_find_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'differential.query'.";
   }
 
   public function getMethodDescription() {
-    return "Query Differential revisions which match certain criteria.";
+    return 'Query Differential revisions which match certain criteria.';
   }
 
   public function defineParamTypes() {
     $types = array(
       'open',
       'committable',
       'revision-ids',
       'phids',
     );
 
     return array(
       'query' => 'required '.$this->formatStringConstants($types),
       'guids' => 'required nonempty list<guids>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $type = $request->getValue('query');
     $guids = $request->getValue('guids');
 
     $results = array();
     if (!$guids) {
       return $results;
     }
 
     $query = id(new DifferentialRevisionQuery())
       ->setViewer($request->getUser());
 
     switch ($type) {
       case 'open':
         $query
           ->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
           ->withAuthors($guids);
         break;
       case 'committable':
         $query
           ->withStatus(DifferentialRevisionQuery::STATUS_ACCEPTED)
           ->withAuthors($guids);
         break;
       case 'revision-ids':
         $query
           ->withIDs($guids);
         break;
       case 'owned':
         $query->withAuthors($guids);
         break;
       case 'phids':
         $query
           ->withPHIDs($guids);
         break;
     }
 
     $revisions = $query->execute();
 
     foreach ($revisions as $revision) {
       $diff = $revision->loadActiveDiff();
       if (!$diff) {
         continue;
       }
       $id = $revision->getID();
       $results[] = array(
         'id'          => $id,
         'phid'        => $revision->getPHID(),
         'name'        => $revision->getTitle(),
         'uri'         => PhabricatorEnv::getProductionURI('/D'.$id),
         'dateCreated' => $revision->getDateCreated(),
         'authorPHID'  => $revision->getAuthorPHID(),
         'statusName'  =>
           ArcanistDifferentialRevisionStatus::getNameForRevisionStatus(
             $revision->getStatus()),
         'sourcePath'  => $diff->getSourcePath(),
       );
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
index f0117073d..b5018dbb5 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
@@ -1,116 +1,116 @@
 <?php
 
 final class ConduitAPI_differential_finishpostponedlinters_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Update diff with new lint messages and mark postponed ".
-           "linters as finished.";
+    return 'Update diff with new lint messages and mark postponed '.
+           'linters as finished.';
   }
 
   public function defineParamTypes() {
     return array(
       'diffID'   => 'required diffID',
       'linters'  => 'required dict',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-DIFF'   => 'Bad diff ID.',
       'ERR-BAD-LINTER' => 'No postponed linter by the given name',
       'ERR-NO-LINT'    => 'No postponed lint field available in diff',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $diff_id = $request->getValue('diffID');
     $linter_map = $request->getValue('linters');
 
     $diff = id(new DifferentialDiffQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($diff_id))
       ->executeOne();
     if (!$diff) {
       throw new ConduitException('ERR-BAD-DIFF');
     }
 
     // Extract the finished linters and messages from the linter map.
     $finished_linters = array_keys($linter_map);
     $new_messages = array();
     foreach ($linter_map as $linter => $messages) {
       $new_messages = array_merge($new_messages, $messages);
     }
 
     // Load the postponed linters attached to this diff.
     $postponed_linters_property = id(
       new DifferentialDiffProperty())->loadOneWhere(
         'diffID = %d AND name = %s',
         $diff_id,
         'arc:lint-postponed');
     if ($postponed_linters_property) {
       $postponed_linters = $postponed_linters_property->getData();
     } else {
       $postponed_linters = array();
     }
 
     foreach ($finished_linters as $linter) {
       if (!in_array($linter, $postponed_linters)) {
         throw new ConduitException('ERR-BAD-LINTER');
       }
     }
 
     foreach ($postponed_linters as $idx => $linter) {
       if (in_array($linter, $finished_linters)) {
         unset($postponed_linters[$idx]);
       }
     }
 
     // Load the lint messages currenty attached to the diff.  If this
     // diff property doesn't exist, create it.
     $messages_property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $diff_id,
       'arc:lint');
     if ($messages_property) {
       $messages = $messages_property->getData();
     } else {
       $messages = array();
     }
 
     // Add new lint messages, removing duplicates.
     foreach ($new_messages as $new_message) {
       if (!in_array($new_message, $messages)) {
         $messages[] = $new_message;
       }
     }
 
     // Use setdiffproperty to update the postponed linters and messages,
     // as these will also update the lint status correctly.
     $call = new ConduitCall(
       'differential.setdiffproperty',
       array(
         'diff_id' => $diff_id,
         'name' => 'arc:lint',
         'data' => json_encode($messages)));
     $call->setForceLocal(true);
     $call->setUser($request->getUser());
     $call->execute();
     $call = new ConduitCall(
       'differential.setdiffproperty',
       array(
         'diff_id' => $diff_id,
         'name' => 'arc:lint-postponed',
         'data' => json_encode($postponed_linters)));
     $call->setForceLocal(true);
     $call->setUser($request->getUser());
     $call->execute();
 
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
index aa3a85312..a018abd7f 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
@@ -1,55 +1,55 @@
 <?php
 
 final class ConduitAPI_differential_getalldiffs_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return pht(
       'This method has been deprecated in favor of differential.querydiffs.');
   }
 
   public function getMethodDescription() {
-    return "Load all diffs for given revisions from Differential.";
+    return 'Load all diffs for given revisions from Differential.';
   }
 
   public function defineParamTypes() {
     return array(
       'revision_ids' => 'required list<int>',
     );
   }
 
   public function defineReturnType() {
     return 'dict';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
     $revision_ids = $request->getValue('revision_ids');
 
     if (!$revision_ids) {
       return $results;
     }
 
     $diffs = id(new DifferentialDiffQuery())
       ->setViewer($request->getUser())
       ->withRevisionIDs($revision_ids)
       ->execute();
 
     foreach ($diffs as $diff) {
       $results[] = array(
         'revision_id' => $diff->getRevisionID(),
         'diff_id' => $diff->getID(),
       );
     }
 
     return $results;
   }
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
index 505570305..5db1b3a67 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
@@ -1,194 +1,194 @@
 <?php
 
 final class ConduitAPI_differential_getcommitmessage_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Retrieve Differential commit messages or message templates.";
+    return 'Retrieve Differential commit messages or message templates.';
   }
 
   public function defineParamTypes() {
     $edit_types = array('edit', 'create');
 
     return array(
       'revision_id' => 'optional revision_id',
       'fields' => 'optional dict<string, wild>',
       'edit' => 'optional '.$this->formatStringConstants($edit_types),
     );
   }
 
   public function defineReturnType() {
     return 'nonempty string';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND' => 'Revision was not found.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $id = $request->getValue('revision_id');
     $viewer = $request->getUser();
 
     if ($id) {
       $revision = id(new DifferentialRevisionQuery())
         ->withIDs(array($id))
         ->setViewer($viewer)
         ->needReviewerStatus(true)
         ->needActiveDiffs(true)
         ->executeOne();
       if (!$revision) {
         throw new ConduitException('ERR_NOT_FOUND');
       }
     } else {
       $revision = DifferentialRevision::initializeNewRevision($viewer);
       $revision->attachReviewerStatus(array());
       $revision->attachActiveDiff(null);
     }
 
     $is_edit = $request->getValue('edit');
     $is_create = ($is_edit == 'create');
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $revision,
       ($is_edit
         ? DifferentialCustomField::ROLE_COMMITMESSAGEEDIT
         : DifferentialCustomField::ROLE_COMMITMESSAGE));
 
     $field_list
       ->setViewer($viewer)
       ->readFieldsFromStorage($revision);
 
     $field_map = mpull($field_list->getFields(), null, 'getFieldKeyForConduit');
 
     if ($is_edit) {
       $fields = $request->getValue('fields', array());
       foreach ($fields as $field => $value) {
         $custom_field = idx($field_map, $field);
         if (!$custom_field) {
           // Just ignore this, these workflows don't make strong distictions
           // about field editability on the client side.
           continue;
         }
         if ($is_create ||
             $custom_field->shouldOverwriteWhenCommitMessageIsEdited()) {
           $custom_field->readValueFromCommitMessage($value);
         }
       }
     }
 
     $phids = array();
     foreach ($field_list->getFields() as $key => $field) {
       $field_phids = $field->getRequiredHandlePHIDsForCommitMessage();
       if (!is_array($field_phids)) {
         throw new Exception(
           pht(
             'Custom field "%s" was expected to return an array of handle '.
             'PHIDs required for commit message rendering, but returned "%s" '.
             'instead.',
             $field->getFieldKey(),
             gettype($field_phids)));
       }
       $phids[$key] = $field_phids;
     }
 
     $all_phids = array_mergev($phids);
     if ($all_phids) {
       $all_handles = id(new PhabricatorHandleQuery())
         ->setViewer($viewer)
         ->withPHIDs($all_phids)
         ->execute();
     } else {
       $all_handles = array();
     }
 
     $key_title = id(new DifferentialTitleField())->getFieldKey();
     $default_title = DifferentialTitleField::getDefaultTitle();
 
     $commit_message = array();
     foreach ($field_list->getFields() as $key => $field) {
       $handles = array_select_keys($all_handles, $phids[$key]);
 
       $label = $field->renderCommitMessageLabel();
       $value = $field->renderCommitMessageValue($handles);
 
       if (!is_string($value) && !is_null($value)) {
         throw new Exception(
           pht(
             'Custom field "%s" was expected to render a string or null value, '.
             'but rendered a "%s" instead.',
             $field->getFieldKey(),
             gettype($value)));
       }
 
       $is_title = ($key == $key_title);
 
       if (!strlen($value)) {
         if ($is_title) {
           $commit_message[] = $default_title;
         } else {
           if ($is_edit && $field->shouldAppearInCommitMessageTemplate()) {
             $commit_message[] = $label.': ';
           }
         }
       } else {
         if ($is_title) {
           $commit_message[] = $value;
         } else {
           $value = str_replace(
             array("\r\n", "\r"),
             array("\n",   "\n"),
             $value);
           if (strpos($value, "\n") !== false || substr($value, 0, 2) === '  ') {
             $commit_message[] = "{$label}:\n{$value}";
           } else {
             $commit_message[] = "{$label}: {$value}";
           }
         }
       }
     }
 
     if ($is_edit) {
       $tip = $this->getProTip($field_list);
       if ($tip !== null) {
         $commit_message[] = "\n".$tip;
       }
     }
 
     $commit_message = implode("\n\n", $commit_message);
 
     return $commit_message;
   }
 
   private function getProTip() {
     // Any field can provide tips, whether it normally appears on commit
     // messages or not.
     $field_list = PhabricatorCustomField::getObjectFields(
       new DifferentialRevision(),
       PhabricatorCustomField::ROLE_DEFAULT);
 
     $tips = array();
     foreach ($field_list->getFields() as $key => $field) {
       $tips[] = $field->getProTips();
     }
     $tips = array_mergev($tips);
 
     if (!$tips) {
       return null;
     }
 
     shuffle($tips);
 
     $tip = pht('Tip: %s', head($tips));
     $tip = wordwrap($tip, 78, "\n", true);
 
     $lines = explode("\n", $tip);
     foreach ($lines as $key => $line) {
-      $lines[$key] = "# ".$line;
+      $lines[$key] = '# '.$line;
     }
 
     return implode("\n", $lines);
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
index 8820b4bea..21896a048 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
@@ -1,52 +1,52 @@
 <?php
 
 final class ConduitAPI_differential_getcommitpaths_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Query which paths should be included when committing a ".
-           "Differential revision.";
+    return 'Query which paths should be included when committing a '.
+           'Differential revision.';
   }
 
   public function defineParamTypes() {
     return array(
       'revision_id' => 'required int',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<string>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND' => 'No such revision exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $id = $request->getValue('revision_id');
 
     $revision = id(new DifferentialRevisionQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($id))
       ->executeOne();
     if (!$revision) {
       throw new ConduitException('ERR_NOT_FOUND');
     }
 
     $paths = array();
     $diff = id(new DifferentialDiff())->loadOneWhere(
       'revisionID = %d ORDER BY id DESC limit 1',
       $revision->getID());
 
     $diff->attachChangesets($diff->loadChangesets());
 
     foreach ($diff->getChangesets() as $changeset) {
       $paths[] = $changeset->getFilename();
     }
 
     return $paths;
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
index 5970012eb..9788d0124 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
@@ -1,49 +1,49 @@
 <?php
 
 final class ConduitAPI_differential_getrawdiff_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return pht("Retrieve a raw diff");
+    return pht('Retrieve a raw diff');
   }
 
   public function defineParamTypes() {
     return array(
       'diffID' => 'required diffID',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty string';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND' => pht('Diff not found.'),
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $diff_id = $request->getValue('diffID');
 
     $viewer = $request->getUser();
 
     $diff = id(new DifferentialDiffQuery())
       ->withIDs(array($diff_id))
       ->setViewer($viewer)
       ->needChangesets(true)
       ->executeOne();
 
     if (!$diff) {
       throw new ConduitException('ERR_NOT_FOUND');
     }
 
     $renderer = id(new DifferentialRawDiffRenderer())
       ->setChangesets($diff->getChangesets())
       ->setViewer($viewer)
       ->setFormat('git');
 
     return $renderer->buildPatch();
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php
index ff25fbd00..0697ad104 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php
@@ -1,99 +1,99 @@
 <?php
 
 final class ConduitAPI_differential_getrevision_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'differential.query'.";
   }
 
   public function getMethodDescription() {
-    return "Load the content of a revision from Differential.";
+    return 'Load the content of a revision from Differential.';
   }
 
   public function defineParamTypes() {
     return array(
       'revision_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_REVISION'    => 'No such revision exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $diff = null;
 
     $revision_id = $request->getValue('revision_id');
     $revision = id(new DifferentialRevisionQuery())
       ->withIDs(array($revision_id))
       ->setViewer($request->getUser())
       ->needRelationships(true)
       ->needReviewerStatus(true)
       ->executeOne();
 
     if (!$revision) {
       throw new ConduitException('ERR_BAD_REVISION');
     }
 
     $reviewer_phids = array_values($revision->getReviewers());
 
     $diffs = id(new DifferentialDiffQuery())
       ->setViewer($request->getUser())
       ->withRevisionIDs(array($revision_id))
       ->needChangesets(true)
       ->needArcanistProjects(true)
       ->execute();
     $diff_dicts = mpull($diffs, 'getDiffDict');
 
     $commit_dicts = array();
     $commit_phids = $revision->loadCommitPHIDs();
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($commit_phids)
       ->execute();
 
     foreach ($commit_phids as $commit_phid) {
       $commit_dicts[] = array(
         'fullname'      => $handles[$commit_phid]->getFullName(),
         'dateCommitted' => $handles[$commit_phid]->getTimestamp(),
       );
     }
 
     $field_data = $this->loadCustomFieldsForRevisions(
       $request->getUser(),
       array($revision));
 
     $dict = array(
       'id' => $revision->getID(),
       'phid' => $revision->getPHID(),
       'authorPHID' => $revision->getAuthorPHID(),
       'uri' => PhabricatorEnv::getURI('/D'.$revision->getID()),
       'title' => $revision->getTitle(),
       'status' => $revision->getStatus(),
       'statusName'  =>
         ArcanistDifferentialRevisionStatus::getNameForRevisionStatus(
           $revision->getStatus()),
       'summary' => $revision->getSummary(),
       'testPlan' => $revision->getTestPlan(),
       'lineCount' => $revision->getLineCount(),
       'reviewerPHIDs' => $reviewer_phids,
       'diffs' => $diff_dicts,
       'commits' => $commit_dicts,
       'auxiliary' => idx($field_data, $revision->getPHID(), array())
     );
 
     return $dict;
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php
index e8f37b6da..d4ce2aeb9 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php
@@ -1,89 +1,89 @@
 <?php
 
 final class ConduitAPI_differential_getrevisioncomments_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return pht('Obsolete and doomed, see T2222.');
   }
 
   public function getMethodDescription() {
-    return "Retrieve Differential Revision Comments.";
+    return 'Retrieve Differential Revision Comments.';
   }
 
   public function defineParamTypes() {
     return array(
       'ids' => 'required list<int>',
       'inlines' => 'optional bool (deprecated)',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict<string, wild>>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $results = array();
     $revision_ids = $request->getValue('ids');
 
     if (!$revision_ids) {
       return $results;
     }
 
     $revisions = id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withIDs($revision_ids)
       ->execute();
 
     if (!$revisions) {
       return $results;
     }
 
     $xactions = id(new DifferentialTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(mpull($revisions, 'getPHID'))
       ->execute();
 
     $revisions = mpull($revisions, null, 'getPHID');
 
     foreach ($xactions as $xaction) {
       $revision = idx($revisions, $xaction->getObjectPHID());
       if (!$revision) {
         continue;
       }
 
       $type = $xaction->getTransactionType();
       if ($type == DifferentialTransaction::TYPE_ACTION) {
         $action = $xaction->getNewValue();
       } else if ($type == PhabricatorTransactions::TYPE_COMMENT) {
         $action = 'comment';
       } else {
         $action = 'none';
       }
 
       $result = array(
         'revisionID'  => $revision->getID(),
         'action'      => $action,
         'authorPHID'  => $xaction->getAuthorPHID(),
         'dateCreated' => $xaction->getDateCreated(),
         'content'     => ($xaction->hasComment()
           ? $xaction->getComment()->getContent()
           : null),
       );
 
       $results[$revision->getID()][] = $result;
     }
 
     return $results;
   }
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
index b5934997b..7fbccbcb0 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
@@ -1,132 +1,132 @@
 <?php
 
 final class ConduitAPI_differential_parsecommitmessage_Method
   extends ConduitAPI_differential_Method {
 
   private $errors;
 
   public function getMethodDescription() {
-    return pht("Parse commit messages for Differential fields.");
+    return pht('Parse commit messages for Differential fields.');
   }
 
   public function defineParamTypes() {
     return array(
       'corpus'  => 'required string',
       'partial' => 'optional bool',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $corpus = $request->getValue('corpus');
     $is_partial = $request->getValue('partial');
 
     $revision = new DifferentialRevision();
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $revision,
       DifferentialCustomField::ROLE_COMMITMESSAGE);
     $field_list->setViewer($viewer);
     $field_map = mpull($field_list->getFields(), null, 'getFieldKeyForConduit');
 
     $this->errors = array();
 
     $label_map = $this->buildLabelMap($field_list);
     $corpus_map = $this->parseCommitMessage($corpus, $label_map);
 
     $values = array();
     foreach ($corpus_map as $field_key => $text_value) {
       $field = idx($field_map, $field_key);
 
       if (!$field) {
         throw new Exception(
           pht(
             'Parser emitted text value for field key "%s", but no such '.
             'field exists.',
             $field_key));
       }
 
       try {
         $values[$field_key] = $field->parseValueFromCommitMessage($text_value);
       } catch (DifferentialFieldParseException $ex) {
         $this->errors[] = pht(
           'Error parsing field "%s": %s',
           $field->renderCommitMessageLabel(),
           $ex->getMessage());
       }
     }
 
     if (!$is_partial) {
       foreach ($field_map as $key => $field) {
         try {
           $field->validateCommitMessageValue(idx($values, $key));
         } catch (DifferentialFieldValidationException $ex) {
           $this->errors[] = pht(
             'Invalid or missing field "%s": %s',
             $field->renderCommitMessageLabel(),
             $ex->getMessage());
         }
       }
     }
 
     return array(
       'errors' => $this->errors,
       'fields' => $values,
     );
   }
 
   private function buildLabelMap(PhabricatorCustomFieldList $field_list) {
     $label_map = array();
 
     foreach ($field_list->getFields() as $key => $field) {
       $labels = $field->getCommitMessageLabels();
       $key = $field->getFieldKeyForConduit();
 
       foreach ($labels as $label) {
         $normal_label = DifferentialCommitMessageParser::normalizeFieldLabel(
           $label);
         if (!empty($label_map[$normal_label])) {
           throw new Exception(
             pht(
               'Field label "%s" is parsed by two custom fields: "%s" and '.
               '"%s". Each label must be parsed by only one field.',
               $label,
               $key,
               $label_map[$normal_label]));
         }
         $label_map[$normal_label] = $key;
       }
     }
 
     return $label_map;
   }
 
 
   private function parseCommitMessage($corpus, array $label_map) {
     $key_title = id(new DifferentialTitleField())->getFieldKeyForConduit();
     $key_summary = id(new DifferentialSummaryField())->getFieldKeyForConduit();
 
     $parser = id(new DifferentialCommitMessageParser())
       ->setLabelMap($label_map)
       ->setTitleKey($key_title)
       ->setSummaryKey($key_summary);
 
     $result = $parser->parseCorpus($corpus);
 
     foreach ($parser->getErrors() as $error) {
       $this->errors[] = $error;
     }
 
     return $result;
   }
 
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_query_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_query_Method.php
index af979dbfa..6a5476758 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_query_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_query_Method.php
@@ -1,242 +1,242 @@
 <?php
 
 final class ConduitAPI_differential_query_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Query Differential revisions which match certain criteria.";
+    return 'Query Differential revisions which match certain criteria.';
   }
 
   public function defineParamTypes() {
     $hash_types = ArcanistDifferentialRevisionHash::getTypes();
     $hash_const = $this->formatStringConstants($hash_types);
 
     $status_types = array(
       DifferentialRevisionQuery::STATUS_ANY,
       DifferentialRevisionQuery::STATUS_OPEN,
       DifferentialRevisionQuery::STATUS_ACCEPTED,
       DifferentialRevisionQuery::STATUS_CLOSED,
     );
     $status_const = $this->formatStringConstants($status_types);
 
     $order_types = array(
       DifferentialRevisionQuery::ORDER_MODIFIED,
       DifferentialRevisionQuery::ORDER_CREATED,
     );
     $order_const = $this->formatStringConstants($order_types);
 
     return array(
       'authors'           => 'optional list<phid>',
       'ccs'               => 'optional list<phid>',
       'reviewers'         => 'optional list<phid>',
       'paths'             => 'optional list<pair<callsign, path>>',
       'commitHashes'      => 'optional list<pair<'.$hash_const.', string>>',
       'status'            => 'optional '.$status_const,
       'order'             => 'optional '.$order_const,
       'limit'             => 'optional uint',
       'offset'            => 'optional uint',
       'ids'               => 'optional list<uint>',
       'phids'             => 'optional list<phid>',
       'subscribers'       => 'optional list<phid>',
       'responsibleUsers'  => 'optional list<phid>',
       'branches'          => 'optional list<string>',
       'arcanistProjects'  => 'optional list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $authors            = $request->getValue('authors');
     $ccs                = $request->getValue('ccs');
     $reviewers          = $request->getValue('reviewers');
     $status             = $request->getValue('status');
     $order              = $request->getValue('order');
     $path_pairs         = $request->getValue('paths');
     $commit_hashes      = $request->getValue('commitHashes');
     $limit              = $request->getValue('limit');
     $offset             = $request->getValue('offset');
     $ids                = $request->getValue('ids');
     $phids              = $request->getValue('phids');
     $subscribers        = $request->getValue('subscribers');
     $responsible_users  = $request->getValue('responsibleUsers');
     $branches           = $request->getValue('branches');
     $arc_projects       = $request->getValue('arcanistProjects');
 
     $query = id(new DifferentialRevisionQuery())
       ->setViewer($request->getUser());
 
     if ($authors) {
       $query->withAuthors($authors);
     }
     if ($ccs) {
       $query->withCCs($ccs);
     }
     if ($reviewers) {
       $query->withReviewers($reviewers);
     }
 
     if ($path_pairs) {
       $paths = array();
       foreach ($path_pairs as $pair) {
         list($callsign, $path) = $pair;
         $paths[] = $path;
       }
 
       $path_map = id(new DiffusionPathIDQuery($paths))->loadPathIDs();
       if (count($path_map) != count($paths)) {
         $unknown_paths = array();
         foreach ($paths as $p) {
           if (!idx($path_map, $p)) {
             $unknown_paths[] = $p;
           }
         }
         throw id(new ConduitException('ERR-INVALID-PARAMETER'))
           ->setErrorDescription(
             'Unknown paths: '.implode(', ', $unknown_paths));
       }
 
       $repos = array();
       foreach ($path_pairs as $pair) {
         list($callsign, $path) = $pair;
         if (!idx($repos, $callsign)) {
           $repos[$callsign] = id(new PhabricatorRepositoryQuery())
             ->setViewer($request->getUser())
             ->withCallsigns(array($callsign))
             ->executeOne();
 
           if (!$repos[$callsign]) {
             throw id(new ConduitException('ERR-INVALID-PARAMETER'))
               ->setErrorDescription(
                 'Unknown repo callsign: '.$callsign);
           }
         }
         $repo = $repos[$callsign];
 
         $query->withPath($repo->getID(), idx($path_map, $path));
       }
     }
 
     if ($commit_hashes) {
       $hash_types = ArcanistDifferentialRevisionHash::getTypes();
       foreach ($commit_hashes as $info) {
         list($type, $hash) = $info;
         if (empty($type) ||
             !in_array($type, $hash_types) ||
             empty($hash)) {
               throw new ConduitException('ERR-INVALID-PARAMETER');
         }
       }
       $query->withCommitHashes($commit_hashes);
     }
 
     if ($status) {
       $query->withStatus($status);
     }
     if ($order) {
       $query->setOrder($order);
     }
     if ($limit) {
       $query->setLimit($limit);
     }
     if ($offset) {
       $query->setOffset($offset);
     }
     if ($ids) {
       $query->withIDs($ids);
     }
     if ($phids) {
       $query->withPHIDs($phids);
     }
     if ($responsible_users) {
       $query->withResponsibleUsers($responsible_users);
     }
     if ($subscribers) {
       $query->withCCs($subscribers);
     }
     if ($branches) {
       $query->withBranches($branches);
     }
     if ($arc_projects) {
       // This is sort of special-cased, but don't make arc do an extra round
       // trip.
       $projects = id(new PhabricatorRepositoryArcanistProject())
         ->loadAllWhere(
           'name in (%Ls)',
           $arc_projects);
       if (!$projects) {
         return array();
       }
 
       $query->withArcanistProjectPHIDs(mpull($projects, 'getPHID'));
     }
 
     $query->needRelationships(true);
     $query->needCommitPHIDs(true);
     $query->needDiffIDs(true);
     $query->needActiveDiffs(true);
     $query->needHashes(true);
 
     $revisions = $query->execute();
 
     $field_data = $this->loadCustomFieldsForRevisions(
       $request->getUser(),
       $revisions);
 
     $results = array();
     foreach ($revisions as $revision) {
       $diff = $revision->getActiveDiff();
       if (!$diff) {
         continue;
       }
 
       $id = $revision->getID();
       $phid = $revision->getPHID();
 
       $result = array(
         'id'                  => $id,
         'phid'                => $phid,
         'title'               => $revision->getTitle(),
         'uri'                 => PhabricatorEnv::getProductionURI('/D'.$id),
         'dateCreated'         => $revision->getDateCreated(),
         'dateModified'        => $revision->getDateModified(),
         'authorPHID'          => $revision->getAuthorPHID(),
         'status'              => $revision->getStatus(),
         'statusName'          =>
           ArcanistDifferentialRevisionStatus::getNameForRevisionStatus(
             $revision->getStatus()),
         'branch'              => $diff->getBranch(),
         'summary'             => $revision->getSummary(),
         'testPlan'            => $revision->getTestPlan(),
         'lineCount'           => $revision->getLineCount(),
         'activeDiffPHID'      => $diff->getPHID(),
         'diffs'               => $revision->getDiffIDs(),
         'commits'             => $revision->getCommitPHIDs(),
         'reviewers'           => array_values($revision->getReviewers()),
         'ccs'                 => array_values($revision->getCCPHIDs()),
         'hashes'              => $revision->getHashes(),
         'auxiliary'           => idx($field_data, $phid, array()),
         'arcanistProjectPHID' => $diff->getArcanistProjectPHID()
       );
 
       // TODO: This is a hacky way to put permissions on this field until we
       // have first-class support, see T838.
       if ($revision->getAuthorPHID() == $request->getUser()->getPHID()) {
         $result['sourcePath'] = $diff->getSourcePath();
       }
 
       $results[] = $result;
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
index 657f4b270..06fa7c024 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
@@ -1,110 +1,110 @@
 <?php
 
 final class ConduitAPI_differential_setdiffproperty_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Attach properties to Differential diffs.";
+    return 'Attach properties to Differential diffs.';
   }
 
   public function defineParamTypes() {
     return array(
       'diff_id' => 'required diff_id',
       'name'    => 'required string',
       'data'    => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND' => 'Diff was not found.',
     );
   }
 
   private static function updateLintStatus($diff_id) {
 
     $diff = id(new DifferentialDiff())->load($diff_id);
     if (!$diff) {
       throw new ConduitException('ERR_NOT_FOUND');
     }
 
     // Load the postponed linters attached to this diff.
     $postponed_linters_property = id(
       new DifferentialDiffProperty())->loadOneWhere(
         'diffID = %d AND name = %s',
         $diff_id,
         'arc:lint-postponed');
     if ($postponed_linters_property) {
       $postponed_linters = $postponed_linters_property->getData();
     } else {
       $postponed_linters = array();
     }
 
     // Load the lint messages currenty attached to the diff
     $messages_property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $diff_id,
       'arc:lint');
     if ($messages_property) {
       $results = $messages_property->getData();
     } else {
       $results = array();
     }
 
     $has_error = false;
     $has_warning = false;
     foreach ($results as $result) {
       if ($result['severity'] === ArcanistLintSeverity::SEVERITY_ERROR) {
         $has_error = true;
         break;
       } else if ($result['severity'] ===
                  ArcanistLintSeverity::SEVERITY_WARNING) {
         $has_warning = true;
       }
     }
 
     if ($has_error) {
       $diff->setLintStatus(DifferentialLintStatus::LINT_FAIL);
     } else if ($has_warning) {
       $diff->setLintStatus(DifferentialLintStatus::LINT_WARN);
     } else if (!empty($postponed_linters)) {
       $diff->setLintStatus(DifferentialLintStatus::LINT_POSTPONED);
     } else if ($diff->getLintStatus() != DifferentialLintStatus::LINT_SKIP) {
       $diff->setLintStatus(DifferentialLintStatus::LINT_OKAY);
     }
     $diff->save();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $diff_id = $request->getValue('diff_id');
     $name = $request->getValue('name');
     $data = json_decode($request->getValue('data'), true);
 
     self::updateDiffProperty($diff_id, $name, $data);
 
     if ($name === 'arc:lint' || $name == 'arc:lint-postponed') {
       self::updateLintStatus($diff_id);
     }
 
     return;
   }
 
   private static function updateDiffProperty($diff_id, $name, $data) {
     $property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $diff_id,
       $name);
     if (!$property) {
       $property = new DifferentialDiffProperty();
       $property->setDiffID($diff_id);
       $property->setName($name);
     }
     $property->setData($data);
     $property->save();
     return $property;
   }
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php
index badd7cbb4..44eed48a5 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php
@@ -1,75 +1,75 @@
 <?php
 
 final class ConduitAPI_differential_updaterevision_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return pht("Update a Differential revision.");
+    return pht('Update a Differential revision.');
   }
 
   public function defineParamTypes() {
     return array(
       'id'        => 'required revisionid',
       'diffid'    => 'required diffid',
       'fields'    => 'required dict',
       'message'   => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_DIFF' => 'Bad diff ID.',
       'ERR_BAD_REVISION' => 'Bad revision ID.',
       'ERR_WRONG_USER' => 'You are not the author of this revision.',
       'ERR_CLOSED' => 'This revision has already been closed.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
 
     $diff = id(new DifferentialDiffQuery())
       ->setViewer($viewer)
       ->withIDs(array($request->getValue('diffid')))
       ->executeOne();
     if (!$diff) {
       throw new ConduitException('ERR_BAD_DIFF');
     }
 
     $revision = id(new DifferentialRevisionQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($request->getValue('id')))
       ->needReviewerStatus(true)
       ->needActiveDiffs(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$revision) {
       throw new ConduitException('ERR_BAD_REVISION');
     }
 
     if ($revision->getStatus() == ArcanistDifferentialRevisionStatus::CLOSED) {
       throw new ConduitException('ERR_CLOSED');
     }
 
     $this->applyFieldEdit(
       $request,
       $revision,
       $diff,
       $request->getValue('fields', array()),
       $request->getValue('message'));
 
     return array(
       'revisionid'  => $revision->getID(),
       'uri'         => PhabricatorEnv::getURI('/D'.$revision->getID()),
     );
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
index be9da87f2..989b8c545 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
@@ -1,148 +1,148 @@
 <?php
 
 final class ConduitAPI_differential_updateunitresults_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
-    return "Update arc unit results for a postponed test.";
+    return 'Update arc unit results for a postponed test.';
   }
 
   public function defineParamTypes() {
     return array(
       'diff_id'   => 'required diff_id',
       'file'      => 'required string',
       'name'      => 'required string',
       'link'      => 'optional string',
       'result'    => 'required string',
       'message'   => 'required string',
       'coverage'  => 'optional map<string, string>',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_DIFF'   => 'Bad diff ID.',
       'ERR_NO_RESULTS' => 'Could not find the postponed test',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $diff_id = $request->getValue('diff_id');
     if (!$diff_id) {
       throw new ConduitException('ERR_BAD_DIFF');
     }
 
     $file = $request->getValue('file');
     $name = $request->getValue('name');
     $link = $request->getValue('link');
     $message = $request->getValue('message');
     $result = $request->getValue('result');
     $coverage = $request->getValue('coverage', array());
 
     $diff_property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $diff_id,
       'arc:unit');
 
     if (!$diff_property) {
       throw new ConduitException('ERR_NO_RESULTS');
     }
 
     $diff = id(new DifferentialDiffQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($diff_id))
       ->executeOne();
 
     $unit_results = $diff_property->getData();
     $postponed_count = 0;
     $unit_status = null;
 
     // If the test result already exists, then update it with
     // the new info.
     foreach ($unit_results as &$unit_result) {
       if ($unit_result['name'] === $name ||
           $unit_result['name'] === $file ||
           $unit_result['name'] === $diff->getSourcePath().$file) {
         $unit_result['name'] = $name;
         $unit_result['link'] = $link;
         $unit_result['file'] = $file;
         $unit_result['result'] = $result;
         $unit_result['userdata'] = $message;
         $unit_result['coverage'] = $coverage;
         $unit_status = $result;
         break;
       }
     }
     unset($unit_result);
 
     // If the test result doesn't exist, just add it.
     if (!$unit_status) {
       $unit_result = array();
       $unit_result['file'] = $file;
       $unit_result['name'] = $name;
       $unit_result['link'] = $link;
       $unit_result['result'] = $result;
       $unit_result['userdata'] = $message;
       $unit_result['coverage'] = $coverage;
       $unit_status = $result;
       $unit_results[] = $unit_result;
     }
     unset($unit_result);
 
     $diff_property->setData($unit_results);
     $diff_property->save();
 
     // Map external unit test status to internal overall diff status
     $status_codes =
       array(
         DifferentialUnitTestResult::RESULT_PASS =>
           DifferentialUnitStatus::UNIT_OKAY,
         DifferentialUnitTestResult::RESULT_UNSOUND =>
           DifferentialUnitStatus::UNIT_WARN,
         DifferentialUnitTestResult::RESULT_FAIL =>
           DifferentialUnitStatus::UNIT_FAIL,
         DifferentialUnitTestResult::RESULT_BROKEN =>
           DifferentialUnitStatus::UNIT_FAIL,
         DifferentialUnitTestResult::RESULT_SKIP =>
           DifferentialUnitStatus::UNIT_OKAY,
         DifferentialUnitTestResult::RESULT_POSTPONED =>
           DifferentialUnitStatus::UNIT_POSTPONED);
 
     // These are the relative priorities for the unit test results
     $status_codes_priority =
       array(
         DifferentialUnitStatus::UNIT_OKAY => 1,
         DifferentialUnitStatus::UNIT_WARN => 2,
         DifferentialUnitStatus::UNIT_POSTPONED => 3,
         DifferentialUnitStatus::UNIT_FAIL => 4);
 
     // Walk the now-current list of status codes to find the overall diff
     // status
     $final_diff_status = DifferentialUnitStatus::UNIT_NONE;
     foreach ($unit_results as $unit_result) {
       // Convert the text result into a diff unit status value
       $status_code = idx($status_codes,
                          $unit_result['result'],
                          DifferentialUnitStatus::UNIT_NONE);
 
       // Convert the unit status into a relative value
       $diff_status_priority = idx($status_codes_priority, $status_code, 0);
 
       // If the relative value of this result is "more bad" than previous
       // results, use it as the new final diff status
       if ($diff_status_priority > idx($status_codes_priority,
                                       $final_diff_status, 0)) {
         $final_diff_status = $status_code;
       }
     }
 
     // Update our unit test result status with the final value
     $diff->setUnitStatus($final_diff_status);
     $diff->save();
   }
 }
diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
index 61832ae12..cf8221c11 100644
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -1,299 +1,299 @@
 <?php
 
 final class PhabricatorDifferentialConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Differential');
   }
 
   public function getDescription() {
     return pht('Configure Differential code review.');
   }
 
   public function getOptions() {
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     $fields = array(
       new DifferentialTitleField(),
       new DifferentialSummaryField(),
       new DifferentialTestPlanField(),
       new DifferentialAuthorField(),
       new DifferentialReviewersField(),
       new DifferentialProjectReviewersField(),
       new DifferentialReviewedByField(),
       new DifferentialSubscribersField(),
       new DifferentialRepositoryField(),
       new DifferentialLintField(),
       new DifferentialUnitField(),
       new DifferentialViewPolicyField(),
       new DifferentialEditPolicyField(),
 
       new DifferentialDependsOnField(),
       new DifferentialDependenciesField(),
       new DifferentialManiphestTasksField(),
       new DifferentialCommitsField(),
 
       new DifferentialJIRAIssuesField(),
       new DifferentialAsanaRepresentationField(),
 
       new DifferentialChangesSinceLastUpdateField(),
       new DifferentialBranchField(),
 
       new DifferentialBlameRevisionField(),
       new DifferentialPathField(),
       new DifferentialHostField(),
       new DifferentialRevertPlanField(),
 
       new DifferentialApplyPatchField(),
 
       new DifferentialRevisionIDField(),
     );
 
     $default_fields = array();
     foreach ($fields as $field) {
       $default_fields[$field->getFieldKey()] = array(
         'disabled' => $field->shouldDisableByDefault(),
       );
     }
 
     return array(
       $this->newOption(
         'differential.fields',
         $custom_field_type,
         $default_fields)
         ->setCustomData(
           id(new DifferentialRevision())->getCustomFieldBaseClass())
         ->setDescription(
           pht(
             "Select and reorder revision fields.\n\n".
             "NOTE: This feature is under active development and subject ".
             "to change.")),
       $this->newOption(
         'differential.whitespace-matters',
         'list<regex>',
         array(
           '/\.py$/',
           '/\.l?hs$/',
         ))
         ->setDescription(
           pht(
             "List of file regexps where whitespace is meaningful and should ".
             "not use 'ignore-all' by default")),
       $this->newOption('differential.require-test-plan-field', 'bool', true)
         ->setBoolOptions(
           array(
             pht("Require 'Test Plan' field"),
             pht("Make 'Test Plan' field optional"),
           ))
         ->setSummary(pht('Require "Test Plan" field?'))
         ->setDescription(
           pht(
             "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.")),
       $this->newOption('differential.enable-email-accept', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Enable Email "!accept" Action'),
             pht('Disable Email "!accept" Action'),
           ))
         ->setSummary(pht('Enable or disable "!accept" action via email.'))
         ->setDescription(
           pht(
             'If inbound email is configured, users can interact with '.
             'revisions by using "!actions" in email replies (for example, '.
             '"!resign" or "!rethink"). However, by default, users may not '.
             '"!accept" revisions via email: email authentication can be '.
             'configured to be very weak, and email "!accept" is kind of '.
             'sketchy and implies the revision may not actually be receiving '.
             'thorough review. You can enable "!accept" by setting this '.
             'option to true.')),
       $this->newOption('differential.generated-paths', 'list<regex>', array())
-        ->setSummary(pht("File regexps to treat as automatically generated."))
+        ->setSummary(pht('File regexps to treat as automatically generated.'))
         ->setDescription(
           pht(
-            "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."))
-        ->addExample("/config\.h$/\n#/autobuilt/#", pht("Valid Setting")),
+            '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.'))
+        ->addExample("/config\.h$/\n#/autobuilt/#", pht('Valid Setting')),
       $this->newOption('differential.sticky-accept', 'bool', true)
         ->setBoolOptions(
           array(
-            pht("Accepts persist across updates"),
-            pht("Accepts are reset by updates"),
+            pht('Accepts persist across updates'),
+            pht('Accepts are reset by updates'),
           ))
         ->setSummary(
           pht('Should "Accepted" revisions remain "Accepted" after updates?'))
         ->setDescription(
           pht(
             'Normally, when revisions that have been "Accepted" are updated, '.
             'they remain "Accepted". This allows reviewers to suggest minor '.
             'alterations when accepting, and encourages authors to update '.
             'if they make minor changes in response to this feedback.'.
             "\n\n".
             'If you want updates to always require re-review, you can disable '.
             'the "stickiness" of the "Accepted" status with this option. '.
             'This may make the process for minor changes much more burdensome '.
             'to both authors and reviewers.')),
       $this->newOption('differential.allow-self-accept', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Allow self-accept"),
-            pht("Disallow self-accept"),
+            pht('Allow self-accept'),
+            pht('Disallow self-accept'),
           ))
-        ->setSummary(pht("Allows users to accept their own revisions."))
+        ->setSummary(pht('Allows users to accept their own revisions.'))
         ->setDescription(
           pht(
             "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.")),
       $this->newOption('differential.always-allow-close', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Allow any user"),
-            pht("Restrict to submitter"),
+            pht('Allow any user'),
+            pht('Restrict to submitter'),
           ))
-        ->setSummary(pht("Allows any user to close accepted revisions."))
+        ->setSummary(pht('Allows any user to close accepted revisions.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('differential.always-allow-abandon', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow any user'),
             pht('Restrict to submitter'),
           ))
         ->setSummary(pht('Allows any user to abandon revisions.'))
         ->setDescription(
           pht(
             'If you set this to true, any user can abandon any revision. If '.
             'false, only the submitter can abandon a revision.')),
       $this->newOption('differential.allow-reopen', 'bool', false)
         ->setBoolOptions(
           array(
-            pht("Enable reopen"),
-            pht("Disable reopen"),
+            pht('Enable reopen'),
+            pht('Disable reopen'),
           ))
-        ->setSummary(pht("Allows any user to reopen a closed revision."))
+        ->setSummary(pht('Allows any user to reopen a closed revision.'))
         ->setDescription(
-          pht("If you set this to true, any user can reopen a revision so ".
-              "long as it has been closed.  This can be useful if a revision ".
-              "is accidentally closed or if a developer changes his or her ".
-              "mind after closing a revision.  If it is false, reopening ".
-              "is not allowed.")),
+          pht('If you set this to true, any user can reopen a revision so '.
+              'long as it has been closed.  This can be useful if a revision '.
+              'is accidentally closed or if a developer changes his or her '.
+              'mind after closing a revision.  If it is false, reopening '.
+              'is not allowed.')),
       $this->newOption('differential.close-on-accept', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Treat Accepted Revisions as "Closed"'),
             pht('Treat Accepted Revisions as "Open"'),
           ))
         ->setSummary(pht('Allows "Accepted" to act as a closed status.'))
         ->setDescription(
           pht(
             'Normally, Differential revisions remain on the dashboard when '.
             'they are "Accepted", and the author then commits the changes '.
             'to "Close" the revision and move it off the dashboard.'.
             "\n\n".
             'If you have an unusual workflow where Differential is used for '.
             'post-commit review (normally called "Audit", elsewhere in '.
             'Phabricator), you can set this flag to treat the "Accepted" '.
             'state as a "Closed" state and end the review workflow early.'.
             "\n\n".
             'This sort of workflow is very unusual. Very few installs should '.
             'need to change this option.')),
       $this->newOption('differential.days-fresh', 'int', 1)
         ->setSummary(
           pht(
             "For how many business days should a revision be considered ".
             "'fresh'?"))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('differential.days-stale', 'int', 3)
         ->setSummary(
           pht("After this many days, a revision will be considered 'stale'."))
         ->setDescription(
           pht(
             "Similar to `differential.days-fresh` but marks stale revisions. ".
             "If the revision is even older than it is when marked as 'old'.")),
       $this->newOption(
         'metamta.differential.reply-handler-domain',
         'string',
         null)
         ->setDescription(
           pht('Inbound email domain for Differential replies.')),
       $this->newOption(
         'metamta.differential.reply-handler',
         'class',
         'DifferentialReplyHandler')
         ->setBaseClass('PhabricatorMailReplyHandler')
         ->setDescription(pht('Alternate reply handler class.')),
       $this->newOption(
         'metamta.differential.subject-prefix',
         'string',
         '[Differential]')
         ->setDescription(pht('Subject prefix for Differential mail.')),
       $this->newOption(
         'metamta.differential.attach-patches',
         'bool',
         false)
         ->setBoolOptions(
           array(
-            pht("Attach Patches"),
-            pht("Do Not Attach Patches"),
+            pht('Attach Patches'),
+            pht('Do Not Attach Patches'),
           ))
-        ->setSummary(pht("Attach patches to email, as text attachments."))
+        ->setSummary(pht('Attach patches to email, as text attachments.'))
         ->setDescription(
           pht(
-            "If you set this to true, Phabricator will attach patches to ".
-            "Differential mail (as text attachments). This will not work if ".
-            "you are using SendGrid as your mail adapter.")),
+            'If you set this to true, Phabricator will attach patches to '.
+            'Differential mail (as text attachments). This will not work if '.
+            'you are using SendGrid as your mail adapter.')),
       $this->newOption(
         'metamta.differential.inline-patches',
         'int',
         0)
-        ->setSummary(pht("Inline patches in email, as body text."))
+        ->setSummary(pht('Inline patches in email, as body text.'))
         ->setDescription(
           pht(
             "To include patches inline 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.")),
       // TODO: Implement 'enum'? Options are 'unified' or 'git'.
       $this->newOption(
         'metamta.differential.patch-format',
         'string',
         'unified')
         ->setDescription(
           pht("Format for inlined or attached patches: 'git' or 'unified'.")),
       $this->newOption(
         'metamta.differential.unified-comment-context',
         'bool',
         false)
         ->setBoolOptions(
           array(
-            pht("Show context"),
-            pht("Do not show context"),
+            pht('Show context'),
+            pht('Do not show context'),
           ))
-        ->setSummary(pht("Show diff context around inline comments in email."))
+        ->setSummary(pht('Show diff context around inline comments in email.'))
         ->setDescription(
           pht(
-            "Normally, inline comments in emails are shown with a file and ".
-            "line but without any diff context. Enabling this option adds ".
-            "diff context.")),
+            'Normally, inline comments in emails are shown with a file and '.
+            'line but without any diff context. Enabling this option adds '.
+            'diff context.')),
     );
   }
 
 }
diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
index f306160f8..c7d98544a 100644
--- a/src/applications/differential/controller/DifferentialDiffCreateController.php
+++ b/src/applications/differential/controller/DifferentialDiffCreateController.php
@@ -1,103 +1,103 @@
 <?php
 
 final class DifferentialDiffCreateController extends DifferentialController {
 
   public function processRequest() {
 
     $request = $this->getRequest();
 
     $errors = array();
     $e_diff = null;
     $e_file = null;
     if ($request->isFormPost()) {
       $diff = null;
 
       if ($request->getFileExists('diff-file')) {
         $diff = PhabricatorFile::readUploadedFileData($_FILES['diff-file']);
       } else {
         $diff = $request->getStr('diff');
       }
 
       if (!strlen($diff)) {
         $errors[] = pht(
-          "You can not create an empty diff. Copy/paste a diff, or upload a ".
-          "diff file.");
+          'You can not create an empty diff. Copy/paste a diff, or upload a '.
+          'diff file.');
         $e_diff = pht('Required');
         $e_file = pht('Required');
       }
 
       if (!$errors) {
         $call = new ConduitCall(
           'differential.createrawdiff',
           array(
             'diff' => $diff,
             ));
         $call->setUser($request->getUser());
         $result = $call->execute();
 
         $path = id(new PhutilURI($result['uri']))->getPath();
         return id(new AphrontRedirectResponse())->setURI($path);
       }
     }
 
     $form = new AphrontFormView();
     $arcanist_href = PhabricatorEnv::getDoclink('Arcanist User Guide');
     $arcanist_link = phutil_tag(
       'a',
       array(
         'href' => $arcanist_href,
         'target' => '_blank',
       ),
       'Arcanist');
 
     $cancel_uri = $this->getApplicationURI();
 
     $form
       ->setAction('/differential/diff/create/')
       ->setEncType('multipart/form-data')
       ->setUser($request->getUser())
       ->appendInstructions(
         pht(
           'The best way to create a Differential diff is by using %s, but you '.
           'can also just paste a diff (for example, from %s, %s or %s) into '.
           'this box, or upload a diff file.',
           $arcanist_link,
           phutil_tag('tt', array(), 'svn diff'),
           phutil_tag('tt', array(), 'git diff'),
           phutil_tag('tt', array(), 'hg diff --git')))
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Raw Diff'))
           ->setName('diff')
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
           ->setError($e_diff))
       ->appendChild(
         id(new AphrontFormFileControl())
           ->setLabel(pht('Raw Diff From File'))
           ->setName('diff-file')
           ->setError($e_file))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($cancel_uri)
-          ->setValue(pht("Create Diff")));
+          ->setValue(pht('Create Diff')));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Create New Diff'))
       ->setForm($form)
       ->setFormErrors($errors);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Create Diff'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => pht('Create Diff'),
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/differential/controller/DifferentialInlineCommentEditController.php b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
index 1bda9e05d..08366bbdd 100644
--- a/src/applications/differential/controller/DifferentialInlineCommentEditController.php
+++ b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
@@ -1,96 +1,96 @@
 <?php
 
 final class DifferentialInlineCommentEditController
   extends PhabricatorInlineCommentController {
 
   private $revisionID;
 
   public function willProcessRequest(array $data) {
     $this->revisionID = $data['id'];
   }
 
   protected function createComment() {
 
     // Verify revision and changeset correspond to actual objects.
     $revision_id = $this->revisionID;
     $changeset_id = $this->getChangesetID();
 
     $viewer = $this->getRequest()->getUser();
     $revision = id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withIDs(array($revision_id))
       ->executeOne();
 
     if (!$revision) {
-      throw new Exception("Invalid revision ID!");
+      throw new Exception('Invalid revision ID!');
     }
 
     if (!id(new DifferentialChangeset())->load($changeset_id)) {
-      throw new Exception("Invalid changeset ID!");
+      throw new Exception('Invalid changeset ID!');
     }
 
     return id(new DifferentialInlineComment())
       ->setRevision($revision)
       ->setChangesetID($changeset_id);
   }
 
   protected function loadComment($id) {
     return id(new DifferentialInlineCommentQuery())
       ->withIDs(array($id))
       ->executeOne();
   }
 
   protected function loadCommentForEdit($id) {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $inline = $this->loadComment($id);
     if (!$this->canEditInlineComment($user, $inline)) {
-      throw new Exception("That comment is not editable!");
+      throw new Exception('That comment is not editable!');
     }
     return $inline;
   }
 
   private function canEditInlineComment(
     PhabricatorUser $user,
     DifferentialInlineComment $inline) {
 
     // Only the author may edit a comment.
     if ($inline->getAuthorPHID() != $user->getPHID()) {
       return false;
     }
 
     // Saved comments may not be edited, for now, although the schema now
     // supports it.
     if (!$inline->isDraft()) {
       return false;
     }
 
     // Inline must be attached to the active revision.
     if ($inline->getRevisionID() != $this->revisionID) {
       return false;
     }
 
     return true;
   }
 
   protected function deleteComment(PhabricatorInlineCommentInterface $inline) {
     $inline->openTransaction();
       DifferentialDraft::deleteHasDraft(
         $inline->getAuthorPHID(),
         $inline->getRevisionPHID(),
         $inline->getPHID());
       $inline->delete();
     $inline->saveTransaction();
   }
 
   protected function saveComment(PhabricatorInlineCommentInterface $inline) {
     $inline->openTransaction();
       $inline->save();
       DifferentialDraft::markHasDraft(
         $inline->getAuthorPHID(),
         $inline->getRevisionPHID(),
         $inline->getPHID());
     $inline->saveTransaction();
   }
 }
diff --git a/src/applications/differential/controller/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php
index e88fe947e..b1dc82af2 100644
--- a/src/applications/differential/controller/DifferentialRevisionEditController.php
+++ b/src/applications/differential/controller/DifferentialRevisionEditController.php
@@ -1,184 +1,184 @@
 <?php
 
 final class DifferentialRevisionEditController
   extends DifferentialController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     if (!$this->id) {
       $this->id = $request->getInt('revisionID');
     }
 
     if ($this->id) {
       $revision = id(new DifferentialRevisionQuery())
         ->setViewer($viewer)
         ->withIDs(array($this->id))
         ->needRelationships(true)
         ->needReviewerStatus(true)
         ->needActiveDiffs(true)
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$revision) {
         return new Aphront404Response();
       }
     } else {
       $revision = DifferentialRevision::initializeNewRevision($viewer);
       $revision->attachReviewerStatus(array());
     }
 
     $diff_id = $request->getInt('diffID');
     if ($diff_id) {
       $diff = id(new DifferentialDiffQuery())
         ->setViewer($viewer)
         ->withIDs(array($diff_id))
         ->executeOne();
       if (!$diff) {
         return new Aphront404Response();
       }
       if ($diff->getRevisionID()) {
         // TODO: Redirect?
-        throw new Exception("This diff is already attached to a revision!");
+        throw new Exception('This diff is already attached to a revision!');
       }
     } else {
       $diff = null;
     }
 
     if (!$diff) {
       if (!$revision->getID()) {
         throw new Exception(
           pht('You can not create a new revision without a diff!'));
       }
     } else {
       // TODO: It would be nice to show the diff being attached in the UI.
     }
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $revision,
       PhabricatorCustomField::ROLE_EDIT);
     $field_list
       ->setViewer($viewer)
       ->readFieldsFromStorage($revision);
 
     $validation_exception = null;
     if ($request->isFormPost() && !$request->getStr('viaDiffView')) {
       $xactions = $field_list->buildFieldTransactionsFromRequest(
         new DifferentialTransaction(),
         $request);
 
       if ($diff) {
         $xactions[] = id(new DifferentialTransaction())
           ->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
           ->setNewValue($diff->getPHID());
       }
 
       $comments = $request->getStr('comments');
       if (strlen($comments)) {
         $xactions[] = id(new DifferentialTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
           ->attachComment(
             id(new DifferentialTransactionComment())
               ->setContent($comments));
       }
 
       $editor = id(new DifferentialTransactionEditor())
         ->setActor($viewer)
         ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true);
 
       try {
         $editor->applyTransactions($revision, $xactions);
         $revision_uri = '/D'.$revision->getID();
         return id(new AphrontRedirectResponse())->setURI($revision_uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
       }
     }
 
 
     $form = new AphrontFormView();
     $form->setUser($request->getUser());
     if ($diff) {
       $form->addHiddenInput('diffID', $diff->getID());
     }
 
     if ($revision->getID()) {
       $form->setAction('/differential/revision/edit/'.$revision->getID().'/');
     } else {
       $form->setAction('/differential/revision/edit/');
     }
 
     if ($diff && $revision->getID()) {
       $form
         ->appendChild(
           id(new AphrontFormTextAreaControl())
             ->setLabel(pht('Comments'))
             ->setName('comments')
             ->setCaption(pht("Explain what's new in this diff."))
             ->setValue($request->getStr('comments')))
         ->appendChild(
           id(new AphrontFormSubmitControl())
             ->setValue(pht('Save')))
         ->appendChild(
           id(new AphrontFormDividerControl()));
     }
 
     $field_list->appendFieldsToForm($form);
 
     $submit = id(new AphrontFormSubmitControl())
       ->setValue('Save');
     if ($diff) {
       $submit->addCancelButton('/differential/diff/'.$diff->getID().'/');
     } else {
       $submit->addCancelButton('/D'.$revision->getID());
     }
 
     $form->appendChild($submit);
 
     $crumbs = $this->buildApplicationCrumbs();
     if ($revision->getID()) {
       if ($diff) {
         $title = pht('Update Differential Revision');
         $crumbs->addTextCrumb(
           'D'.$revision->getID(),
           '/differential/diff/'.$diff->getID().'/');
       } else {
         $title = pht('Edit Differential Revision');
         $crumbs->addTextCrumb(
           'D'.$revision->getID(),
           '/D'.$revision->getID());
       }
     } else {
       $title = pht('Create New Differential Revision');
     }
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setValidationException($validation_exception)
       ->setForm($form);
 
     $crumbs->addTextCrumb($title);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/differential/controller/DifferentialRevisionLandController.php b/src/applications/differential/controller/DifferentialRevisionLandController.php
index 774906671..2f07b9ee6 100644
--- a/src/applications/differential/controller/DifferentialRevisionLandController.php
+++ b/src/applications/differential/controller/DifferentialRevisionLandController.php
@@ -1,153 +1,153 @@
 <?php
 
 final class DifferentialRevisionLandController extends DifferentialController {
 
   private $revisionID;
   private $strategyClass;
   private $pushStrategy;
 
   public function willProcessRequest(array $data) {
     $this->revisionID = $data['id'];
     $this->strategyClass = $data['strategy'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $revision_id = $this->revisionID;
 
     $revision = id(new DifferentialRevisionQuery())
       ->withIDs(array($revision_id))
       ->setViewer($viewer)
       ->executeOne();
     if (!$revision) {
       return new Aphront404Response();
     }
 
     if (is_subclass_of($this->strategyClass, 'DifferentialLandingStrategy')) {
       $this->pushStrategy = newv($this->strategyClass, array());
     } else {
       throw new Exception(
         "Strategy type must be a valid class name and must subclass ".
         "DifferentialLandingStrategy. ".
         "'{$this->strategyClass}' is not a subclass of ".
         "DifferentialLandingStrategy.");
     }
 
     if ($request->isDialogFormPost()) {
       $response = null;
       $text = '';
       try {
         $response = $this->attemptLand($revision, $request);
-        $title = pht("Success!");
-        $text = pht("Revision was successfully landed.");
+        $title = pht('Success!');
+        $text = pht('Revision was successfully landed.');
       } catch (Exception $ex) {
-        $title = pht("Failed to land revision");
+        $title = pht('Failed to land revision');
         if ($ex instanceof PhutilProxyException) {
           $text = hsprintf(
             '%s:<br><pre>%s</pre>',
             $ex->getMessage(),
             $ex->getPreviousException()->getMessage());
         } else {
           $text = phutil_tag('pre', array(), $ex->getMessage());
         }
         $text = id(new AphrontErrorView())
            ->appendChild($text);
       }
 
       if ($response instanceof AphrontDialogView) {
         $dialog = $response;
       } else {
         $dialog = id(new AphrontDialogView())
           ->setUser($viewer)
           ->setTitle($title)
           ->appendChild(phutil_tag('p', array(), $text))
           ->addCancelButton('/D'.$revision_id, pht('Done'));
       }
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     $is_disabled = $this->pushStrategy->isActionDisabled(
       $viewer,
       $revision,
       $revision->getRepository());
     if ($is_disabled) {
       if (is_string($is_disabled)) {
         $explain = $is_disabled;
       } else {
-        $explain = pht("This action is not currently enabled.");
+        $explain = pht('This action is not currently enabled.');
       }
       $dialog = id(new AphrontDialogView())
         ->setUser($viewer)
         ->setTitle(pht("Can't land revision"))
         ->appendChild($explain)
         ->addCancelButton('/D'.$revision_id);
 
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
 
     $prompt = hsprintf('%s<br><br>%s',
       pht(
         'This will squash and rebase revision %s, and push it to '.
           'the default / master branch.',
         $revision_id),
       pht('It is an experimental feature and may not work.'));
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
-      ->setTitle(pht("Land Revision %s?", $revision_id))
+      ->setTitle(pht('Land Revision %s?', $revision_id))
       ->appendChild($prompt)
       ->setSubmitURI($request->getRequestURI())
       ->addSubmitButton(pht('Land it!'))
       ->addCancelButton('/D'.$revision_id);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function attemptLand($revision, $request) {
     $status = $revision->getStatus();
     if ($status != ArcanistDifferentialRevisionStatus::ACCEPTED) {
-      throw new Exception("Only Accepted revisions can be landed.");
+      throw new Exception('Only Accepted revisions can be landed.');
     }
 
     $repository = $revision->getRepository();
 
     if ($repository === null) {
-      throw new Exception("revision is not attached to a repository.");
+      throw new Exception('revision is not attached to a repository.');
     }
 
     $can_push = PhabricatorPolicyFilter::hasCapability(
       $request->getUser(),
       $repository,
       DiffusionCapabilityPush::CAPABILITY);
 
     if (!$can_push) {
       throw new Exception(
         pht('You do not have permission to push to this repository.'));
     }
 
     $lock = $this->lockRepository($repository);
 
     try {
       $response = $this->pushStrategy->processLandRequest(
         $request,
         $revision,
         $repository);
     } catch (Exception $e) {
       $lock->unlock();
       throw $e;
     }
 
     $lock->unlock();
     return $response;
   }
 
   private function lockRepository($repository) {
     $lock_name = __CLASS__.':'.($repository->getCallsign());
     $lock = PhabricatorGlobalLock::newLock($lock_name);
     $lock->lock();
     return $lock;
   }
 }
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 3a859d75d..61d60332d 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -1,968 +1,968 @@
 <?php
 
 final class DifferentialRevisionViewController extends DifferentialController {
 
   private $revisionID;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->revisionID = $data['id'];
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
     $viewer_is_anonymous = !$user->isLoggedIn();
 
     $revision = id(new DifferentialRevisionQuery())
       ->withIDs(array($this->revisionID))
       ->setViewer($request->getUser())
       ->needRelationships(true)
       ->needReviewerStatus(true)
       ->needReviewerAuthority(true)
       ->executeOne();
 
     if (!$revision) {
       return new Aphront404Response();
     }
 
     $diffs = id(new DifferentialDiffQuery())
       ->setViewer($request->getUser())
       ->withRevisionIDs(array($this->revisionID))
       ->needArcanistProjects(true)
       ->execute();
     $diffs = array_reverse($diffs, $preserve_keys = true);
 
     if (!$diffs) {
       throw new Exception(
-        "This revision has no diffs. Something has gone quite wrong.");
+        'This revision has no diffs. Something has gone quite wrong.');
     }
 
     $revision->attachActiveDiff(last($diffs));
 
     $diff_vs = $request->getInt('vs');
 
     $target_id = $request->getInt('id');
     $target = idx($diffs, $target_id, end($diffs));
 
     $target_manual = $target;
     if (!$target_id) {
       foreach ($diffs as $diff) {
         if ($diff->getCreationMethod() != 'commit') {
           $target_manual = $diff;
         }
       }
     }
 
     if (empty($diffs[$diff_vs])) {
       $diff_vs = null;
     }
 
     $repository = null;
     $repository_phid = $target->getRepositoryPHID();
     if ($repository_phid) {
       if ($repository_phid == $revision->getRepositoryPHID()) {
         $repository = $revision->getRepository();
       } else {
         $repository = id(new PhabricatorRepositoryQuery())
           ->setViewer($user)
           ->withPHIDs(array($repository_phid))
           ->executeOne();
       }
     }
 
     list($changesets, $vs_map, $vs_changesets, $rendering_references) =
       $this->loadChangesetsAndVsMap(
         $target,
         idx($diffs, $diff_vs),
         $repository);
 
     if ($request->getExists('download')) {
       return $this->buildRawDiffResponse(
         $revision,
         $changesets,
         $vs_changesets,
         $vs_map,
         $repository);
     }
 
     $props = id(new DifferentialDiffProperty())->loadAllWhere(
       'diffID = %d',
       $target_manual->getID());
     $props = mpull($props, 'getData', 'getName');
 
     $all_changesets = $changesets;
     $inlines = $this->loadInlineComments(
       $revision,
       $all_changesets);
 
     $object_phids = array_merge(
       $revision->getReviewers(),
       $revision->getCCPHIDs(),
       $revision->loadCommitPHIDs(),
       array(
         $revision->getAuthorPHID(),
         $user->getPHID(),
       ));
 
     foreach ($revision->getAttached() as $type => $phids) {
       foreach ($phids as $phid => $info) {
         $object_phids[] = $phid;
       }
     }
 
     $handles = $this->loadViewerHandles($object_phids);
 
     $request_uri = $request->getRequestURI();
 
     $limit = 100;
     $large = $request->getStr('large');
     if (count($changesets) > $limit && !$large) {
       $count = count($changesets);
       $warning = new AphrontErrorView();
       $warning->setTitle('Very Large Diff');
       $warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
       $warning->appendChild(hsprintf(
         '%s <strong>%s</strong>',
         pht(
           'This diff is very large and affects %s files. Load each file '.
             'individually.',
           new PhutilNumber($count)),
         phutil_tag(
           'a',
           array(
             'href' => $request_uri
               ->alter('large', 'true')
               ->setFragment('toc'),
           ),
           pht('Show All Files Inline'))));
       $warning = $warning->render();
 
       $my_inlines = id(new DifferentialInlineCommentQuery())
         ->withDraftComments($user->getPHID(), $this->revisionID)
         ->execute();
 
       $visible_changesets = array();
       foreach ($inlines + $my_inlines as $inline) {
         $changeset_id = $inline->getChangesetID();
         if (isset($changesets[$changeset_id])) {
           $visible_changesets[$changeset_id] = $changesets[$changeset_id];
         }
       }
 
       if (!empty($props['arc:lint'])) {
         $changeset_paths = mpull($changesets, null, 'getFilename');
         foreach ($props['arc:lint'] as $lint) {
           $changeset = idx($changeset_paths, $lint['path']);
           if ($changeset) {
             $visible_changesets[$changeset->getID()] = $changeset;
           }
         }
       }
 
     } else {
       $warning = null;
       $visible_changesets = $changesets;
     }
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $revision,
       PhabricatorCustomField::ROLE_VIEW);
 
     $field_list->setViewer($user);
     $field_list->readFieldsFromStorage($revision);
 
 
     // TODO: This should be in a DiffQuery or similar.
     $need_props = array();
     foreach ($field_list->getFields() as $field) {
       foreach ($field->getRequiredDiffPropertiesForRevisionView() as $prop) {
         $need_props[$prop] = $prop;
       }
     }
 
     if ($need_props) {
       $prop_diff = $revision->getActiveDiff();
       $load_props = id(new DifferentialDiffProperty())->loadAllWhere(
         'diffID = %d AND name IN (%Ls)',
         $prop_diff->getID(),
         $need_props);
       $load_props = mpull($load_props, 'getData', 'getName');
       foreach ($need_props as $need) {
         $prop_diff->attachProperty($need, idx($load_props, $need));
       }
     }
 
     $commit_hashes = mpull($diffs, 'getSourceControlBaseRevision');
     $local_commits = idx($props, 'local:commits', array());
     foreach ($local_commits as $local_commit) {
       $commit_hashes[] = idx($local_commit, 'tree');
       $commit_hashes[] = idx($local_commit, 'local');
     }
     $commit_hashes = array_unique(array_filter($commit_hashes));
     if ($commit_hashes) {
       $commits_for_links = id(new DiffusionCommitQuery())
         ->setViewer($user)
         ->withIdentifiers($commit_hashes)
         ->execute();
       $commits_for_links = mpull(
         $commits_for_links,
         null,
         'getCommitIdentifier');
     } else {
       $commits_for_links = array();
     }
 
     $revision_detail = id(new DifferentialRevisionDetailView())
       ->setUser($user)
       ->setRevision($revision)
       ->setDiff(end($diffs))
       ->setCustomFields($field_list)
       ->setURI($request->getRequestURI());
 
     $actions = $this->getRevisionActions($revision);
 
     $whitespace = $request->getStr(
       'whitespace',
       DifferentialChangesetParser::WHITESPACE_IGNORE_ALL);
 
     $arc_project = $target->getArcanistProject();
     if ($arc_project) {
       list($symbol_indexes, $project_phids) = $this->buildSymbolIndexes(
         $arc_project,
         $visible_changesets);
     } else {
       $symbol_indexes = array();
       $project_phids = null;
     }
 
     $revision_detail->setActions($actions);
     $revision_detail->setUser($user);
 
     $revision_detail_box = $revision_detail->render();
 
     $revision_warnings = $this->buildRevisionWarnings($revision, $handles);
     if ($revision_warnings) {
       $revision_detail_box->setErrorView($revision_warnings);
     }
 
     $comment_view = $this->buildTransactions(
       $revision,
       $diff_vs ? $diffs[$diff_vs] : $target,
       $target,
       $all_changesets);
 
     if (!$viewer_is_anonymous) {
       $comment_view->setQuoteRef('D'.$revision->getID());
       $comment_view->setQuoteTargetID('comment-content');
     }
 
     $wrap_id = celerity_generate_unique_node_id();
     $comment_view = phutil_tag(
       'div',
       array(
         'id' => $wrap_id,
       ),
       $comment_view);
 
     if ($arc_project) {
       Javelin::initBehavior(
         'repository-crossreference',
         array(
           'section' => $wrap_id,
           'projects' => $project_phids,
         ));
     }
 
     $changeset_view = new DifferentialChangesetListView();
     $changeset_view->setChangesets($changesets);
     $changeset_view->setVisibleChangesets($visible_changesets);
 
     if (!$viewer_is_anonymous) {
       $changeset_view->setInlineCommentControllerURI(
         '/differential/comment/inline/edit/'.$revision->getID().'/');
     }
 
     $changeset_view->setStandaloneURI('/differential/changeset/');
     $changeset_view->setRawFileURIs(
       '/differential/changeset/?view=old',
       '/differential/changeset/?view=new');
 
     $changeset_view->setUser($user);
     $changeset_view->setDiff($target);
     $changeset_view->setRenderingReferences($rendering_references);
     $changeset_view->setVsMap($vs_map);
     $changeset_view->setWhitespace($whitespace);
     if ($repository) {
       $changeset_view->setRepository($repository);
     }
     $changeset_view->setSymbolIndexes($symbol_indexes);
     $changeset_view->setTitle('Diff '.$target->getID());
 
     $diff_history = id(new DifferentialRevisionUpdateHistoryView())
       ->setUser($user)
       ->setDiffs($diffs)
       ->setSelectedVersusDiffID($diff_vs)
       ->setSelectedDiffID($target->getID())
       ->setSelectedWhitespace($whitespace)
       ->setCommitsForLinks($commits_for_links);
 
     $local_view = id(new DifferentialLocalCommitsView())
       ->setUser($user)
       ->setLocalCommits(idx($props, 'local:commits'))
       ->setCommitsForLinks($commits_for_links);
 
     if ($repository) {
       $other_revisions = $this->loadOtherRevisions(
         $changesets,
         $target,
         $repository);
     } else {
       $other_revisions = array();
     }
 
     $other_view = null;
     if ($other_revisions) {
       $other_view = $this->renderOtherRevisions($other_revisions);
     }
 
     $toc_view = new DifferentialDiffTableOfContentsView();
     $toc_view->setChangesets($changesets);
     $toc_view->setVisibleChangesets($visible_changesets);
     $toc_view->setRenderingReferences($rendering_references);
     $toc_view->setUnitTestData(idx($props, 'arc:unit', array()));
     if ($repository) {
       $toc_view->setRepository($repository);
     }
     $toc_view->setDiff($target);
     $toc_view->setUser($user);
     $toc_view->setRevisionID($revision->getID());
     $toc_view->setWhitespace($whitespace);
 
     $comment_form = null;
     if (!$viewer_is_anonymous) {
       $draft = id(new PhabricatorDraft())->loadOneWhere(
         'authorPHID = %s AND draftKey = %s',
         $user->getPHID(),
         'differential-comment-'.$revision->getID());
 
       $reviewers = array();
       $ccs = array();
       if ($draft) {
         $reviewers = idx($draft->getMetadata(), 'reviewers', array());
         $ccs = idx($draft->getMetadata(), 'ccs', array());
         if ($reviewers || $ccs) {
           $handles = $this->loadViewerHandles(array_merge($reviewers, $ccs));
           $reviewers = array_select_keys($handles, $reviewers);
           $ccs = array_select_keys($handles, $ccs);
         }
       }
 
       $comment_form = new DifferentialAddCommentView();
       $comment_form->setRevision($revision);
 
       $review_warnings = array();
       foreach ($field_list->getFields() as $field) {
         $review_warnings[] = $field->getWarningsForDetailView();
       }
       $review_warnings = array_mergev($review_warnings);
 
       if ($review_warnings) {
         $review_warnings_panel = id(new AphrontErrorView())
           ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
           ->setErrors($review_warnings);
         $comment_form->setErrorView($review_warnings_panel);
       }
 
       $comment_form->setActions($this->getRevisionCommentActions($revision));
       $action_uri = $this->getApplicationURI(
         'comment/save/'.$revision->getID().'/');
 
       $comment_form->setActionURI($action_uri);
       $comment_form->setUser($user);
       $comment_form->setDraft($draft);
       $comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
       $comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));
 
       // TODO: This just makes the "Z" key work. Generalize this and remove
       // it at some point.
       $comment_form = phutil_tag(
         'div',
         array(
           'class' => 'differential-add-comment-panel',
         ),
         $comment_form);
     }
 
     $pane_id = celerity_generate_unique_node_id();
     Javelin::initBehavior(
       'differential-keyboard-navigation',
       array(
         'haunt' => $pane_id,
       ));
     Javelin::initBehavior('differential-user-select');
 
     $page_pane = id(new DifferentialPrimaryPaneView())
       ->setID($pane_id)
       ->appendChild(array(
         $comment_view,
         $diff_history,
         $warning,
         $local_view,
         $toc_view,
         $other_view,
         $changeset_view,
       ));
     if ($comment_form) {
 
       $page_pane->appendChild($comment_form);
     } else {
       // TODO: For now, just use this to get "Login to Comment".
       $page_pane->appendChild(
         id(new PhabricatorApplicationTransactionCommentView())
           ->setUser($user)
           ->setRequestURI($request->getRequestURI()));
     }
 
 
     $object_id = 'D'.$revision->getID();
 
     $top_anchor = id(new PhabricatorAnchorView())
       ->setAnchorName('top')
       ->setNavigationMarker(true);
 
     $content = array(
       $top_anchor,
       $revision_detail_box,
       $page_pane,
     );
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($object_id, '/'.$object_id);
     $crumbs->setActionList($revision_detail->getActionList());
 
     $prefs = $user->loadPreferences();
 
     $pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
     if ($prefs->getPreference($pref_filetree)) {
       $collapsed = $prefs->getPreference(
         PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED,
         false);
 
       $nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
         ->setAnchorName('top')
         ->setTitle('D'.$revision->getID())
         ->setBaseURI(new PhutilURI('/D'.$revision->getID()))
         ->setCollapsed((bool)$collapsed)
         ->build($changesets);
       $nav->appendChild($content);
       $nav->setCrumbs($crumbs);
       $content = $nav;
     } else {
       array_unshift($content, $crumbs);
     }
 
     return $this->buildApplicationPage(
       $content,
       array(
         'title' => $object_id.' '.$revision->getTitle(),
         'pageObjects' => array($revision->getPHID()),
         'device' => true,
       ));
   }
 
   private function getRevisionActions(DifferentialRevision $revision) {
     $viewer = $this->getRequest()->getUser();
     $revision_id = $revision->getID();
     $revision_phid = $revision->getPHID();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $revision,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $actions = array();
 
     $actions[] = id(new PhabricatorActionView())
       ->setIcon('fa-pencil')
       ->setHref("/differential/revision/edit/{$revision_id}/")
       ->setName(pht('Edit Revision'))
       ->setDisabled(!$can_edit)
       ->setWorkflow(!$can_edit);
 
     $this->requireResource('phabricator-object-selector-css');
     $this->requireResource('javelin-behavior-phabricator-object-selector');
 
     $actions[] = id(new PhabricatorActionView())
       ->setIcon('fa-link')
       ->setName(pht('Edit Dependencies'))
       ->setHref("/search/attach/{$revision_phid}/DREV/dependencies/")
       ->setWorkflow(true)
       ->setDisabled(!$can_edit);
 
     $maniphest = 'PhabricatorApplicationManiphest';
     if (PhabricatorApplication::isClassInstalled($maniphest)) {
       $actions[] = id(new PhabricatorActionView())
         ->setIcon('fa-anchor')
         ->setName(pht('Edit Maniphest Tasks'))
         ->setHref("/search/attach/{$revision_phid}/TASK/")
         ->setWorkflow(true)
         ->setDisabled(!$can_edit);
     }
 
     $request_uri = $this->getRequest()->getRequestURI();
     $actions[] = id(new PhabricatorActionView())
       ->setIcon('fa-download')
       ->setName(pht('Download Raw Diff'))
       ->setHref($request_uri->alter('download', 'true'));
 
     return $actions;
   }
 
   private function getRevisionCommentActions(DifferentialRevision $revision) {
 
     $actions = array(
       DifferentialAction::ACTION_COMMENT => true,
     );
 
     $viewer = $this->getRequest()->getUser();
     $viewer_phid = $viewer->getPHID();
     $viewer_is_owner = ($viewer_phid == $revision->getAuthorPHID());
     $viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
     $status = $revision->getStatus();
 
     $viewer_has_accepted = false;
     $viewer_has_rejected = false;
     $status_accepted = DifferentialReviewerStatus::STATUS_ACCEPTED;
     $status_rejected = DifferentialReviewerStatus::STATUS_REJECTED;
     foreach ($revision->getReviewerStatus() as $reviewer) {
       if ($reviewer->getReviewerPHID() == $viewer_phid) {
         if ($reviewer->getStatus() == $status_accepted) {
           $viewer_has_accepted = true;
         }
         if ($reviewer->getStatus() == $status_rejected) {
           $viewer_has_rejected = true;
         }
         break;
       }
     }
 
     $allow_self_accept = PhabricatorEnv::getEnvConfig(
       'differential.allow-self-accept');
     $always_allow_abandon = PhabricatorEnv::getEnvConfig(
       'differential.always-allow-abandon');
     $always_allow_close = PhabricatorEnv::getEnvConfig(
       'differential.always-allow-close');
     $allow_reopen = PhabricatorEnv::getEnvConfig(
       'differential.allow-reopen');
 
     if ($viewer_is_owner) {
       switch ($status) {
         case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
           $actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
           $actions[DifferentialAction::ACTION_ABANDON] = true;
           $actions[DifferentialAction::ACTION_RETHINK] = true;
           break;
         case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
         case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
           $actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
           $actions[DifferentialAction::ACTION_ABANDON] = true;
           $actions[DifferentialAction::ACTION_REQUEST] = true;
           break;
         case ArcanistDifferentialRevisionStatus::ACCEPTED:
           $actions[DifferentialAction::ACTION_ABANDON] = true;
           $actions[DifferentialAction::ACTION_REQUEST] = true;
           $actions[DifferentialAction::ACTION_RETHINK] = true;
           $actions[DifferentialAction::ACTION_CLOSE] = true;
           break;
         case ArcanistDifferentialRevisionStatus::CLOSED:
           break;
         case ArcanistDifferentialRevisionStatus::ABANDONED:
           $actions[DifferentialAction::ACTION_RECLAIM] = true;
           break;
       }
     } else {
       switch ($status) {
         case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
           $actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
           $actions[DifferentialAction::ACTION_ACCEPT] = true;
           $actions[DifferentialAction::ACTION_REJECT] = true;
           $actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
           break;
         case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
         case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
           $actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
           $actions[DifferentialAction::ACTION_ACCEPT] = true;
           $actions[DifferentialAction::ACTION_REJECT] = !$viewer_has_rejected;
           $actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
           break;
         case ArcanistDifferentialRevisionStatus::ACCEPTED:
           $actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
           $actions[DifferentialAction::ACTION_ACCEPT] = !$viewer_has_accepted;
           $actions[DifferentialAction::ACTION_REJECT] = true;
           $actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
           break;
         case ArcanistDifferentialRevisionStatus::CLOSED:
         case ArcanistDifferentialRevisionStatus::ABANDONED:
           break;
       }
       if ($status != ArcanistDifferentialRevisionStatus::CLOSED) {
         $actions[DifferentialAction::ACTION_CLAIM] = true;
         $actions[DifferentialAction::ACTION_CLOSE] = $always_allow_close;
       }
     }
 
     $actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;
     $actions[DifferentialAction::ACTION_ADDCCS] = true;
     $actions[DifferentialAction::ACTION_REOPEN] = $allow_reopen &&
       ($status == ArcanistDifferentialRevisionStatus::CLOSED);
 
     $actions = array_keys(array_filter($actions));
     $actions_dict = array();
     foreach ($actions as $action) {
       $actions_dict[$action] = DifferentialAction::getActionVerb($action);
     }
 
     return $actions_dict;
   }
 
   private function loadInlineComments(
     DifferentialRevision $revision,
     array &$changesets) {
     assert_instances_of($changesets, 'DifferentialChangeset');
 
     $inline_comments = array();
 
     $inline_comments = id(new DifferentialInlineCommentQuery())
       ->withRevisionIDs(array($revision->getID()))
       ->withNotDraft(true)
       ->execute();
 
     $load_changesets = array();
     foreach ($inline_comments as $inline) {
       $changeset_id = $inline->getChangesetID();
       if (isset($changesets[$changeset_id])) {
         continue;
       }
       $load_changesets[$changeset_id] = true;
     }
 
     $more_changesets = array();
     if ($load_changesets) {
       $changeset_ids = array_keys($load_changesets);
       $more_changesets += id(new DifferentialChangeset())
         ->loadAllWhere(
           'id IN (%Ld)',
           $changeset_ids);
     }
 
     if ($more_changesets) {
       $changesets += $more_changesets;
       $changesets = msort($changesets, 'getSortKey');
     }
 
     return $inline_comments;
   }
 
   private function loadChangesetsAndVsMap(
     DifferentialDiff $target,
     DifferentialDiff $diff_vs = null,
     PhabricatorRepository $repository = null) {
 
     $load_ids = array();
     if ($diff_vs) {
       $load_ids[] = $diff_vs->getID();
     }
     $load_ids[] = $target->getID();
 
     $raw_changesets = id(new DifferentialChangeset())
       ->loadAllWhere(
         'diffID IN (%Ld)',
         $load_ids);
     $changeset_groups = mgroup($raw_changesets, 'getDiffID');
 
     $changesets = idx($changeset_groups, $target->getID(), array());
     $changesets = mpull($changesets, null, 'getID');
 
     $refs          = array();
     $vs_map        = array();
     $vs_changesets = array();
     if ($diff_vs) {
       $vs_id                  = $diff_vs->getID();
       $vs_changesets_path_map = array();
       foreach (idx($changeset_groups, $vs_id, array()) as $changeset) {
         $path = $changeset->getAbsoluteRepositoryPath($repository, $diff_vs);
         $vs_changesets_path_map[$path] = $changeset;
         $vs_changesets[$changeset->getID()] = $changeset;
       }
       foreach ($changesets as $key => $changeset) {
         $path = $changeset->getAbsoluteRepositoryPath($repository, $target);
         if (isset($vs_changesets_path_map[$path])) {
           $vs_map[$changeset->getID()] =
             $vs_changesets_path_map[$path]->getID();
           $refs[$changeset->getID()] =
             $changeset->getID().'/'.$vs_changesets_path_map[$path]->getID();
           unset($vs_changesets_path_map[$path]);
         } else {
           $refs[$changeset->getID()] = $changeset->getID();
         }
       }
       foreach ($vs_changesets_path_map as $path => $changeset) {
         $changesets[$changeset->getID()] = $changeset;
         $vs_map[$changeset->getID()]     = -1;
         $refs[$changeset->getID()]       = $changeset->getID().'/-1';
       }
     } else {
       foreach ($changesets as $changeset) {
         $refs[$changeset->getID()] = $changeset->getID();
       }
     }
 
     $changesets = msort($changesets, 'getSortKey');
 
     return array($changesets, $vs_map, $vs_changesets, $refs);
   }
 
   private function buildSymbolIndexes(
     PhabricatorRepositoryArcanistProject $arc_project,
     array $visible_changesets) {
     assert_instances_of($visible_changesets, 'DifferentialChangeset');
 
     $engine = PhabricatorSyntaxHighlighter::newEngine();
 
     $langs = $arc_project->getSymbolIndexLanguages();
     if (!$langs) {
       return array(array(), array());
     }
 
     $symbol_indexes = array();
 
     $project_phids = array_merge(
       array($arc_project->getPHID()),
       nonempty($arc_project->getSymbolIndexProjects(), array()));
 
     $indexed_langs = array_fill_keys($langs, true);
     foreach ($visible_changesets as $key => $changeset) {
       $lang = $engine->getLanguageFromFilename($changeset->getFilename());
       if (isset($indexed_langs[$lang])) {
         $symbol_indexes[$key] = array(
           'lang'      => $lang,
           'projects'  => $project_phids,
         );
       }
     }
 
     return array($symbol_indexes, $project_phids);
   }
 
   private function loadOtherRevisions(
     array $changesets,
     DifferentialDiff $target,
     PhabricatorRepository $repository) {
     assert_instances_of($changesets, 'DifferentialChangeset');
 
     $paths = array();
     foreach ($changesets as $changeset) {
       $paths[] = $changeset->getAbsoluteRepositoryPath(
         $repository,
         $target);
     }
 
     if (!$paths) {
       return array();
     }
 
     $path_map = id(new DiffusionPathIDQuery($paths))->loadPathIDs();
 
     if (!$path_map) {
       return array();
     }
 
     $query = id(new DifferentialRevisionQuery())
       ->setViewer($this->getRequest()->getUser())
       ->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
       ->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
       ->setLimit(10)
       ->needFlags(true)
       ->needDrafts(true)
       ->needRelationships(true);
 
     foreach ($path_map as $path => $path_id) {
       $query->withPath($repository->getID(), $path_id);
     }
 
     $results = $query->execute();
 
     // Strip out *this* revision.
     foreach ($results as $key => $result) {
       if ($result->getID() == $this->revisionID) {
         unset($results[$key]);
       }
     }
 
     return $results;
   }
 
   private function renderOtherRevisions(array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
 
     $user = $this->getRequest()->getUser();
 
     $view = id(new DifferentialRevisionListView())
       ->setRevisions($revisions)
       ->setUser($user);
 
     $phids = $view->getRequiredHandlePHIDs();
     $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     return id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Open Revisions Affecting These Files'))
       ->appendChild($view);
   }
 
 
   /**
    * Note this code is somewhat similar to the buildPatch method in
    * @{class:DifferentialReviewRequestMail}.
    *
    * @return @{class:AphrontRedirectResponse}
    */
   private function buildRawDiffResponse(
     DifferentialRevision $revision,
     array $changesets,
     array $vs_changesets,
     array $vs_map,
     PhabricatorRepository $repository = null) {
 
     assert_instances_of($changesets,    'DifferentialChangeset');
     assert_instances_of($vs_changesets, 'DifferentialChangeset');
 
     $viewer = $this->getRequest()->getUser();
 
     id(new DifferentialHunkQuery())
       ->setViewer($viewer)
       ->withChangesets($changesets)
       ->needAttachToChangesets(true)
       ->execute();
 
     $diff = new DifferentialDiff();
     $diff->attachChangesets($changesets);
     $raw_changes = $diff->buildChangesList();
     $changes = array();
     foreach ($raw_changes as $changedict) {
       $changes[] = ArcanistDiffChange::newFromDictionary($changedict);
     }
 
     $loader = id(new PhabricatorFileBundleLoader())
       ->setViewer($viewer);
 
     $bundle = ArcanistBundle::newFromChanges($changes);
     $bundle->setLoadFileDataCallback(array($loader, 'loadFileData'));
 
     $vcs = $repository ? $repository->getVersionControlSystem() : null;
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $raw_diff = $bundle->toGitPatch();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
       default:
         $raw_diff = $bundle->toUnifiedDiff();
         break;
     }
 
     $request_uri = $this->getRequest()->getRequestURI();
 
     // this ends up being something like
     //   D123.diff
     // or the verbose
     //   D123.vs123.id123.whitespaceignore-all.diff
     // lame but nice to include these options
     $file_name = ltrim($request_uri->getPath(), '/').'.';
     foreach ($request_uri->getQueryParams() as $key => $value) {
       if ($key == 'download') {
         continue;
       }
       $file_name .= $key.$value.'.';
     }
     $file_name .= 'diff';
 
     $file = PhabricatorFile::buildFromFileDataOrHash(
       $raw_diff,
       array(
         'name' => $file_name,
         'ttl' => (60 * 60 * 24),
         'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
       ));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $file->attachToObject(
         $this->getRequest()->getUser(),
         $revision->getPHID());
     unset($unguarded);
 
     return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
 
   }
 
   private function buildTransactions(
     DifferentialRevision $revision,
     DifferentialDiff $left_diff,
     DifferentialDiff $right_diff,
     array $changesets) {
     $viewer = $this->getRequest()->getUser();
 
     $xactions = id(new DifferentialTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($revision->getPHID()))
       ->needComments(true)
       ->execute();
 
     $timeline = id(new DifferentialTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($revision->getPHID())
       ->setChangesets($changesets)
       ->setRevision($revision)
       ->setLeftDiff($left_diff)
       ->setRightDiff($right_diff)
       ->setTransactions($xactions);
 
     return $timeline;
   }
 
   private function buildRevisionWarnings(
     DifferentialRevision $revision,
     array $handles) {
 
     $status_needs_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
     if ($revision->getStatus() != $status_needs_review) {
       return;
     }
 
     foreach ($revision->getReviewers() as $reviewer) {
       if (!$handles[$reviewer]->isDisabled()) {
         return;
       }
     }
 
     $warnings = array();
     if ($revision->getReviewers()) {
       $warnings[] = pht(
         'This revision needs review, but all specified reviewers are '.
         'disabled or inactive.');
     } else {
       $warnings[] = pht(
         'This revision needs review, but there are no reviewers specified.');
     }
 
     return id(new AphrontErrorView())
       ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
       ->setErrors($warnings);
   }
 
 }
diff --git a/src/applications/differential/customfield/DifferentialJIRAIssuesField.php b/src/applications/differential/customfield/DifferentialJIRAIssuesField.php
index 5a0e62164..d179952bd 100644
--- a/src/applications/differential/customfield/DifferentialJIRAIssuesField.php
+++ b/src/applications/differential/customfield/DifferentialJIRAIssuesField.php
@@ -1,310 +1,310 @@
 <?php
 
 final class DifferentialJIRAIssuesField
   extends DifferentialStoredCustomField {
 
   private $error;
 
   public function getFieldKey() {
     return 'phabricator:jira-issues';
   }
 
   public function getFieldKeyForConduit() {
     return 'jira.issues';
   }
 
   public function isFieldEnabled() {
     return (bool)PhabricatorAuthProviderOAuth1JIRA::getJIRAProvider();
   }
 
   public function canDisableField() {
     return false;
   }
 
   public function getValueForStorage() {
     return json_encode($this->getValue());
   }
 
   public function setValueFromStorage($value) {
     $this->setValue(phutil_json_decode($value));
     return $this;
   }
 
   public function getFieldName() {
     return pht('JIRA Issues');
   }
 
   public function getFieldDescription() {
     return pht('Lists associated JIRA issues.');
   }
 
   public function shouldAppearInPropertyView() {
     return true;
   }
 
   public function renderPropertyViewLabel() {
     return $this->getFieldName();
   }
 
   public function renderPropertyViewValue(array $handles) {
     $xobjs = $this->loadDoorkeeperExternalObjects($this->getValue());
     if (!$xobjs) {
       return null;
     }
 
     $links = array();
     foreach ($xobjs as $xobj) {
       $links[] = id(new DoorkeeperTagView())
         ->setExternalObject($xobj);
     }
 
     return phutil_implode_html(phutil_tag('br'), $links);
   }
 
   private function buildDoorkeeperRefs($value) {
     $provider = PhabricatorAuthProviderOAuth1JIRA::getJIRAProvider();
 
     $refs = array();
     if ($value) {
       foreach ($value as $jira_key) {
         $refs[] = id(new DoorkeeperObjectRef())
           ->setApplicationType(DoorkeeperBridgeJIRA::APPTYPE_JIRA)
           ->setApplicationDomain($provider->getProviderDomain())
           ->setObjectType(DoorkeeperBridgeJIRA::OBJTYPE_ISSUE)
           ->setObjectID($jira_key);
       }
     }
 
     return $refs;
   }
 
   private function loadDoorkeeperExternalObjects($value) {
     $refs = $this->buildDoorkeeperRefs($value);
     if (!$refs) {
       return array();
     }
 
     $xobjs = id(new DoorkeeperExternalObjectQuery())
       ->setViewer($this->getViewer())
       ->withObjectKeys(mpull($refs, 'getObjectKey'))
       ->execute();
 
     return $xobjs;
   }
 
   public function shouldAppearInEditView() {
     return PhabricatorAuthProviderOAuth1JIRA::getJIRAProvider();
   }
 
   public function shouldAppearInApplicationTransactions() {
     return PhabricatorAuthProviderOAuth1JIRA::getJIRAProvider();
   }
 
   public function readValueFromRequest(AphrontRequest $request) {
     $this->setValue($request->getStrList($this->getFieldKey()));
     return $this;
   }
 
   public function renderEditControl(array $handles) {
     return id(new AphrontFormTextControl())
       ->setLabel(pht('JIRA Issues'))
       ->setCaption(
         pht('Example: %s', phutil_tag('tt', array(), 'JIS-3, JIS-9')))
       ->setName($this->getFieldKey())
       ->setValue(implode(', ', nonempty($this->getValue(), array())))
       ->setError($this->error);
   }
 
   public function getOldValueForApplicationTransactions() {
     return array_unique(nonempty($this->getValue(), array()));
   }
 
   public function getNewValueForApplicationTransactions() {
     return array_unique(nonempty($this->getValue(), array()));
   }
 
   public function validateApplicationTransactions(
     PhabricatorApplicationTransactionEditor $editor,
     $type,
     array $xactions) {
 
     $this->error = null;
 
     $errors = parent::validateApplicationTransactions(
       $editor,
       $type,
       $xactions);
 
     $transaction = null;
     foreach ($xactions as $xaction) {
       $old = $xaction->getOldValue();
       $new = $xaction->getNewValue();
 
       $add = array_diff($new, $old);
       if (!$add) {
         continue;
       }
 
       // Only check that the actor can see newly added JIRA refs. You're
       // allowed to remove refs or make no-op changes even if you aren't
       // linked to JIRA.
 
       try {
         $refs = id(new DoorkeeperImportEngine())
           ->setViewer($this->getViewer())
           ->setRefs($this->buildDoorkeeperRefs($add))
           ->setThrowOnMissingLink(true)
           ->execute();
       } catch (DoorkeeperMissingLinkException $ex) {
         $this->error = pht('Not Linked');
         $errors[] = new PhabricatorApplicationTransactionValidationError(
           $type,
           pht('Not Linked'),
           pht(
             'You can not add JIRA issues (%s) to this revision because your '.
             'Phabricator account is not linked to a JIRA account.',
             implode(', ', $add)),
           $xaction);
         continue;
       }
 
       $bad = array();
       foreach ($refs as $ref) {
         if (!$ref->getIsVisible()) {
           $bad[] = $ref->getObjectID();
         }
       }
 
       if ($bad) {
         $bad = implode(', ', $bad);
         $this->error = pht('Invalid');
 
         $errors[] = new PhabricatorApplicationTransactionValidationError(
           $type,
           pht('Invalid'),
           pht(
-            "Some JIRA issues could not be loaded. They may not exist, or ".
-            "you may not have permission to view them: %s",
+            'Some JIRA issues could not be loaded. They may not exist, or '.
+            'you may not have permission to view them: %s',
             $bad),
           $xaction);
       }
     }
 
     return $errors;
   }
 
   public function getApplicationTransactionTitle(
     PhabricatorApplicationTransaction $xaction) {
 
     $old = $xaction->getOldValue();
     if (!is_array($old)) {
       $old = array();
     }
 
     $new = $xaction->getNewValue();
     if (!is_array($new)) {
       $new = array();
     }
 
     $add = array_diff($new, $old);
     $rem = array_diff($old, $new);
 
     $author_phid = $xaction->getAuthorPHID();
     if ($add && $rem) {
       return pht(
         '%s updated JIRA issue(s): added %d %s; removed %d %s.',
         $xaction->renderHandleLink($author_phid),
         new PhutilNumber(count($add)),
         implode(', ', $add),
         new PhutilNumber(count($rem)),
         implode(', ', $rem));
     } else if ($add) {
       return pht(
         '%s added %d JIRA issue(s): %s.',
         $xaction->renderHandleLink($author_phid),
         new PhutilNumber(count($add)),
         implode(', ', $add));
     } else if ($rem) {
       return pht(
         '%s removed %d JIRA issue(s): %s.',
         $xaction->renderHandleLink($author_phid),
         new PhutilNumber(count($rem)),
         implode(', ', $rem));
     }
 
     return parent::getApplicationTransactionTitle($xaction);
   }
 
   public function applyApplicationTransactionExternalEffects(
     PhabricatorApplicationTransaction $xaction) {
 
     // Update the CustomField storage.
     parent::applyApplicationTransactionExternalEffects($xaction);
 
     // Now, synchronize the Doorkeeper edges.
     $revision = $this->getObject();
     $revision_phid = $revision->getPHID();
 
     $edge_type = PhabricatorEdgeConfig::TYPE_PHOB_HAS_JIRAISSUE;
     $xobjs = $this->loadDoorkeeperExternalObjects($xaction->getNewValue());
     $edge_dsts = mpull($xobjs, 'getPHID');
 
     $edges = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $revision_phid,
       $edge_type);
 
     $editor = id(new PhabricatorEdgeEditor())
       ->setActor($this->getViewer());
 
     foreach (array_diff($edges, $edge_dsts) as $rem_edge) {
       $editor->removeEdge($revision_phid, $edge_type, $rem_edge);
     }
 
     foreach (array_diff($edge_dsts, $edges) as $add_edge) {
       $editor->addEdge($revision_phid, $edge_type, $add_edge);
     }
 
     $editor->save();
   }
 
   public function shouldAppearInCommitMessage() {
     return true;
   }
 
   public function shouldAppearInCommitMessageTemplate() {
     return true;
   }
 
   public function getCommitMessageLabels() {
     return array(
       'JIRA',
       'JIRA Issues',
       'JIRA Issue',
     );
   }
 
   public function parseValueFromCommitMessage($value) {
     return preg_split('/[\s,]+/', $value, $limit = -1, PREG_SPLIT_NO_EMPTY);
   }
 
   public function readValueFromCommitMessage($value) {
     $this->setValue($value);
     return $this;
   }
 
 
 
   public function renderCommitMessageValue(array $handles) {
     $value = $this->getValue();
     if (!$value) {
       return null;
     }
     return implode(', ', $value);
   }
 
   public function shouldAppearInConduitDictionary() {
     return true;
   }
 
 
 }
diff --git a/src/applications/differential/customfield/DifferentialLintField.php b/src/applications/differential/customfield/DifferentialLintField.php
index b72608971..0d5272b2f 100644
--- a/src/applications/differential/customfield/DifferentialLintField.php
+++ b/src/applications/differential/customfield/DifferentialLintField.php
@@ -1,257 +1,257 @@
 <?php
 
 final class DifferentialLintField
   extends DifferentialCustomField {
 
   public function getFieldKey() {
     return 'differential:lint';
   }
 
   public function getFieldName() {
     return pht('Lint');
   }
 
   public function getFieldDescription() {
     return pht('Shows lint results.');
   }
 
   public function shouldAppearInPropertyView() {
     return true;
   }
 
   public function renderPropertyViewLabel() {
     return $this->getFieldName();
   }
 
   public function getRequiredDiffPropertiesForRevisionView() {
     return array(
       'arc:lint',
       'arc:lint-excuse',
       'arc:lint-postponed',
     );
   }
 
   public function renderPropertyViewValue(array $handles) {
     $diff = $this->getObject()->getActiveDiff();
 
     $path_changesets = mpull($diff->loadChangesets(), 'getID', 'getFilename');
 
     $lstar = DifferentialRevisionUpdateHistoryView::renderDiffLintStar($diff);
     $lmsg = DifferentialRevisionUpdateHistoryView::getDiffLintMessage($diff);
     $ldata = $diff->getProperty('arc:lint');
     $ltail = null;
 
     $rows = array();
 
     $rows[] = array(
       'style'     => 'star',
       'name'      => $lstar,
       'value'     => $lmsg,
       'show'      => true,
     );
 
     $excuse = $diff->getProperty('arc:lint-excuse');
     if ($excuse) {
       $rows[] = array(
         'style'   => 'excuse',
         'name'    => 'Excuse',
         'value'   => phutil_escape_html_newlines($excuse),
         'show'    => true,
       );
     }
 
     $show_limit = 10;
     $hidden = array();
 
     if ($ldata) {
       $ldata = igroup($ldata, 'path');
       foreach ($ldata as $path => $messages) {
 
         $rows[] = array(
           'style' => 'section',
           'name'  => $path,
           'show'  => $show_limit,
         );
 
         foreach ($messages as $message) {
           $path = idx($message, 'path');
           $line = idx($message, 'line');
 
           $code = idx($message, 'code');
           $severity = idx($message, 'severity');
 
           $name = idx($message, 'name');
           $description = idx($message, 'description');
 
           $line_link = 'line '.intval($line);
           if (isset($path_changesets[$path])) {
             $href = '#C'.$path_changesets[$path].'NL'.max(1, $line);
 
             // TODO: We are always showing the active diff
             // if ($diff->getID() != $this->getDiff()->getID()) {
             //  $href = '/D'.$diff->getRevisionID().'?id='.$diff->getID().$href;
             // }
 
             $line_link = phutil_tag(
               'a',
               array(
                 'href' => $href,
               ),
               $line_link);
           }
 
           if ($show_limit) {
             --$show_limit;
             $show = true;
           } else {
             $show = false;
             if (empty($hidden[$severity])) {
               $hidden[$severity] = 0;
             }
             $hidden[$severity]++;
           }
 
           $rows[] = array(
             'style' => $this->getSeverityStyle($severity),
             'name'  => ucwords($severity),
             'value' => hsprintf(
               '(%s) %s at %s',
               $code,
               $name,
               $line_link),
             'show'  => $show,
           );
 
           if (!empty($message['locations'])) {
             $locations = array();
             foreach ($message['locations'] as $location) {
               $other_line = idx($location, 'line');
               $locations[] =
                 idx($location, 'path', $path).
-                ($other_line ? ":{$other_line}" : "");
+                ($other_line ? ":{$other_line}" : '');
             }
-            $description .= "\nOther locations: ".implode(", ", $locations);
+            $description .= "\nOther locations: ".implode(', ', $locations);
           }
 
           if (strlen($description)) {
             $rows[] = array(
               'style' => 'details',
               'value' => phutil_escape_html_newlines($description),
               'show'  => false,
             );
             if (empty($hidden['details'])) {
               $hidden['details'] = 0;
             }
             $hidden['details']++;
           }
         }
       }
     }
 
     $postponed = $diff->getProperty('arc:lint-postponed');
     if ($postponed) {
       foreach ($postponed as $linter) {
         $rows[] = array(
           'style' => $this->getPostponedStyle(),
           'name' => 'Postponed',
           'value' => $linter,
           'show'  => false,
           );
         if (empty($hidden['postponed'])) {
           $hidden['postponed'] = 0;
         }
         $hidden['postponed']++;
       }
     }
 
     $show_string = $this->renderShowString($hidden);
 
     $view = new DifferentialResultsTableView();
     $view->setRows($rows);
     $view->setShowMoreString($show_string);
 
     return $view->render();
   }
 
   private function getSeverityStyle($severity) {
     $map = array(
       ArcanistLintSeverity::SEVERITY_ERROR      => 'red',
       ArcanistLintSeverity::SEVERITY_WARNING    => 'yellow',
       ArcanistLintSeverity::SEVERITY_AUTOFIX    => 'yellow',
       ArcanistLintSeverity::SEVERITY_ADVICE     => 'yellow',
     );
     return idx($map, $severity);
   }
 
   private function getPostponedStyle() {
     return 'blue';
   }
 
   private function renderShowString(array $hidden) {
     if (!$hidden) {
       return null;
     }
 
     // Reorder hidden things by severity.
     $hidden = array_select_keys(
       $hidden,
       array(
         ArcanistLintSeverity::SEVERITY_ERROR,
         ArcanistLintSeverity::SEVERITY_WARNING,
         ArcanistLintSeverity::SEVERITY_AUTOFIX,
         ArcanistLintSeverity::SEVERITY_ADVICE,
         'details',
         'postponed',
       )) + $hidden;
 
     $show = array();
     foreach ($hidden as $key => $value) {
       switch ($key) {
         case ArcanistLintSeverity::SEVERITY_ERROR:
           $show[] = pht('%d Error(s)', $value);
           break;
         case ArcanistLintSeverity::SEVERITY_WARNING:
           $show[] = pht('%d Warning(s)', $value);
           break;
         case ArcanistLintSeverity::SEVERITY_AUTOFIX:
           $show[] = pht('%d Auto-Fix(es)', $value);
           break;
         case ArcanistLintSeverity::SEVERITY_ADVICE:
           $show[] = pht('%d Advice(s)', $value);
           break;
         case 'details':
           $show[] = pht('%d Detail(s)', $value);
           break;
         case 'postponed':
           $show[] = pht('%d Postponed', $value);
           break;
         default:
           $show[] = $value;
           break;
       }
     }
 
-    return "Show Full Lint Results (".implode(', ', $show).")";
+    return 'Show Full Lint Results ('.implode(', ', $show).')';
   }
 
   public function getWarningsForDetailView() {
     $status = $this->getObject()->getActiveDiff()->getLintStatus();
     if ($status < DifferentialLintStatus::LINT_WARN) {
       return array();
     }
 
     $warnings = array();
     if ($status == DifferentialLintStatus::LINT_SKIP) {
       $warnings[] = pht(
         'Lint was skipped when generating these changes.');
     } else if ($status == DifferentialLintStatus::LINT_POSTPONED) {
       $warnings[] = pht(
         'Background linting has not finished executing on these changes.');
     } else {
       $warnings[] = pht('These changes have lint problems.');
     }
 
     return $warnings;
   }
 
 }
diff --git a/src/applications/differential/customfield/DifferentialTitleField.php b/src/applications/differential/customfield/DifferentialTitleField.php
index 77cddae75..facd0e80c 100644
--- a/src/applications/differential/customfield/DifferentialTitleField.php
+++ b/src/applications/differential/customfield/DifferentialTitleField.php
@@ -1,126 +1,126 @@
 <?php
 
 final class DifferentialTitleField
   extends DifferentialCoreCustomField {
 
   public function getFieldKey() {
     return 'differential:title';
   }
 
   public function getFieldKeyForConduit() {
     return 'title';
   }
 
   public function getFieldName() {
     return pht('Title');
   }
 
   public function getFieldDescription() {
     return pht('Stores the revision title.');
   }
 
   public static function getDefaultTitle() {
     return pht('<<Replace this line with your Revision Title>>');
   }
 
   protected function readValueFromRevision(
     DifferentialRevision $revision) {
     return $revision->getTitle();
   }
 
   protected function writeValueToRevision(
     DifferentialRevision $revision,
     $value) {
     $revision->setTitle($value);
   }
 
   protected function getCoreFieldRequiredErrorString() {
     return pht('You must choose a title for this revision.');
   }
 
   public function readValueFromRequest(AphrontRequest $request) {
     $this->setValue($request->getStr($this->getFieldKey()));
   }
 
   protected function isCoreFieldRequired() {
     return true;
   }
 
   public function renderEditControl(array $handles) {
     return id(new AphrontFormTextAreaControl())
       ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
       ->setName($this->getFieldKey())
       ->setValue($this->getValue())
       ->setError($this->getFieldError())
       ->setLabel($this->getFieldName());
   }
 
   public function getApplicationTransactionTitle(
     PhabricatorApplicationTransaction $xaction) {
     $author_phid = $xaction->getAuthorPHID();
     $old = $xaction->getOldValue();
     $new = $xaction->getNewValue();
 
     if (strlen($old)) {
       return pht(
         '%s retitled this revision from "%s" to "%s".',
         $xaction->renderHandleLink($author_phid),
         $old,
         $new);
     } else {
       return pht(
         '%s created this revision.',
         $xaction->renderHandleLink($author_phid));
     }
   }
 
   public function getApplicationTransactionTitleForFeed(
     PhabricatorApplicationTransaction $xaction,
     PhabricatorFeedStory $story) {
 
     $object_phid = $xaction->getObjectPHID();
     $author_phid = $xaction->getAuthorPHID();
     $old = $xaction->getOldValue();
     $new = $xaction->getNewValue();
 
     if (strlen($old)) {
       return pht(
         '%s retitled %s, from "%s" to "%s".',
         $xaction->renderHandleLink($author_phid),
         $xaction->renderHandleLink($object_phid),
         $old,
         $new);
     } else {
       return pht(
         '%s created %s.',
         $xaction->renderHandleLink($author_phid),
         $xaction->renderHandleLink($object_phid));
     }
   }
 
   public function shouldAppearInCommitMessage() {
     return true;
   }
 
   public function shouldOverwriteWhenCommitMessageIsEdited() {
     return true;
   }
 
   public function validateCommitMessageValue($value) {
     if (!strlen($value)) {
       throw new DifferentialFieldValidationException(
         pht(
-          "You must provide a revision title in the first line ".
-          "of your commit message."));
+          'You must provide a revision title in the first line '.
+          'of your commit message.'));
     }
 
     if (preg_match('/^<<.*>>$/', $value)) {
       throw new DifferentialFieldValidationException(
         pht(
           'Replace the line "%s" with a human-readable revision title which '.
           'describes the changes you are making.',
           self::getDefaultTitle()));
     }
   }
 
 }
diff --git a/src/applications/differential/customfield/DifferentialUnitField.php b/src/applications/differential/customfield/DifferentialUnitField.php
index fb813f707..de7605689 100644
--- a/src/applications/differential/customfield/DifferentialUnitField.php
+++ b/src/applications/differential/customfield/DifferentialUnitField.php
@@ -1,226 +1,226 @@
 <?php
 
 final class DifferentialUnitField
   extends DifferentialCustomField {
 
   public function getFieldKey() {
     return 'differential:unit';
   }
 
   public function getFieldName() {
     return pht('Unit');
   }
 
   public function getFieldDescription() {
     return pht('Shows unit test results.');
   }
 
   public function shouldAppearInPropertyView() {
     return true;
   }
 
   public function renderPropertyViewLabel() {
     return $this->getFieldName();
   }
 
   public function getRequiredDiffPropertiesForRevisionView() {
     return array(
       'arc:unit',
       'arc:unit-excuse',
     );
   }
 
   public function renderPropertyViewValue(array $handles) {
     $diff = $this->getObject()->getActiveDiff();
 
     $ustar = DifferentialRevisionUpdateHistoryView::renderDiffUnitStar($diff);
     $umsg = DifferentialRevisionUpdateHistoryView::getDiffUnitMessage($diff);
 
     $rows = array();
 
     $rows[] = array(
       'style' => 'star',
       'name'  => $ustar,
       'value' => $umsg,
       'show'  => true,
     );
 
     $excuse = $diff->getProperty('arc:unit-excuse');
     if ($excuse) {
       $rows[] = array(
         'style' => 'excuse',
         'name'  => 'Excuse',
         'value' => phutil_escape_html_newlines($excuse),
         'show'  => true,
       );
     }
 
     $show_limit = 10;
     $hidden = array();
 
     $udata = $diff->getProperty('arc:unit');
     if ($udata) {
       $sort_map = array(
         ArcanistUnitTestResult::RESULT_BROKEN     => 0,
         ArcanistUnitTestResult::RESULT_FAIL       => 1,
         ArcanistUnitTestResult::RESULT_UNSOUND    => 2,
         ArcanistUnitTestResult::RESULT_SKIP       => 3,
         ArcanistUnitTestResult::RESULT_POSTPONED  => 4,
         ArcanistUnitTestResult::RESULT_PASS       => 5,
       );
 
       foreach ($udata as $key => $test) {
         $udata[$key]['sort'] = idx($sort_map, idx($test, 'result'));
       }
       $udata = isort($udata, 'sort');
       $engine = new PhabricatorMarkupEngine();
       $engine->setViewer($this->getViewer());
       $markup_objects = array();
       foreach ($udata as $key => $test) {
         $userdata = idx($test, 'userdata');
         if ($userdata) {
           if ($userdata !== false) {
             $userdata = str_replace("\000", '', $userdata);
           }
           $markup_object = id(new PhabricatorMarkupOneOff())
               ->setContent($userdata)
               ->setPreserveLinebreaks(true);
           $engine->addObject($markup_object, 'default');
           $markup_objects[$key] = $markup_object;
         }
       }
       $engine->process();
       foreach ($udata as $key => $test) {
         $result = idx($test, 'result');
 
         $default_hide = false;
         switch ($result) {
           case ArcanistUnitTestResult::RESULT_POSTPONED:
           case ArcanistUnitTestResult::RESULT_PASS:
             $default_hide = true;
             break;
         }
 
         if ($show_limit && !$default_hide) {
           --$show_limit;
           $show = true;
         } else {
           $show = false;
           if (empty($hidden[$result])) {
             $hidden[$result] = 0;
           }
           $hidden[$result]++;
         }
 
         $value = idx($test, 'name');
         if (!empty($test['link'])) {
           $value = phutil_tag(
             'a',
             array(
               'href' => $test['link'],
               'target' => '_blank',
             ),
             $value);
         }
         $rows[] = array(
           'style' => $this->getResultStyle($result),
           'name'  => ucwords($result),
           'value' => $value,
           'show'  => $show,
         );
 
         if (isset($markup_objects[$key])) {
           $rows[] = array(
             'style' => 'details',
             'value' => $engine->getOutput($markup_objects[$key], 'default'),
             'show'  => false,
           );
           if (empty($hidden['details'])) {
             $hidden['details'] = 0;
           }
           $hidden['details']++;
         }
       }
     }
 
     $show_string = $this->renderShowString($hidden);
 
     $view = new DifferentialResultsTableView();
     $view->setRows($rows);
     $view->setShowMoreString($show_string);
 
     return $view->render();
   }
 
   private function getResultStyle($result) {
     $map = array(
       ArcanistUnitTestResult::RESULT_PASS       => 'green',
       ArcanistUnitTestResult::RESULT_FAIL       => 'red',
       ArcanistUnitTestResult::RESULT_SKIP       => 'blue',
       ArcanistUnitTestResult::RESULT_BROKEN     => 'red',
       ArcanistUnitTestResult::RESULT_UNSOUND    => 'yellow',
       ArcanistUnitTestResult::RESULT_POSTPONED  => 'blue',
     );
     return idx($map, $result);
   }
 
   private function renderShowString(array $hidden) {
     if (!$hidden) {
       return null;
     }
 
     // Reorder hidden things by severity.
     $hidden = array_select_keys(
       $hidden,
       array(
         ArcanistUnitTestResult::RESULT_BROKEN,
         ArcanistUnitTestResult::RESULT_FAIL,
         ArcanistUnitTestResult::RESULT_UNSOUND,
         ArcanistUnitTestResult::RESULT_SKIP,
         ArcanistUnitTestResult::RESULT_POSTPONED,
         ArcanistUnitTestResult::RESULT_PASS,
         'details',
       )) + $hidden;
 
     $noun = array(
       ArcanistUnitTestResult::RESULT_BROKEN     => 'Broken',
       ArcanistUnitTestResult::RESULT_FAIL       => 'Failed',
       ArcanistUnitTestResult::RESULT_UNSOUND    => 'Unsound',
       ArcanistUnitTestResult::RESULT_SKIP       => 'Skipped',
       ArcanistUnitTestResult::RESULT_POSTPONED  => 'Postponed',
       ArcanistUnitTestResult::RESULT_PASS       => 'Passed',
     );
 
     $show = array();
     foreach ($hidden as $key => $value) {
       if ($key == 'details') {
         $show[] = pht('%d Detail(s)', $value);
       } else {
         $show[] = $value.' '.idx($noun, $key);
       }
     }
 
-    return "Show Full Unit Results (".implode(', ', $show).")";
+    return 'Show Full Unit Results ('.implode(', ', $show).')';
   }
 
   public function getWarningsForDetailView() {
     $status = $this->getObject()->getActiveDiff()->getUnitStatus();
 
     $warnings = array();
     if ($status < DifferentialUnitStatus::UNIT_WARN) {
       // Don't show any warnings.
     } else if ($status == DifferentialUnitStatus::UNIT_POSTPONED) {
       $warnings[] = pht(
         'Background tests have not finished executing on these changes.');
     } else if ($status == DifferentialUnitStatus::UNIT_SKIP) {
       $warnings[] = pht(
         'Unit tests were skipped when generating these changes.');
     } else {
       $warnings[] = pht('These changes have unit test problems.');
     }
 
     return $warnings;
   }
 
 
 }
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9e06fb1da..87e73ab08 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1,1707 +1,1707 @@
 <?php
 
 final class DifferentialTransactionEditor
   extends PhabricatorApplicationTransactionEditor {
 
   private $heraldEmailPHIDs;
   private $changedPriorToCommitURI;
   private $isCloseByCommit;
 
   public function getDiffUpdateTransaction(array $xactions) {
     $type_update = DifferentialTransaction::TYPE_UPDATE;
 
     foreach ($xactions as $xaction) {
       if ($xaction->getTransactionType() == $type_update) {
         return $xaction;
       }
     }
 
     return null;
   }
 
   public function setIsCloseByCommit($is_close_by_commit) {
     $this->isCloseByCommit = $is_close_by_commit;
     return $this;
   }
 
   public function getIsCloseByCommit() {
     return $this->isCloseByCommit;
   }
 
   public function setChangedPriorToCommitURI($uri) {
     $this->changedPriorToCommitURI = $uri;
     return $this;
   }
 
   public function getChangedPriorToCommitURI() {
     return $this->changedPriorToCommitURI;
   }
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
     $types[] = PhabricatorTransactions::TYPE_EDGE;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     $types[] = DifferentialTransaction::TYPE_ACTION;
     $types[] = DifferentialTransaction::TYPE_INLINE;
     $types[] = DifferentialTransaction::TYPE_STATUS;
     $types[] = DifferentialTransaction::TYPE_UPDATE;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         return $object->getViewPolicy();
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         return $object->getEditPolicy();
       case DifferentialTransaction::TYPE_ACTION:
         return null;
       case DifferentialTransaction::TYPE_INLINE:
         return null;
       case DifferentialTransaction::TYPE_UPDATE:
         if ($this->getIsNewObject()) {
           return null;
         } else {
           return $object->getActiveDiff()->getPHID();
         }
     }
 
     return parent::getCustomTransactionOldValue($object, $xaction);
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case DifferentialTransaction::TYPE_ACTION:
       case DifferentialTransaction::TYPE_UPDATE:
         return $xaction->getNewValue();
       case DifferentialTransaction::TYPE_INLINE:
         return null;
     }
 
     return parent::getCustomTransactionNewValue($object, $xaction);
   }
 
   protected function transactionHasEffect(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case DifferentialTransaction::TYPE_INLINE:
         return $xaction->hasComment();
       case DifferentialTransaction::TYPE_ACTION:
         $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
         $status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
         $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
         $status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
         $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
 
         $action_type = $xaction->getNewValue();
         switch ($action_type) {
           case DifferentialAction::ACTION_ACCEPT:
           case DifferentialAction::ACTION_REJECT:
             if ($action_type == DifferentialAction::ACTION_ACCEPT) {
               $new_status = DifferentialReviewerStatus::STATUS_ACCEPTED;
             } else {
               $new_status = DifferentialReviewerStatus::STATUS_REJECTED;
             }
 
             $actor = $this->getActor();
             $actor_phid = $actor->getPHID();
 
             // These transactions can cause effects in two ways: by altering the
             // status of an existing reviewer; or by adding the actor as a new
             // reviewer.
 
             $will_add_reviewer = true;
             foreach ($object->getReviewerStatus() as $reviewer) {
               if ($reviewer->hasAuthority($actor)) {
                 if ($reviewer->getStatus() != $new_status) {
                   return true;
                 }
               }
               if ($reviewer->getReviewerPHID() == $actor_phid) {
                 $will_add_reviwer = false;
               }
             }
 
             return $will_add_reviewer;
           case DifferentialAction::ACTION_CLOSE:
             return ($object->getStatus() != $status_closed);
           case DifferentialAction::ACTION_ABANDON:
             return ($object->getStatus() != $status_abandoned);
           case DifferentialAction::ACTION_RECLAIM:
             return ($object->getStatus() == $status_abandoned);
           case DifferentialAction::ACTION_REOPEN:
             return ($object->getStatus() == $status_closed);
           case DifferentialAction::ACTION_RETHINK:
             return ($object->getStatus() != $status_plan);
           case DifferentialAction::ACTION_REQUEST:
             return ($object->getStatus() != $status_review);
           case DifferentialAction::ACTION_RESIGN:
             $actor_phid = $this->getActor()->getPHID();
             foreach ($object->getReviewerStatus() as $reviewer) {
               if ($reviewer->getReviewerPHID() == $actor_phid) {
                 return true;
               }
             }
             return false;
           case DifferentialAction::ACTION_CLAIM:
             $actor_phid = $this->getActor()->getPHID();
             return ($actor_phid != $object->getAuthorPHID());
         }
     }
 
     return parent::transactionHasEffect($object, $xaction);
   }
 
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
     $status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
     $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         $object->setViewPolicy($xaction->getNewValue());
         return;
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         $object->setEditPolicy($xaction->getNewValue());
         return;
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
       case PhabricatorTransactions::TYPE_COMMENT:
       case DifferentialTransaction::TYPE_INLINE:
         return;
       case PhabricatorTransactions::TYPE_EDGE:
         return;
       case DifferentialTransaction::TYPE_UPDATE:
         if (!$this->getIsCloseByCommit() &&
             (($object->getStatus() == $status_revision) ||
              ($object->getStatus() == $status_plan))) {
           $object->setStatus($status_review);
         }
 
         $diff = $this->requireDiff($xaction->getNewValue());
 
         $object->setLineCount($diff->getLineCount());
         $object->setRepositoryPHID($diff->getRepositoryPHID());
         $object->setArcanistProjectPHID($diff->getArcanistProjectPHID());
         $object->attachActiveDiff($diff);
 
         // TODO: Update the `diffPHID` once we add that.
         return;
       case DifferentialTransaction::TYPE_ACTION:
         switch ($xaction->getNewValue()) {
           case DifferentialAction::ACTION_RESIGN:
           case DifferentialAction::ACTION_ACCEPT:
           case DifferentialAction::ACTION_REJECT:
             // These have no direct effects, and affect review status only
             // indirectly by altering reviewers with TYPE_EDGE transactions.
             return;
           case DifferentialAction::ACTION_ABANDON:
             $object->setStatus(ArcanistDifferentialRevisionStatus::ABANDONED);
             return;
           case DifferentialAction::ACTION_RETHINK:
             $object->setStatus($status_plan);
             return;
           case DifferentialAction::ACTION_RECLAIM:
             $object->setStatus($status_review);
             return;
           case DifferentialAction::ACTION_REOPEN:
             $object->setStatus($status_review);
             return;
           case DifferentialAction::ACTION_REQUEST:
             $object->setStatus($status_review);
             return;
           case DifferentialAction::ACTION_CLOSE:
             $object->setStatus(ArcanistDifferentialRevisionStatus::CLOSED);
             return;
           case DifferentialAction::ACTION_CLAIM:
             $object->setAuthorPHID($this->getActor()->getPHID());
             return;
         }
         break;
     }
 
     return parent::applyCustomInternalTransaction($object, $xaction);
   }
 
   protected function expandTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $results = parent::expandTransaction($object, $xaction);
 
     $actor = $this->getActor();
     $actor_phid = $actor->getPHID();
     $type_edge = PhabricatorTransactions::TYPE_EDGE;
 
     $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
 
     $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
     $edge_ref_task = PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK;
 
     $is_sticky_accept = PhabricatorEnv::getEnvConfig(
       'differential.sticky-accept');
 
     $downgrade_rejects = false;
     $downgrade_accepts = false;
     if ($this->getIsCloseByCommit()) {
       // Never downgrade reviewers when we're closing a revision after a
       // commit.
     } else {
       switch ($xaction->getTransactionType()) {
         case DifferentialTransaction::TYPE_UPDATE:
           $downgrade_rejects = true;
           if (!$is_sticky_accept) {
             // If "sticky accept" is disabled, also downgrade the accepts.
             $downgrade_accepts = true;
           }
           break;
         case DifferentialTransaction::TYPE_ACTION:
           switch ($xaction->getNewValue()) {
             case DifferentialAction::ACTION_REQUEST:
               $downgrade_rejects = true;
               if ((!$is_sticky_accept) ||
                   ($object->getStatus() != $status_plan)) {
                 // If the old state isn't "changes planned", downgrade the
                 // accepts. This exception allows an accepted revision to
                 // go through Plan Changes -> Request Review to return to
                 // "accepted" if the author didn't update the revision.
                 $downgrade_accepts = true;
               }
               break;
           }
           break;
       }
     }
 
     $new_accept = DifferentialReviewerStatus::STATUS_ACCEPTED;
     $new_reject = DifferentialReviewerStatus::STATUS_REJECTED;
     $old_accept = DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER;
     $old_reject = DifferentialReviewerStatus::STATUS_REJECTED_OLDER;
 
     if ($downgrade_rejects || $downgrade_accepts) {
       // When a revision is updated, change all "reject" to "rejected older
       // revision". This means we won't immediately push the update back into
       // "needs review", but outstanding rejects will still block it from
       // moving to "accepted".
 
       // We also do this for "Request Review", even though the diff is not
       // updated directly. Essentially, this acts like an update which doesn't
       // actually change the diff text.
 
       $edits = array();
       foreach ($object->getReviewerStatus() as $reviewer) {
         if ($downgrade_rejects) {
           if ($reviewer->getStatus() == $new_reject) {
             $edits[$reviewer->getReviewerPHID()] = array(
               'data' => array(
                 'status' => $old_reject,
               ),
             );
           }
         }
 
         if ($downgrade_accepts) {
           if ($reviewer->getStatus() == $new_accept) {
             $edits[$reviewer->getReviewerPHID()] = array(
               'data' => array(
                 'status' => $old_accept,
               ),
             );
           }
         }
       }
 
       if ($edits) {
         $results[] = id(new DifferentialTransaction())
           ->setTransactionType($type_edge)
           ->setMetadataValue('edge:type', $edge_reviewer)
           ->setIgnoreOnNoEffect(true)
           ->setNewValue(array('+' => $edits));
       }
     }
 
     switch ($xaction->getTransactionType()) {
       case DifferentialTransaction::TYPE_UPDATE:
         if ($this->getIsCloseByCommit()) {
           // Don't bother with any of this if this update is a side effect of
           // commit detection.
           break;
         }
 
         // When a revision is updated and the diff comes from a branch named
         // "T123" or similar, automatically associate the commit with the
         // task that the branch names.
 
         $maniphest = 'PhabricatorApplicationManiphest';
         if (PhabricatorApplication::isClassInstalled($maniphest)) {
           $diff = $this->requireDiff($xaction->getNewValue());
           $branch = $diff->getBranch();
 
           // No "$", to allow for branches like T123_demo.
           $match = null;
           if (preg_match('/^T(\d+)/i', $branch, $match)) {
             $task_id = $match[1];
             $tasks = id(new ManiphestTaskQuery())
               ->setViewer($this->getActor())
               ->withIDs(array($task_id))
               ->execute();
             if ($tasks) {
               $task = head($tasks);
               $task_phid = $task->getPHID();
 
               $results[] = id(new DifferentialTransaction())
                 ->setTransactionType($type_edge)
                 ->setMetadataValue('edge:type', $edge_ref_task)
                 ->setIgnoreOnNoEffect(true)
                 ->setNewValue(array('+' => array($task_phid => $task_phid)));
             }
           }
         }
         break;
 
       case PhabricatorTransactions::TYPE_COMMENT:
         // When a user leaves a comment, upgrade their reviewer status from
         // "added" to "commented" if they're also a reviewer. We may further
         // upgrade this based on other actions in the transaction group.
 
         $status_added = DifferentialReviewerStatus::STATUS_ADDED;
         $status_commented = DifferentialReviewerStatus::STATUS_COMMENTED;
 
         $data = array(
           'status' => $status_commented,
         );
 
         $edits = array();
         foreach ($object->getReviewerStatus() as $reviewer) {
           if ($reviewer->getReviewerPHID() == $actor_phid) {
             if ($reviewer->getStatus() == $status_added) {
               $edits[$actor_phid] = array(
                 'data' => $data,
               );
             }
           }
         }
 
         if ($edits) {
           $results[] = id(new DifferentialTransaction())
             ->setTransactionType($type_edge)
             ->setMetadataValue('edge:type', $edge_reviewer)
             ->setIgnoreOnNoEffect(true)
             ->setNewValue(array('+' => $edits));
         }
         break;
 
       case DifferentialTransaction::TYPE_ACTION:
         $action_type = $xaction->getNewValue();
 
         switch ($action_type) {
           case DifferentialAction::ACTION_ACCEPT:
           case DifferentialAction::ACTION_REJECT:
             if ($action_type == DifferentialAction::ACTION_ACCEPT) {
               $data = array(
                 'status' => DifferentialReviewerStatus::STATUS_ACCEPTED,
               );
             } else {
               $data = array(
                 'status' => DifferentialReviewerStatus::STATUS_REJECTED,
               );
             }
 
             $edits = array();
 
             foreach ($object->getReviewerStatus() as $reviewer) {
               if ($reviewer->hasAuthority($actor)) {
                 $edits[$reviewer->getReviewerPHID()] = array(
                   'data' => $data,
                 );
               }
             }
 
             // Also either update or add the actor themselves as a reviewer.
             $edits[$actor_phid] = array(
               'data' => $data,
             );
 
             $results[] = id(new DifferentialTransaction())
               ->setTransactionType($type_edge)
               ->setMetadataValue('edge:type', $edge_reviewer)
               ->setIgnoreOnNoEffect(true)
               ->setNewValue(array('+' => $edits));
             break;
 
           case DifferentialAction::ACTION_CLAIM:
             // If the user is commandeering, add the previous owner as a
             // reviewer and remove the actor.
 
             $edits = array(
               '-' => array(
                 $actor_phid => $actor_phid,
               ),
             );
 
             $owner_phid = $object->getAuthorPHID();
             if ($owner_phid) {
               $reviewer = new DifferentialReviewer(
                 $owner_phid,
                 array(
                   'status' => DifferentialReviewerStatus::STATUS_ADDED,
                 ));
 
               $edits['+'] = array(
                 $owner_phid => array(
                   'data' => $reviewer->getEdgeData(),
                 ),
               );
             }
 
             // NOTE: We're setting setIsCommandeerSideEffect() on this because
             // normally you can't add a revision's author as a reviewer, but
             // this action swaps them after validation executes.
 
             $results[] = id(new DifferentialTransaction())
               ->setTransactionType($type_edge)
               ->setMetadataValue('edge:type', $edge_reviewer)
               ->setIgnoreOnNoEffect(true)
               ->setIsCommandeerSideEffect(true)
               ->setNewValue($edits);
 
             break;
           case DifferentialAction::ACTION_RESIGN:
             // If the user is resigning, add a separate reviewer edit
             // transaction which removes them as a reviewer.
 
             $results[] = id(new DifferentialTransaction())
               ->setTransactionType($type_edge)
               ->setMetadataValue('edge:type', $edge_reviewer)
               ->setIgnoreOnNoEffect(true)
               ->setNewValue(
                 array(
                   '-' => array(
                     $actor_phid => $actor_phid,
                   ),
                 ));
 
             break;
         }
       break;
     }
 
     return $results;
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         return;
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
       case PhabricatorTransactions::TYPE_EDGE:
       case PhabricatorTransactions::TYPE_COMMENT:
       case DifferentialTransaction::TYPE_ACTION:
       case DifferentialTransaction::TYPE_INLINE:
         return;
       case DifferentialTransaction::TYPE_UPDATE:
         // Now that we're inside the transaction, do a final check.
         $diff = $this->requireDiff($xaction->getNewValue());
 
         // TODO: It would be slightly cleaner to just revalidate this
         // transaction somehow using the same validation code, but that's
         // not easy to do at the moment.
 
         $revision_id = $diff->getRevisionID();
         if ($revision_id && ($revision_id != $object->getID())) {
           throw new Exception(
             pht(
               'Diff is already attached to another revision. You lost '.
               'a race?'));
         }
 
         $diff->setRevisionID($object->getID());
         $diff->save();
         return;
     }
 
     return parent::applyCustomExternalTransaction($object, $xaction);
   }
 
   protected function mergeEdgeData($type, array $u, array $v) {
     $result = parent::mergeEdgeData($type, $u, $v);
 
     switch ($type) {
       case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER:
         // When the same reviewer has their status updated by multiple
         // transactions, we want the strongest status to win. An example of
         // this is when a user adds a comment and also accepts a revision which
         // they are a reviewer on. The comment creates a "commented" status,
         // while the accept creates an "accepted" status. Since accept is
         // stronger, it should win and persist.
 
         $u_status = idx($u, 'status');
         $v_status = idx($v, 'status');
         $u_str = DifferentialReviewerStatus::getStatusStrength($u_status);
         $v_str = DifferentialReviewerStatus::getStatusStrength($v_status);
         if ($u_str > $v_str) {
           $result['status'] = $u_status;
         } else {
           $result['status'] = $v_status;
         }
         break;
     }
 
     return $result;
   }
 
 
 
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     // Load the most up-to-date version of the revision and its reviewers,
     // so we don't need to try to deduce the state of reviewers by examining
     // all the changes made by the transactions. Then, update the reviewers
     // on the object to make sure we're acting on the current reviewer set
     // (and, for example, sending mail to the right people).
 
     $new_revision = id(new DifferentialRevisionQuery())
       ->setViewer($this->getActor())
       ->needReviewerStatus(true)
       ->needActiveDiffs(true)
       ->withIDs(array($object->getID()))
       ->executeOne();
     if (!$new_revision) {
       throw new Exception(
         pht('Failed to load revision from transaction finalization.'));
     }
 
     $object->attachReviewerStatus($new_revision->getReviewerStatus());
     $object->attachActiveDiff($new_revision->getActiveDiff());
     $object->attachRepository($new_revision->getRepository());
 
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case DifferentialTransaction::TYPE_UPDATE:
           $diff = $this->requireDiff($xaction->getNewValue(), true);
 
           // Update these denormalized index tables when we attach a new
           // diff to a revision.
 
           $this->updateRevisionHashTable($object, $diff);
           $this->updateAffectedPathTable($object, $diff);
           break;
       }
     }
 
     $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
     $status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
     $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
 
     $old_status = $object->getStatus();
     switch ($old_status) {
       case $status_accepted:
       case $status_revision:
       case $status_review:
         // Try to move a revision to "accepted". We look for:
         //
         //   - at least one accepting reviewer who is a user; and
         //   - no rejects; and
         //   - no rejects of older diffs; and
         //   - no blocking reviewers.
 
         $has_accepting_user = false;
         $has_rejecting_reviewer = false;
         $has_rejecting_older_reviewer = false;
         $has_blocking_reviewer = false;
         foreach ($object->getReviewerStatus() as $reviewer) {
           $reviewer_status = $reviewer->getStatus();
           switch ($reviewer_status) {
             case DifferentialReviewerStatus::STATUS_REJECTED:
               $has_rejecting_reviewer = true;
               break;
             case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
               $has_rejecting_older_reviewer = true;
               break;
             case DifferentialReviewerStatus::STATUS_BLOCKING:
               $has_blocking_reviewer = true;
               break;
             case DifferentialReviewerStatus::STATUS_ACCEPTED:
               if ($reviewer->isUser()) {
                 $has_accepting_user = true;
               }
               break;
           }
         }
 
         $new_status = null;
         if ($has_accepting_user &&
             !$has_rejecting_reviewer &&
             !$has_rejecting_older_reviewer &&
             !$has_blocking_reviewer) {
           $new_status = $status_accepted;
         } else if ($has_rejecting_reviewer) {
           // This isn't accepted, and there's at least one rejecting reviewer,
           // so the revision needs changes. This usually happens after a
           // "reject".
           $new_status = $status_revision;
         } else if ($old_status == $status_accepted) {
           // This revision was accepted, but it no longer satisfies the
           // conditions for acceptance. This usually happens after an accepting
           // reviewer resigns or is removed.
           $new_status = $status_review;
         }
 
         if ($new_status !== null && ($new_status != $old_status)) {
           $xaction = id(new DifferentialTransaction())
             ->setTransactionType(DifferentialTransaction::TYPE_STATUS)
             ->setOldValue($old_status)
             ->setNewValue($new_status);
 
           $xaction = $this->populateTransaction($object, $xaction)->save();
 
           $xactions[] = $xaction;
 
           $object->setStatus($new_status)->save();
         }
         break;
       default:
         // Revisions can't transition out of other statuses (like closed or
         // abandoned) as a side effect of reviewer status changes.
         break;
     }
 
     return $xactions;
   }
 
 
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
     $type,
     array $xactions) {
 
     $errors = parent::validateTransaction($object, $type, $xactions);
 
     $config_self_accept_key = 'differential.allow-self-accept';
     $allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);
 
     foreach ($xactions as $xaction) {
       switch ($type) {
         case PhabricatorTransactions::TYPE_EDGE:
           switch ($xaction->getMetadataValue('edge:type')) {
             case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER:
 
               // Prevent the author from becoming a reviewer.
 
               // NOTE: This is pretty gross, but this restriction is unusual.
               // If we end up with too much more of this, we should try to clean
               // this up -- maybe by moving validation to after transactions
               // are adjusted (so we can just examine the final value) or adding
               // a second phase there?
 
               $author_phid = $object->getAuthorPHID();
               $new = $xaction->getNewValue();
 
               $add = idx($new, '+', array());
               $eq = idx($new, '=', array());
               $phids = array_keys($add + $eq);
 
               foreach ($phids as $phid) {
                 if (($phid == $author_phid) &&
                     !$allow_self_accept &&
                     !$xaction->getIsCommandeerSideEffect()) {
                   $errors[] =
                     new PhabricatorApplicationTransactionValidationError(
                       $type,
                       pht('Invalid'),
                       pht('The author of a revision can not be a reviewer.'),
                       $xaction);
                 }
               }
               break;
           }
           break;
         case DifferentialTransaction::TYPE_UPDATE:
           $diff = $this->loadDiff($xaction->getNewValue());
           if (!$diff) {
             $errors[] = new PhabricatorApplicationTransactionValidationError(
               $type,
               pht('Invalid'),
               pht('The specified diff does not exist.'),
               $xaction);
           } else if (($diff->getRevisionID()) &&
             ($diff->getRevisionID() != $object->getID())) {
             $errors[] = new PhabricatorApplicationTransactionValidationError(
               $type,
               pht('Invalid'),
               pht(
                 'You can not update this revision to the specified diff, '.
                 'because the diff is already attached to another revision.'),
               $xaction);
           }
           break;
         case DifferentialTransaction::TYPE_ACTION:
           $error = $this->validateDifferentialAction(
             $object,
             $type,
             $xaction,
             $xaction->getNewValue());
           if ($error) {
             $errors[] = new PhabricatorApplicationTransactionValidationError(
               $type,
               pht('Invalid'),
               $error,
               $xaction);
           }
           break;
       }
     }
 
     return $errors;
   }
 
   private function validateDifferentialAction(
     DifferentialRevision $revision,
     $type,
     DifferentialTransaction $xaction,
     $action) {
 
     $author_phid = $revision->getAuthorPHID();
     $actor_phid = $this->getActor()->getPHID();
     $actor_is_author = ($author_phid == $actor_phid);
 
     $config_abandon_key = 'differential.always-allow-abandon';
     $always_allow_abandon = PhabricatorEnv::getEnvConfig($config_abandon_key);
 
     $config_close_key = 'differential.always-allow-close';
     $always_allow_close = PhabricatorEnv::getEnvConfig($config_close_key);
 
     $config_reopen_key = 'differential.allow-reopen';
     $allow_reopen = PhabricatorEnv::getEnvConfig($config_reopen_key);
 
     $config_self_accept_key = 'differential.allow-self-accept';
     $allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);
 
     $revision_status = $revision->getStatus();
 
     $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
     $status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
     $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
 
     switch ($action) {
       case DifferentialAction::ACTION_ACCEPT:
         if ($actor_is_author && !$allow_self_accept) {
           return pht(
             'You can not accept this revision because you are the owner.');
         }
 
         if ($revision_status == $status_abandoned) {
           return pht(
             'You can not accept this revision because it has been '.
             'abandoned.');
         }
 
         if ($revision_status == $status_closed) {
           return pht(
             'You can not accept this revision because it has already been '.
             'closed.');
         }
         break;
 
       case DifferentialAction::ACTION_REJECT:
         if ($actor_is_author) {
           return pht(
             'You can not request changes to your own revision.');
         }
 
         if ($revision_status == $status_abandoned) {
           return pht(
             'You can not request changes to this revision because it has been '.
             'abandoned.');
         }
 
         if ($revision_status == $status_closed) {
           return pht(
             'You can not request changes to this revision because it has '.
             'already been closed.');
         }
         break;
 
       case DifferentialAction::ACTION_RESIGN:
         // You can always resign from a revision if you're a reviewer. If you
         // aren't, this is a no-op rather than invalid.
         break;
 
       case DifferentialAction::ACTION_CLAIM:
         // You can claim a revision if you're not the owner. If you are, this
         // is a no-op rather than invalid.
 
         if ($revision_status == $status_closed) {
           return pht(
-            "You can not commandeer this revision because it has already been ".
-            "closed.");
+            'You can not commandeer this revision because it has already been '.
+            'closed.');
         }
         break;
 
       case DifferentialAction::ACTION_ABANDON:
         if (!$actor_is_author && !$always_allow_abandon) {
           return pht(
-            "You can not abandon this revision because you do not own it. ".
-            "You can only abandon revisions you own.");
+            'You can not abandon this revision because you do not own it. '.
+            'You can only abandon revisions you own.');
         }
 
         if ($revision_status == $status_closed) {
           return pht(
-            "You can not abandon this revision because it has already been ".
-            "closed.");
+            'You can not abandon this revision because it has already been '.
+            'closed.');
         }
 
         // NOTE: Abandons of already-abandoned revisions are treated as no-op
         // instead of invalid. Other abandons are OK.
 
         break;
 
       case DifferentialAction::ACTION_RECLAIM:
         if (!$actor_is_author) {
           return pht(
-            "You can not reclaim this revision because you do not own ".
-            "it. You can only reclaim revisions you own.");
+            'You can not reclaim this revision because you do not own '.
+            'it. You can only reclaim revisions you own.');
         }
 
         if ($revision_status == $status_closed) {
           return pht(
-            "You can not reclaim this revision because it has already been ".
-            "closed.");
+            'You can not reclaim this revision because it has already been '.
+            'closed.');
         }
 
         // NOTE: Reclaims of other non-abandoned revisions are treated as no-op
         // instead of invalid.
 
         break;
 
       case DifferentialAction::ACTION_REOPEN:
         if (!$allow_reopen) {
           return pht(
             'The reopen action is not enabled on this Phabricator install. '.
             'Adjust your configuration to enable it.');
         }
 
         // NOTE: If the revision is not closed, this is caught as a no-op
         // instead of an invalid transaction.
 
         break;
 
       case DifferentialAction::ACTION_RETHINK:
         if (!$actor_is_author) {
           return pht(
-            "You can not plan changes to this revision because you do not ".
-            "own it. To plan changes to a revision, you must be its owner.");
+            'You can not plan changes to this revision because you do not '.
+            'own it. To plan changes to a revision, you must be its owner.');
         }
 
         switch ($revision_status) {
           case ArcanistDifferentialRevisionStatus::ACCEPTED:
           case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
           case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
             // These are OK.
             break;
           case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
             // Let this through, it's a no-op.
             break;
           case ArcanistDifferentialRevisionStatus::ABANDONED:
             return pht(
-              "You can not plan changes to this revision because it has ".
-              "been abandoned.");
+              'You can not plan changes to this revision because it has '.
+              'been abandoned.');
           case ArcanistDifferentialRevisionStatus::CLOSED:
             return pht(
-              "You can not plan changes to this revision because it has ".
-              "already been closed.");
+              'You can not plan changes to this revision because it has '.
+              'already been closed.');
           default:
             throw new Exception(
               pht(
                 'Encountered unexpected revision status ("%s") when '.
                 'validating "%s" action.',
                 $revision_status,
                 $action));
         }
         break;
 
       case DifferentialAction::ACTION_REQUEST:
         if (!$actor_is_author) {
           return pht(
-            "You can not request review of this revision because you do ".
-            "not own it. To request review of a revision, you must be its ".
-            "owner.");
+            'You can not request review of this revision because you do '.
+            'not own it. To request review of a revision, you must be its '.
+            'owner.');
         }
 
         switch ($revision_status) {
           case ArcanistDifferentialRevisionStatus::ACCEPTED:
           case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
           case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
             // These are OK.
             break;
           case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
             // This will be caught as "no effect" later on.
             break;
           case ArcanistDifferentialRevisionStatus::ABANDONED:
             return pht(
-              "You can not request review of this revision because it has ".
-              "been abandoned. Instead, reclaim it.");
+              'You can not request review of this revision because it has '.
+              'been abandoned. Instead, reclaim it.');
           case ArcanistDifferentialRevisionStatus::CLOSED:
             return pht(
-              "You can not request review of this revision because it has ".
-              "already been closed.");
+              'You can not request review of this revision because it has '.
+              'already been closed.');
           default:
             throw new Exception(
               pht(
                 'Encountered unexpected revision status ("%s") when '.
                 'validating "%s" action.',
                 $revision_status,
                 $action));
         }
         break;
 
       case DifferentialAction::ACTION_CLOSE:
         // We force revisions closed when we discover a corresponding commit.
         // In this case, revisions are allowed to transition to closed from
         // any state. This is an automated action taken by the daemons.
 
         if (!$this->getIsCloseByCommit()) {
           if (!$actor_is_author && !$always_allow_close) {
             return pht(
-              "You can not close this revision because you do not own it. To ".
-              "close a revision, you must be its owner.");
+              'You can not close this revision because you do not own it. To '.
+              'close a revision, you must be its owner.');
           }
 
           if ($revision_status != $status_accepted) {
             return pht(
-              "You can not close this revision because it has not been ".
-              "accepted. You can only close accepted revisions.");
+              'You can not close this revision because it has not been '.
+              'accepted. You can only close accepted revisions.');
           }
         }
         break;
     }
 
     return null;
   }
 
   protected function sortTransactions(array $xactions) {
     $xactions = parent::sortTransactions($xactions);
 
     $head = array();
     $tail = array();
 
     foreach ($xactions as $xaction) {
       $type = $xaction->getTransactionType();
       if ($type == DifferentialTransaction::TYPE_INLINE) {
         $tail[] = $xaction;
       } else {
         $head[] = $xaction;
       }
     }
 
     return array_values(array_merge($head, $tail));
   }
 
   protected function requireCapabilities(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
     }
 
     return parent::requireCapabilities($object, $xaction);
   }
 
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     $phids = array();
     $phids[] = $object->getAuthorPHID();
     foreach ($object->getReviewerStatus() as $reviewer) {
       $phids[] = $reviewer->getReviewerPHID();
     }
     return $phids;
   }
 
   protected function getMailCC(PhabricatorLiskDAO $object) {
     $phids = parent::getMailCC($object);
 
     if ($this->heraldEmailPHIDs) {
       foreach ($this->heraldEmailPHIDs as $phid) {
         $phids[] = $phid;
       }
     }
 
     return $phids;
   }
 
   protected function getMailAction(
     PhabricatorLiskDAO $object,
     array $xactions) {
     $action = parent::getMailAction($object, $xactions);
 
     $strongest = $this->getStrongestAction($object, $xactions);
     switch ($strongest->getTransactionType()) {
       case DifferentialTransaction::TYPE_UPDATE:
         $count = new PhutilNumber($object->getLineCount());
         $action = pht('%s, %s line(s)', $action, $count);
         break;
     }
 
     return $action;
   }
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.differential.subject-prefix');
   }
 
   protected function getMailThreadID(PhabricatorLiskDAO $object) {
     // This is nonstandard, but retains threading with older messages.
     $phid = $object->getPHID();
     return "differential-rev-{$phid}-req";
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new DifferentialReplyHandler())
       ->setMailReceiver($object);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $title = $object->getTitle();
 
     $original_title = $object->getOriginalTitle();
 
     $subject = "D{$id}: {$title}";
     $thread_topic = "D{$id}: {$original_title}";
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject($subject)
       ->addHeader('Thread-Topic', $thread_topic);
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
 
     $type_inline = DifferentialTransaction::TYPE_INLINE;
 
     $inlines = array();
     foreach ($xactions as $xaction) {
       if ($xaction->getTransactionType() == $type_inline) {
         $inlines[] = $xaction;
       }
     }
 
     $changed_uri = $this->getChangedPriorToCommitURI();
     if ($changed_uri) {
       $body->addTextSection(
         pht('CHANGED PRIOR TO COMMIT'),
         $changed_uri);
     }
 
     if ($inlines) {
       $body->addTextSection(
         pht('INLINE COMMENTS'),
         $this->renderInlineCommentsForMail($object, $inlines));
     }
 
     $body->addTextSection(
       pht('REVISION DETAIL'),
       PhabricatorEnv::getProductionURI('/D'.$object->getID()));
 
     $update_xaction = null;
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case DifferentialTransaction::TYPE_UPDATE:
           $update_xaction = $xaction;
           break;
       }
     }
 
     if ($update_xaction) {
       $diff = $this->requireDiff($update_xaction->getNewValue(), true);
 
       $body->addTextSection(
         pht('AFFECTED FILES'),
         $this->renderAffectedFilesForMail($diff));
 
       $config_key_inline = 'metamta.differential.inline-patches';
       $config_inline = PhabricatorEnv::getEnvConfig($config_key_inline);
 
       $config_key_attach = 'metamta.differential.attach-patches';
       $config_attach = PhabricatorEnv::getEnvConfig($config_key_attach);
 
       if ($config_inline || $config_attach) {
         $patch = $this->renderPatchForMail($diff);
         $lines = count(phutil_split_lines($patch));
 
         if ($config_inline && ($lines <= $config_inline)) {
           $body->addTextSection(
             pht('CHANGE DETAILS'),
             $patch);
         }
 
         if ($config_attach) {
           $name = pht('D%s.%s.patch', $object->getID(), $diff->getID());
           $mime_type = 'text/x-patch; charset=utf-8';
           $body->addAttachment(
             new PhabricatorMetaMTAAttachment($patch, $name, $mime_type));
         }
       }
     }
 
     return $body;
   }
 
   protected function supportsSearch() {
     return true;
   }
 
   protected function extractFilePHIDsFromCustomTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
     }
 
     return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
   }
 
   protected function expandCustomRemarkupBlockTransactions(
     PhabricatorLiskDAO $object,
     array $xactions,
     $blocks,
     PhutilMarkupEngine $engine) {
 
 
     $flat_blocks = array_mergev($blocks);
     $huge_block = implode("\n\n", $flat_blocks);
 
     $task_map = array();
     $task_refs = id(new ManiphestCustomFieldStatusParser())
       ->parseCorpus($huge_block);
     foreach ($task_refs as $match) {
       foreach ($match['monograms'] as $monogram) {
         $task_id = (int)trim($monogram, 'tT');
         $task_map[$task_id] = true;
       }
     }
 
     $rev_map = array();
     $rev_refs = id(new DifferentialCustomFieldDependsOnParser())
       ->parseCorpus($huge_block);
     foreach ($rev_refs as $match) {
       foreach ($match['monograms'] as $monogram) {
         $rev_id = (int)trim($monogram, 'dD');
         $rev_map[$rev_id] = true;
       }
     }
 
     $edges = array();
 
     if ($task_map) {
       $tasks = id(new ManiphestTaskQuery())
         ->setViewer($this->getActor())
         ->withIDs(array_keys($task_map))
         ->execute();
 
       if ($tasks) {
         $edge_related = PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK;
         $edges[$edge_related] = mpull($tasks, 'getPHID', 'getPHID');
       }
     }
 
     if ($rev_map) {
       $revs = id(new DifferentialRevisionQuery())
         ->setViewer($this->getActor())
         ->withIDs(array_keys($rev_map))
         ->execute();
       $rev_phids = mpull($revs, 'getPHID', 'getPHID');
 
       // NOTE: Skip any write attempts if a user cleverly implies a revision
       // depends upon itself.
       unset($rev_phids[$object->getPHID()]);
 
       if ($revs) {
         $edge_depends = PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV;
         $edges[$edge_depends] = $rev_phids;
       }
     }
 
     $result = array();
     foreach ($edges as $type => $specs) {
       $result[] = id(new DifferentialTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
         ->setMetadataValue('edge:type', $type)
         ->setNewValue(array('+' => $specs));
     }
 
     return $result;
   }
 
   private function renderInlineCommentsForMail(
     PhabricatorLiskDAO $object,
     array $inlines) {
 
     $context_key = 'metamta.differential.unified-comment-context';
     $show_context = PhabricatorEnv::getEnvConfig($context_key);
 
     $changeset_ids = array();
     foreach ($inlines as $inline) {
       $id = $inline->getComment()->getChangesetID();
       $changeset_ids[$id] = $id;
     }
 
     $changesets = id(new DifferentialChangesetQuery())
       ->setViewer($this->getActor())
       ->withIDs($changeset_ids)
       ->needHunks(true)
       ->execute();
 
     $inline_groups = DifferentialTransactionComment::sortAndGroupInlines(
       $inlines,
       $changesets);
 
     if ($show_context) {
       $hunk_parser = new DifferentialHunkParser();
     }
 
     $result = array();
     foreach ($inline_groups as $changeset_id => $group) {
       $changeset = idx($changesets, $changeset_id);
       if (!$changeset) {
         continue;
       }
 
       foreach ($group as $inline) {
         $comment = $inline->getComment();
         $file = $changeset->getFilename();
         $start = $comment->getLineNumber();
         $len = $comment->getLineLength();
         if ($len) {
           $range = $start.'-'.($start + $len);
         } else {
           $range = $start;
         }
 
         $inline_content = $comment->getContent();
 
         if (!$show_context) {
           $result[] = "{$file}:{$range} {$inline_content}";
         } else {
-          $result[] = "================";
-          $result[] = "Comment at: " . $file . ":" . $range;
+          $result[] = '================';
+          $result[] = 'Comment at: ' . $file . ':' . $range;
           $result[] = $hunk_parser->makeContextDiff(
             $changeset->getHunks(),
             $comment->getIsNewFile(),
             $comment->getLineNumber(),
             $comment->getLineLength(),
             1);
-          $result[] = "----------------";
+          $result[] = '----------------';
 
           $result[] = $inline_content;
           $result[] = null;
         }
       }
     }
 
     return implode("\n", $result);
   }
 
   private function loadDiff($phid, $need_changesets = false) {
     $query = id(new DifferentialDiffQuery())
       ->withPHIDs(array($phid))
       ->setViewer($this->getActor());
 
     if ($need_changesets) {
       $query->needChangesets(true);
     }
 
     return $query->executeOne();
   }
 
   private function requireDiff($phid, $need_changesets = false) {
     $diff = $this->loadDiff($phid, $need_changesets);
     if (!$diff) {
       throw new Exception(pht('Diff "%s" does not exist!', $phid));
     }
 
     return $diff;
   }
 
 /* -(  Herald Integration  )------------------------------------------------- */
 
   protected function shouldApplyHeraldRules(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     if ($this->getIsNewObject()) {
       return true;
     }
 
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case DifferentialTransaction::TYPE_UPDATE:
           if (!$this->getIsCloseByCommit()) {
             return true;
           }
       }
     }
 
     return parent::shouldApplyHeraldRules($object, $xactions);
   }
 
   protected function buildHeraldAdapter(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $unsubscribed_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $object->getPHID(),
       PhabricatorEdgeConfig::TYPE_OBJECT_HAS_UNSUBSCRIBER);
 
     $subscribed_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
       $object->getPHID());
 
     $revision = id(new DifferentialRevisionQuery())
       ->setViewer($this->getActor())
       ->withPHIDs(array($object->getPHID()))
       ->needActiveDiffs(true)
       ->needReviewerStatus(true)
       ->executeOne();
     if (!$revision) {
       throw new Exception(
         pht(
           'Failed to load revision for Herald adapter construction!'));
     }
 
     $adapter = HeraldDifferentialRevisionAdapter::newLegacyAdapter(
       $revision,
       $revision->getActiveDiff());
 
     $reviewers = $revision->getReviewerStatus();
     $reviewer_phids = mpull($reviewers, 'getReviewerPHID');
 
     $adapter->setExplicitCCs($subscribed_phids);
     $adapter->setExplicitReviewers($reviewer_phids);
     $adapter->setForbiddenCCs($unsubscribed_phids);
 
     $adapter->setIsNewObject($this->getIsNewObject());
 
     return $adapter;
   }
 
   protected function didApplyHeraldRules(
     PhabricatorLiskDAO $object,
     HeraldAdapter $adapter,
     HeraldTranscript $transcript) {
 
     $xactions = array();
 
     // Build a transaction to adjust CCs.
     $ccs = array(
       '+' => array_keys($adapter->getCCsAddedByHerald()),
       '-' => array_keys($adapter->getCCsRemovedByHerald()),
     );
     $value = array();
     foreach ($ccs as $type => $phids) {
       foreach ($phids as $phid) {
         $value[$type][$phid] = $phid;
       }
     }
 
     if ($value) {
       $xactions[] = id(new DifferentialTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
         ->setNewValue($value);
     }
 
     // Build a transaction to adjust reviewers.
     $reviewers = array(
       DifferentialReviewerStatus::STATUS_ADDED =>
         array_keys($adapter->getReviewersAddedByHerald()),
       DifferentialReviewerStatus::STATUS_BLOCKING =>
         array_keys($adapter->getBlockingReviewersAddedByHerald()),
     );
 
     $old_reviewers = $object->getReviewerStatus();
     $old_reviewers = mpull($old_reviewers, null, 'getReviewerPHID');
 
     $value = array();
     foreach ($reviewers as $status => $phids) {
       foreach ($phids as $phid) {
         if ($phid == $object->getAuthorPHID()) {
           // Don't try to add the revision's author as a reviewer, since this
           // isn't valid and doesn't make sense.
           continue;
         }
 
         // If the target is already a reviewer, don't try to change anything
         // if their current status is at least as strong as the new status.
         // For example, don't downgrade an "Accepted" to a "Blocking Reviewer".
         $old_reviewer = idx($old_reviewers, $phid);
         if ($old_reviewer) {
           $old_status = $old_reviewer->getStatus();
 
           $old_strength = DifferentialReviewerStatus::getStatusStrength(
             $old_status);
           $new_strength = DifferentialReviewerStatus::getStatusStrength(
             $status);
 
           if ($new_strength <= $old_strength) {
             continue;
           }
         }
 
         $value['+'][$phid] = array(
           'data' => array(
             'status' => $status,
           ),
         );
       }
     }
 
     if ($value) {
       $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
 
       $xactions[] = id(new DifferentialTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
         ->setMetadataValue('edge:type', $edge_reviewer)
         ->setNewValue($value);
     }
 
     // Save extra email PHIDs for later.
     $email_phids = $adapter->getEmailPHIDsAddedByHerald();
     $this->heraldEmailPHIDs = array_keys($email_phids);
 
     // Apply build plans.
     HarbormasterBuildable::applyBuildPlans(
       $adapter->getDiff()->getPHID(),
       $adapter->getPHID(),
       $adapter->getBuildPlans());
 
     return $xactions;
   }
 
   /**
    * Update the table which links Differential revisions to paths they affect,
    * so Diffusion can efficiently find pending revisions for a given file.
    */
   private function updateAffectedPathTable(
     DifferentialRevision $revision,
     DifferentialDiff $diff) {
 
     $repository = $revision->getRepository();
     if (!$repository) {
       // The repository where the code lives is untracked.
       return;
     }
 
     $path_prefix = null;
 
     $local_root = $diff->getSourceControlPath();
     if ($local_root) {
       // We're in a working copy which supports subdirectory checkouts (e.g.,
       // SVN) so we need to figure out what prefix we should add to each path
       // (e.g., trunk/projects/example/) to get the absolute path from the
       // root of the repository. DVCS systems like Git and Mercurial are not
       // affected.
 
       // Normalize both paths and check if the repository root is a prefix of
       // the local root. If so, throw it away. Note that this correctly handles
       // the case where the remote path is "/".
       $local_root = id(new PhutilURI($local_root))->getPath();
       $local_root = rtrim($local_root, '/');
 
       $repo_root = id(new PhutilURI($repository->getRemoteURI()))->getPath();
       $repo_root = rtrim($repo_root, '/');
 
       if (!strncmp($repo_root, $local_root, strlen($repo_root))) {
         $path_prefix = substr($local_root, strlen($repo_root));
       }
     }
 
     $changesets = $diff->getChangesets();
     $paths = array();
     foreach ($changesets as $changeset) {
       $paths[] = $path_prefix.'/'.$changeset->getFilename();
     }
 
     // Mark this as also touching all parent paths, so you can see all pending
     // changes to any file within a directory.
     $all_paths = array();
     foreach ($paths as $local) {
       foreach (DiffusionPathIDQuery::expandPathToRoot($local) as $path) {
         $all_paths[$path] = true;
       }
     }
     $all_paths = array_keys($all_paths);
 
     $path_ids =
       PhabricatorRepositoryCommitChangeParserWorker::lookupOrCreatePaths(
         $all_paths);
 
     $table = new DifferentialAffectedPath();
     $conn_w = $table->establishConnection('w');
 
     $sql = array();
     foreach ($path_ids as $path_id) {
       $sql[] = qsprintf(
         $conn_w,
         '(%d, %d, %d, %d)',
         $repository->getID(),
         $path_id,
         time(),
         $revision->getID());
     }
 
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE revisionID = %d',
       $table->getTableName(),
       $revision->getID());
     foreach (array_chunk($sql, 256) as $chunk) {
       queryfx(
         $conn_w,
         'INSERT INTO %T (repositoryID, pathID, epoch, revisionID) VALUES %Q',
         $table->getTableName(),
         implode(', ', $chunk));
     }
   }
 
 
   /**
    * Update the table connecting revisions to DVCS local hashes, so we can
    * identify revisions by commit/tree hashes.
    */
   private function updateRevisionHashTable(
     DifferentialRevision $revision,
     DifferentialDiff $diff) {
 
     $vcs = $diff->getSourceControlSystem();
     if ($vcs == DifferentialRevisionControlSystem::SVN) {
       // Subversion has no local commit or tree hash information, so we don't
       // have to do anything.
       return;
     }
 
     $property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $diff->getID(),
       'local:commits');
     if (!$property) {
       return;
     }
 
     $hashes = array();
 
     $data = $property->getData();
     switch ($vcs) {
       case DifferentialRevisionControlSystem::GIT:
         foreach ($data as $commit) {
           $hashes[] = array(
             ArcanistDifferentialRevisionHash::HASH_GIT_COMMIT,
             $commit['commit'],
           );
           $hashes[] = array(
             ArcanistDifferentialRevisionHash::HASH_GIT_TREE,
             $commit['tree'],
           );
         }
         break;
       case DifferentialRevisionControlSystem::MERCURIAL:
         foreach ($data as $commit) {
           $hashes[] = array(
             ArcanistDifferentialRevisionHash::HASH_MERCURIAL_COMMIT,
             $commit['rev'],
           );
         }
         break;
     }
 
     $conn_w = $revision->establishConnection('w');
 
     $sql = array();
     foreach ($hashes as $info) {
       list($type, $hash) = $info;
       $sql[] = qsprintf(
         $conn_w,
         '(%d, %s, %s)',
         $revision->getID(),
         $type,
         $hash);
     }
 
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE revisionID = %d',
       ArcanistDifferentialRevisionHash::TABLE_NAME,
       $revision->getID());
 
     if ($sql) {
       queryfx(
         $conn_w,
         'INSERT INTO %T (revisionID, type, hash) VALUES %Q',
         ArcanistDifferentialRevisionHash::TABLE_NAME,
         implode(', ', $sql));
     }
   }
 
   private function renderAffectedFilesForMail(DifferentialDiff $diff) {
     $changesets = $diff->getChangesets();
 
     $filenames = mpull($changesets, 'getDisplayFilename');
     sort($filenames);
 
     $count = count($filenames);
     $max = 250;
     if ($count > $max) {
       $filenames = array_slice($filenames, 0, $max);
       $filenames[] = pht('(%d more files...)', ($count - $max));
     }
 
     return implode("\n", $filenames);
   }
 
   private function renderPatchForMail(DifferentialDiff $diff) {
     $format = PhabricatorEnv::getEnvConfig('metamta.differential.patch-format');
 
     return id(new DifferentialRawDiffRenderer())
       ->setViewer($this->getActor())
       ->setFormat($format)
       ->setChangesets($diff->getChangesets())
       ->buildPatch();
   }
 
 }
diff --git a/src/applications/differential/landing/DifferentialLandingStrategy.php b/src/applications/differential/landing/DifferentialLandingStrategy.php
index aea5d8371..211c54b98 100644
--- a/src/applications/differential/landing/DifferentialLandingStrategy.php
+++ b/src/applications/differential/landing/DifferentialLandingStrategy.php
@@ -1,86 +1,86 @@
 <?php
 
 abstract class DifferentialLandingStrategy {
 
   public abstract function processLandRequest(
     AphrontRequest $request,
     DifferentialRevision $revision,
     PhabricatorRepository $repository);
 
   /**
    * returns PhabricatorActionView or null.
    */
   abstract function createMenuItem(
     PhabricatorUser $viewer,
     DifferentialRevision $revision,
     PhabricatorRepository $repository);
 
   /**
    * returns PhabricatorActionView which can be attached to the revision view.
    */
   protected function createActionView($revision, $name) {
     $strategy = get_class($this);
     $revision_id = $revision->getId();
     return id(new PhabricatorActionView())
       ->setRenderAsForm(true)
       ->setWorkflow(true)
       ->setName($name)
       ->setHref("/differential/revision/land/{$revision_id}/{$strategy}/");
   }
 
   /**
    * Check if this action should be disabled, and explain why.
    *
    * By default, this method checks for push permissions, and for the
    * revision being Accepted.
    *
    * @return FALSE for "not disabled";
    *         Human-readable text explaining why, if it is disabled;
    */
   public function isActionDisabled(
     PhabricatorUser $viewer,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $status = $revision->getStatus();
     if ($status != ArcanistDifferentialRevisionStatus::ACCEPTED) {
-      return pht("Only Accepted revisions can be landed.");
+      return pht('Only Accepted revisions can be landed.');
     }
 
     if (!PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $repository,
         DiffusionCapabilityPush::CAPABILITY)) {
-      return pht("You do not have permissions to push to this repository.");
+      return pht('You do not have permissions to push to this repository.');
     }
 
     return false;
   }
 
   /**
    * might break if repository is not Git.
    */
   protected function getGitWorkspace(PhabricatorRepository $repository) {
     try {
         return DifferentialGetWorkingCopy::getCleanGitWorkspace($repository);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to allocate a workspace',
         $e);
     }
   }
 
   /**
    * might break if repository is not Mercurial.
    */
   protected function getMercurialWorkspace(PhabricatorRepository $repository) {
     try {
       return DifferentialGetWorkingCopy::getCleanMercurialWorkspace(
         $repository);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to allocate a workspace',
         $e);
     }
   }
 }
diff --git a/src/applications/differential/landing/DifferentialLandingToGitHub.php b/src/applications/differential/landing/DifferentialLandingToGitHub.php
index f459f109b..74e2a2f68 100644
--- a/src/applications/differential/landing/DifferentialLandingToGitHub.php
+++ b/src/applications/differential/landing/DifferentialLandingToGitHub.php
@@ -1,179 +1,179 @@
 <?php
 
 final class DifferentialLandingToGitHub
   extends DifferentialLandingStrategy {
 
   private $account;
   private $provider;
 
   public function processLandRequest(
     AphrontRequest $request,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $viewer = $request->getUser();
     $this->init($viewer, $repository);
 
     $workspace = $this->getGitWorkspace($repository);
 
     try {
       id(new DifferentialLandingToHostedGit())
         ->commitRevisionToWorkspace(
           $revision,
           $workspace,
           $viewer);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to commit patch',
         $e);
     }
 
     try {
       $this->pushWorkspaceRepository($repository, $workspace);
     } catch (Exception $e) {
       // If it's a permission problem, we know more than git.
       $dialog = $this->verifyRemotePermissions($viewer, $revision, $repository);
       if ($dialog) {
         return $dialog;
       }
 
       // Else, throw what git said.
       throw new PhutilProxyException(
         'Failed to push changes upstream',
         $e);
     }
   }
 
   /**
    * returns PhabricatorActionView or an array of PhabricatorActionView or null.
    */
   public function createMenuItem(
     PhabricatorUser $viewer,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $vcs = $repository->getVersionControlSystem();
     if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_GIT) {
       return;
     }
 
     if ($repository->isHosted()) {
       return;
     }
 
     try {
       // These throw when failing.
       $this->init($viewer, $repository);
       $this->findGitHubRepo($repository);
     } catch (Exception $e) {
       return;
     }
 
     return $this->createActionView($revision, pht('Land to GitHub'))
       ->setIcon('fa-cloud-upload');
   }
 
   public function pushWorkspaceRepository(
     PhabricatorRepository $repository,
     ArcanistRepositoryAPI $workspace) {
 
     $token = $this->getAccessToken();
 
     $github_repo = $this->findGitHubRepo($repository);
 
     $remote = urisprintf(
       'https://%s:x-oauth-basic@%s/%s.git',
       $token,
       $this->provider->getProviderDomain(),
       $github_repo);
 
     $workspace->execxLocal(
-      "push %P HEAD:master",
+      'push %P HEAD:master',
       new PhutilOpaqueEnvelope($remote));
   }
 
   private function init($viewer, $repository) {
     $repo_uri = $repository->getRemoteURIObject();
     $repo_domain = $repo_uri->getDomain();
 
     $this->account = id(new PhabricatorExternalAccountQuery())
       ->setViewer($viewer)
       ->withUserPHIDs(array($viewer->getPHID()))
-      ->withAccountTypes(array("github"))
+      ->withAccountTypes(array('github'))
       ->withAccountDomains(array($repo_domain))
       ->executeOne();
 
     if (!$this->account) {
       throw new Exception(
         "No matching GitHub account found for {$repo_domain}.");
     }
 
     $this->provider = PhabricatorAuthProvider::getEnabledProviderByKey(
       $this->account->getProviderKey());
     if (!$this->provider) {
       throw new Exception("GitHub provider for {$repo_domain} is not enabled.");
     }
   }
 
   private function findGitHubRepo(PhabricatorRepository $repository) {
     $repo_uri = $repository->getRemoteURIObject();
 
     $repo_path = $repo_uri->getPath();
 
     if (substr($repo_path, -4) == '.git') {
       $repo_path = substr($repo_path, 0, -4);
     }
     $repo_path = ltrim($repo_path, '/');
 
     return $repo_path;
   }
 
   private function getAccessToken() {
     return $this->provider->getOAuthAccessToken($this->account);
   }
 
   private function verifyRemotePermissions($viewer, $revision, $repository) {
     $github_user = $this->account->getUsername();
     $github_repo = $this->findGitHubRepo($repository);
 
     $uri = urisprintf(
       'https://api.github.com/repos/%s/collaborators/%s',
       $github_repo,
       $github_user);
 
     $uri = new PhutilURI($uri);
     $uri->setQueryParam('access_token', $this->getAccessToken());
     list($status, $body, $headers) = id(new HTTPSFuture($uri))->resolve();
 
     // Likely status codes:
     // 204 No Content: Has permissions. Token might be too weak.
     // 404 Not Found: Not a collaborator.
     // 401 Unauthorized: Token is bad/revoked.
 
     $no_permission = ($status->getStatusCode() == 404);
 
     if ($no_permission) {
       throw new Exception(
         "You don't have permission to push to this repository. \n".
         "Push permissions for this repository are managed on GitHub.");
     }
 
     $scopes = BaseHTTPFuture::getHeader($headers, 'X-OAuth-Scopes');
     if (strpos($scopes, 'public_repo') === false) {
       $provider_key = $this->provider->getProviderKey();
       $refresh_token_uri = new PhutilURI("/auth/refresh/{$provider_key}/");
       $refresh_token_uri->setQueryParam('scope', 'public_repo');
 
       return id(new AphrontDialogView())
         ->setUser($viewer)
         ->setTitle(pht('Stronger token needed'))
         ->appendChild(pht(
             'In order to complete this action, you need a '.
             'stronger GitHub token.'))
         ->setSubmitURI($refresh_token_uri)
         ->addCancelButton('/D'.$revision->getId())
         ->setDisableWorkflowOnSubmit(true)
         ->addSubmitButton(pht('Refresh Account Link'));
     }
   }
 }
diff --git a/src/applications/differential/landing/DifferentialLandingToHostedGit.php b/src/applications/differential/landing/DifferentialLandingToHostedGit.php
index 5084785ef..0b4642a77 100644
--- a/src/applications/differential/landing/DifferentialLandingToHostedGit.php
+++ b/src/applications/differential/landing/DifferentialLandingToHostedGit.php
@@ -1,135 +1,135 @@
 <?php
 
 final class DifferentialLandingToHostedGit
   extends DifferentialLandingStrategy {
 
   public function processLandRequest(
     AphrontRequest $request,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $viewer = $request->getUser();
 
     $workspace = $this->getGitWorkspace($repository);
 
     try {
       $this->commitRevisionToWorkspace(
         $revision,
         $workspace,
         $viewer);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to commit patch',
         $e);
     }
 
     try {
       $this->pushWorkspaceRepository(
         $repository,
         $workspace,
         $viewer);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to push changes upstream',
         $e);
     }
   }
 
   public function commitRevisionToWorkspace(
     DifferentialRevision $revision,
     ArcanistRepositoryAPI $workspace,
     PhabricatorUser $user) {
 
     $diff_id = $revision->loadActiveDiff()->getID();
 
     $call = new ConduitCall(
       'differential.getrawdiff',
       array(
         'diffID'   => $diff_id,
       ));
 
     $call->setUser($user);
     $raw_diff = $call->execute();
 
     $missing_binary =
       "\nindex "
       . "0000000000000000000000000000000000000000.."
       . "0000000000000000000000000000000000000000\n";
     if (strpos($raw_diff, $missing_binary) !== false) {
-      throw new Exception("Patch is missing content for a binary file");
+      throw new Exception('Patch is missing content for a binary file');
     }
 
     $future = $workspace->execFutureLocal('apply --index -');
     $future->write($raw_diff);
     $future->resolvex();
 
     $workspace->reloadWorkingCopy();
 
     $call = new ConduitCall(
       'differential.getcommitmessage',
       array(
         'revision_id'   => $revision->getID(),
       ));
 
     $call->setUser($user);
     $message = $call->execute();
 
     $author = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $revision->getAuthorPHID());
 
     $author_string = sprintf(
       '%s <%s>',
       $author->getRealName(),
       $author->loadPrimaryEmailAddress());
     $author_date = $revision->getDateCreated();
 
     $workspace->execxLocal(
       '-c user.name=%s -c user.email=%s ' .
       'commit --date=%s --author=%s '.
       '--message=%s',
       // -c will set the 'committer'
       $user->getRealName(),
       $user->loadPrimaryEmailAddress(),
       $author_date,
       $author_string,
       $message);
   }
 
 
   public function pushWorkspaceRepository(
     PhabricatorRepository $repository,
     ArcanistRepositoryAPI $workspace,
     PhabricatorUser $user) {
 
-    $workspace->execxLocal("push origin HEAD:master");
+    $workspace->execxLocal('push origin HEAD:master');
   }
 
   public function createMenuItem(
     PhabricatorUser $viewer,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $vcs = $repository->getVersionControlSystem();
     if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_GIT) {
       return;
     }
 
     if (!$repository->isHosted()) {
       return;
     }
 
     if (!$repository->isWorkingCopyBare()) {
       return;
     }
 
     // TODO: This temporarily disables this action, because it doesn't work
     // and is confusing to users. If you want to use it, comment out this line
     // for now and we'll provide real support eventually.
     return;
 
     return $this->createActionView(
       $revision,
       pht('Land to Hosted Repository'));
   }
 }
diff --git a/src/applications/differential/landing/DifferentialLandingToHostedMercurial.php b/src/applications/differential/landing/DifferentialLandingToHostedMercurial.php
index 029f82181..e121b2244 100644
--- a/src/applications/differential/landing/DifferentialLandingToHostedMercurial.php
+++ b/src/applications/differential/landing/DifferentialLandingToHostedMercurial.php
@@ -1,114 +1,114 @@
 <?php
 
 final class DifferentialLandingToHostedMercurial
   extends DifferentialLandingStrategy {
 
   public function processLandRequest(
     AphrontRequest $request,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $viewer = $request->getUser();
 
     $workspace = $this->getMercurialWorkspace($repository);
 
     try {
       $this->commitRevisionToWorkspace(
         $revision,
         $workspace,
         $viewer);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to commit patch',
         $e);
     }
 
     try {
       $this->pushWorkspaceRepository(
         $repository,
         $workspace,
         $viewer);
     } catch (Exception $e) {
       throw new PhutilProxyException(
         'Failed to push changes upstream',
         $e);
     }
   }
 
   public function commitRevisionToWorkspace(
     DifferentialRevision $revision,
     ArcanistRepositoryAPI $workspace,
     PhabricatorUser $user) {
 
     $diff_id = $revision->loadActiveDiff()->getID();
 
     $call = new ConduitCall(
       'differential.getrawdiff',
       array(
         'diffID'   => $diff_id,
       ));
 
     $call->setUser($user);
     $raw_diff = $call->execute();
 
     $future = $workspace->execFutureLocal('patch --no-commit -');
     $future->write($raw_diff);
     $future->resolvex();
 
     $workspace->reloadWorkingCopy();
 
     $call = new ConduitCall(
       'differential.getcommitmessage',
       array(
         'revision_id'   => $revision->getID(),
       ));
 
     $call->setUser($user);
     $message = $call->execute();
 
     $author = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $revision->getAuthorPHID());
 
     $author_string = sprintf(
       '%s <%s>',
       $author->getRealName(),
       $author->loadPrimaryEmailAddress());
     $author_date = $revision->getDateCreated();
 
     $workspace->execxLocal(
       'commit --date=%s --user=%s '.
       '--message=%s',
       $author_date.' 0',
       $author_string,
       $message);
   }
 
 
   public function pushWorkspaceRepository(
     PhabricatorRepository $repository,
     ArcanistRepositoryAPI $workspace,
     PhabricatorUser $user) {
 
-    $workspace->execxLocal("push -b default");
+    $workspace->execxLocal('push -b default');
   }
 
   public function createMenuItem(
     PhabricatorUser $viewer,
     DifferentialRevision $revision,
     PhabricatorRepository $repository) {
 
     $vcs = $repository->getVersionControlSystem();
     if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL) {
       return;
     }
 
     if (!$repository->isHosted()) {
       return;
     }
 
     return $this->createActionView(
       $revision,
       pht('Land to Hosted Repository'));
   }
 }
diff --git a/src/applications/differential/mail/DifferentialReplyHandler.php b/src/applications/differential/mail/DifferentialReplyHandler.php
index aa02b3a55..1abb30bc9 100644
--- a/src/applications/differential/mail/DifferentialReplyHandler.php
+++ b/src/applications/differential/mail/DifferentialReplyHandler.php
@@ -1,175 +1,175 @@
 <?php
 
 /**
  * NOTE: Do not extend this!
  *
  * @concrete-extensible
  */
 class DifferentialReplyHandler extends PhabricatorMailReplyHandler {
 
   private $receivedMail;
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof DifferentialRevision)) {
-      throw new Exception("Receiver is not a DifferentialRevision!");
+      throw new Exception('Receiver is not a DifferentialRevision!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'D');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('D');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.differential.reply-handler-domain');
   }
 
   /*
    * Generate text like the following from the supported commands.
    * "
    *
    * ACTIONS
    * Reply to comment, or !accept, !reject, !abandon, !resign, !reclaim.
    *
    * "
    */
   public function getReplyHandlerInstructions() {
     if (!$this->supportsReplies()) {
       return null;
     }
 
     $supported_commands = $this->getSupportedCommands();
     $text = '';
     if (empty($supported_commands)) {
       return $text;
     }
 
     $comment_command_printed = false;
     if (in_array(DifferentialAction::ACTION_COMMENT, $supported_commands)) {
       $text .= pht('Reply to comment');
       $comment_command_printed = true;
 
       $supported_commands = array_diff(
         $supported_commands, array(DifferentialAction::ACTION_COMMENT));
     }
 
     if (!empty($supported_commands)) {
       if ($comment_command_printed) {
         $text .= ', or ';
       }
 
       $modified_commands = array();
       foreach ($supported_commands as $command) {
         $modified_commands[] = '!'.$command;
       }
 
       $text .= implode(', ', $modified_commands);
     }
 
-    $text .= ".";
+    $text .= '.';
 
     return $text;
   }
 
   public function getSupportedCommands() {
     $actions = array(
       DifferentialAction::ACTION_COMMENT,
       DifferentialAction::ACTION_REJECT,
       DifferentialAction::ACTION_ABANDON,
       DifferentialAction::ACTION_RECLAIM,
       DifferentialAction::ACTION_RESIGN,
       DifferentialAction::ACTION_RETHINK,
       'unsubscribe',
     );
 
     if (PhabricatorEnv::getEnvConfig('differential.enable-email-accept')) {
       $actions[] = DifferentialAction::ACTION_ACCEPT;
     }
 
     return $actions;
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $this->receivedMail = $mail;
     $this->handleAction($mail->getCleanTextBody(), $mail->getAttachments());
   }
 
   public function handleAction($body, array $attachments) {
     // all commands start with a bang and separated from the body by a newline
     // to make sure that actual feedback text couldn't trigger an action.
     // unrecognized commands will be parsed as part of the comment.
     $command = DifferentialAction::ACTION_COMMENT;
     $supported_commands = $this->getSupportedCommands();
     $regex = "/\A\n*!(" . implode('|', $supported_commands) . ")\n*/";
     $matches = array();
     if (preg_match($regex, $body, $matches)) {
       $command = $matches[1];
       $body = trim(str_replace('!' . $command, '', $body));
     }
 
     $actor = $this->getActor();
     if (!$actor) {
       throw new Exception('No actor is set for the reply action.');
     }
 
     switch ($command) {
       case 'unsubscribe':
         id(new PhabricatorSubscriptionsEditor())
           ->setObject($this->getMailReceiver())
           ->unsubscribe(array($actor->getPHID()))
           ->save();
         // TODO: Send the user a confirmation email?
         return null;
     }
 
     $body = $this->enhanceBodyWithAttachments($body, $attachments);
 
     $xactions = array();
 
     if ($command && ($command != DifferentialAction::ACTION_COMMENT)) {
       $xactions[] = id(new DifferentialTransaction())
         ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
         ->setNewValue($command);
     }
 
     if (strlen($body)) {
       $xactions[] = id(new DifferentialTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new DifferentialTransactionComment())
             ->setContent($body));
     }
 
     $editor = id(new DifferentialTransactionEditor())
       ->setActor($actor)
       ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
       ->setContinueOnMissingFields(true)
       ->setContinueOnNoEffect(true);
 
     // NOTE: We have to be careful about this because Facebook's
     // implementation jumps straight into handleAction() and will not have
     // a PhabricatorMetaMTAReceivedMail object.
     if ($this->receivedMail) {
       $content_source = PhabricatorContentSource::newForSource(
         PhabricatorContentSource::SOURCE_EMAIL,
         array(
           'id' => $this->receivedMail->getID(),
         ));
       $editor->setContentSource($content_source);
       $editor->setParentMessageID($this->receivedMail->getMessageID());
     } else {
       $content_source = PhabricatorContentSource::newForSource(
         PhabricatorContentSource::SOURCE_LEGACY,
         array());
       $editor->setContentSource($content_source);
     }
 
     $editor->applyTransactions($this->getMailReceiver(), $xactions);
   }
 
 }
diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
index d2c539ffe..6ca27db88 100644
--- a/src/applications/differential/parser/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/DifferentialChangesetParser.php
@@ -1,1237 +1,1237 @@
 <?php
 
 final class DifferentialChangesetParser {
 
   protected $visible      = array();
   protected $new          = array();
   protected $old          = array();
   protected $intra        = array();
   protected $newRender    = null;
   protected $oldRender    = null;
 
   protected $filename     = null;
   protected $hunkStartLines = array();
 
   protected $comments     = array();
   protected $specialAttributes = array();
 
   protected $changeset;
   protected $whitespaceMode = null;
 
   protected $renderCacheKey = null;
 
   private $handles = array();
   private $user;
 
   private $leftSideChangesetID;
   private $leftSideAttachesToNewFile;
 
   private $rightSideChangesetID;
   private $rightSideAttachesToNewFile;
 
   private $originalLeft;
   private $originalRight;
 
   private $renderingReference;
   private $isSubparser;
 
   private $isTopLevel;
   private $coverage;
   private $markupEngine;
   private $highlightErrors;
   private $disableCache;
   private $renderer;
 
   public function setRenderer($renderer) {
     $this->renderer = $renderer;
     return $this;
   }
 
   public function getRenderer() {
     if (!$this->renderer) {
       return new DifferentialChangesetTwoUpRenderer();
     }
     return $this->renderer;
   }
 
   public function setDisableCache($disable_cache) {
     $this->disableCache = $disable_cache;
     return $this;
   }
 
   public function getDisableCache() {
     return $this->disableCache;
   }
 
   const CACHE_VERSION = 11;
   const CACHE_MAX_SIZE = 8e6;
 
   const ATTR_GENERATED  = 'attr:generated';
   const ATTR_DELETED    = 'attr:deleted';
   const ATTR_UNCHANGED  = 'attr:unchanged';
   const ATTR_WHITELINES = 'attr:white';
 
   const LINES_CONTEXT = 8;
 
   const WHITESPACE_SHOW_ALL         = 'show-all';
   const WHITESPACE_IGNORE_TRAILING  = 'ignore-trailing';
 
   // TODO: This is now "Ignore Most" in the UI.
   const WHITESPACE_IGNORE_ALL       = 'ignore-all';
 
   const WHITESPACE_IGNORE_FORCE     = 'ignore-force';
 
   public function setOldLines(array $lines) {
     $this->old = $lines;
     return $this;
   }
 
   public function setNewLines(array $lines) {
     $this->new = $lines;
     return $this;
   }
 
   public function setSpecialAttributes(array $attributes) {
     $this->specialAttributes = $attributes;
     return $this;
   }
 
   public function setIntraLineDiffs(array $diffs) {
     $this->intra = $diffs;
     return $this;
   }
 
   public function setVisibileLinesMask(array $mask) {
     $this->visible = $mask;
     return $this;
   }
 
   /**
    * Configure which Changeset comments added to the right side of the visible
    * diff will be attached to. The ID must be the ID of a real Differential
    * Changeset.
    *
    * The complexity here is that we may show an arbitrary side of an arbitrary
    * changeset as either the left or right part of a diff. This method allows
    * the left and right halves of the displayed diff to be correctly mapped to
    * storage changesets.
    *
    * @param id    The Differential Changeset ID that comments added to the right
    *              side of the visible diff should be attached to.
    * @param bool  If true, attach new comments to the right side of the storage
    *              changeset. Note that this may be false, if the left side of
    *              some storage changeset is being shown as the right side of
    *              a display diff.
    * @return this
    */
   public function setRightSideCommentMapping($id, $is_new) {
     $this->rightSideChangesetID = $id;
     $this->rightSideAttachesToNewFile = $is_new;
     return $this;
   }
 
   /**
    * See setRightSideCommentMapping(), but this sets information for the left
    * side of the display diff.
    */
   public function setLeftSideCommentMapping($id, $is_new) {
     $this->leftSideChangesetID = $id;
     $this->leftSideAttachesToNewFile = $is_new;
     return $this;
   }
 
   public function setOriginals(
     DifferentialChangeset $left,
     DifferentialChangeset $right) {
 
     $this->originalLeft = $left;
     $this->originalRight = $right;
   }
 
   public function diffOriginals() {
     $engine = new PhabricatorDifferenceEngine();
     $changeset = $engine->generateChangesetFromFileContent(
       implode('', mpull($this->originalLeft->getHunks(), 'getChanges')),
       implode('', mpull($this->originalRight->getHunks(), 'getChanges')));
 
     $parser = new DifferentialHunkParser();
 
     return $parser->parseHunksForHighlightMasks(
       $changeset->getHunks(),
       $this->originalLeft->getHunks(),
       $this->originalRight->getHunks());
   }
 
   /**
    * Set a key for identifying this changeset in the render cache. If set, the
    * parser will attempt to use the changeset render cache, which can improve
    * performance for frequently-viewed changesets.
    *
    * By default, there is no render cache key and parsers do not use the cache.
    * This is appropriate for rarely-viewed changesets.
    *
    * NOTE: Currently, this key must be a valid Differential Changeset ID.
    *
    * @param   string  Key for identifying this changeset in the render cache.
    * @return  this
    */
   public function setRenderCacheKey($key) {
     $this->renderCacheKey = $key;
     return $this;
   }
 
   private function getRenderCacheKey() {
     return $this->renderCacheKey;
   }
 
   public function setChangeset(DifferentialChangeset $changeset) {
     $this->changeset = $changeset;
 
     $this->setFilename($changeset->getFilename());
 
     return $this;
   }
 
   public function setWhitespaceMode($whitespace_mode) {
     $this->whitespaceMode = $whitespace_mode;
     return $this;
   }
 
   public function setRenderingReference($ref) {
     $this->renderingReference = $ref;
     return $this;
   }
 
   private function getRenderingReference() {
     return $this->renderingReference;
   }
 
   public function getChangeset() {
     return $this->changeset;
   }
 
   public function setFilename($filename) {
     $this->filename = $filename;
     return $this;
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
     $this->markupEngine = $engine;
     return $this;
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   public function setCoverage($coverage) {
     $this->coverage = $coverage;
     return $this;
   }
   private function getCoverage() {
     return $this->coverage;
   }
 
   public function parseInlineComment(
     PhabricatorInlineCommentInterface $comment) {
 
     // Parse only comments which are actually visible.
     if ($this->isCommentVisibleOnRenderedDiff($comment)) {
       $this->comments[] = $comment;
     }
     return $this;
   }
 
   private function loadCache() {
     $render_cache_key = $this->getRenderCacheKey();
     if (!$render_cache_key) {
       return false;
     }
 
     $data = null;
 
     $changeset = new DifferentialChangeset();
     $conn_r = $changeset->establishConnection('r');
     $data = queryfx_one(
       $conn_r,
       'SELECT * FROM %T WHERE id = %d',
       $changeset->getTableName().'_parse_cache',
       $render_cache_key);
 
     if (!$data) {
       return false;
     }
 
     if ($data['cache'][0] == '{') {
       // This is likely an old-style JSON cache which we will not be able to
       // deserialize.
       return false;
     }
 
     $data = unserialize($data['cache']);
     if (!is_array($data) || !$data) {
       return false;
     }
 
     foreach (self::getCacheableProperties() as $cache_key) {
       if (!array_key_exists($cache_key, $data)) {
         // If we're missing a cache key, assume we're looking at an old cache
         // and ignore it.
         return false;
       }
     }
 
     if ($data['cacheVersion'] !== self::CACHE_VERSION) {
       return false;
     }
 
     // Someone displays contents of a partially cached shielded file.
     if (!isset($data['newRender']) && (!$this->isTopLevel || $this->comments)) {
       return false;
     }
 
     unset($data['cacheVersion'], $data['cacheHost']);
     $cache_prop = array_select_keys($data, self::getCacheableProperties());
     foreach ($cache_prop as $cache_key => $v) {
       $this->$cache_key = $v;
     }
 
     return true;
   }
 
   protected static function getCacheableProperties() {
     return array(
       'visible',
       'new',
       'old',
       'intra',
       'newRender',
       'oldRender',
       'specialAttributes',
       'hunkStartLines',
       'cacheVersion',
       'cacheHost',
     );
   }
 
   public function saveCache() {
     if ($this->highlightErrors) {
       return false;
     }
 
     $render_cache_key = $this->getRenderCacheKey();
     if (!$render_cache_key) {
       return false;
     }
 
     $cache = array();
     foreach (self::getCacheableProperties() as $cache_key) {
       switch ($cache_key) {
         case 'cacheVersion':
           $cache[$cache_key] = self::CACHE_VERSION;
           break;
         case 'cacheHost':
           $cache[$cache_key] = php_uname('n');
           break;
         default:
           $cache[$cache_key] = $this->$cache_key;
           break;
       }
     }
     $cache = serialize($cache);
 
     // We don't want to waste too much space by a single changeset.
     if (strlen($cache) > self::CACHE_MAX_SIZE) {
       return;
     }
 
     $changeset = new DifferentialChangeset();
     $conn_w = $changeset->establishConnection('w');
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       queryfx(
         $conn_w,
         'INSERT INTO %T (id, cache, dateCreated) VALUES (%d, %B, %d)
           ON DUPLICATE KEY UPDATE cache = VALUES(cache)',
         DifferentialChangeset::TABLE_CACHE,
         $render_cache_key,
         $cache,
         time());
     unset($unguarded);
   }
 
   private function markGenerated($new_corpus_block = '') {
     $generated_guess = (strpos($new_corpus_block, '@'.'generated') !== false);
 
     if (!$generated_guess) {
       $generated_path_regexps = PhabricatorEnv::getEnvConfig(
         'differential.generated-paths');
       foreach ($generated_path_regexps as $regexp) {
         if (preg_match($regexp, $this->changeset->getFilename())) {
           $generated_guess = true;
           break;
         }
       }
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_DIFFERENTIAL_WILLMARKGENERATED,
       array(
         'corpus' => $new_corpus_block,
         'is_generated' => $generated_guess,
       )
     );
     PhutilEventEngine::dispatchEvent($event);
 
     $generated = $event->getValue('is_generated');
     $this->specialAttributes[self::ATTR_GENERATED] = $generated;
   }
 
   public function isGenerated() {
     return idx($this->specialAttributes, self::ATTR_GENERATED, false);
   }
 
   public function isDeleted() {
     return idx($this->specialAttributes, self::ATTR_DELETED, false);
   }
 
   public function isUnchanged() {
     return idx($this->specialAttributes, self::ATTR_UNCHANGED, false);
   }
 
   public function isWhitespaceOnly() {
     return idx($this->specialAttributes, self::ATTR_WHITELINES, false);
   }
 
   private function applyIntraline(&$render, $intra, $corpus) {
 
     foreach ($render as $key => $text) {
       if (isset($intra[$key])) {
         $render[$key] = ArcanistDiffUtils::applyIntralineDiff(
           $text,
           $intra[$key]);
       }
     }
   }
 
   private function getHighlightFuture($corpus) {
     return $this->highlightEngine->getHighlightFuture(
       $this->highlightEngine->getLanguageFromFilename($this->filename),
       $corpus);
   }
 
   protected function processHighlightedSource($data, $result) {
 
     $result_lines = phutil_split_lines($result);
     foreach ($data as $key => $info) {
       if (!$info) {
         unset($result_lines[$key]);
       }
     }
     return $result_lines;
   }
 
   private function tryCacheStuff() {
     $whitespace_mode = $this->whitespaceMode;
     switch ($whitespace_mode) {
       case self::WHITESPACE_SHOW_ALL:
       case self::WHITESPACE_IGNORE_TRAILING:
       case self::WHITESPACE_IGNORE_FORCE:
         break;
       default:
         $whitespace_mode = self::WHITESPACE_IGNORE_ALL;
         break;
     }
 
     $skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_ALL);
     if ($this->disableCache) {
       $skip_cache = true;
     }
 
     $this->whitespaceMode = $whitespace_mode;
 
     $changeset = $this->changeset;
 
     if ($changeset->getFileType() != DifferentialChangeType::FILE_TEXT &&
         $changeset->getFileType() != DifferentialChangeType::FILE_SYMLINK) {
 
       $this->markGenerated();
 
     } else {
       if ($skip_cache || !$this->loadCache()) {
         $this->process();
         if (!$skip_cache) {
           $this->saveCache();
         }
       }
     }
   }
 
   private function process() {
     $whitespace_mode = $this->whitespaceMode;
     $changeset = $this->changeset;
 
     $ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_ALL) ||
                   ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE));
 
     $force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE);
 
     if (!$force_ignore) {
       if ($ignore_all && $changeset->getWhitespaceMatters()) {
         $ignore_all = false;
       }
     }
 
     // The "ignore all whitespace" algorithm depends on rediffing the
     // files, and we currently need complete representations of both
     // files to do anything reasonable. If we only have parts of the files,
     // don't use the "ignore all" algorithm.
     if ($ignore_all) {
       $hunks = $changeset->getHunks();
       if (count($hunks) !== 1) {
         $ignore_all = false;
       } else {
         $first_hunk = reset($hunks);
         if ($first_hunk->getOldOffset() != 1 ||
             $first_hunk->getNewOffset() != 1) {
             $ignore_all = false;
         }
       }
     }
 
     if ($ignore_all) {
       $old_file = $changeset->makeOldFile();
       $new_file = $changeset->makeNewFile();
       if ($old_file == $new_file) {
         // If the old and new files are exactly identical, the synthetic
         // diff below will give us nonsense and whitespace modes are
         // irrelevant anyway. This occurs when you, e.g., copy a file onto
         // itself in Subversion (see T271).
         $ignore_all = false;
       }
     }
 
     $hunk_parser = new DifferentialHunkParser();
     $hunk_parser->setWhitespaceMode($whitespace_mode);
     $hunk_parser->parseHunksForLineData($changeset->getHunks());
 
     // Depending on the whitespace mode, we may need to compute a different
     // set of changes than the set of changes in the hunk data (specificaly,
     // we might want to consider changed lines which have only whitespace
     // changes as unchanged).
     if ($ignore_all) {
       $engine = new PhabricatorDifferenceEngine();
       $engine->setIgnoreWhitespace(true);
       $no_whitespace_changeset = $engine->generateChangesetFromFileContent(
         $old_file,
         $new_file);
 
       $type_parser = new DifferentialHunkParser();
       $type_parser->parseHunksForLineData($no_whitespace_changeset->getHunks());
 
       $hunk_parser->setOldLineTypeMap($type_parser->getOldLineTypeMap());
       $hunk_parser->setNewLineTypeMap($type_parser->getNewLineTypeMap());
     }
 
     $hunk_parser->reparseHunksForSpecialAttributes();
 
     $unchanged = false;
     if (!$hunk_parser->getHasAnyChanges()) {
       $filetype = $this->changeset->getFileType();
       if ($filetype == DifferentialChangeType::FILE_TEXT ||
           $filetype == DifferentialChangeType::FILE_SYMLINK) {
         $unchanged = true;
       }
     }
 
     $changetype = $this->changeset->getChangeType();
     if ($changetype == DifferentialChangeType::TYPE_MOVE_AWAY) {
       // sometimes we show moved files as unchanged, sometimes deleted,
       // and sometimes inconsistent with what actually happened at the
       // destination of the move.  Rather than make a false claim,
       // omit the 'not changed' notice if this is the source of a move
       $unchanged = false;
     }
 
     $this->setSpecialAttributes(array(
       self::ATTR_UNCHANGED  => $unchanged,
       self::ATTR_DELETED    => $hunk_parser->getIsDeleted(),
       self::ATTR_WHITELINES => !$hunk_parser->getHasTextChanges(),
     ));
 
     $hunk_parser->generateIntraLineDiffs();
     $hunk_parser->generateVisibileLinesMask();
 
     $this->setOldLines($hunk_parser->getOldLines());
     $this->setNewLines($hunk_parser->getNewLines());
     $this->setIntraLineDiffs($hunk_parser->getIntraLineDiffs());
     $this->setVisibileLinesMask($hunk_parser->getVisibleLinesMask());
     $this->hunkStartLines = $hunk_parser->getHunkStartLines(
       $changeset->getHunks());
 
     $new_corpus = $hunk_parser->getNewCorpus();
     $new_corpus_block = implode('', $new_corpus);
     $this->markGenerated($new_corpus_block);
 
     if ($this->isTopLevel &&
         !$this->comments &&
           ($this->isGenerated() ||
            $this->isUnchanged() ||
            $this->isDeleted())) {
       return;
     }
 
     $old_corpus = $hunk_parser->getOldCorpus();
     $old_corpus_block = implode('', $old_corpus);
     $old_future = $this->getHighlightFuture($old_corpus_block);
     $new_future = $this->getHighlightFuture($new_corpus_block);
     $futures = array(
       'old' => $old_future,
       'new' => $new_future,
     );
     $corpus_blocks = array(
       'old' => $old_corpus_block,
       'new' => $new_corpus_block,
     );
 
     $this->highlightErrors = false;
     foreach (Futures($futures) as $key => $future) {
       try {
         try {
           $highlighted = $future->resolve();
         } catch (PhutilSyntaxHighlighterException $ex) {
           $this->highlightErrors = true;
           $highlighted = id(new PhutilDefaultSyntaxHighlighter())
             ->getHighlightFuture($corpus_blocks[$key])
             ->resolve();
         }
         switch ($key) {
         case 'old':
           $this->oldRender = $this->processHighlightedSource(
             $this->old,
             $highlighted);
           break;
         case 'new':
           $this->newRender = $this->processHighlightedSource(
             $this->new,
             $highlighted);
           break;
         }
       } catch (Exception $ex) {
         phlog($ex);
         throw $ex;
       }
     }
 
     $this->applyIntraline(
       $this->oldRender,
       ipull($this->intra, 0),
       $old_corpus);
     $this->applyIntraline(
       $this->newRender,
       ipull($this->intra, 1),
       $new_corpus);
   }
 
   private function shouldRenderPropertyChangeHeader($changeset) {
     if (!$this->isTopLevel) {
       // We render properties only at top level; otherwise we get multiple
       // copies of them when a user clicks "Show More".
       return false;
     }
 
     $old = $changeset->getOldProperties();
     $new = $changeset->getNewProperties();
 
     if ($old === $new) {
       return false;
     }
 
     if ($changeset->getChangeType() == DifferentialChangeType::TYPE_ADD &&
         $new == array('unix:filemode' => '100644')) {
       return false;
     }
 
     if ($changeset->getChangeType() == DifferentialChangeType::TYPE_DELETE &&
         $old == array('unix:filemode' => '100644')) {
       return false;
     }
     return true;
   }
 
   public function render(
     $range_start  = null,
     $range_len    = null,
     $mask_force   = array()) {
 
     // "Top level" renders are initial requests for the whole file, versus
     // requests for a specific range generated by clicking "show more". We
     // generate property changes and "shield" UI elements only for toplevel
     // requests.
     $this->isTopLevel = (($range_start === null) && ($range_len === null));
     $this->highlightEngine = PhabricatorSyntaxHighlighter::newEngine();
     $this->tryCacheStuff();
     $render_pch = $this->shouldRenderPropertyChangeHeader($this->changeset);
 
     $rows = max(
       count($this->old),
       count($this->new));
 
     $renderer = $this->getRenderer()
       ->setChangeset($this->changeset)
       ->setRenderPropertyChangeHeader($render_pch)
       ->setIsTopLevel($this->isTopLevel)
       ->setOldRender($this->oldRender)
       ->setNewRender($this->newRender)
       ->setHunkStartLines($this->hunkStartLines)
       ->setOldChangesetID($this->leftSideChangesetID)
       ->setNewChangesetID($this->rightSideChangesetID)
       ->setOldAttachesToNewFile($this->leftSideAttachesToNewFile)
       ->setNewAttachesToNewFile($this->rightSideAttachesToNewFile)
       ->setCodeCoverage($this->getCoverage())
       ->setRenderingReference($this->getRenderingReference())
       ->setMarkupEngine($this->markupEngine)
       ->setHandles($this->handles)
       ->setOldLines($this->old)
       ->setNewLines($this->new);
 
     if ($this->user) {
       $renderer->setUser($this->user);
     }
 
     $shield = null;
     if ($this->isTopLevel && !$this->comments) {
       if ($this->isGenerated()) {
         $shield = $renderer->renderShield(
           pht(
             'This file contains generated code, which does not normally '.
             'need to be reviewed.'));
       } else if ($this->isUnchanged()) {
         $type = 'text';
         if (!$rows) {
           // NOTE: Normally, diffs which don't change files do not include
           // file content (for example, if you "chmod +x" a file and then
           // run "git show", the file content is not available). Similarly,
           // if you move a file from A to B without changing it, diffs normally
           // do not show the file content. In some cases `arc` is able to
           // synthetically generate content for these diffs, but for raw diffs
           // we'll never have it so we need to be prepared to not render a link.
           $type = 'none';
         }
         $shield = $renderer->renderShield(
           pht('The contents of this file were not changed.'),
           $type);
       } else if ($this->isWhitespaceOnly()) {
         $shield = $renderer->renderShield(
           pht('This file was changed only by adding or removing whitespace.'),
           'whitespace');
       } else if ($this->isDeleted()) {
         $shield = $renderer->renderShield(
           pht('This file was completely deleted.'));
       } else if ($this->changeset->getAffectedLineCount() > 2500) {
         $lines = number_format($this->changeset->getAffectedLineCount());
         $shield = $renderer->renderShield(
           pht(
             'This file has a very large number of changes (%s lines).',
             $lines));
       }
     }
 
     if ($shield) {
       return $renderer->renderChangesetTable($shield);
     }
 
     $old_comments = array();
     $new_comments = array();
     $old_mask = array();
     $new_mask = array();
     $feedback_mask = array();
 
     if ($this->comments) {
       foreach ($this->comments as $comment) {
         $start = max($comment->getLineNumber() - self::LINES_CONTEXT, 0);
         $end = $comment->getLineNumber() +
           $comment->getLineLength() +
           self::LINES_CONTEXT;
         $new_side = $this->isCommentOnRightSideWhenDisplayed($comment);
         for ($ii = $start; $ii <= $end; $ii++) {
           if ($new_side) {
             $new_mask[$ii] = true;
           } else {
             $old_mask[$ii] = true;
           }
         }
       }
 
       foreach ($this->old as $ii => $old) {
         if (isset($old['line']) && isset($old_mask[$old['line']])) {
           $feedback_mask[$ii] = true;
         }
       }
 
       foreach ($this->new as $ii => $new) {
         if (isset($new['line']) && isset($new_mask[$new['line']])) {
           $feedback_mask[$ii] = true;
         }
       }
       $this->comments = msort($this->comments, 'getID');
       foreach ($this->comments as $comment) {
         $final = $comment->getLineNumber() +
           $comment->getLineLength();
         $final = max(1, $final);
         if ($this->isCommentOnRightSideWhenDisplayed($comment)) {
           $new_comments[$final][] = $comment;
         } else {
           $old_comments[$final][] = $comment;
         }
       }
     }
     $renderer
       ->setOldComments($old_comments)
       ->setNewComments($new_comments);
 
     switch ($this->changeset->getFileType()) {
       case DifferentialChangeType::FILE_IMAGE:
         $old = null;
         $new = null;
         // TODO: Improve the architectural issue as discussed in D955
         // https://secure.phabricator.com/D955
         $reference = $this->getRenderingReference();
         $parts = explode('/', $reference);
         if (count($parts) == 2) {
           list($id, $vs) = $parts;
         } else {
           $id = $parts[0];
           $vs = 0;
         }
         $id = (int)$id;
         $vs = (int)$vs;
 
         if (!$vs) {
           $metadata = $this->changeset->getMetadata();
           $data = idx($metadata, 'attachment-data');
 
           $old_phid = idx($metadata, 'old:binary-phid');
           $new_phid = idx($metadata, 'new:binary-phid');
         } else {
           $vs_changeset = id(new DifferentialChangeset())->load($vs);
           $old_phid = null;
           $new_phid = null;
 
           // TODO: This is spooky, see D6851
           if ($vs_changeset) {
             $vs_metadata = $vs_changeset->getMetadata();
             $old_phid = idx($vs_metadata, 'new:binary-phid');
           }
 
           $changeset = id(new DifferentialChangeset())->load($id);
           if ($changeset) {
             $metadata = $changeset->getMetadata();
             $new_phid = idx($metadata, 'new:binary-phid');
           }
         }
 
         if ($old_phid || $new_phid) {
           // grab the files, (micro) optimization for 1 query not 2
           $file_phids = array();
           if ($old_phid) {
             $file_phids[] = $old_phid;
           }
           if ($new_phid) {
             $file_phids[] = $new_phid;
           }
 
           // TODO: (T603) Probably fine to use omnipotent viewer here?
           $files = id(new PhabricatorFile())->loadAllWhere(
             'phid IN (%Ls)',
             $file_phids);
           foreach ($files as $file) {
             if (empty($file)) {
               continue;
             }
             if ($file->getPHID() == $old_phid) {
               $old = $file;
             } else if ($file->getPHID() == $new_phid) {
               $new = $file;
             }
           }
         }
 
         return $renderer->renderFileChange($old, $new, $id, $vs);
       case DifferentialChangeType::FILE_DIRECTORY:
       case DifferentialChangeType::FILE_BINARY:
         $output = $renderer->renderChangesetTable(null);
         return $output;
     }
 
     if ($this->originalLeft && $this->originalRight) {
       list($highlight_old, $highlight_new) = $this->diffOriginals();
       $highlight_old = array_flip($highlight_old);
       $highlight_new = array_flip($highlight_new);
       $renderer
         ->setHighlightOld($highlight_old)
         ->setHighlightNew($highlight_new);
     }
     $renderer
       ->setOriginalOld($this->originalLeft)
       ->setOriginalNew($this->originalRight);
 
     if ($range_start === null) {
       $range_start = 0;
     }
     if ($range_len === null) {
       $range_len = $rows;
     }
     $range_len = min($range_len, $rows - $range_start);
 
     list($gaps, $mask, $depths) = $this->calculateGapsMaskAndDepths(
       $mask_force,
       $feedback_mask,
       $range_start,
       $range_len);
 
     $renderer
       ->setGaps($gaps)
       ->setMask($mask)
       ->setDepths($depths);
 
     $html = $renderer->renderTextChange(
       $range_start,
       $range_len,
       $rows);
 
     return $renderer->renderChangesetTable($html);
   }
 
   /**
    * This function calculates a lot of stuff we need to know to display
    * the diff:
    *
    * Gaps - compute gaps in the visible display diff, where we will render
    * "Show more context" spacers. If a gap is smaller than the context size,
    * we just display it. Otherwise, we record it into $gaps and will render a
    * "show more context" element instead of diff text below. A given $gap
    * is a tuple of $gap_line_number_start and $gap_length.
    *
    * Mask - compute the actual lines that need to be shown (because they
    * are near changes lines, near inline comments, or the request has
    * explicitly asked for them, i.e. resulting from the user clicking
    * "show more"). The $mask returned is a sparesely populated dictionary
    * of $visible_line_number => true.
    *
    * Depths - compute how indented any given line is. The $depths returned
    * is a sparesely populated dictionary of $visible_line_number => $depth.
    *
    * This function also has the side effect of modifying member variable
    * new such that tabs are normalized to spaces for each line of the diff.
    *
    * @return array($gaps, $mask, $depths)
    */
   private function calculateGapsMaskAndDepths($mask_force,
                                               $feedback_mask,
                                               $range_start,
                                               $range_len) {
 
     // Calculate gaps and mask first
     $gaps = array();
     $gap_start = 0;
     $in_gap = false;
     $base_mask = $this->visible + $mask_force + $feedback_mask;
     $base_mask[$range_start + $range_len] = true;
     for ($ii = $range_start; $ii <= $range_start + $range_len; $ii++) {
       if (isset($base_mask[$ii])) {
         if ($in_gap) {
           $gap_length = $ii - $gap_start;
           if ($gap_length <= self::LINES_CONTEXT) {
             for ($jj = $gap_start; $jj <= $gap_start + $gap_length; $jj++) {
               $base_mask[$jj] = true;
             }
           } else {
             $gaps[] = array($gap_start, $gap_length);
           }
           $in_gap = false;
         }
       } else {
         if (!$in_gap) {
           $gap_start = $ii;
           $in_gap = true;
         }
       }
     }
     $gaps = array_reverse($gaps);
     $mask = $base_mask;
 
     // Time to calculate depth.
     // We need to go backwards to properly indent whitespace in this code:
     //
     //   0: class C {
     //   1:
     //   1:   function f() {
     //   2:
     //   2:     return;
     //   1:
     //   1:   }
     //   0:
     //   0: }
     //
     $depths = array();
     $last_depth = 0;
     $range_end = $range_start + $range_len;
     if (!isset($this->new[$range_end])) {
       $range_end--;
     }
     for ($ii = $range_end; $ii >= $range_start; $ii--) {
       // We need to expand tabs to process mixed indenting and to round
       // correctly later.
-      $line = str_replace("\t", "  ", $this->new[$ii]['text']);
+      $line = str_replace("\t", '  ', $this->new[$ii]['text']);
       $trimmed = ltrim($line);
       if ($trimmed != '') {
         // We round down to flatten "/**" and " *".
         $last_depth = floor((strlen($line) - strlen($trimmed)) / 2);
       }
       $depths[$ii] = $last_depth;
     }
 
     return array($gaps, $mask, $depths);
   }
 
   /**
    * Determine if an inline comment will appear on the rendered diff,
    * taking into consideration which halves of which changesets will actually
    * be shown.
    *
    * @param PhabricatorInlineCommentInterface Comment to test for visibility.
    * @return bool True if the comment is visible on the rendered diff.
    */
   private function isCommentVisibleOnRenderedDiff(
     PhabricatorInlineCommentInterface $comment) {
 
       $changeset_id = $comment->getChangesetID();
       $is_new = $comment->getIsNewFile();
 
       if ($changeset_id == $this->rightSideChangesetID &&
         $is_new == $this->rightSideAttachesToNewFile) {
           return true;
         }
 
       if ($changeset_id == $this->leftSideChangesetID &&
         $is_new == $this->leftSideAttachesToNewFile) {
           return true;
         }
 
     return false;
   }
 
 
   /**
    * Determine if a comment will appear on the right side of the display diff.
    * Note that the comment must appear somewhere on the rendered changeset, as
    * per isCommentVisibleOnRenderedDiff().
    *
    * @param PhabricatorInlineCommentInterface Comment to test for display
    *              location.
    * @return bool True for right, false for left.
    */
   private function isCommentOnRightSideWhenDisplayed(
     PhabricatorInlineCommentInterface $comment) {
 
     if (!$this->isCommentVisibleOnRenderedDiff($comment)) {
-      throw new Exception("Comment is not visible on changeset!");
+      throw new Exception('Comment is not visible on changeset!');
     }
 
     $changeset_id = $comment->getChangesetID();
     $is_new = $comment->getIsNewFile();
 
     if ($changeset_id == $this->rightSideChangesetID &&
         $is_new == $this->rightSideAttachesToNewFile) {
       return true;
     }
 
     return false;
   }
 
   /**
    * Parse the 'range' specification that this class and the client-side JS
    * emit to indicate that a user clicked "Show more..." on a diff. Generally,
    * use is something like this:
    *
    *   $spec = $request->getStr('range');
    *   $parsed = DifferentialChangesetParser::parseRangeSpecification($spec);
    *   list($start, $end, $mask) = $parsed;
    *   $parser->render($start, $end, $mask);
    *
    * @param string Range specification, indicating the range of the diff that
    *               should be rendered.
    * @return tuple List of <start, end, mask> suitable for passing to
    *               @{method:render}.
    */
   public static function parseRangeSpecification($spec) {
     $range_s = null;
     $range_e = null;
     $mask = array();
 
     if ($spec) {
       $match = null;
       if (preg_match('@^(\d+)-(\d+)(?:/(\d+)-(\d+))?$@', $spec, $match)) {
         $range_s = (int)$match[1];
         $range_e = (int)$match[2];
         if (count($match) > 3) {
           $start = (int)$match[3];
           $len = (int)$match[4];
           for ($ii = $start; $ii < $start + $len; $ii++) {
             $mask[$ii] = true;
           }
         }
       }
     }
 
     return array($range_s, $range_e, $mask);
   }
 
   /**
    * Render "modified coverage" information; test coverage on modified lines.
    * This synthesizes diff information with unit test information into a useful
    * indicator of how well tested a change is.
    */
   public function renderModifiedCoverage() {
     $na = phutil_tag('em', array(), '-');
 
     $coverage = $this->getCoverage();
     if (!$coverage) {
       return $na;
     }
 
     $covered = 0;
     $not_covered = 0;
 
     foreach ($this->new as $k => $new) {
       if (!$new['line']) {
         continue;
       }
 
       if (!$new['type']) {
         continue;
       }
 
       if (empty($coverage[$new['line'] - 1])) {
         continue;
       }
 
       switch ($coverage[$new['line'] - 1]) {
         case 'C':
           $covered++;
           break;
         case 'U':
           $not_covered++;
           break;
       }
     }
 
     if (!$covered && !$not_covered) {
       return $na;
     }
 
     return sprintf('%d%%', 100 * ($covered / ($covered + $not_covered)));
   }
 
   public function detectCopiedCode(
     array $changesets,
     $min_width = 30,
     $min_lines = 3) {
 
     assert_instances_of($changesets, 'DifferentialChangeset');
 
     $map = array();
     $files = array();
     $types = array();
     foreach ($changesets as $changeset) {
       $file = $changeset->getFilename();
       foreach ($changeset->getHunks() as $hunk) {
         $line = $hunk->getOldOffset();
         foreach (explode("\n", $hunk->getChanges()) as $code) {
           $type = (isset($code[0]) ? $code[0] : '');
           if ($type == '-' || $type == ' ') {
             $code = trim(substr($code, 1));
             $files[$file][$line] = $code;
             $types[$file][$line] = $type;
             if (strlen($code) >= $min_width) {
               $map[$code][] = array($file, $line);
             }
             $line++;
           }
         }
       }
     }
 
     foreach ($changesets as $changeset) {
       $copies = array();
       foreach ($changeset->getHunks() as $hunk) {
         $added = array_map('trim', $hunk->getAddedLines());
         for (reset($added); list($line, $code) = each($added); ) {
           if (isset($map[$code])) { // We found a long matching line.
 
             if (count($map[$code]) > 16) {
               // If there are a large number of identical lines in this diff,
               // don't try to figure out where this block came from: the
               // analysis is O(N^2), since we need to compare every line
               // against every other line. Even if we arrive at a result, it
               // is unlikely to be meaningful. See T5041.
               continue 2;
             }
 
             $best_length = 0;
             foreach ($map[$code] as $val) { // Explore all candidates.
               list($file, $orig_line) = $val;
               $length = 1;
               // Search also backwards for short lines.
               foreach (array(-1, 1) as $direction) {
                 $offset = $direction;
                 while (!isset($copies[$line + $offset]) &&
                     isset($added[$line + $offset]) &&
                     idx($files[$file], $orig_line + $offset) ===
                       $added[$line + $offset]) {
                   $length++;
                   $offset += $direction;
                 }
               }
               if ($length > $best_length ||
                   ($length == $best_length && // Prefer moves.
                    idx($types[$file], $orig_line) == '-')) {
                 $best_length = $length;
                 // ($offset - 1) contains number of forward matching lines.
                 $best_offset = $offset - 1;
                 $best_file = $file;
                 $best_line = $orig_line;
               }
             }
             $file = ($best_file == $changeset->getFilename() ? '' : $best_file);
             for ($i = $best_length; $i--; ) {
               $type = idx($types[$best_file], $best_line + $best_offset - $i);
               $copies[$line + $best_offset - $i] = ($best_length < $min_lines
                 ? array() // Ignore short blocks.
                 : array($file, $best_line + $best_offset - $i, $type));
             }
             for ($i = 0; $i < $best_offset; $i++) {
               next($added);
             }
           }
         }
       }
       $copies = array_filter($copies);
       if ($copies) {
         $metadata = $changeset->getMetadata();
         $metadata['copy:lines'] = $copies;
         $changeset->setMetadata($metadata);
       }
     }
     return $changesets;
   }
 
 }
diff --git a/src/applications/differential/parser/DifferentialHunkParser.php b/src/applications/differential/parser/DifferentialHunkParser.php
index 4964e109c..f404d81f4 100644
--- a/src/applications/differential/parser/DifferentialHunkParser.php
+++ b/src/applications/differential/parser/DifferentialHunkParser.php
@@ -1,670 +1,670 @@
 <?php
 
 final class DifferentialHunkParser {
 
   private $oldLines;
   private $newLines;
   private $intraLineDiffs;
   private $visibleLinesMask;
   private $whitespaceMode;
 
   /**
    * Get a map of lines on which hunks start, other than line 1. This
    * datastructure is used to determine when to render "Context not available."
    * in diffs with multiple hunks.
    *
    * @return dict<int, bool>  Map of lines where hunks start, other than line 1.
    */
   public function getHunkStartLines(array $hunks) {
     assert_instances_of($hunks, 'DifferentialHunk');
 
     $map = array();
     foreach ($hunks as $hunk) {
       $line = $hunk->getOldOffset();
       if ($line > 1) {
         $map[$line] = true;
       }
     }
 
     return $map;
   }
 
   private function setVisibleLinesMask($mask) {
     $this->visibleLinesMask = $mask;
     return $this;
   }
   public function getVisibleLinesMask() {
     if ($this->visibleLinesMask === null) {
       throw new Exception(
         'You must generateVisibileLinesMask before accessing this data.'
       );
     }
     return $this->visibleLinesMask;
   }
 
   private function setIntraLineDiffs($intra_line_diffs) {
     $this->intraLineDiffs = $intra_line_diffs;
     return $this;
   }
   public function getIntraLineDiffs() {
     if ($this->intraLineDiffs === null) {
       throw new Exception(
         'You must generateIntraLineDiffs before accessing this data.'
       );
     }
     return $this->intraLineDiffs;
   }
 
   private function setNewLines($new_lines) {
     $this->newLines = $new_lines;
     return $this;
   }
   public function getNewLines() {
     if ($this->newLines === null) {
       throw new Exception(
         'You must parseHunksForLineData before accessing this data.'
       );
     }
     return $this->newLines;
   }
 
   private function setOldLines($old_lines) {
     $this->oldLines = $old_lines;
     return $this;
   }
   public function getOldLines() {
     if ($this->oldLines === null) {
       throw new Exception(
         'You must parseHunksForLineData before accessing this data.'
       );
     }
     return $this->oldLines;
   }
 
   public function getOldLineTypeMap() {
     $map = array();
     $old = $this->getOldLines();
     foreach ($old as $o) {
       if (!$o) {
         continue;
       }
       $map[$o['line']] = $o['type'];
     }
     return $map;
   }
 
   public function setOldLineTypeMap(array $map) {
     $lines = $this->getOldLines();
     foreach ($lines as $key => $data) {
       $lines[$key]['type'] = $map[$data['line']];
     }
     $this->oldLines = $lines;
     return $this;
   }
 
   public function getNewLineTypeMap() {
     $map = array();
     $new = $this->getNewLines();
     foreach ($new as $n) {
       if (!$n) {
         continue;
       }
       $map[$n['line']] = $n['type'];
     }
     return $map;
   }
 
   public function setNewLineTypeMap(array $map) {
     $lines = $this->getNewLines();
     foreach ($lines as $key => $data) {
       $lines[$key]['type'] = $map[$data['line']];
     }
     $this->newLines = $lines;
     return $this;
   }
 
 
   public function setWhitespaceMode($white_space_mode) {
     $this->whitespaceMode = $white_space_mode;
     return $this;
   }
 
   private function getWhitespaceMode() {
     if ($this->whitespaceMode === null) {
       throw new Exception(
         'You must setWhitespaceMode before accessing this data.'
       );
     }
     return $this->whitespaceMode;
   }
 
   public function getIsDeleted() {
     foreach ($this->getNewLines() as $line) {
       if ($line) {
         // At least one new line, so the entire file wasn't deleted.
         return false;
       }
     }
 
     foreach ($this->getOldLines() as $line) {
       if ($line) {
         // No new lines, at least one old line; the entire file was deleted.
         return true;
       }
     }
 
     // This is an empty file.
     return false;
   }
 
   /**
    * Returns true if the hunks change any text, not just whitespace.
    */
   public function getHasTextChanges() {
     return $this->getHasChanges('text');
   }
 
   /**
    * Returns true if the hunks change anything, including whitespace.
    */
   public function getHasAnyChanges() {
     return $this->getHasChanges('any');
   }
 
   private function getHasChanges($filter) {
     if ($filter !== 'any' && $filter !== 'text') {
       throw new Exception("Unknown change filter '{$filter}'.");
     }
 
     $old = $this->getOldLines();
     $new = $this->getNewLines();
 
     $is_any = ($filter === 'any');
 
     foreach ($old as $key => $o) {
       $n = $new[$key];
       if ($o === null || $n === null) {
         // One side is missing, and it's impossible for both sides to be null,
         // so the other side must have something, and thus the two sides are
         // different and the file has been changed under any type of filter.
         return true;
       }
 
       if ($o['type'] !== $n['type']) {
         // The types are different, so either the underlying text is actually
         // different or whatever whitespace rules we're using consider them
         // different.
         return true;
       }
 
       if ($o['text'] !== $n['text']) {
         if ($is_any) {
           // The text is different, so there's a change.
           return true;
         } else if (trim($o['text']) !== trim($n['text'])) {
           return true;
         }
       }
     }
 
     // No changes anywhere in the file.
     return false;
   }
 
 
   /**
    * This function takes advantage of the parsing work done in
    * @{method:parseHunksForLineData} and continues the struggle to hammer this
    * data into something we can display to a user.
    *
    * In particular, this function re-parses the hunks to make them equivalent
    * in length for easy rendering, adding `null` as necessary to pad the
    * length.
    *
    * Anyhoo, this function is not particularly well-named but I try.
    *
    * NOTE: this function must be called after
    * @{method:parseHunksForLineData}.
    */
   public function reparseHunksForSpecialAttributes() {
     $rebuild_old = array();
     $rebuild_new = array();
 
     $old_lines = array_reverse($this->getOldLines());
     $new_lines = array_reverse($this->getNewLines());
 
     while (count($old_lines) || count($new_lines)) {
       $old_line_data = array_pop($old_lines);
       $new_line_data = array_pop($new_lines);
 
       if ($old_line_data) {
         $o_type = $old_line_data['type'];
       } else {
         $o_type = null;
       }
 
       if ($new_line_data) {
         $n_type = $new_line_data['type'];
       } else {
         $n_type = null;
       }
 
       // This line does not exist in the new file.
       if (($o_type != null) && ($n_type == null)) {
         $rebuild_old[] = $old_line_data;
         $rebuild_new[] = null;
         if ($new_line_data) {
           array_push($new_lines, $new_line_data);
         }
         continue;
       }
 
       // This line does not exist in the old file.
       if (($n_type != null) && ($o_type == null)) {
         $rebuild_old[] = null;
         $rebuild_new[] = $new_line_data;
         if ($old_line_data) {
           array_push($old_lines, $old_line_data);
         }
         continue;
       }
 
       $rebuild_old[] = $old_line_data;
       $rebuild_new[] = $new_line_data;
     }
 
     $this->setOldLines($rebuild_old);
     $this->setNewLines($rebuild_new);
 
     $this->updateChangeTypesForWhitespaceMode();
 
     return $this;
   }
 
   private function updateChangeTypesForWhitespaceMode() {
     $mode = $this->getWhitespaceMode();
 
     $mode_show_all = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
     if ($mode === $mode_show_all) {
       // If we're showing all whitespace, we don't need to perform any updates.
       return;
     }
 
     $mode_trailing = DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING;
     $is_trailing = ($mode === $mode_trailing);
 
     $new = $this->getNewLines();
     $old = $this->getOldLines();
     foreach ($old as $key => $o) {
       $n = $new[$key];
 
       if (!$o || !$n) {
         continue;
       }
 
       if ($is_trailing) {
         // In "trailing" mode, we need to identify lines which are marked
         // changed but differ only by trailing whitespace. We mark these lines
         // unchanged.
         if ($o['type'] != $n['type']) {
           if (rtrim($o['text']) === rtrim($n['text'])) {
             $old[$key]['type'] = null;
             $new[$key]['type'] = null;
           }
         }
       } else {
         // In "ignore most" and "ignore all" modes, we need to identify lines
         // which are marked unchanged but have internal whitespace changes.
         // We want to ignore leading and trailing whitespace changes only, not
         // internal whitespace changes (`diff` doesn't have a mode for this, so
         // we have to fix it here). If the text is marked unchanged but the
         // old and new text differs by internal space, mark the lines changed.
         if ($o['type'] === null && $n['type'] === null) {
           if ($o['text'] !== $n['text']) {
             if (trim($o['text']) !== trim($n['text'])) {
               $old[$key]['type'] = '-';
               $new[$key]['type'] = '+';
             }
           }
         }
       }
     }
 
     $this->setOldLines($old);
     $this->setNewLines($new);
 
     return $this;
   }
 
   public function generateIntraLineDiffs() {
     $old = $this->getOldLines();
     $new = $this->getNewLines();
 
     $diffs = array();
     foreach ($old as $key => $o) {
       $n = $new[$key];
 
       if (!$o || !$n) {
         continue;
       }
 
       if ($o['type'] != $n['type']) {
         $diffs[$key] = ArcanistDiffUtils::generateIntralineDiff(
           $o['text'],
           $n['text']);
       }
     }
 
     $this->setIntraLineDiffs($diffs);
 
     return $this;
   }
 
   public function generateVisibileLinesMask() {
     $lines_context = DifferentialChangesetParser::LINES_CONTEXT;
     $old = $this->getOldLines();
     $new = $this->getNewLines();
     $max_length = max(count($old), count($new));
     $visible = false;
     $last = 0;
     $mask = array();
     for ($cursor = -$lines_context; $cursor < $max_length; $cursor++) {
       $offset = $cursor + $lines_context;
       if ((isset($old[$offset]) && $old[$offset]['type']) ||
           (isset($new[$offset]) && $new[$offset]['type'])) {
         $visible = true;
         $last = $offset;
       } else if ($cursor > $last + $lines_context) {
         $visible = false;
       }
       if ($visible && $cursor > 0) {
         $mask[$cursor] = 1;
       }
     }
 
     $this->setVisibleLinesMask($mask);
 
     return $this;
   }
 
   public function getOldCorpus() {
     return $this->getCorpus($this->getOldLines());
   }
 
   public function getNewCorpus() {
     return $this->getCorpus($this->getNewLines());
   }
 
   private function getCorpus(array $lines) {
 
     $corpus = array();
     foreach ($lines as $l) {
       if ($l['type'] != '\\') {
         if ($l['text'] === null) {
           // There's no text on this side of the diff, but insert a placeholder
           // newline so the highlighted line numbers match up.
           $corpus[] = "\n";
         } else {
           $corpus[] = $l['text'];
         }
       }
     }
     return $corpus;
   }
 
   public function parseHunksForLineData(array $hunks) {
     assert_instances_of($hunks, 'DifferentialHunk');
 
     $old_lines = array();
     $new_lines = array();
     foreach ($hunks as $hunk) {
 
       $lines = $hunk->getChanges();
       $lines = phutil_split_lines($lines);
 
       $line_type_map = array();
       $line_text = array();
       foreach ($lines as $line_index => $line) {
         if (isset($line[0])) {
           $char = $line[0];
           switch ($char) {
-            case " ":
+            case ' ':
               $line_type_map[$line_index] = null;
               $line_text[$line_index] = substr($line, 1);
               break;
             case "\r":
             case "\n":
               // NOTE: Normally, the first character is a space, plus, minus or
               // backslash, but it may be a newline if it used to be a space and
               // trailing whitespace has been stripped via email transmission or
               // some similar mechanism. In these cases, we essentially pretend
               // the missing space is still there.
               $line_type_map[$line_index] = null;
               $line_text[$line_index] = $line;
               break;
-            case "+":
-            case "-":
-            case "\\":
+            case '+':
+            case '-':
+            case '\\':
               $line_type_map[$line_index] = $char;
               $line_text[$line_index] = substr($line, 1);
               break;
             default:
               throw new Exception(
                 pht(
                   'Unexpected leading character "%s" at line index %s!',
                   $char,
                   $line_index));
           }
         } else {
           $line_type_map[$line_index] = null;
           $line_text[$line_index] = '';
         }
       }
 
       $old_line = $hunk->getOldOffset();
       $new_line = $hunk->getNewOffset();
 
       $num_lines = count($lines);
       for ($cursor = 0; $cursor < $num_lines; $cursor++) {
         $type = $line_type_map[$cursor];
         $data = array(
           'type'  => $type,
           'text'  => $line_text[$cursor],
           'line'  => $new_line,
         );
         if ($type == '\\') {
           $type = $line_type_map[$cursor - 1];
           $data['text'] = ltrim($data['text']);
         }
         switch ($type) {
           case '+':
             $new_lines[] = $data;
             ++$new_line;
             break;
           case '-':
             $data['line'] = $old_line;
             $old_lines[] = $data;
             ++$old_line;
             break;
           default:
             $new_lines[] = $data;
             $data['line'] = $old_line;
             $old_lines[] = $data;
             ++$new_line;
             ++$old_line;
             break;
         }
       }
     }
 
     $this->setOldLines($old_lines);
     $this->setNewLines($new_lines);
 
     return $this;
   }
 
   public function parseHunksForHighlightMasks(
     array $changeset_hunks,
     array $old_hunks,
     array $new_hunks) {
     assert_instances_of($changeset_hunks, 'DifferentialHunk');
     assert_instances_of($old_hunks,       'DifferentialHunk');
     assert_instances_of($new_hunks,       'DifferentialHunk');
 
     // Put changes side by side.
     $olds = array();
     $news = array();
     foreach ($changeset_hunks as $hunk) {
       $n_old = $hunk->getOldOffset();
       $n_new = $hunk->getNewOffset();
       $changes = phutil_split_lines($hunk->getChanges());
       foreach ($changes as $line) {
         $diff_type = $line[0]; // Change type in diff of diffs.
         $orig_type = $line[1]; // Change type in the original diff.
         if ($diff_type == ' ') {
           // Use the same key for lines that are next to each other.
           $key = max(last_key($olds), last_key($news)) + 1;
           $olds[$key] = null;
           $news[$key] = null;
         } else if ($diff_type == '-') {
           $olds[] = array($n_old, $orig_type);
         } else if ($diff_type == '+') {
           $news[] = array($n_new, $orig_type);
         }
         if (($diff_type == '-' || $diff_type == ' ') && $orig_type != '-') {
           $n_old++;
         }
         if (($diff_type == '+' || $diff_type == ' ') && $orig_type != '-') {
           $n_new++;
         }
       }
     }
 
     $offsets_old = $this->computeOffsets($old_hunks);
     $offsets_new = $this->computeOffsets($new_hunks);
 
     // Highlight lines that were added on each side or removed on the other
     // side.
     $highlight_old = array();
     $highlight_new = array();
     $last = max(last_key($olds), last_key($news));
     for ($i = 0; $i <= $last; $i++) {
       if (isset($olds[$i])) {
         list($n, $type) = $olds[$i];
         if ($type == '+' ||
             ($type == ' ' && isset($news[$i]) && $news[$i][1] != ' ')) {
           $highlight_old[] = $offsets_old[$n];
         }
       }
       if (isset($news[$i])) {
         list($n, $type) = $news[$i];
         if ($type == '+' ||
             ($type == ' ' && isset($olds[$i]) && $olds[$i][1] != ' ')) {
           $highlight_new[] = $offsets_new[$n];
         }
       }
     }
 
     return array($highlight_old, $highlight_new);
   }
 
   public function makeContextDiff(
     array $hunks,
     $is_new,
     $line_number,
     $line_length,
     $add_context) {
 
     assert_instances_of($hunks, 'DifferentialHunk');
 
     $context = array();
 
     if ($is_new) {
       $prefix = '+';
     } else {
       $prefix = '-';
     }
 
     foreach ($hunks as $hunk) {
       if ($is_new) {
         $offset = $hunk->getNewOffset();
         $length = $hunk->getNewLen();
       } else {
         $offset = $hunk->getOldOffset();
         $length = $hunk->getOldLen();
       }
       $start = $line_number - $offset;
       $end = $start + $line_length;
       // We need to go in if $start == $length, because the last line
       // might be a "\No newline at end of file" marker, which we want
       // to show if the additional context is > 0.
       if ($start <= $length && $end >= 0) {
         $start = $start - $add_context;
         $end = $end + $add_context;
         $hunk_content = array();
-        $hunk_pos = array( "-" => 0, "+" => 0 );
-        $hunk_offset = array( "-" => null, "+" => null );
-        $hunk_last = array( "-" => null, "+" => null );
+        $hunk_pos = array( '-' => 0, '+' => 0 );
+        $hunk_offset = array( '-' => null, '+' => null );
+        $hunk_last = array( '-' => null, '+' => null );
         foreach (explode("\n", $hunk->getChanges()) as $line) {
-          $in_common = strncmp($line, " ", 1) === 0;
-          $in_old = strncmp($line, "-", 1) === 0 || $in_common;
-          $in_new = strncmp($line, "+", 1) === 0 || $in_common;
+          $in_common = strncmp($line, ' ', 1) === 0;
+          $in_old = strncmp($line, '-', 1) === 0 || $in_common;
+          $in_new = strncmp($line, '+', 1) === 0 || $in_common;
           $in_selected = strncmp($line, $prefix, 1) === 0;
           $skip = !$in_selected && !$in_common;
           if ($hunk_pos[$prefix] <= $end) {
             if ($start <= $hunk_pos[$prefix]) {
               if (!$skip || ($hunk_pos[$prefix] != $start &&
                 $hunk_pos[$prefix] != $end)) {
                   if ($in_old) {
-                    if ($hunk_offset["-"] === null) {
-                      $hunk_offset["-"] = $hunk_pos["-"];
+                    if ($hunk_offset['-'] === null) {
+                      $hunk_offset['-'] = $hunk_pos['-'];
                     }
-                    $hunk_last["-"] = $hunk_pos["-"];
+                    $hunk_last['-'] = $hunk_pos['-'];
                   }
                   if ($in_new) {
-                    if ($hunk_offset["+"] === null) {
-                      $hunk_offset["+"] = $hunk_pos["+"];
+                    if ($hunk_offset['+'] === null) {
+                      $hunk_offset['+'] = $hunk_pos['+'];
                     }
-                    $hunk_last["+"] = $hunk_pos["+"];
+                    $hunk_last['+'] = $hunk_pos['+'];
                   }
 
                   $hunk_content[] = $line;
                 }
             }
-            if ($in_old) { ++$hunk_pos["-"]; }
-            if ($in_new) { ++$hunk_pos["+"]; }
+            if ($in_old) { ++$hunk_pos['-']; }
+            if ($in_new) { ++$hunk_pos['+']; }
           }
         }
-        if ($hunk_offset["-"] !== null || $hunk_offset["+"] !== null) {
-          $header = "@@";
-          if ($hunk_offset["-"] !== null) {
-            $header .= " -" . ($hunk->getOldOffset() + $hunk_offset["-"]) .
-              "," . ($hunk_last["-"] - $hunk_offset["-"] + 1);
+        if ($hunk_offset['-'] !== null || $hunk_offset['+'] !== null) {
+          $header = '@@';
+          if ($hunk_offset['-'] !== null) {
+            $header .= ' -' . ($hunk->getOldOffset() + $hunk_offset['-']) .
+              ',' . ($hunk_last['-'] - $hunk_offset['-'] + 1);
           }
-          if ($hunk_offset["+"] !== null) {
-            $header .= " +" . ($hunk->getNewOffset() + $hunk_offset["+"]) .
-              "," . ($hunk_last["+"] - $hunk_offset["+"] + 1);
+          if ($hunk_offset['+'] !== null) {
+            $header .= ' +' . ($hunk->getNewOffset() + $hunk_offset['+']) .
+              ',' . ($hunk_last['+'] - $hunk_offset['+'] + 1);
           }
-          $header .= " @@";
+          $header .= ' @@';
           $context[] = $header;
           $context[] = implode("\n", $hunk_content);
         }
       }
     }
     return implode("\n", $context);
   }
 
   private function computeOffsets(array $hunks) {
     assert_instances_of($hunks, 'DifferentialHunk');
 
     $offsets = array();
     $n = 1;
     foreach ($hunks as $hunk) {
       for ($i = 0; $i < $hunk->getNewLen(); $i++) {
         $offsets[$n] = $hunk->getNewOffset() + $i;
         $n++;
       }
     }
     return $offsets;
   }
 }
diff --git a/src/applications/differential/parser/__tests__/DifferentialCustomFieldRevertsParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialCustomFieldRevertsParserTestCase.php
index bb7a27631..ff8d1c1bf 100644
--- a/src/applications/differential/parser/__tests__/DifferentialCustomFieldRevertsParserTestCase.php
+++ b/src/applications/differential/parser/__tests__/DifferentialCustomFieldRevertsParserTestCase.php
@@ -1,92 +1,92 @@
 <?php
 
 final class DifferentialCustomFieldRevertsParserTestCase
   extends PhabricatorTestCase {
 
   public function testParser() {
     $map = array(
       'quack quack quack' => array(),
 
       // Git default message.
       'This reverts commit 1234abcd.' => array(
         array(
           'match' => 'reverts commit 1234abcd',
           'prefix' => 'reverts',
           'infix' => 'commit',
           'monograms' => array('1234abcd'),
           'suffix' => '',
           'offset' => 5,
         ),
       ),
 
       // Mercurial default message.
       'Backed out changeset 1234abcd.' => array(
         array(
           'match' => 'Backed out changeset 1234abcd',
           'prefix' => 'Backed out',
           'infix' => 'changeset',
           'monograms' => array('1234abcd'),
           'suffix' => '',
           'offset' => 0,
         ),
       ),
 
       'this undoes 1234abcd, 5678efab. they were bad' => array(
         array(
           'match' => 'undoes 1234abcd, 5678efab',
           'prefix' => 'undoes',
           'infix' => '',
           'monograms' => array('1234abcd', '5678efab'),
           'suffix' => '',
           'offset' => 5,
         ),
       ),
 
-      "Reverts 123" => array(
+      'Reverts 123' => array(
         array(
           'match' => 'Reverts 123',
           'prefix' => 'Reverts',
           'infix' => '',
           'monograms' => array('123'),
           'suffix' => '',
           'offset' => 0,
         ),
       ),
 
 
-      "Reverts r123" => array(
+      'Reverts r123' => array(
         array(
           'match' => 'Reverts r123',
           'prefix' => 'Reverts',
           'infix' => '',
           'monograms' => array('r123'),
           'suffix' => '',
           'offset' => 0,
         ),
       ),
 
       "Backs out commit\n99\n100" => array(
         array(
           'match' => "Backs out commit\n99\n100",
           'prefix' => 'Backs out',
           'infix' => 'commit',
           'monograms' => array('99', '100'),
           'suffix' => '',
           'offset' => 0,
         ),
       ),
 
       "This doesn't revert anything" => array(),
       'nonrevert of r11' => array(),
-      "fixed a bug" => array(),
+      'fixed a bug' => array(),
     );
 
     foreach ($map as $input => $expect) {
       $parser = new DifferentialCustomFieldRevertsParser();
       $output = $parser->parseCorpus($input);
 
       $this->assertEqual($expect, $output, $input);
     }
   }
 
 }
diff --git a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
index 9147ea3ad..dc4acb383 100644
--- a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
+++ b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
@@ -1,289 +1,289 @@
 <?php
 
 final class DifferentialHunkParserTestCase extends PhabricatorTestCase {
 
   private function createComment() {
     $comment = new DifferentialInlineComment();
     return $comment;
   }
 
   private function createHunk(
     $old_offset,
     $old_len,
     $new_offset,
     $new_len,
     $changes) {
 
     $hunk = id(new DifferentialHunkModern())
       ->setOldOffset($old_offset)
       ->setOldLen($old_len)
       ->setNewOffset($new_offset)
       ->setNewLen($new_len)
       ->setChanges($changes);
 
     return $hunk;
   }
 
   // Returns a change that consists of a single hunk, starting at line 1.
   private function createSingleChange($old_lines, $new_lines, $changes) {
     return array(
       0 => $this->createHunk(1, $old_lines, 1, $new_lines, $changes),
     );
   }
 
   private function createHunksFromFile($name) {
     $data = Filesystem::readFile(dirname(__FILE__).'/data/'.$name);
 
     $parser = new ArcanistDiffParser();
     $changes = $parser->parseDiff($data);
     if (count($changes) !== 1) {
       throw new Exception("Expected 1 changeset for '{$name}'!");
     }
 
     $diff = DifferentialDiff::newFromRawChanges($changes);
     return head($diff->getChangesets())->getHunks();
   }
 
   public function testOneLineOldComment() {
     $parser = new DifferentialHunkParser();
-    $hunks = $this->createSingleChange(1, 0, "-a");
+    $hunks = $this->createSingleChange(1, 0, '-a');
     $context = $parser->makeContextDiff(
       $hunks,
       0,
       1,
       0,
       0);
     $this->assertEqual("@@ -1,1 @@\n-a", $context);
   }
 
   public function testOneLineNewComment() {
     $parser = new DifferentialHunkParser();
-    $hunks = $this->createSingleChange(0, 1, "+a");
+    $hunks = $this->createSingleChange(0, 1, '+a');
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       1,
       0,
       0);
     $this->assertEqual("@@ +1,1 @@\n+a", $context);
   }
 
   public function testCannotFindContext() {
     $parser = new DifferentialHunkParser();
-    $hunks = $this->createSingleChange(0, 1, "+a");
+    $hunks = $this->createSingleChange(0, 1, '+a');
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       2,
       0,
       0);
-    $this->assertEqual("", $context);
+    $this->assertEqual('', $context);
   }
 
   public function testOverlapFromStartOfHunk() {
     $parser = new DifferentialHunkParser();
     $hunks = array(
       0 => $this->createHunk(23, 2, 42, 2, " 1\n 2"),
     );
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       41,
       1,
       0);
     $this->assertEqual("@@ -23,1 +42,1 @@\n 1", $context);
   }
 
   public function testOverlapAfterEndOfHunk() {
     $parser = new DifferentialHunkParser();
     $hunks = array(
       0 => $this->createHunk(23, 2, 42, 2, " 1\n 2"),
     );
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       43,
       1,
       0);
     $this->assertEqual("@@ -24,1 +43,1 @@\n 2", $context);
   }
 
   public function testInclusionOfNewFileInOldCommentFromStart() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(2, 3,
          "+n1\n".
          " e1/2\n".
          "-o2\n".
          "+n3\n");
     $context = $parser->makeContextDiff(
       $hunks,
       0,
       1,
       1,
       0);
     $this->assertEqual(
         "@@ -1,2 +2,1 @@\n".
         " e1/2\n".
         "-o2", $context);
   }
 
   public function testInclusionOfOldFileInNewCommentFromStart() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(2, 2,
          "-o1\n".
          " e2/1\n".
          "-o3\n".
          "+n2\n");
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       1,
       1,
       0);
     $this->assertEqual(
         "@@ -2,1 +1,2 @@\n".
         " e2/1\n".
         "+n2", $context);
   }
 
   public function testNoNewlineAtEndOfFile() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(0, 1,
         "+a\n".
         "\\No newline at end of file");
     // Note that this only works with additional context.
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       2,
       0,
       1);
     $this->assertEqual(
         "@@ +1,1 @@\n".
         "+a\n".
         "\\No newline at end of file", $context);
   }
 
   public function testMultiLineNewComment() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(7, 7,
         " e1\n".
         " e2\n".
         "-o3\n".
         "-o4\n".
         "+n3\n".
         " e5/4\n".
         " e6/5\n".
         "+n6\n".
         " e7\n");
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       2,
       4,
       0);
     $this->assertEqual(
         "@@ -2,5 +2,5 @@\n".
         " e2\n".
         "-o3\n".
         "-o4\n".
         "+n3\n".
         " e5/4\n".
         " e6/5\n".
         "+n6", $context);
   }
 
   public function testMultiLineOldComment() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(7, 7,
         " e1\n".
         " e2\n".
         "-o3\n".
         "-o4\n".
         "+n3\n".
         " e5/4\n".
         " e6/5\n".
         "+n6\n".
         " e7\n");
     $context = $parser->makeContextDiff(
       $hunks,
       0,
       2,
       4,
       0);
     $this->assertEqual(
         "@@ -2,5 +2,4 @@\n".
         " e2\n".
         "-o3\n".
         "-o4\n".
         "+n3\n".
         " e5/4\n".
         " e6/5", $context);
   }
 
   public function testInclusionOfNewFileInOldCommentFromStartWithContext() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(2, 3,
          "+n1\n".
          " e1/2\n".
          "-o2\n".
          "+n3\n");
     $context = $parser->makeContextDiff(
       $hunks,
       0,
       1,
       1,
       1);
     $this->assertEqual(
         "@@ -1,2 +1,2 @@\n".
         "+n1\n".
         " e1/2\n".
         "-o2", $context);
   }
 
   public function testInclusionOfOldFileInNewCommentFromStartWithContext() {
     $parser = new DifferentialHunkParser();
     $hunks = $this->createSingleChange(2, 2,
          "-o1\n".
          " e2/1\n".
          "-o3\n".
          "+n2\n");
     $context = $parser->makeContextDiff(
       $hunks,
       1,
       1,
       1,
       1);
     $this->assertEqual(
         "@@ -1,3 +1,2 @@\n".
         "-o1\n".
         " e2/1\n".
         "-o3\n".
         "+n2", $context);
   }
 
   public function testMissingContext() {
     $tests = array(
       'missing_context.diff' => array(
         4 => true,
       ),
       'missing_context_2.diff' => array(
         5 => true,
       ),
       'missing_context_3.diff' => array(
         4 => true,
         13 => true,
       ),
     );
 
     foreach ($tests as $name => $expect) {
       $hunks = $this->createHunksFromFile($name);
 
       $parser = new DifferentialHunkParser();
       $actual = $parser->getHunkStartLines($hunks);
 
       $this->assertEqual($expect, $actual, $name);
     }
   }
 
 }
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 4c6ba908c..dd6854302 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -1,1170 +1,1170 @@
 <?php
 
 /**
  * Flexible query API for Differential revisions. Example:
  *
  *   // Load open revisions
  *   $revisions = id(new DifferentialRevisionQuery())
  *     ->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
  *     ->execute();
  *
  * @task config   Query Configuration
  * @task exec     Query Execution
  * @task internal Internals
  */
 final class DifferentialRevisionQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $pathIDs = array();
 
   private $status             = 'status-any';
   const STATUS_ANY            = 'status-any';
   const STATUS_OPEN           = 'status-open';
   const STATUS_ACCEPTED       = 'status-accepted';
   const STATUS_NEEDS_REVIEW   = 'status-needs-review';
   const STATUS_NEEDS_REVISION = 'status-needs-revision';
   const STATUS_CLOSED         = 'status-closed';
   const STATUS_ABANDONED      = 'status-abandoned';
 
   private $authors = array();
   private $draftAuthors = array();
   private $ccs = array();
   private $reviewers = array();
   private $revIDs = array();
   private $commitHashes = array();
   private $phids = array();
   private $responsibles = array();
   private $branches = array();
   private $arcanistProjectPHIDs = array();
   private $repositoryPHIDs;
 
   private $order            = 'order-modified';
   const ORDER_MODIFIED      = 'order-modified';
   const ORDER_CREATED       = 'order-created';
   /**
    * This is essentially a denormalized copy of the revision modified time that
    * should perform better for path queries with a LIMIT. Critically, when you
    * browse "/", every revision in that repository for all time will match so
    * the query benefits from being able to stop before fully materializing the
    * result set.
    */
   const ORDER_PATH_MODIFIED = 'order-path-modified';
 
   private $needRelationships  = false;
   private $needActiveDiffs    = false;
   private $needDiffIDs        = false;
   private $needCommitPHIDs    = false;
   private $needHashes         = false;
   private $needReviewerStatus = false;
   private $needReviewerAuthority;
   private $needDrafts;
   private $needFlags;
 
   private $buildingGlobalOrder;
 
 
 /* -(  Query Configuration  )------------------------------------------------ */
 
 
   /**
    * Filter results to revisions which affect a Diffusion path ID in a given
    * repository. You can call this multiple times to select revisions for
    * several paths.
    *
    * @param int Diffusion repository ID.
    * @param int Diffusion path ID.
    * @return this
    * @task config
    */
   public function withPath($repository_id, $path_id) {
     $this->pathIDs[] = array(
       'repositoryID' => $repository_id,
       'pathID'       => $path_id,
     );
     return $this;
   }
 
   /**
    * Filter results to revisions authored by one of the given PHIDs. Calling
    * this function will clear anything set by previous calls to
    * @{method:withAuthors}.
    *
    * @param array List of PHIDs of authors
    * @return this
    * @task config
    */
   public function withAuthors(array $author_phids) {
     $this->authors = $author_phids;
     return $this;
   }
 
   /**
    * Filter results to revisions with comments authored bythe given PHIDs
    *
    * @param array List of PHIDs of authors
    * @return this
    * @task config
    */
   public function withDraftRepliesByAuthors(array $author_phids) {
     $this->draftAuthors = $author_phids;
     return $this;
   }
 
   /**
    * Filter results to revisions which CC one of the listed people. Calling this
    * function will clear anything set by previous calls to @{method:withCCs}.
    *
    * @param array List of PHIDs of subscribers.
    * @return this
    * @task config
    */
   public function withCCs(array $cc_phids) {
     $this->ccs = $cc_phids;
     return $this;
   }
 
   /**
    * Filter results to revisions that have one of the provided PHIDs as
    * reviewers. Calling this function will clear anything set by previous calls
    * to @{method:withReviewers}.
    *
    * @param array List of PHIDs of reviewers
    * @return this
    * @task config
    */
   public function withReviewers(array $reviewer_phids) {
     $this->reviewers = $reviewer_phids;
     return $this;
   }
 
   /**
    * Filter results to revisions that have one of the provided commit hashes.
    * Calling this function will clear anything set by previous calls to
    * @{method:withCommitHashes}.
    *
    * @param array List of pairs <Class
    *              ArcanistDifferentialRevisionHash::HASH_$type constant,
    *              hash>
    * @return this
    * @task config
    */
   public function withCommitHashes(array $commit_hashes) {
     $this->commitHashes = $commit_hashes;
     return $this;
   }
 
   /**
    * Filter results to revisions with a given status. Provide a class constant,
    * such as ##DifferentialRevisionQuery::STATUS_OPEN##.
    *
    * @param const Class STATUS constant, like STATUS_OPEN.
    * @return this
    * @task config
    */
   public function withStatus($status_constant) {
     $this->status = $status_constant;
     return $this;
   }
 
 
   /**
    * Filter results to revisions on given branches.
    *
    * @param  list List of branch names.
    * @return this
    * @task config
    */
   public function withBranches(array $branches) {
     $this->branches = $branches;
     return $this;
   }
 
 
   /**
    * Filter results to only return revisions whose ids are in the given set.
    *
    * @param array List of revision ids
    * @return this
    * @task config
    */
   public function withIDs(array $ids) {
     $this->revIDs = $ids;
     return $this;
   }
 
 
   /**
    * Filter results to only return revisions whose PHIDs are in the given set.
    *
    * @param array List of revision PHIDs
    * @return this
    * @task config
    */
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
 
   /**
    * Given a set of users, filter results to return only revisions they are
    * responsible for (i.e., they are either authors or reviewers).
    *
    * @param array List of user PHIDs.
    * @return this
    * @task config
    */
   public function withResponsibleUsers(array $responsible_phids) {
     $this->responsibles = $responsible_phids;
     return $this;
   }
 
 
   /**
    * Filter results to only return revisions with a given set of arcanist
    * projects.
    *
    * @param array List of project PHIDs.
    * @return this
    * @task config
    */
   public function withArcanistProjectPHIDs(array $arc_project_phids) {
     $this->arcanistProjectPHIDs = $arc_project_phids;
     return $this;
   }
 
   public function withRepositoryPHIDs(array $repository_phids) {
     $this->repositoryPHIDs = $repository_phids;
     return $this;
   }
 
 
   /**
    * Set result ordering. Provide a class constant, such as
    * ##DifferentialRevisionQuery::ORDER_CREATED##.
    *
    * @task config
    */
   public function setOrder($order_constant) {
     $this->order = $order_constant;
     return $this;
   }
 
 
   /**
    * Set whether or not the query will load and attach relationships.
    *
    * @param bool True to load and attach relationships.
    * @return this
    * @task config
    */
   public function needRelationships($need_relationships) {
     $this->needRelationships = $need_relationships;
     return $this;
   }
 
 
   /**
    * Set whether or not the query should load the active diff for each
    * revision.
    *
    * @param bool True to load and attach diffs.
    * @return this
    * @task config
    */
   public function needActiveDiffs($need_active_diffs) {
     $this->needActiveDiffs = $need_active_diffs;
     return $this;
   }
 
 
   /**
    * Set whether or not the query should load the associated commit PHIDs for
    * each revision.
    *
    * @param bool True to load and attach diffs.
    * @return this
    * @task config
    */
   public function needCommitPHIDs($need_commit_phids) {
     $this->needCommitPHIDs = $need_commit_phids;
     return $this;
   }
 
 
   /**
    * Set whether or not the query should load associated diff IDs for each
    * revision.
    *
    * @param bool True to load and attach diff IDs.
    * @return this
    * @task config
    */
   public function needDiffIDs($need_diff_ids) {
     $this->needDiffIDs = $need_diff_ids;
     return $this;
   }
 
 
   /**
    * Set whether or not the query should load associated commit hashes for each
    * revision.
    *
    * @param bool True to load and attach commit hashes.
    * @return this
    * @task config
    */
   public function needHashes($need_hashes) {
     $this->needHashes = $need_hashes;
     return $this;
   }
 
 
   /**
    * Set whether or not the query should load associated reviewer status.
    *
    * @param bool True to load and attach reviewers.
    * @return this
    * @task config
    */
   public function needReviewerStatus($need_reviewer_status) {
     $this->needReviewerStatus = $need_reviewer_status;
     return $this;
   }
 
 
   /**
    * Request information about the viewer's authority to act on behalf of each
    * reviewer. In particular, they have authority to act on behalf of projects
    * they are a member of.
    *
    * @param bool True to load and attach authority.
    * @return this
    * @task config
    */
   public function needReviewerAuthority($need_reviewer_authority) {
     $this->needReviewerAuthority = $need_reviewer_authority;
     return $this;
   }
 
   public function needFlags($need_flags) {
     $this->needFlags = $need_flags;
     return $this;
   }
 
   public function needDrafts($need_drafts) {
     $this->needDrafts = $need_drafts;
     return $this;
   }
 
 
 /* -(  Query Execution  )---------------------------------------------------- */
 
 
   /**
    * Execute the query as configured, returning matching
    * @{class:DifferentialRevision} objects.
    *
    * @return list List of matching DifferentialRevision objects.
    * @task exec
    */
   public function loadPage() {
     $table = new DifferentialRevision();
     $conn_r = $table->establishConnection('r');
 
     $data = $this->loadData();
 
     return $table->loadAllFromArray($data);
   }
 
   public function willFilterPage(array $revisions) {
     $viewer = $this->getViewer();
 
     $repository_phids = mpull($revisions, 'getRepositoryPHID');
     $repository_phids = array_filter($repository_phids);
 
     $repositories = array();
     if ($repository_phids) {
       $repositories = id(new PhabricatorRepositoryQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs($repository_phids)
         ->execute();
       $repositories = mpull($repositories, null, 'getPHID');
     }
 
     // If a revision is associated with a repository:
     //
     //   - the viewer must be able to see the repository; or
     //   - the viewer must have an automatic view capability.
     //
     // In the latter case, we'll load the revision but not load the repository.
 
     $can_view = PhabricatorPolicyCapability::CAN_VIEW;
     foreach ($revisions as $key => $revision) {
       $repo_phid = $revision->getRepositoryPHID();
       if (!$repo_phid) {
         // The revision has no associated repository. Attach `null` and move on.
         $revision->attachRepository(null);
         continue;
       }
 
       $repository = idx($repositories, $repo_phid);
       if ($repository) {
         // The revision has an associated repository, and the viewer can see
         // it. Attach it and move on.
         $revision->attachRepository($repository);
         continue;
       }
 
       if ($revision->hasAutomaticCapability($can_view, $viewer)) {
         // The revision has an associated repository which the viewer can not
         // see, but the viewer has an automatic capability on this revision.
         // Load the revision without attaching a repository.
         $revision->attachRepository(null);
         continue;
       }
 
       if ($this->getViewer()->isOmnipotent()) {
         // The viewer is omnipotent. Allow the revision to load even without
         // a repository.
         $revision->attachRepository(null);
         continue;
       }
 
       // The revision has an associated repository, and the viewer can't see
       // it, and the viewer has no special capabilities. Filter out this
       // revision.
       $this->didRejectResult($revision);
       unset($revisions[$key]);
     }
 
     if (!$revisions) {
       return array();
     }
 
     $table = new DifferentialRevision();
     $conn_r = $table->establishConnection('r');
 
     if ($this->needRelationships) {
       $this->loadRelationships($conn_r, $revisions);
     }
 
     if ($this->needCommitPHIDs) {
       $this->loadCommitPHIDs($conn_r, $revisions);
     }
 
     $need_active = $this->needActiveDiffs;
     $need_ids = $need_active || $this->needDiffIDs;
 
     if ($need_ids) {
       $this->loadDiffIDs($conn_r, $revisions);
     }
 
     if ($need_active) {
       $this->loadActiveDiffs($conn_r, $revisions);
     }
 
     if ($this->needHashes) {
       $this->loadHashes($conn_r, $revisions);
     }
 
     if ($this->needReviewerStatus || $this->needReviewerAuthority) {
       $this->loadReviewers($conn_r, $revisions);
     }
 
     return $revisions;
   }
 
   protected function didFilterPage(array $revisions) {
     $viewer = $this->getViewer();
 
     if ($this->needFlags) {
       $flags = id(new PhabricatorFlagQuery())
         ->setViewer($viewer)
         ->withOwnerPHIDs(array($viewer->getPHID()))
         ->withObjectPHIDs(mpull($revisions, 'getPHID'))
         ->execute();
       $flags = mpull($flags, null, 'getObjectPHID');
       foreach ($revisions as $revision) {
         $revision->attachFlag(
           $viewer,
           idx($flags, $revision->getPHID()));
       }
     }
 
     if ($this->needDrafts) {
       $drafts = id(new DifferentialDraft())->loadAllWhere(
         'authorPHID = %s AND objectPHID IN (%Ls)',
         $viewer->getPHID(),
         mpull($revisions, 'getPHID'));
       $drafts = mgroup($drafts, 'getObjectPHID');
       foreach ($revisions as $revision) {
         $revision->attachDrafts(
           $viewer,
           idx($drafts, $revision->getPHID(), array()));
       }
     }
 
     return $revisions;
   }
 
   private function loadData() {
     $table = new DifferentialRevision();
     $conn_r = $table->establishConnection('r');
 
     $selects = array();
 
     // NOTE: If the query includes "responsiblePHIDs", we execute it as a
     // UNION of revisions they own and revisions they're reviewing. This has
     // much better performance than doing it with JOIN/WHERE.
     if ($this->responsibles) {
       $basic_authors = $this->authors;
       $basic_reviewers = $this->reviewers;
 
       $authority_projects = id(new PhabricatorProjectQuery())
         ->setViewer($this->getViewer())
         ->withMemberPHIDs($this->responsibles)
         ->execute();
       $authority_phids = mpull($authority_projects, 'getPHID');
 
       try {
         // Build the query where the responsible users are authors.
         $this->authors = array_merge($basic_authors, $this->responsibles);
         $this->reviewers = $basic_reviewers;
         $selects[] = $this->buildSelectStatement($conn_r);
 
         // Build the query where the responsible users are reviewers, or
         // projects they are members of are reviewers.
         $this->authors = $basic_authors;
         $this->reviewers = array_merge(
           $basic_reviewers,
           $this->responsibles,
           $authority_phids);
         $selects[] = $this->buildSelectStatement($conn_r);
 
         // Put everything back like it was.
         $this->authors = $basic_authors;
         $this->reviewers = $basic_reviewers;
       } catch (Exception $ex) {
         $this->authors = $basic_authors;
         $this->reviewers = $basic_reviewers;
         throw $ex;
       }
     } else {
       $selects[] = $this->buildSelectStatement($conn_r);
     }
 
     if (count($selects) > 1) {
       $this->buildingGlobalOrder = true;
       $query = qsprintf(
         $conn_r,
         '%Q %Q %Q',
         implode(' UNION DISTINCT ', $selects),
         $this->buildOrderClause($conn_r),
         $this->buildLimitClause($conn_r));
     } else {
       $query = head($selects);
     }
 
     return queryfx_all($conn_r, '%Q', $query);
   }
 
   private function buildSelectStatement(AphrontDatabaseConnection $conn_r) {
     $table = new DifferentialRevision();
 
     $select = qsprintf(
       $conn_r,
       'SELECT r.* FROM %T r',
       $table->getTableName());
 
     $joins = $this->buildJoinsClause($conn_r);
     $where = $this->buildWhereClause($conn_r);
     $group_by = $this->buildGroupByClause($conn_r);
 
     $this->buildingGlobalOrder = false;
     $order_by = $this->buildOrderClause($conn_r);
 
     $limit = $this->buildLimitClause($conn_r);
 
     return qsprintf(
       $conn_r,
       '(%Q %Q %Q %Q %Q %Q)',
       $select,
       $joins,
       $where,
       $group_by,
       $order_by,
       $limit);
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   private function buildJoinsClause($conn_r) {
     $joins = array();
     if ($this->pathIDs) {
       $path_table = new DifferentialAffectedPath();
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T p ON p.revisionID = r.id',
         $path_table->getTableName());
     }
 
     if ($this->commitHashes) {
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T hash_rel ON hash_rel.revisionID = r.id',
         ArcanistDifferentialRevisionHash::TABLE_NAME);
     }
 
     if ($this->ccs) {
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T e_ccs ON e_ccs.src = r.phid '.
         'AND e_ccs.type = %s '.
         'AND e_ccs.dst in (%Ls)',
         PhabricatorEdgeConfig::TABLE_NAME_EDGE,
         PhabricatorEdgeConfig::TYPE_OBJECT_HAS_SUBSCRIBER,
         $this->ccs);
     }
 
     if ($this->reviewers) {
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T e_reviewers ON e_reviewers.src = r.phid '.
         'AND e_reviewers.type = %s '.
         'AND e_reviewers.dst in (%Ls)',
         PhabricatorEdgeConfig::TABLE_NAME_EDGE,
         PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER,
         $this->reviewers);
     }
 
     if ($this->draftAuthors) {
       $differential_draft = new DifferentialDraft();
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T has_draft ON has_draft.objectPHID = r.phid '.
         'AND has_draft.authorPHID IN (%Ls)',
         $differential_draft->getTableName(),
         $this->draftAuthors);
     }
 
     $joins = implode(' ', $joins);
 
     return $joins;
   }
 
 
   /**
    * @task internal
    */
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if ($this->pathIDs) {
       $path_clauses = array();
       $repo_info = igroup($this->pathIDs, 'repositoryID');
       foreach ($repo_info as $repository_id => $paths) {
         $path_clauses[] = qsprintf(
           $conn_r,
           '(p.repositoryID = %d AND p.pathID IN (%Ld))',
           $repository_id,
           ipull($paths, 'pathID'));
       }
       $path_clauses = '('.implode(' OR ', $path_clauses).')';
       $where[] = $path_clauses;
     }
 
     if ($this->authors) {
       $where[] = qsprintf(
         $conn_r,
         'r.authorPHID IN (%Ls)',
         $this->authors);
     }
 
     if ($this->revIDs) {
       $where[] = qsprintf(
         $conn_r,
         'r.id IN (%Ld)',
         $this->revIDs);
     }
 
     if ($this->repositoryPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'r.repositoryPHID IN (%Ls)',
         $this->repositoryPHIDs);
     }
 
     if ($this->commitHashes) {
       $hash_clauses = array();
       foreach ($this->commitHashes as $info) {
         list($type, $hash) = $info;
         $hash_clauses[] = qsprintf(
           $conn_r,
           '(hash_rel.type = %s AND hash_rel.hash = %s)',
           $type,
           $hash);
       }
       $hash_clauses = '('.implode(' OR ', $hash_clauses).')';
       $where[] = $hash_clauses;
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'r.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->branches) {
       $where[] = qsprintf(
         $conn_r,
         'r.branchName in (%Ls)',
         $this->branches);
     }
 
     if ($this->arcanistProjectPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'r.arcanistProjectPHID in (%Ls)',
         $this->arcanistProjectPHIDs);
     }
 
     switch ($this->status) {
       case self::STATUS_ANY:
         break;
       case self::STATUS_OPEN:
         $where[] = qsprintf(
           $conn_r,
           'r.status IN (%Ld)',
           DifferentialRevisionStatus::getOpenStatuses());
         break;
       case self::STATUS_NEEDS_REVIEW:
         $where[] = qsprintf(
           $conn_r,
           'r.status IN (%Ld)',
           array(
                ArcanistDifferentialRevisionStatus::NEEDS_REVIEW,
           ));
         break;
       case self::STATUS_NEEDS_REVISION:
         $where[] = qsprintf(
           $conn_r,
           'r.status IN (%Ld)',
           array(
                ArcanistDifferentialRevisionStatus::NEEDS_REVISION,
           ));
         break;
       case self::STATUS_ACCEPTED:
         $where[] = qsprintf(
           $conn_r,
           'r.status IN (%Ld)',
           array(
             ArcanistDifferentialRevisionStatus::ACCEPTED,
           ));
         break;
       case self::STATUS_CLOSED:
         $where[] = qsprintf(
           $conn_r,
           'r.status IN (%Ld)',
           DifferentialRevisionStatus::getClosedStatuses());
         break;
       case self::STATUS_ABANDONED:
         $where[] = qsprintf(
           $conn_r,
           'r.status IN (%Ld)',
           array(
             ArcanistDifferentialRevisionStatus::ABANDONED,
           ));
         break;
       default:
         throw new Exception(
           "Unknown revision status filter constant '{$this->status}'!");
     }
 
     $where[] = $this->buildPagingClause($conn_r);
     return $this->formatWhereClause($where);
   }
 
 
   /**
    * @task internal
    */
   private function buildGroupByClause($conn_r) {
     $join_triggers = array_merge(
       $this->pathIDs,
       $this->ccs,
       $this->reviewers);
 
     $needs_distinct = (count($join_triggers) > 1);
 
     if ($needs_distinct) {
       return 'GROUP BY r.id';
     } else {
       return '';
     }
   }
 
   private function loadCursorObject($id) {
     $results = id(new DifferentialRevisionQuery())
       ->setViewer($this->getPagingViewer())
       ->withIDs(array((int)$id))
       ->execute();
     return head($results);
   }
 
   protected function buildPagingClause(AphrontDatabaseConnection $conn_r) {
     $default = parent::buildPagingClause($conn_r);
 
     $before_id = $this->getBeforeID();
     $after_id = $this->getAfterID();
 
     if (!$before_id && !$after_id) {
       return $default;
     }
 
     if ($before_id) {
       $cursor = $this->loadCursorObject($before_id);
     } else {
       $cursor = $this->loadCursorObject($after_id);
     }
 
     if (!$cursor) {
       return null;
     }
 
     $columns = array();
 
     switch ($this->order) {
       case self::ORDER_CREATED:
         return $default;
       case self::ORDER_MODIFIED:
         $columns[] = array(
           'name' => 'r.dateModified',
           'value' => $cursor->getDateModified(),
           'type' => 'int',
         );
         break;
       case self::ORDER_PATH_MODIFIED:
         $columns[] = array(
           'name' => 'p.epoch',
           'value' => $cursor->getDateCreated(),
           'type' => 'int',
         );
         break;
     }
 
     $columns[] = array(
       'name' => 'r.id',
       'value' => $cursor->getID(),
       'type' => 'int',
     );
 
     return $this->buildPagingClauseFromMultipleColumns(
       $conn_r,
       $columns,
       array(
         'reversed' => (bool)($before_id xor $this->getReversePaging()),
       ));
   }
 
   protected function getPagingColumn() {
     $is_global = $this->buildingGlobalOrder;
     switch ($this->order) {
       case self::ORDER_MODIFIED:
         if ($is_global) {
           return 'dateModified';
         }
         return 'r.dateModified';
       case self::ORDER_CREATED:
         if ($is_global) {
           return 'id';
         }
         return 'r.id';
       case self::ORDER_PATH_MODIFIED:
         if (!$this->pathIDs) {
           throw new Exception(
-            "To use ORDER_PATH_MODIFIED, you must specify withPath().");
+            'To use ORDER_PATH_MODIFIED, you must specify withPath().');
         }
         return 'p.epoch';
       default:
         throw new Exception("Unknown query order constant '{$this->order}'.");
     }
   }
 
   private function loadRelationships($conn_r, array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
 
     $type_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
     $type_subscriber = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_SUBSCRIBER;
 
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(mpull($revisions, 'getPHID'))
       ->withEdgeTypes(array($type_reviewer, $type_subscriber))
       ->setOrder(PhabricatorEdgeQuery::ORDER_OLDEST_FIRST)
       ->execute();
 
     $type_map = array(
       DifferentialRevision::RELATION_REVIEWER => $type_reviewer,
       DifferentialRevision::RELATION_SUBSCRIBED => $type_subscriber,
     );
 
     foreach ($revisions as $revision) {
       $data = array();
       foreach ($type_map as $rel_type => $edge_type) {
         $revision_edges = $edges[$revision->getPHID()][$edge_type];
         foreach ($revision_edges as $dst_phid => $edge_data) {
           $data[] = array(
             'relation' => $rel_type,
             'objectPHID' => $dst_phid,
             'reasonPHID' => null,
           );
         }
       }
 
       $revision->attachRelationships($data);
     }
   }
 
   private function loadCommitPHIDs($conn_r, array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
     $commit_phids = queryfx_all(
       $conn_r,
       'SELECT * FROM %T WHERE revisionID IN (%Ld)',
       DifferentialRevision::TABLE_COMMIT,
       mpull($revisions, 'getID'));
     $commit_phids = igroup($commit_phids, 'revisionID');
     foreach ($revisions as $revision) {
       $phids = idx($commit_phids, $revision->getID(), array());
       $phids = ipull($phids, 'commitPHID');
       $revision->attachCommitPHIDs($phids);
     }
   }
 
   private function loadDiffIDs($conn_r, array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
 
     $diff_table = new DifferentialDiff();
 
     $diff_ids = queryfx_all(
       $conn_r,
       'SELECT revisionID, id FROM %T WHERE revisionID IN (%Ld)
         ORDER BY id DESC',
       $diff_table->getTableName(),
       mpull($revisions, 'getID'));
     $diff_ids = igroup($diff_ids, 'revisionID');
 
     foreach ($revisions as $revision) {
       $ids = idx($diff_ids, $revision->getID(), array());
       $ids = ipull($ids, 'id');
       $revision->attachDiffIDs($ids);
     }
   }
 
   private function loadActiveDiffs($conn_r, array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
 
     $diff_table = new DifferentialDiff();
 
     $load_ids = array();
     foreach ($revisions as $revision) {
       $diffs = $revision->getDiffIDs();
       if ($diffs) {
         $load_ids[] = max($diffs);
       }
     }
 
     $active_diffs = array();
     if ($load_ids) {
       $active_diffs = $diff_table->loadAllWhere(
         'id IN (%Ld)',
         $load_ids);
     }
 
     $active_diffs = mpull($active_diffs, null, 'getRevisionID');
     foreach ($revisions as $revision) {
       $revision->attachActiveDiff(idx($active_diffs, $revision->getID()));
     }
   }
 
   private function loadHashes(
     AphrontDatabaseConnection $conn_r,
     array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T WHERE revisionID IN (%Ld)',
       'differential_revisionhash',
       mpull($revisions, 'getID'));
 
     $data = igroup($data, 'revisionID');
     foreach ($revisions as $revision) {
       $hashes = idx($data, $revision->getID(), array());
       $list = array();
       foreach ($hashes as $hash) {
         $list[] = array($hash['type'], $hash['hash']);
       }
       $revision->attachHashes($list);
     }
   }
 
   private function loadReviewers(
     AphrontDatabaseConnection $conn_r,
     array $revisions) {
 
     assert_instances_of($revisions, 'DifferentialRevision');
     $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
 
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(mpull($revisions, 'getPHID'))
       ->withEdgeTypes(array($edge_type))
       ->needEdgeData(true)
       ->setOrder(PhabricatorEdgeQuery::ORDER_OLDEST_FIRST)
       ->execute();
 
     $viewer = $this->getViewer();
     $viewer_phid = $viewer->getPHID();
     $allow_key = 'differential.allow-self-accept';
     $allow_self = PhabricatorEnv::getEnvConfig($allow_key);
 
     // Figure out which of these reviewers the viewer has authority to act as.
     if ($this->needReviewerAuthority && $viewer_phid) {
       $authority = $this->loadReviewerAuthority(
         $revisions,
         $edges,
         $allow_self);
     }
 
     foreach ($revisions as $revision) {
       $revision_edges = $edges[$revision->getPHID()][$edge_type];
       $reviewers = array();
       foreach ($revision_edges as $reviewer_phid => $edge) {
         $reviewer = new DifferentialReviewer($reviewer_phid, $edge['data']);
 
         if ($this->needReviewerAuthority) {
           if (!$viewer_phid) {
             // Logged-out users never have authority.
             $has_authority = false;
           } else if ((!$allow_self) &&
                      ($revision->getAuthorPHID() == $viewer_phid)) {
             // The author can never have authority unless we allow self-accept.
             $has_authority = false;
           } else {
             // Otherwise, look up whether th viewer has authority.
             $has_authority = isset($authority[$reviewer_phid]);
           }
 
           $reviewer->attachAuthority($viewer, $has_authority);
         }
 
         $reviewers[$reviewer_phid] = $reviewer;
       }
 
       $revision->attachReviewerStatus($reviewers);
     }
 
   }
 
 
   public static function splitResponsible(array $revisions, array $user_phids) {
     $blocking = array();
     $active = array();
     $waiting = array();
     $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
 
     // Bucket revisions into $blocking (revisions where you are blocking
     // others), $active (revisions you need to do something about) and $waiting
     // (revisions you're waiting on someone else to do something about).
     foreach ($revisions as $revision) {
       $needs_review = ($revision->getStatus() == $status_review);
       $filter_is_author = in_array($revision->getAuthorPHID(), $user_phids);
       if (!$revision->getReviewers()) {
         $needs_review = false;
         $author_is_reviewer = false;
       } else {
         $author_is_reviewer = in_array(
           $revision->getAuthorPHID(),
           $revision->getReviewers());
       }
 
       // If exactly one of "needs review" and "the user is the author" is
       // true, the user needs to act on it. Otherwise, they're waiting on
       // it.
       if ($needs_review ^ $filter_is_author) {
         if ($needs_review) {
           array_unshift($blocking, $revision);
         } else {
           $active[] = $revision;
         }
       // User is author **and** reviewer. An exotic but configurable workflow.
       // User needs to act on it double.
       } else if ($needs_review && $author_is_reviewer) {
         array_unshift($blocking, $revision);
         $active[] = $revision;
       } else {
         $waiting[] = $revision;
       }
     }
 
     return array($blocking, $active, $waiting);
   }
 
   private function loadReviewerAuthority(
     array $revisions,
     array $edges,
     $allow_self) {
 
     $revision_map = mpull($revisions, null, 'getPHID');
     $viewer_phid = $this->getViewer()->getPHID();
 
     // Find all the project reviewers which the user may have authority over.
     $project_phids = array();
     $project_type = PhabricatorProjectPHIDTypeProject::TYPECONST;
     $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
     foreach ($edges as $src => $types) {
       if (!$allow_self) {
         if ($revision_map[$src]->getAuthorPHID() == $viewer_phid) {
           // If self-review isn't permitted, the user will never have
           // authority over projects on revisions they authored because you
           // can't accept your own revisions, so we don't need to load any
           // data about these reviewers.
           continue;
         }
       }
       $edge_data = idx($types, $edge_type, array());
       foreach ($edge_data as $dst => $data) {
         if (phid_get_type($dst) == $project_type) {
           $project_phids[] = $dst;
         }
       }
     }
 
     // Now, figure out which of these projects the viewer is actually a
     // member of.
     $project_authority = array();
     if ($project_phids) {
       $project_authority = id(new PhabricatorProjectQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs($project_phids)
         ->withMemberPHIDs(array($viewer_phid))
         ->execute();
       $project_authority = mpull($project_authority, 'getPHID');
     }
 
     // Finally, the viewer has authority over themselves.
     return array(
       $viewer_phid => true,
     ) + array_fuse($project_authority);
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationDifferential';
   }
 
 }
diff --git a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
index 25d8aeee5..ac3c2a7d1 100644
--- a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
@@ -1,77 +1,77 @@
 <?php
 
 final class DifferentialChangesetOneUpRenderer
   extends DifferentialChangesetHTMLRenderer {
 
   public function isOneUpRenderer() {
     return true;
   }
 
   public function renderTextChange(
     $range_start,
     $range_len,
     $rows) {
 
     $primitives = $this->buildPrimitives($range_start, $range_len);
 
     $out = array();
     foreach ($primitives as $p) {
       $type = $p['type'];
       switch ($type) {
         case 'old':
         case 'new':
           $out[] = hsprintf('<tr>');
           if ($type == 'old') {
             if ($p['htype']) {
               $class = 'left old';
             } else {
               $class = 'left';
             }
             $out[] = phutil_tag('th', array(), $p['line']);
             $out[] = phutil_tag('th', array());
             $out[] = phutil_tag('td', array('class' => $class), $p['render']);
           } else if ($type == 'new') {
             if ($p['htype']) {
               $class = 'right new';
               $out[] = phutil_tag('th', array());
             } else {
               $class = 'right';
               $out[] = phutil_tag('th', array(), $p['oline']);
             }
             $out[] = phutil_tag('th', array(), $p['line']);
             $out[] = phutil_tag('td', array('class' => $class), $p['render']);
           }
           $out[] = hsprintf('</tr>');
           break;
         case 'inline':
           $out[] = hsprintf('<tr><th /><th />');
           $out[] = hsprintf('<td>');
 
           $inline = $this->buildInlineComment(
             $p['comment'],
             $p['right']);
           $inline->setBuildScaffolding(false);
           $out[] = $inline->render();
 
           $out[] = hsprintf('</td></tr>');
           break;
         default:
           $out[] = hsprintf('<tr><th /><th /><td>%s</td></tr>', $type);
           break;
       }
     }
 
     if ($out) {
       return $this->wrapChangeInTable(phutil_implode_html('', $out));
     }
     return null;
   }
 
   public function renderFileChange($old_file = null,
                                    $new_file = null,
                                    $id = 0,
                                    $vs = 0) {
-    throw new Exception("Not implemented!");
+    throw new Exception('Not implemented!');
   }
 
 }
diff --git a/src/applications/differential/render/DifferentialChangesetTestRenderer.php b/src/applications/differential/render/DifferentialChangesetTestRenderer.php
index 4472eaf24..4dd0ff764 100644
--- a/src/applications/differential/render/DifferentialChangesetTestRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetTestRenderer.php
@@ -1,86 +1,86 @@
 <?php
 
 abstract class DifferentialChangesetTestRenderer
   extends DifferentialChangesetRenderer {
 
   protected function renderChangeTypeHeader($force) {
     $changeset = $this->getChangeset();
 
     $old = nonempty($changeset->getOldFile(), '-');
     $away = nonempty(implode(', ', $changeset->getAwayPaths()), '-');
     $ctype = $changeset->getChangeType();
     $ftype = $changeset->getFileType();
     $force = ($force ? '(forced)' : '(unforced)');
 
     return "CTYPE {$ctype} {$ftype} {$force}\n".
            "{$old}\n".
            "{$away}\n";
   }
 
   public function renderShield($message, $force = 'default') {
     return "SHIELD ({$force}) {$message}\n";
   }
 
   protected function renderPropertyChangeHeader() {
     $changeset = $this->getChangeset();
     $old = $changeset->getOldProperties();
     $new = $changeset->getNewProperties();
 
     if (!$old && !$new) {
       return null;
     }
 
     $props = '';
     foreach ($old as $key => $value) {
       $props .= "P - {$key} {$value}~\n";
     }
     foreach ($new as $key => $value) {
       $props .= "P + {$key} {$value}~\n";
     }
 
     return "PROPERTIES\n".$props;
   }
 
   public function renderTextChange(
     $range_start,
     $range_len,
     $rows) {
 
     $out = array();
 
     $primitives = $this->buildPrimitives($range_start, $range_len);
     foreach ($primitives as $p) {
       $type = $p['type'];
       switch ($type) {
         case 'old':
         case 'new':
           $num = nonempty($p['line'], '-');
           $render = $p['render'];
           $htype = nonempty($p['htype'], '.');
 
           // TODO: This should probably happen earlier, whenever we deal with
           // \r and \t normalization?
           $render = rtrim($render, "\r\n");
           $t = ($type == 'old') ? 'O' : 'N';
 
           $out[] = "{$t} {$num} {$htype} {$render}~";
           break;
         default:
           $out[] = $type;
           break;
       }
     }
 
     $out = implode("\n", $out)."\n";
     return $out;
   }
 
 
   public function renderFileChange($old_file = null,
                                    $new_file = null,
                                    $id = 0,
                                    $vs = 0) {
-    throw new Exception("Not implemented!");
+    throw new Exception('Not implemented!');
   }
 
 }
diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
index 78ac18bbb..b4d36723f 100644
--- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
@@ -1,452 +1,452 @@
 <?php
 
 final class DifferentialChangesetTwoUpRenderer
   extends DifferentialChangesetHTMLRenderer {
 
   public function isOneUpRenderer() {
     return false;
   }
 
   public function renderTextChange(
     $range_start,
     $range_len,
     $rows) {
 
     $hunk_starts = $this->getHunkStartLines();
 
     $context_not_available = null;
     if ($hunk_starts) {
       $context_not_available = javelin_tag(
         'tr',
         array(
           'sigil' => 'context-target',
         ),
         phutil_tag(
           'td',
           array(
             'colspan' => 6,
             'class' => 'show-more'
           ),
           pht('Context not available.')));
     }
 
     $html = array();
 
     $old_lines = $this->getOldLines();
     $new_lines = $this->getNewLines();
     $gaps = $this->getGaps();
     $reference = $this->getRenderingReference();
     $left_id = $this->getOldChangesetID();
     $right_id = $this->getNewChangesetID();
 
     // "N" stands for 'new' and means the comment should attach to the new file
     // when stored, i.e. DifferentialInlineComment->setIsNewFile().
     // "O" stands for 'old' and means the comment should attach to the old file.
 
     $left_char = $this->getOldAttachesToNewFile()
       ? 'N'
       : 'O';
     $right_char = $this->getNewAttachesToNewFile()
       ? 'N'
       : 'O';
 
     $changeset = $this->getChangeset();
     $copy_lines = idx($changeset->getMetadata(), 'copy:lines', array());
     $highlight_old = $this->getHighlightOld();
     $highlight_new = $this->getHighlightNew();
     $old_render = $this->getOldRender();
     $new_render = $this->getNewRender();
     $original_left = $this->getOriginalOld();
     $original_right = $this->getOriginalNew();
     $depths = $this->getDepths();
     $mask = $this->getMask();
 
     for ($ii = $range_start; $ii < $range_start + $range_len; $ii++) {
       if (empty($mask[$ii])) {
         // If we aren't going to show this line, we've just entered a gap.
         // Pop information about the next gap off the $gaps stack and render
         // an appropriate "Show more context" element. This branch eventually
         // increments $ii by the entire size of the gap and then continues
         // the loop.
         $gap = array_pop($gaps);
         $top = $gap[0];
         $len = $gap[1];
 
         $end   = $top + $len - 20;
 
         $contents = array();
 
         if ($len > 40) {
           $is_first_block = false;
           if ($ii == 0) {
             $is_first_block = true;
           }
 
           $contents[] = javelin_tag(
             'a',
             array(
               'href' => '#',
               'mustcapture' => true,
               'sigil'       => 'show-more',
               'meta'        => array(
                 'ref'    => $reference,
                 'range' => "{$top}-{$len}/{$top}-20",
               ),
             ),
             $is_first_block
-              ? pht("Show First 20 Lines")
+              ? pht('Show First 20 Lines')
               : pht("\xE2\x96\xB2 Show 20 Lines"));
         }
 
         $contents[] = javelin_tag(
           'a',
           array(
             'href' => '#',
             'mustcapture' => true,
             'sigil'       => 'show-more',
             'meta'        => array(
               'type'   => 'all',
               'ref'    => $reference,
               'range'  => "{$top}-{$len}/{$top}-{$len}",
             ),
           ),
           pht('Show All %d Lines', $len));
 
         $is_last_block = false;
         if ($ii + $len >= $rows) {
           $is_last_block = true;
         }
 
         if ($len > 40) {
           $contents[] = javelin_tag(
             'a',
             array(
               'href' => '#',
               'mustcapture' => true,
               'sigil'       => 'show-more',
               'meta'        => array(
                 'ref'    => $reference,
                 'range' => "{$top}-{$len}/{$end}-20",
               ),
             ),
             $is_last_block
-              ? pht("Show Last 20 Lines")
+              ? pht('Show Last 20 Lines')
               : pht("\xE2\x96\xBC Show 20 Lines"));
         }
 
         $context = null;
         $context_line = null;
         if (!$is_last_block && $depths[$ii + $len]) {
           for ($l = $ii + $len - 1; $l >= $ii; $l--) {
             $line = $new_lines[$l]['text'];
             if ($depths[$l] < $depths[$ii + $len] && trim($line) != '') {
               $context = $new_render[$l];
               $context_line = $new_lines[$l]['line'];
               break;
             }
           }
         }
 
         $container = javelin_tag(
           'tr',
           array(
             'sigil' => 'context-target',
           ),
           array(
             phutil_tag(
               'td',
               array(
                 'colspan' => 2,
                 'class' => 'show-more',
               ),
               phutil_implode_html(
                 " \xE2\x80\xA2 ", // Bullet
                 $contents)),
             phutil_tag(
               'th',
               array(
                 'class' => 'show-context-line',
               ),
               $context_line ? (int)$context_line : null),
             phutil_tag(
               'td',
               array(
                 'colspan' => 3,
                 'class' => 'show-context',
               ),
               // TODO: [HTML] Escaping model here isn't ideal.
               phutil_safe_html($context)),
           ));
 
         $html[] = $container;
 
         $ii += ($len - 1);
         continue;
       }
 
       $o_num = null;
       $o_classes = '';
       $o_text = null;
       if (isset($old_lines[$ii])) {
         $o_num  = $old_lines[$ii]['line'];
         $o_text = isset($old_render[$ii]) ? $old_render[$ii] : null;
         if ($old_lines[$ii]['type']) {
           if ($old_lines[$ii]['type'] == '\\') {
             $o_text = $old_lines[$ii]['text'];
             $o_class = 'comment';
           } else if ($original_left && !isset($highlight_old[$o_num])) {
             $o_class = 'old-rebase';
           } else if (empty($new_lines[$ii])) {
             $o_class = 'old old-full';
           } else {
             $o_class = 'old';
           }
           $o_classes = $o_class;
         }
       }
 
       $n_copy = hsprintf('<td class="copy" />');
       $n_cov = null;
       $n_colspan = 2;
       $n_classes = '';
       $n_num  = null;
       $n_text = null;
 
       if (isset($new_lines[$ii])) {
         $n_num  = $new_lines[$ii]['line'];
         $n_text = isset($new_render[$ii]) ? $new_render[$ii] : null;
         $coverage = $this->getCodeCoverage();
 
         if ($coverage !== null) {
           if (empty($coverage[$n_num - 1])) {
             $cov_class = 'N';
           } else {
             $cov_class = $coverage[$n_num - 1];
           }
           $cov_class = 'cov-'.$cov_class;
           $n_cov = phutil_tag('td', array('class' => "cov {$cov_class}"));
           $n_colspan--;
         }
 
         if ($new_lines[$ii]['type']) {
           if ($new_lines[$ii]['type'] == '\\') {
             $n_text = $new_lines[$ii]['text'];
             $n_class = 'comment';
           } else if ($original_right && !isset($highlight_new[$n_num])) {
             $n_class = 'new-rebase';
           } else if (empty($old_lines[$ii])) {
             $n_class = 'new new-full';
           } else {
             $n_class = 'new';
           }
           $n_classes = $n_class;
 
           if ($new_lines[$ii]['type'] == '\\' || !isset($copy_lines[$n_num])) {
             $n_copy = phutil_tag('td', array('class' => "copy {$n_class}"));
           } else {
             list($orig_file, $orig_line, $orig_type) = $copy_lines[$n_num];
             $title = ($orig_type == '-' ? 'Moved' : 'Copied').' from ';
             if ($orig_file == '') {
               $title .= "line {$orig_line}";
             } else {
               $title .=
                 basename($orig_file).
                 ":{$orig_line} in dir ".
                 dirname('/'.$orig_file);
             }
             $class = ($orig_type == '-' ? 'new-move' : 'new-copy');
             $n_copy = javelin_tag(
               'td',
               array(
                 'meta' => array(
                   'msg' => $title,
                 ),
                 'class' => 'copy '.$class,
               ),
               '');
           }
         }
       }
 
       if (isset($hunk_starts[$o_num])) {
         $html[] = $context_not_available;
       }
 
       if ($o_num && $left_id) {
         $o_id = 'C'.$left_id.$left_char.'L'.$o_num;
       } else {
         $o_id = null;
       }
 
       if ($n_num && $right_id) {
         $n_id = 'C'.$right_id.$right_char.'L'.$n_num;
       } else {
         $n_id = null;
       }
 
       // NOTE: This is a unicode zero-width space, which we use as a hint when
       // intercepting 'copy' events to make sure sensible text ends up on the
       // clipboard. See the 'phabricator-oncopy' behavior.
       $zero_space = "\xE2\x80\x8B";
 
       // NOTE: The Javascript is sensitive to whitespace changes in this
       // block!
 
       $html[] = phutil_tag('tr', array(), array(
         phutil_tag('th', array('id' => $o_id), $o_num),
         phutil_tag('td', array('class' => $o_classes), $o_text),
         phutil_tag('th', array('id' => $n_id), $n_num),
         $n_copy,
         phutil_tag(
           'td',
           array('class' => $n_classes, 'colspan' => $n_colspan),
           array(
             phutil_tag('span', array('class' => 'zwsp'), $zero_space),
             $n_text
           )),
         $n_cov,
       ));
 
       if ($context_not_available && ($ii == $rows - 1)) {
         $html[] = $context_not_available;
       }
 
       $old_comments = $this->getOldComments();
       $new_comments = $this->getNewComments();
 
       if ($o_num && isset($old_comments[$o_num])) {
         foreach ($old_comments[$o_num] as $comment) {
           $comment_html = $this->renderInlineComment($comment,
                                                      $on_right = false);
           $new = '';
           if ($n_num && isset($new_comments[$n_num])) {
             foreach ($new_comments[$n_num] as $key => $new_comment) {
               if ($comment->isCompatible($new_comment)) {
                 $new = $this->renderInlineComment($new_comment,
                                                   $on_right = true);
                 unset($new_comments[$n_num][$key]);
               }
             }
           }
           $html[] = phutil_tag('tr', array('class' => 'inline'), array(
             phutil_tag('th', array()),
             phutil_tag('td', array(), $comment_html),
             phutil_tag('th', array()),
             phutil_tag('td', array('colspan' => 3), $new),
           ));
         }
       }
       if ($n_num && isset($new_comments[$n_num])) {
         foreach ($new_comments[$n_num] as $comment) {
           $comment_html = $this->renderInlineComment($comment,
                                                      $on_right = true);
           $html[] = phutil_tag('tr', array('class' => 'inline'), array(
             phutil_tag('th', array()),
             phutil_tag('td', array()),
             phutil_tag('th', array()),
             phutil_tag(
               'td',
               array('colspan' => 3),
               $comment_html),
           ));
         }
       }
     }
 
     return $this->wrapChangeInTable(phutil_implode_html('', $html));
   }
 
   public function renderFileChange($old_file = null,
                                    $new_file = null,
                                    $id = 0,
                                    $vs = 0) {
     $old = null;
     if ($old_file) {
       $old = phutil_tag(
         'div',
         array(
           'class' => 'differential-image-stage'
         ),
         phutil_tag(
           'img',
           array(
             'src' => $old_file->getBestURI(),
           )));
     }
 
     $new = null;
     if ($new_file) {
       $new = phutil_tag(
         'div',
         array(
           'class' => 'differential-image-stage'
         ),
         phutil_tag(
           'img',
           array(
             'src' => $new_file->getBestURI(),
           )));
     }
 
     $html_old = array();
     $html_new = array();
     foreach ($this->getOldComments() as $on_line => $comment_group) {
       foreach ($comment_group as $comment) {
         $comment_html = $this->renderInlineComment($comment, $on_right = false);
         $html_old[] = phutil_tag('tr', array('class' => 'inline'), array(
           phutil_tag('th', array()),
           phutil_tag('td', array(), $comment_html),
           phutil_tag('th', array()),
           phutil_tag('td', array('colspan' => 3)),
         ));
       }
     }
     foreach ($this->getNewComments() as $lin_line => $comment_group) {
       foreach ($comment_group as $comment) {
         $comment_html = $this->renderInlineComment($comment, $on_right = true);
         $html_new[] = phutil_tag('tr', array('class' => 'inline'), array(
           phutil_tag('th', array()),
           phutil_tag('td', array()),
           phutil_tag('th', array()),
           phutil_tag(
             'td',
             array('colspan' => 3),
             $comment_html),
         ));
       }
     }
 
     if (!$old) {
       $th_old = phutil_tag('th', array());
     } else {
       $th_old = phutil_tag('th', array('id' => "C{$vs}OL1"), 1);
     }
 
     if (!$new) {
       $th_new = phutil_tag('th', array());
     } else {
       $th_new = phutil_tag('th', array('id' => "C{$id}OL1"), 1);
     }
 
     $output = hsprintf(
       '<tr class="differential-image-diff">'.
         '%s'.
         '<td class="differential-old-image">%s</td>'.
         '%s'.
         '<td class="differential-new-image" colspan="3">%s</td>'.
       '</tr>'.
       '%s'.
       '%s',
       $th_old,
       $old,
       $th_new,
       $new,
       phutil_implode_html('', $html_old),
       phutil_implode_html('', $html_new));
 
     $output = $this->wrapChangeInTable($output);
 
     return $this->renderChangesetTable($output);
   }
 
 }
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
index dd15ce400..6893d7d18 100644
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewer.php
@@ -1,56 +1,56 @@
 <?php
 
 final class DifferentialReviewer {
 
   private $reviewerPHID;
   private $status;
   private $diffID;
   private $authority = array();
 
   public function __construct($reviewer_phid, array $edge_data) {
     $this->reviewerPHID = $reviewer_phid;
     $this->status = idx($edge_data, 'status');
     $this->diffID = idx($edge_data, 'diff');
   }
 
   public function getReviewerPHID() {
     return $this->reviewerPHID;
   }
 
   public function getStatus() {
     return $this->status;
   }
 
   public function getDiffID() {
     return $this->diffID;
   }
 
   public function isUser() {
     $user_type = PhabricatorPeoplePHIDTypeUser::TYPECONST;
     return (phid_get_type($this->getReviewerPHID()) == $user_type);
   }
 
   public function attachAuthority(PhabricatorUser $user, $has_authority) {
     $this->authority[$user->getPHID()] = $has_authority;
     return $this;
   }
 
   public function hasAuthority(PhabricatorUser $viewer) {
     // It would be nice to use assertAttachedKey() here, but we don't extend
     // PhabricatorLiskDAO, and faking that seems sketchy.
 
     $viewer_phid = $viewer->getPHID();
     if (!array_key_exists($viewer_phid, $this->authority)) {
-      throw new Exception("You must attachAuthority() first!");
+      throw new Exception('You must attachAuthority() first!');
     }
     return $this->authority[$viewer_phid];
   }
 
   public function getEdgeData() {
     return array(
       'status' => $this->status,
       'diffID' => $this->diffID,
     );
   }
 
 }
diff --git a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
index 785f5e742..a62f7f21d 100644
--- a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
+++ b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
@@ -1,37 +1,37 @@
 <?php
 
 final class DifferentialHunkTestCase extends ArcanistPhutilTestCase {
 
   public function testMakeChanges() {
     $root = dirname(__FILE__).'/hunk/';
 
     $hunk = new DifferentialHunkModern();
     $hunk->setChanges(Filesystem::readFile($root.'basic.diff'));
     $hunk->setOldOffset(1);
     $hunk->setNewOffset(11);
 
     $old = Filesystem::readFile($root.'old.txt');
     $this->assertEqual($old, $hunk->makeOldFile());
 
     $new = Filesystem::readFile($root.'new.txt');
     $this->assertEqual($new, $hunk->makeNewFile());
 
     $added = array(
       12 => "1 quack\n",
       13 => "1 quack\n",
       16 => "5 drake\n",
     );
     $this->assertEqual($added, $hunk->getAddedLines());
 
     $hunk = new DifferentialHunkModern();
     $hunk->setChanges(Filesystem::readFile($root.'newline.diff'));
     $hunk->setOldOffset(1);
     $hunk->setNewOffset(11);
 
     $this->assertEqual("a\n", $hunk->makeOldFile());
-    $this->assertEqual("a", $hunk->makeNewFile());
-    $this->assertEqual(array(11 => "a"), $hunk->getAddedLines());
+    $this->assertEqual('a', $hunk->makeNewFile());
+    $this->assertEqual(array(11 => 'a'), $hunk->getAddedLines());
 
   }
 
 }
diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
index 91e44259c..cffb1f34a 100644
--- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
+++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
@@ -1,323 +1,322 @@
 <?php
 
 final class DifferentialDiffTableOfContentsView extends AphrontView {
 
   private $changesets = array();
   private $visibleChangesets = array();
   private $references = array();
   private $repository;
   private $diff;
   private $renderURI = '/differential/changeset/';
   private $revisionID;
   private $whitespace;
   private $unitTestData;
 
   public function setChangesets($changesets) {
     $this->changesets = $changesets;
     return $this;
   }
 
   public function setVisibleChangesets($visible_changesets) {
     $this->visibleChangesets = $visible_changesets;
     return $this;
   }
 
   public function setRenderingReferences(array $references) {
     $this->references = $references;
     return $this;
   }
 
   public function setRepository(PhabricatorRepository $repository) {
     $this->repository = $repository;
     return $this;
   }
 
   public function setDiff(DifferentialDiff $diff) {
     $this->diff = $diff;
     return $this;
   }
 
   public function setUnitTestData($unit_test_data) {
     $this->unitTestData = $unit_test_data;
     return $this;
   }
 
   public function setRevisionID($revision_id) {
     $this->revisionID = $revision_id;
     return $this;
   }
 
   public function setWhitespace($whitespace) {
     $this->whitespace = $whitespace;
     return $this;
   }
 
   public function render() {
 
     $this->requireResource('differential-core-view-css');
     $this->requireResource('differential-table-of-contents-css');
 
     $rows = array();
 
     $coverage = array();
     if ($this->unitTestData) {
       $coverage_by_file = array();
       foreach ($this->unitTestData as $result) {
         $test_coverage = idx($result, 'coverage');
         if (!$test_coverage) {
           continue;
         }
         foreach ($test_coverage as $file => $results) {
           $coverage_by_file[$file][] = $results;
         }
       }
       foreach ($coverage_by_file as $file => $coverages) {
         $coverage[$file] = ArcanistUnitTestResult::mergeCoverage($coverages);
       }
     }
 
     $changesets = $this->changesets;
     $paths = array();
     foreach ($changesets as $id => $changeset) {
       $type = $changeset->getChangeType();
       $ftype = $changeset->getFileType();
       $ref = idx($this->references, $id);
       $display_file = $changeset->getDisplayFilename();
 
       $meta = null;
       if (DifferentialChangeType::isOldLocationChangeType($type)) {
         $away = $changeset->getAwayPaths();
         if (count($away) > 1) {
           $meta = array();
           if ($type == DifferentialChangeType::TYPE_MULTICOPY) {
             $meta[] = pht('Deleted after being copied to multiple locations:');
           } else {
             $meta[] = pht('Copied to multiple locations:');
           }
           foreach ($away as $path) {
             $meta[] = $path;
           }
           $meta = phutil_implode_html(phutil_tag('br'), $meta);
         } else {
           if ($type == DifferentialChangeType::TYPE_MOVE_AWAY) {
             $display_file = $this->renderRename(
               $display_file,
               reset($away),
               "\xE2\x86\x92");
           } else {
             $meta = pht('Copied to %s', reset($away));
           }
         }
       } else if ($type == DifferentialChangeType::TYPE_MOVE_HERE) {
         $old_file = $changeset->getOldFile();
         $display_file = $this->renderRename(
           $display_file,
           $old_file,
           "\xE2\x86\x90");
       } else if ($type == DifferentialChangeType::TYPE_COPY_HERE) {
         $meta = pht('Copied from %s', $changeset->getOldFile());
       }
 
       $link = $this->renderChangesetLink($changeset, $ref, $display_file);
 
       $line_count = $changeset->getAffectedLineCount();
       if ($line_count == 0) {
         $lines = '';
       } else {
         $lines = ' '.pht('(%d line(s))', $line_count);
       }
 
       $char = DifferentialChangeType::getSummaryCharacterForChangeType($type);
       $chartitle = DifferentialChangeType::getFullNameForChangeType($type);
       $desc = DifferentialChangeType::getShortNameForFileType($ftype);
       if ($desc) {
         $desc = '('.$desc.')';
       }
       $pchar =
         ($changeset->getOldProperties() === $changeset->getNewProperties())
           ? ''
-          : phutil_tag('span', array('title' => pht('Properties Changed')), 'M')
-        ;
+          : phutil_tag('span', array('title' => pht('Properties Changed')), 'M');
 
       $fname = $changeset->getFilename();
       $cov  = $this->renderCoverage($coverage, $fname);
       if ($cov === null) {
         $mcov = $cov = phutil_tag('em', array(), '-');
       } else {
         $mcov = phutil_tag(
           'div',
           array(
             'id' => 'differential-mcoverage-'.md5($fname),
             'class' => 'differential-mcoverage-loading',
           ),
           (isset($this->visibleChangesets[$id]) ?
             pht('Loading...') : pht('?')));
       }
 
       if ($meta) {
         $meta = phutil_tag(
           'div',
           array(
             'class' => 'differential-toc-meta'
           ),
           $meta);
       }
 
       if ($this->diff && $this->repository) {
         $paths[] =
           $changeset->getAbsoluteRepositoryPath($this->repository, $this->diff);
       }
 
       $rows[] = array(
         $char,
         $pchar,
         $desc,
         array($link, $lines, $meta),
         $cov,
         $mcov
       );
     }
 
     $editor_link = null;
     if ($paths && $this->user) {
       $editor_link = $this->user->loadEditorLink(
         $paths,
         1, // line number
         $this->repository->getCallsign());
       if ($editor_link) {
         $editor_link =
           phutil_tag(
             'a',
             array(
               'href' => $editor_link,
               'class' => 'button differential-toc-edit-all',
             ),
             pht('Open All in Editor'));
       }
     }
 
     $reveal_link = javelin_tag(
         'a',
         array(
           'sigil' => 'differential-reveal-all',
           'mustcapture' => true,
           'class' => 'button differential-toc-reveal-all',
         ),
         pht('Show All Context'));
 
     $buttons = phutil_tag(
       'div',
       array(
         'class' => 'differential-toc-buttons grouped'
       ),
       array(
         $editor_link,
         $reveal_link
       ));
 
     $table = id(new AphrontTableView($rows));
     $table->setHeaders(
       array(
         '',
         '',
         '',
         pht('Path'),
         pht('Coverage (All)'),
         pht('Coverage (Touched)'),
       ));
     $table->setColumnClasses(
       array(
         'differential-toc-char center',
         'differential-toc-prop center',
         'differential-toc-ftype center',
         'differential-toc-file wide',
         'differential-toc-cov',
         'differential-toc-cov',
       ));
     $table->setDeviceVisibility(
       array(
         true,
         true,
         true,
         true,
         false,
         false,
       ));
     $anchor = id(new PhabricatorAnchorView())
         ->setAnchorName('toc')
         ->setNavigationMarker(true);
 
     return id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Table of Contents'))
       ->appendChild($anchor)
       ->appendChild($table)
       ->appendChild($buttons);
   }
 
   private function renderRename($display_file, $other_file, $arrow) {
     $old = explode('/', $display_file);
     $new = explode('/', $other_file);
 
     $start = count($old);
     foreach ($old as $index => $part) {
       if (!isset($new[$index]) || $part != $new[$index]) {
         $start = $index;
         break;
       }
     }
 
     $end = count($old);
     foreach (array_reverse($old) as $from_end => $part) {
       $index = count($new) - $from_end - 1;
       if (!isset($new[$index]) || $part != $new[$index]) {
         $end = $from_end;
         break;
       }
     }
 
     $rename =
       '{'.
       implode('/', array_slice($old, $start, count($old) - $end - $start)).
       ' '.$arrow.' '.
       implode('/', array_slice($new, $start, count($new) - $end - $start)).
       '}';
 
     array_splice($new, $start, count($new) - $end - $start, $rename);
     return implode('/', $new);
   }
 
   private function renderCoverage(array $coverage, $file) {
     $info = idx($coverage, $file);
     if (!$info) {
       return null;
     }
 
     $not_covered = substr_count($info, 'U');
     $covered     = substr_count($info, 'C');
 
     if (!$not_covered && !$covered) {
       return null;
     }
 
     return sprintf('%d%%', 100 * ($covered / ($covered + $not_covered)));
   }
 
 
   private function renderChangesetLink(
     DifferentialChangeset $changeset,
     $ref,
     $display_file) {
 
     return javelin_tag(
       'a',
       array(
         'href' => '#'.$changeset->getAnchorName(),
         'sigil' => 'differential-load',
         'meta' => array(
           'id' => 'diff-'.$changeset->getAnchorName(),
         ),
       ),
       $display_file);
   }
 
 }
diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php
index 4e0f4814c..453175d75 100644
--- a/src/applications/differential/view/DifferentialInlineCommentEditView.php
+++ b/src/applications/differential/view/DifferentialInlineCommentEditView.php
@@ -1,149 +1,149 @@
 <?php
 
 final class DifferentialInlineCommentEditView extends AphrontView {
 
   private $inputs = array();
   private $uri;
   private $title;
   private $onRight;
   private $number;
   private $length;
 
   public function addHiddenInput($key, $value) {
     $this->inputs[] = array($key, $value);
     return $this;
   }
 
   public function setSubmitURI($uri) {
     $this->uri = $uri;
     return $this;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function setOnRight($on_right) {
     $this->onRight = $on_right;
     $this->addHiddenInput('on_right', $on_right);
     return $this;
   }
 
   public function setNumber($number) {
     $this->number = $number;
     return $this;
   }
 
   public function setLength($length) {
     $this->length = $length;
     return $this;
   }
 
   public function render() {
     if (!$this->uri) {
-      throw new Exception("Call setSubmitURI() before render()!");
+      throw new Exception('Call setSubmitURI() before render()!');
     }
     if (!$this->user) {
-      throw new Exception("Call setUser() before render()!");
+      throw new Exception('Call setUser() before render()!');
     }
 
     $content = phabricator_form(
       $this->user,
       array(
         'action'    => $this->uri,
         'method'    => 'POST',
         'sigil'     => 'inline-edit-form',
       ),
       array(
         $this->renderInputs(),
         $this->renderBody(),
       ));
 
     return phutil_tag('table', array(), phutil_tag(
       'tr',
       array('class' => 'inline-comment-splint'),
       array(
         phutil_tag('th', array()),
         phutil_tag(
           'td',
           array('class' => 'left'),
           $this->onRight ? null : $content),
         phutil_tag('th', array()),
         phutil_tag(
           'td',
           array('colspan' => 3, 'class' => 'right3'),
           $this->onRight ? $content : null),
       )));
   }
 
   private function renderInputs() {
     $out = array();
     foreach ($this->inputs as $input) {
       list($name, $value) = $input;
       $out[] = phutil_tag(
         'input',
         array(
           'type'  => 'hidden',
           'name'  => $name,
           'value' => $value,
         ));
     }
     return $out;
   }
 
   private function renderBody() {
     $buttons = array();
 
     $buttons[] = phutil_tag('button', array(), pht('Ready'));
     $buttons[] = javelin_tag(
       'button',
       array(
         'sigil' => 'inline-edit-cancel',
         'class' => 'grey',
       ),
       pht('Cancel'));
 
     $title = phutil_tag(
       'div',
       array(
         'class' => 'differential-inline-comment-edit-title',
       ),
       $this->title);
 
     $body = phutil_tag(
       'div',
       array(
         'class' => 'differential-inline-comment-edit-body',
       ),
       $this->renderChildren());
 
     $edit = phutil_tag(
       'div',
       array(
         'class' => 'differential-inline-comment-edit-buttons',
       ),
       array(
         $buttons,
         phutil_tag('div', array('style' => 'clear: both'), ''),
       ));
 
     return javelin_tag(
       'div',
       array(
         'class' => 'differential-inline-comment-edit',
         'sigil' => 'differential-inline-comment',
         'meta' => array(
           'on_right' => $this->onRight,
           'number' => $this->number,
           'length' => $this->length,
         ),
       ),
       array(
         $title,
         $body,
         $edit,
       ));
   }
 
 }
diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php
index 6da8515af..aa965af34 100644
--- a/src/applications/differential/view/DifferentialLocalCommitsView.php
+++ b/src/applications/differential/view/DifferentialLocalCommitsView.php
@@ -1,153 +1,153 @@
 <?php
 
 final class DifferentialLocalCommitsView extends AphrontView {
 
   private $localCommits;
   private $commitsForLinks = array();
 
   public function setLocalCommits($local_commits) {
     $this->localCommits = $local_commits;
     return $this;
   }
 
   public function setCommitsForLinks(array $commits) {
     assert_instances_of($commits, 'PhabricatorRepositoryCommit');
     $this->commitsForLinks = $commits;
     return $this;
   }
 
   public function render() {
     $user = $this->user;
     if (!$user) {
-      throw new Exception("Call setUser() before render()-ing this view.");
+      throw new Exception('Call setUser() before render()-ing this view.');
     }
 
     $local = $this->localCommits;
     if (!$local) {
       return null;
     }
 
     $has_tree = false;
     $has_local = false;
 
     foreach ($local as $commit) {
       if (idx($commit, 'tree')) {
         $has_tree = true;
       }
       if (idx($commit, 'local')) {
         $has_local = true;
       }
     }
 
     $rows = array();
     foreach ($local as $commit) {
       $row = array();
       if (idx($commit, 'commit')) {
         $commit_link = $this->buildCommitLink($commit['commit']);
       } else if (isset($commit['rev'])) {
         $commit_link = $this->buildCommitLink($commit['rev']);
       } else {
         $commit_link = null;
       }
       $row[] = $commit_link;
 
       if ($has_tree) {
         $row[] = $this->buildCommitLink($commit['tree']);
       }
 
       if ($has_local) {
         $row[] = $this->buildCommitLink($commit['local']);
       }
 
       $parents = idx($commit, 'parents', array());
       foreach ($parents as $k => $parent) {
         if (is_array($parent)) {
           $parent = idx($parent, 'rev');
         }
         $parents[$k] = $this->buildCommitLink($parent);
       }
       $parents = phutil_implode_html(phutil_tag('br'), $parents);
       $row[] = $parents;
 
       $author = nonempty(
         idx($commit, 'user'),
         idx($commit, 'author'));
       $row[] = $author;
 
       $message = idx($commit, 'message');
 
       $summary = idx($commit, 'summary');
       $summary = phutil_utf8_shorten($summary, 80);
 
       $view = new AphrontMoreView();
       $view->setSome($summary);
 
       if ($message && (trim($summary) != trim($message))) {
         $view->setMore(phutil_escape_html_newlines($message));
       }
 
       $row[] = $view->render();
 
       $date = nonempty(
         idx($commit, 'date'),
         idx($commit, 'time'));
       if ($date) {
         $date = phabricator_datetime($date, $user);
       }
       $row[] = $date;
 
       $rows[] = $row;
     }
 
     $column_classes = array('');
     if ($has_tree) {
       $column_classes[] = '';
     }
     if ($has_local) {
       $column_classes[] = '';
     }
     $column_classes[] = '';
     $column_classes[] = '';
     $column_classes[] = 'wide';
     $column_classes[] = 'date';
     $table = id(new AphrontTableView($rows))
       ->setColumnClasses($column_classes);
     $headers = array();
     $headers[] = pht('Commit');
     if ($has_tree) {
       $headers[] = pht('Tree');
     }
     if ($has_local) {
       $headers[] = pht('Local');
     }
     $headers[] = pht('Parents');
     $headers[] = pht('Author');
     $headers[] = pht('Summary');
     $headers[] = pht('Date');
     $table->setHeaders($headers);
 
     return id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Local Commits'))
       ->appendChild($table);
   }
 
   private static function formatCommit($commit) {
     return substr($commit, 0, 12);
   }
 
   private function buildCommitLink($hash) {
     $commit_for_link = idx($this->commitsForLinks, $hash);
     $commit_hash = self::formatCommit($hash);
     if ($commit_for_link) {
       $link = phutil_tag(
         'a',
         array(
           'href' => $commit_for_link->getURI()),
         $commit_hash);
     } else {
       $link = $commit_hash;
     }
     return $link;
   }
 
 }
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index d7564d3f6..ea8fcc531 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -1,189 +1,189 @@
 <?php
 
 /**
  * Render a table of Differential revisions.
  */
 final class DifferentialRevisionListView extends AphrontView {
 
   private $revisions;
   private $handles;
   private $highlightAge;
   private $header;
   private $noDataString;
 
   public function setNoDataString($no_data_string) {
     $this->noDataString = $no_data_string;
     return $this;
   }
 
   public function setHeader($header) {
     $this->header = $header;
     return $this;
   }
 
   public function setRevisions(array $revisions) {
     assert_instances_of($revisions, 'DifferentialRevision');
     $this->revisions = $revisions;
     return $this;
   }
 
   public function setHighlightAge($bool) {
     $this->highlightAge = $bool;
     return $this;
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = array();
     foreach ($this->revisions as $revision) {
       $phids[] = array($revision->getAuthorPHID());
 
       // TODO: Switch to getReviewerStatus(), but not all callers pass us
       // revisions with this data loaded.
       $phids[] = $revision->getReviewers();
     }
     return array_mergev($phids);
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   public function render() {
 
     $user = $this->user;
     if (!$user) {
-      throw new Exception("Call setUser() before render()!");
+      throw new Exception('Call setUser() before render()!');
     }
 
     $fresh = PhabricatorEnv::getEnvConfig('differential.days-fresh');
     if ($fresh) {
       $fresh = PhabricatorCalendarHoliday::getNthBusinessDay(
         time(),
         -$fresh);
     }
 
     $stale = PhabricatorEnv::getEnvConfig('differential.days-stale');
     if ($stale) {
       $stale = PhabricatorCalendarHoliday::getNthBusinessDay(
         time(),
         -$stale);
     }
 
     $this->initBehavior('phabricator-tooltips', array());
     $this->requireResource('aphront-tooltip-css');
 
     $list = new PHUIObjectItemListView();
 
     foreach ($this->revisions as $revision) {
       $item = id(new PHUIObjectItemView())
         ->setUser($user);
 
       $icons = array();
 
       $phid = $revision->getPHID();
       $flag = $revision->getFlag($user);
       if ($flag) {
         $flag_class = PhabricatorFlagColor::getCSSClass($flag->getColor());
         $icons['flag'] = phutil_tag(
           'div',
           array(
             'class' => 'phabricator-flag-icon '.$flag_class,
           ),
           '');
       }
 
       if ($revision->getDrafts($user)) {
         $icons['draft'] = true;
       }
 
       $modified = $revision->getDateModified();
 
       $status = $revision->getStatus();
       $show_age = ($fresh || $stale) &&
                   $this->highlightAge &&
                   !$revision->isClosed();
 
       if ($stale && $modified < $stale) {
         $object_age = PHUIObjectItemView::AGE_OLD;
       } else if ($fresh && $modified < $fresh) {
         $object_age = PHUIObjectItemView::AGE_STALE;
       } else {
         $object_age = PHUIObjectItemView::AGE_FRESH;
       }
 
       $status_name =
         ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);
 
       if (isset($icons['flag'])) {
         $item->addHeadIcon($icons['flag']);
       }
 
       $item->setObjectName('D'.$revision->getID());
       $item->setHeader(phutil_tag('a',
         array('href' => '/D'.$revision->getID()),
         $revision->getTitle()));
 
       if (isset($icons['draft'])) {
         $draft = id(new PHUIIconView())
           ->setIconFont('fa-comment-o lightgreytext')
           ->addSigil('has-tooltip')
           ->setMetadata(
             array(
               'tip' => pht('Unsubmitted Comments'),
             ));
         $item->addAttribute($draft);
       }
 
       /* Most things 'Need Review', so accept it's the default */
       if ($status != ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {
         $item->addAttribute($status_name);
       }
 
       // Author
       $author_handle = $this->handles[$revision->getAuthorPHID()];
       $item->addByline(pht('Author: %s', $author_handle->renderLink()));
 
       $reviewers = array();
       // TODO: As above, this should be based on `getReviewerStatus()`.
       foreach ($revision->getReviewers() as $reviewer) {
         $reviewers[] = $this->handles[$reviewer]->renderLink();
       }
       if (!$reviewers) {
         $reviewers = phutil_tag('em', array(), pht('None'));
       } else {
         $reviewers = phutil_implode_html(', ', $reviewers);
       }
 
       $item->addAttribute(pht('Reviewers: %s', $reviewers));
       $item->setEpoch($revision->getDateModified(), $object_age);
 
       switch ($status) {
         case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
           break;
         case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
         case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
           $item->setBarColor('red');
           break;
         case ArcanistDifferentialRevisionStatus::ACCEPTED:
           $item->setBarColor('green');
           break;
         case ArcanistDifferentialRevisionStatus::CLOSED:
           $item->setDisabled(true);
           break;
         case ArcanistDifferentialRevisionStatus::ABANDONED:
           $item->setBarColor('black');
           break;
       }
 
       $list->addItem($item);
     }
 
     $list->setHeader($this->header);
     $list->setNoDataString($this->noDataString);
 
     return $list;
   }
 
 }
diff --git a/src/applications/differential/view/DifferentialTransactionView.php b/src/applications/differential/view/DifferentialTransactionView.php
index dfdb7c2f4..443a4d23c 100644
--- a/src/applications/differential/view/DifferentialTransactionView.php
+++ b/src/applications/differential/view/DifferentialTransactionView.php
@@ -1,170 +1,170 @@
 <?php
 
 final class DifferentialTransactionView
   extends PhabricatorApplicationTransactionView {
 
   private $changesets;
   private $revision;
   private $rightDiff;
   private $leftDiff;
 
   public function setLeftDiff(DifferentialDiff $left_diff) {
     $this->leftDiff = $left_diff;
     return $this;
   }
 
   public function getLeftDiff() {
     return $this->leftDiff;
   }
 
   public function setRightDiff(DifferentialDiff $right_diff) {
     $this->rightDiff = $right_diff;
     return $this;
   }
 
   public function getRightDiff() {
     return $this->rightDiff;
   }
 
   public function setRevision(DifferentialRevision $revision) {
     $this->revision = $revision;
     return $this;
   }
 
   public function getRevision() {
     return $this->revision;
   }
 
   public function setChangesets(array $changesets) {
     assert_instances_of($changesets, 'DifferentialChangeset');
     $this->changesets = $changesets;
     return $this;
   }
 
   public function getChangesets() {
     return $this->changesets;
   }
 
   // TODO: There's a whole lot of code duplication between this and
   // PholioTransactionView to handle inlines. Merge this into the core? Some of
   // it can probably be shared, while other parts are trickier.
 
   protected function shouldGroupTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     if ($u->getAuthorPHID() != $v->getAuthorPHID()) {
       // Don't group transactions by different authors.
       return false;
     }
 
     if (($v->getDateCreated() - $u->getDateCreated()) > 60) {
       // Don't group if transactions that happened more than 60s apart.
       return false;
     }
 
     switch ($u->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
       case DifferentialTransaction::TYPE_INLINE:
         break;
       default:
         return false;
     }
 
     switch ($v->getTransactionType()) {
       case DifferentialTransaction::TYPE_INLINE:
         return true;
     }
 
     return parent::shouldGroupTransactions($u, $v);
   }
 
   protected function renderTransactionContent(
     PhabricatorApplicationTransaction $xaction) {
 
     $out = array();
 
     $type_inline = DifferentialTransaction::TYPE_INLINE;
 
     $group = $xaction->getTransactionGroup();
     if ($xaction->getTransactionType() == $type_inline) {
       array_unshift($group, $xaction);
     } else {
       $out[] = parent::renderTransactionContent($xaction);
     }
 
     if (!$group) {
       return $out;
     }
 
     $inlines = array();
     foreach ($group as $xaction) {
       switch ($xaction->getTransactionType()) {
         case DifferentialTransaction::TYPE_INLINE:
           $inlines[] = $xaction;
           break;
         default:
-          throw new Exception("Unknown grouped transaction type!");
+          throw new Exception('Unknown grouped transaction type!');
       }
     }
 
     if ($inlines) {
       $inline_view = new PhabricatorInlineSummaryView();
 
       $changesets = $this->getChangesets();
 
       $inline_groups = DifferentialTransactionComment::sortAndGroupInlines(
         $inlines,
         $changesets);
       foreach ($inline_groups as $changeset_id => $group) {
         $changeset = $changesets[$changeset_id];
         $items = array();
         foreach ($group as $inline) {
           $comment = $inline->getComment();
           $item = array(
             'id' => $comment->getID(),
             'line' => $comment->getLineNumber(),
             'length' => $comment->getLineLength(),
             'content' => parent::renderTransactionContent($inline),
           );
 
           $changeset_diff_id = $changeset->getDiffID();
           if ($comment->getIsNewFile()) {
             $visible_diff_id = $this->getRightDiff()->getID();
           } else {
             $visible_diff_id = $this->getLeftDiff()->getID();
           }
 
           // TODO: We still get one edge case wrong here, when we have a
           // versus diff and the file didn't exist in the old version. The
           // comment is visible because we show the left side of the target
           // diff when there's no corresponding file in the versus diff, but
           // we incorrectly link it off-page.
 
           $is_visible = ($changeset_diff_id == $visible_diff_id);
           if (!$is_visible) {
             $item['where'] = pht('(On Diff #%d)', $changeset_diff_id);
 
             $revision_id = $this->getRevision()->getID();
             $comment_id = $comment->getID();
 
             $item['href'] =
-              "/D".$revision_id.
-              "?id=".$changeset_diff_id.
-              "#inline-".$comment_id;
+              '/D'.$revision_id.
+              '?id='.$changeset_diff_id.
+              '#inline-'.$comment_id;
           }
 
           $items[] = $item;
         }
         $inline_view->addCommentGroup(
           $changeset->getFilename(),
           $items);
       }
 
       $out[] = $inline_view;
     }
 
     return $out;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
index 1948960a4..8fda475ed 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
@@ -1,55 +1,55 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_diffusion_existsquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
-    return "Determine if code exists in a version control system.";
+    return 'Determine if code exists in a version control system.';
   }
 
   public function defineReturnType() {
     return 'bool';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string'
     );
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
     list($err, $merge_base) = $repository->execLocalCommand(
       'cat-file -t %s',
       $commit);
     return !$err;
   }
 
   protected function getSVNResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
     list($info) = $repository->execxRemoteCommand(
       'info %s',
       $repository->getRemoteURI());
     $exists = false;
     $matches = null;
     if (preg_match('/^Revision: (\d+)$/m', $info, $matches)) {
       $base_revision = $matches[1];
       $exists = $base_revision >= $commit;
     }
     return $exists;
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
     list($err, $stdout) = $repository->execLocalCommand(
       'id --rev %s',
       $commit);
     return  !$err;
   }
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
index d44f51bfe..51462659a 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
@@ -1,84 +1,84 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_diffusion_findsymbols_Method
   extends ConduitAPI_diffusion_Method {
 
   public function getMethodDescription() {
-    return "Retrieve Diffusion symbol information.";
+    return 'Retrieve Diffusion symbol information.';
   }
 
   public function defineParamTypes() {
     return array(
       'name'        => 'optional string',
       'namePrefix'  => 'optional string',
       'context'     => 'optional string',
       'language'    => 'optional string',
       'type'        => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $name = $request->getValue('name');
     $name_prefix = $request->getValue('namePrefix');
     $context = $request->getValue('context');
     $language = $request->getValue('language');
     $type = $request->getValue('type');
 
     $query = new DiffusionSymbolQuery();
     if ($name !== null) {
       $query->setName($name);
     }
     if ($name_prefix !== null) {
       $query->setNamePrefix($name_prefix);
     }
     if ($context !== null) {
       $query->setContext($context);
     }
     if ($language !== null) {
       $query->setLanguage($language);
     }
     if ($type !== null) {
       $query->setType($type);
     }
 
     $query->needPaths(true);
     $query->needArcanistProjects(true);
     $query->needRepositories(true);
 
     $results = $query->execute();
 
 
     $response = array();
     foreach ($results as $result) {
       $uri = $result->getURI();
       if ($uri) {
         $uri = PhabricatorEnv::getProductionURI($uri);
       }
 
       $response[] = array(
         'name'        => $result->getSymbolName(),
         'context'     => $result->getSymbolContext(),
         'type'        => $result->getSymbolType(),
         'language'    => $result->getSymbolLanguage(),
         'path'        => $result->getPath(),
         'line'        => $result->getLineNumber(),
         'uri'         => $uri,
       );
     }
 
     return $response;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
index 8d80588c8..1e11ef114 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
@@ -1,73 +1,73 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_diffusion_getlintmessages_Method
   extends ConduitAPI_diffusion_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Get lint messages for existing code.";
+    return 'Get lint messages for existing code.';
   }
 
   public function defineParamTypes() {
     return array(
       'arcanistProject' => 'required string',
       'branch'          => 'optional string',
       'commit'          => 'optional string',
       'files'           => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $project = id(new PhabricatorRepositoryArcanistProject())->loadOneWhere(
       'name = %s',
       $request->getValue('arcanistProject'));
     if (!$project || !$project->getRepositoryID()) {
       return array();
     }
 
     $branch_name = $request->getValue('branch');
     if ($branch_name == '') {
       $repository = id(new PhabricatorRepositoryQuery())
         ->setViewer($request->getUser())
         ->withIDs(array($project->getRepositoryID()))
         ->executeOne();
       $branch_name = $repository->getDefaultArcanistBranch();
     }
 
     $branch = id(new PhabricatorRepositoryBranch())->loadOneWhere(
       'repositoryID = %d AND name = %s',
       $project->getRepositoryID(),
       $branch_name);
     if (!$branch || !$branch->getLintCommit()) {
       return array();
     }
 
     $lint_messages = queryfx_all(
       $branch->establishConnection('r'),
       'SELECT path, line, code FROM %T WHERE branchID = %d AND path IN (%Ls)',
       PhabricatorRepository::TABLE_LINTMESSAGE,
       $branch->getID(),
       $request->getValue('files'));
 
     // TODO: Compare commit identifiers of individual files like in
     // DiffusionBrowseFileController::loadLintMessages().
 
     return $lint_messages;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
index 3c4ff3f1a..ca4467e01 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
@@ -1,67 +1,67 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_diffusion_getrecentcommitsbypath_Method
   extends ConduitAPI_diffusion_Method {
 
   const DEFAULT_LIMIT = 10;
 
   public function getMethodDescription() {
-    return "Get commit identifiers for recent commits affecting a given path.";
+    return 'Get commit identifiers for recent commits affecting a given path.';
   }
 
   public function defineParamTypes() {
     return array(
       'callsign' => 'required string',
       'path' => 'required string',
       'branch' => 'optional string',
       'limit' => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<string>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => $request->getUser(),
         'callsign' => $request->getValue('callsign'),
         'path' => $request->getValue('path'),
         'branch' => $request->getValue('branch'),
       ));
 
     $limit = nonempty(
       $request->getValue('limit'),
       self::DEFAULT_LIMIT);
 
     $history_result = DiffusionQuery::callConduitWithDiffusionRequest(
       $request->getUser(),
       $drequest,
       'diffusion.historyquery',
       array(
         'commit' => $drequest->getCommit(),
         'path' => $drequest->getPath(),
         'offset' => 0,
         'limit' => $limit,
         'needDirectChanges' => true,
         'needChildChanges' => true));
     $history = DiffusionPathChange::newFromConduit(
       $history_result['pathChanges']);
 
     $raw_commit_identifiers = mpull($history, 'getCommitIdentifier');
     $result = array();
     foreach ($raw_commit_identifiers as $id) {
       $result[] = 'r'.$request->getValue('callsign').$id;
     }
     return $result;
   }
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
index 8cf211509..fbcc750ef 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
@@ -1,267 +1,267 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_diffusion_historyquery_Method
 extends ConduitAPI_diffusion_abstractquery_Method {
 
   private $parents = array();
 
   public function getMethodDescription() {
     return 'Returns history information for a repository at a specific '.
       'commit and path.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string',
       'path' => 'required string',
       'offset' => 'required int',
       'limit' => 'required int',
       'needDirectChanges' => 'optional bool',
       'needChildChanges' => 'optional bool',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $path_changes = parent::getResult($request);
 
     return array(
       'pathChanges' => mpull($path_changes, 'toDictionary'),
       'parents' => $this->parents);
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit_hash = $request->getValue('commit');
     $path = $request->getValue('path');
     $offset = $request->getValue('offset');
     $limit = $request->getValue('limit');
 
     list($stdout) = $repository->execxLocalCommand(
       'log '.
         '--skip=%d '.
         '-n %d '.
         '--pretty=format:%s '.
         '%s -- %C',
       $offset,
       $limit,
       '%H:%P',
       $commit_hash,
       // Git omits merge commits if the path is provided, even if it is empty.
       (strlen($path) ? csprintf('%s', $path) : ''));
 
     $lines = explode("\n", trim($stdout));
     $lines = array_filter($lines);
     if (!$lines) {
       return array();
     }
 
     $hash_list = array();
     $parent_map = array();
     foreach ($lines as $line) {
-      list($hash, $parents) = explode(":", $line);
+      list($hash, $parents) = explode(':', $line);
       $hash_list[] = $hash;
       $parent_map[$hash] = preg_split('/\s+/', $parents);
     }
 
     $this->parents = $parent_map;
 
     return DiffusionQuery::loadHistoryForCommitIdentifiers(
       $hash_list,
       $drequest);
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit_hash = $request->getValue('commit');
     $path = $request->getValue('path');
     $offset = $request->getValue('offset');
     $limit = $request->getValue('limit');
 
     $path = DiffusionPathIDQuery::normalizePath($path);
     $path = ltrim($path, '/');
 
     // NOTE: Older versions of Mercurial give different results for these
     // commands (see T1268):
     //
     //   $ hg log -- ''
     //   $ hg log
     //
     // All versions of Mercurial give different results for these commands
     // (merge commits are excluded with the "." version):
     //
     //   $ hg log -- .
     //   $ hg log
     //
     // If we don't have a path component in the query, omit it from the command
     // entirely to avoid these inconsistencies.
 
     // NOTE: When viewing the history of a file, we don't use "-b", because
     // Mercurial stops history at the branchpoint but we're interested in all
     // ancestors. When viewing history of a branch, we do use "-b", and thus
     // stop history (this is more consistent with the Mercurial worldview of
     // branches).
 
     if (strlen($path)) {
       $path_arg = csprintf('-- %s', $path);
       $branch_arg = '';
     } else {
       $path_arg = '';
       // NOTE: --branch used to be called --only-branch; use -b for
       // compatibility.
       $branch_arg = csprintf('-b %s', $drequest->getBranch());
     }
 
     list($stdout) = $repository->execxLocalCommand(
       'log --debug --template %s --limit %d %C --rev %s %C',
       '{node};{parents}\\n',
       ($offset + $limit), // No '--skip' in Mercurial.
       $branch_arg,
       hgsprintf('reverse(ancestors(%s))', $commit_hash),
       $path_arg);
 
     $stdout = PhabricatorRepository::filterMercurialDebugOutput($stdout);
     $lines = explode("\n", trim($stdout));
     $lines = array_slice($lines, $offset);
 
     $hash_list = array();
     $parent_map = array();
 
     $last = null;
     foreach (array_reverse($lines) as $line) {
       list($hash, $parents) = explode(';', $line);
       $parents = trim($parents);
       if (!$parents) {
         if ($last === null) {
           $parent_map[$hash] = array('...');
         } else {
           $parent_map[$hash] = array($last);
         }
       } else {
         $parents = preg_split('/\s+/', $parents);
         foreach ($parents as $parent) {
           list($plocal, $phash) = explode(':', $parent);
           if (!preg_match('/^0+$/', $phash)) {
             $parent_map[$hash][] = $phash;
           }
         }
         // This may happen for the zeroth commit in repository, both hashes
         // are "000000000...".
         if (empty($parent_map[$hash])) {
           $parent_map[$hash] = array('...');
         }
       }
 
       // The rendering code expects the first commit to be "mainline", like
       // Git. Flip the order so it does the right thing.
       $parent_map[$hash] = array_reverse($parent_map[$hash]);
 
       $hash_list[] = $hash;
       $last = $hash;
     }
 
     $hash_list = array_reverse($hash_list);
     $this->parents = $parent_map;
 
     return DiffusionQuery::loadHistoryForCommitIdentifiers(
       $hash_list,
       $drequest);
   }
 
   protected function getSVNResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit = $request->getValue('commit');
     $path = $request->getValue('path');
     $offset = $request->getValue('offset');
     $limit = $request->getValue('limit');
     $need_direct_changes = $request->getValue('needDirectChanges');
     $need_child_changes = $request->getValue('needChildChanges');
 
     $conn_r = $repository->establishConnection('r');
 
     $paths = queryfx_all(
       $conn_r,
       'SELECT id, path FROM %T WHERE pathHash IN (%Ls)',
       PhabricatorRepository::TABLE_PATH,
       array(md5('/'.trim($path, '/'))));
     $paths = ipull($paths, 'id', 'path');
     $path_id = idx($paths, '/'.trim($path, '/'));
 
     if (!$path_id) {
       return array();
     }
 
     $filter_query = '';
     if ($need_direct_changes) {
       if ($need_child_changes) {
         $type = DifferentialChangeType::TYPE_CHILD;
         $filter_query = 'AND (isDirect = 1 OR changeType = '.$type.')';
       } else {
         $filter_query = 'AND (isDirect = 1)';
       }
     }
 
     $history_data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T WHERE repositoryID = %d AND pathID = %d
         AND commitSequence <= %d
         %Q
         ORDER BY commitSequence DESC
         LIMIT %d, %d',
       PhabricatorRepository::TABLE_PATHCHANGE,
       $repository->getID(),
       $path_id,
       $commit ? $commit : 0x7FFFFFFF,
       $filter_query,
       $offset,
       $limit);
 
     $commits = array();
     $commit_data = array();
 
     $commit_ids = ipull($history_data, 'commitID');
     if ($commit_ids) {
       $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
         'id IN (%Ld)',
         $commit_ids);
       if ($commits) {
         $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
           'commitID in (%Ld)',
           $commit_ids);
         $commit_data = mpull($commit_data, null, 'getCommitID');
       }
     }
 
     $history = array();
     foreach ($history_data as $row) {
       $item = new DiffusionPathChange();
 
       $commit = idx($commits, $row['commitID']);
       if ($commit) {
         $item->setCommit($commit);
         $item->setCommitIdentifier($commit->getCommitIdentifier());
         $data = idx($commit_data, $commit->getID());
         if ($data) {
           $item->setCommitData($data);
         }
       }
 
       $item->setChangeType($row['changeType']);
       $item->setFileType($row['fileType']);
 
       $history[] = $item;
     }
 
     return $history;
   }
 
 }
diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
index 40821e3f8..b2271c131 100644
--- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
+++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
@@ -1,122 +1,122 @@
 <?php
 
 final class PhabricatorDiffusionConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Diffusion');
   }
 
   public function getDescription() {
     return pht('Configure Diffusion repository browsing.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'metamta.diffusion.subject-prefix',
         'string',
         '[Diffusion]')
         ->setDescription(pht('Subject prefix for Diffusion mail.')),
       $this->newOption(
         'metamta.diffusion.reply-handler-domain',
         'string',
         null)
         ->setDescription(
           pht(
             'See {{metamta.maniphest.reply-handler}}. This does the same '.
             'thing, but affects Diffusion.')),
       $this->newOption(
         'metamta.diffusion.reply-handler',
         'class',
         'PhabricatorAuditReplyHandler')
         ->setBaseClass('PhabricatorMailReplyHandler')
         ->setDescription(pht('Override mail reply handler class.')),
       $this->newOption(
         'metamta.diffusion.attach-patches',
         'bool',
         false)
         ->setBoolOptions(
           array(
-            pht("Attach Patches"),
-            pht("Do Not Attach Patches"),
+            pht('Attach Patches'),
+            pht('Do Not Attach Patches'),
           ))
         ->setDescription(pht(
           'Set this to true if you want patches to be attached to commit '.
           'notifications from Diffusion.')),
       $this->newOption('metamta.diffusion.inline-patches', 'int', 0)
         ->setSummary(pht('Include patches in Diffusion mail as body text.'))
         ->setDescription(
           pht(
             '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.')),
       $this->newOption('metamta.diffusion.byte-limit', 'int', 1024 * 1024)
         ->setDescription(pht('Hard byte limit on including patches in email.')),
       $this->newOption('metamta.diffusion.time-limit', 'int', 60)
         ->setDescription(pht('Hard time limit on generating patches.')),
       $this->newOption(
         'audit.can-author-close-audit',
         'bool',
         false)
         ->setBoolOptions(
           array(
-            pht("Enable Closing Audits"),
-            pht("Disable Closing Audits"),
+            pht('Enable Closing Audits'),
+            pht('Disable Closing Audits'),
           ))
         ->setDescription(pht('Controls whether Author can Close Audits.')),
 
       $this->newOption('bugtraq.url', 'string', '')
         ->addExample('https://bugs.php.net/%BUGID%', pht('PHP bugs'))
         ->addExample('/%BUGID%', pht('Local Maniphest URL'))
         ->setDescription(pht(
           'URL of external bug tracker used by Diffusion. %s will be '.
             'substituted by the bug ID.',
           '%BUGID%')),
       $this->newOption('bugtraq.logregex', 'list<regex>', array())
         ->addExample(array('/\B#([1-9]\d*)\b/'), pht('Issue #123'))
         ->addExample(
           array('/[Ii]ssues?:?(\s*,?\s*#\d+)+/', '/(\d+)/'),
           pht('Issue #123, #456'))
         ->addExample(array('/(?<!#)\b(T[1-9]\d*)\b/'), pht('Task T123'))
         ->addExample('/[A-Z]{2,}-\d+/', pht('JIRA-1234'))
         ->setDescription(pht(
           'Regular expression to link external bug tracker. See '.
             'http://tortoisesvn.net/docs/release/TortoiseSVN_en/'.
             'tsvn-dug-bugtracker.html for further explanation.')),
       $this->newOption('diffusion.allow-http-auth', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow HTTP Basic Auth'),
             pht('Disable HTTP Basic Auth'),
           ))
         ->setSummary(pht('Enable HTTP Basic Auth for repositories.'))
         ->setDescription(
           pht(
             "Phabricator can serve repositories over HTTP, using HTTP basic ".
             "auth.\n\n".
             "Because HTTP basic auth is less secure than SSH auth, it is ".
             "disabled by default. You can enable it here if you'd like to use ".
             "it anyway. There's nothing fundamentally insecure about it as ".
             "long as Phabricator uses HTTPS, but it presents a much lower ".
             "barrier to attackers than SSH does.\n\n".
             "Consider using SSH for authenticated access to repositories ".
             "instead of HTTP.")),
       $this->newOption('diffusion.ssh-user', 'string', null)
         ->setSummary(pht('Login username for SSH connections to repositories.'))
         ->setDescription(
           pht(
             'When constructing clone URIs to show to users, Diffusion will '.
             'fill in this login username. If you have configured a VCS user '.
             'like `git`, you should provide it here.')),
       $this->newOption('diffusion.ssh-port', 'int', null)
         ->setSummary(pht('Port for SSH connections to repositories.'))
         ->setDescription(
           pht(
             'When constructing clone URIs to show to users, Diffusion by '.
             'default will not display a port assuming the default for your '.
             'VCS. Explicitly declare when running on a non-standard port.')),
     );
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
index 2a926136a..9975fbc83 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -1,1091 +1,1091 @@
 <?php
 
 final class DiffusionBrowseFileController extends DiffusionBrowseController {
 
   private $lintCommit;
   private $lintMessages;
   private $coverage;
 
   public function processRequest() {
     $request = $this->getRequest();
     $drequest = $this->getDiffusionRequest();
     $viewer = $request->getUser();
 
     $before = $request->getStr('before');
     if ($before) {
       return $this->buildBeforeResponse($before);
     }
 
     $path = $drequest->getPath();
 
     $preferences = $viewer->loadPreferences();
 
     $show_blame = $request->getBool(
       'blame',
       $preferences->getPreference(
         PhabricatorUserPreferences::PREFERENCE_DIFFUSION_BLAME,
         false));
     $show_color = $request->getBool(
       'color',
       $preferences->getPreference(
         PhabricatorUserPreferences::PREFERENCE_DIFFUSION_COLOR,
         true));
 
     $view = $request->getStr('view');
     if ($request->isFormPost() && $view != 'raw' && $viewer->isLoggedIn()) {
       $preferences->setPreference(
         PhabricatorUserPreferences::PREFERENCE_DIFFUSION_BLAME,
         $show_blame);
       $preferences->setPreference(
         PhabricatorUserPreferences::PREFERENCE_DIFFUSION_COLOR,
         $show_color);
       $preferences->save();
 
       $uri = $request->getRequestURI()
         ->alter('blame', null)
         ->alter('color', null);
 
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     // We need the blame information if blame is on and we're building plain
     // text, or blame is on and this is an Ajax request. If blame is on and
     // this is a colorized request, we don't show blame at first (we ajax it
     // in afterward) so we don't need to query for it.
     $needs_blame = ($show_blame && !$show_color) ||
                    ($show_blame && $request->isAjax());
 
     $file_content = DiffusionFileContent::newFromConduit(
       $this->callConduitWithDiffusionRequest(
         'diffusion.filecontentquery',
         array(
           'commit' => $drequest->getCommit(),
           'path' => $drequest->getPath(),
           'needsBlame' => $needs_blame,
         )));
     $data = $file_content->getCorpus();
 
     if ($view === 'raw') {
       return $this->buildRawResponse($path, $data);
     }
 
     $this->loadLintMessages();
     $this->coverage = $drequest->loadCoverage();
 
     $binary_uri = null;
     if (ArcanistDiffUtils::isHeuristicBinaryFile($data)) {
       $file = $this->loadFileForData($path, $data);
       $file_uri = $file->getBestURI();
 
       if ($file->isViewableImage()) {
         $corpus = $this->buildImageCorpus($file_uri);
       } else {
         $corpus = $this->buildBinaryCorpus($file_uri, $data);
         $binary_uri = $file_uri;
       }
     } else {
       // Build the content of the file.
       $corpus = $this->buildCorpus(
         $show_blame,
         $show_color,
         $file_content,
         $needs_blame,
         $drequest,
         $path,
         $data);
     }
 
     if ($request->isAjax()) {
       return id(new AphrontAjaxResponse())->setContent($corpus);
     }
 
     require_celerity_resource('diffusion-source-css');
 
     // Render the page.
     $view = $this->buildActionView($drequest);
     $action_list = $this->enrichActionView(
       $view,
       $drequest,
       $show_blame,
       $show_color);
 
     $properties = $this->buildPropertyView($drequest, $action_list);
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($this->buildHeaderView($drequest))
       ->addPropertyList($properties);
 
     $content = array();
     $content[] = $object_box;
 
     $follow  = $request->getStr('follow');
     if ($follow) {
       $notice = new AphrontErrorView();
       $notice->setSeverity(AphrontErrorView::SEVERITY_WARNING);
       $notice->setTitle(pht('Unable to Continue'));
       switch ($follow) {
         case 'first':
           $notice->appendChild(
-            pht("Unable to continue tracing the history of this file because ".
-            "this commit is the first commit in the repository."));
+            pht('Unable to continue tracing the history of this file because '.
+            'this commit is the first commit in the repository.'));
           break;
         case 'created':
           $notice->appendChild(
-            pht("Unable to continue tracing the history of this file because ".
-            "this commit created the file."));
+            pht('Unable to continue tracing the history of this file because '.
+            'this commit created the file.'));
           break;
       }
       $content[] = $notice;
     }
 
     $renamed = $request->getStr('renamed');
     if ($renamed) {
       $notice = new AphrontErrorView();
       $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
       $notice->setTitle(pht('File Renamed'));
       $notice->appendChild(
         pht("File history passes through a rename from '%s' to '%s'.",
           $drequest->getPath(), $renamed));
       $content[] = $notice;
     }
 
     $content[] = $corpus;
     $content[] = $this->buildOpenRevisions();
 
     $crumbs = $this->buildCrumbs(
       array(
         'branch' => true,
         'path'   => true,
         'view'   => 'browse',
       ));
 
     $basename = basename($this->getDiffusionRequest()->getPath());
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $content,
       ),
       array(
         'title' => $basename,
       ));
   }
 
   private function loadLintMessages() {
     $drequest = $this->getDiffusionRequest();
     $branch = $drequest->loadBranch();
 
     if (!$branch || !$branch->getLintCommit()) {
       return;
     }
 
     $this->lintCommit = $branch->getLintCommit();
 
     $conn = id(new PhabricatorRepository())->establishConnection('r');
 
     $where = '';
     if ($drequest->getLint()) {
       $where = qsprintf(
         $conn,
         'AND code = %s',
         $drequest->getLint());
     }
 
     $this->lintMessages = queryfx_all(
       $conn,
       'SELECT * FROM %T WHERE branchID = %d %Q AND path = %s',
       PhabricatorRepository::TABLE_LINTMESSAGE,
       $branch->getID(),
       $where,
       '/'.$drequest->getPath());
   }
 
   private function buildCorpus(
     $show_blame,
     $show_color,
     DiffusionFileContent $file_content,
     $needs_blame,
     DiffusionRequest $drequest,
     $path,
     $data) {
 
     if (!$show_color) {
       $style =
-        "border: none; width: 100%; height: 80em; font-family: monospace";
+        'border: none; width: 100%; height: 80em; font-family: monospace';
       if (!$show_blame) {
         $corpus = phutil_tag(
           'textarea',
           array(
             'style' => $style,
           ),
           $file_content->getCorpus());
       } else {
         $text_list = $file_content->getTextList();
         $rev_list = $file_content->getRevList();
         $blame_dict = $file_content->getBlameDict();
 
         $rows = array();
         foreach ($text_list as $k => $line) {
           $rev = $rev_list[$k];
           $author = $blame_dict[$rev]['author'];
           $rows[] =
-            sprintf("%-10s %-20s %s", substr($rev, 0, 7), $author, $line);
+            sprintf('%-10s %-20s %s', substr($rev, 0, 7), $author, $line);
         }
 
         $corpus = phutil_tag(
           'textarea',
           array(
             'style' => $style,
           ),
           implode("\n", $rows));
       }
     } else {
       require_celerity_resource('syntax-highlighting-css');
       $text_list = $file_content->getTextList();
       $rev_list = $file_content->getRevList();
       $blame_dict = $file_content->getBlameDict();
 
       $text_list = implode("\n", $text_list);
       $text_list = PhabricatorSyntaxHighlighter::highlightWithFilename(
         $path,
         $text_list);
       $text_list = explode("\n", $text_list);
 
       $rows = $this->buildDisplayRows($text_list, $rev_list, $blame_dict,
         $needs_blame, $drequest, $show_blame, $show_color);
 
       $corpus_table = javelin_tag(
         'table',
         array(
-          'class' => "diffusion-source remarkup-code PhabricatorMonospaced",
+          'class' => 'diffusion-source remarkup-code PhabricatorMonospaced',
           'sigil' => 'phabricator-source',
         ),
         $rows);
 
       if ($this->getRequest()->isAjax()) {
         return $corpus_table;
       }
 
       $id = celerity_generate_unique_node_id();
 
       $projects = $drequest->loadArcanistProjects();
       $langs = array();
       foreach ($projects as $project) {
         $ls = $project->getSymbolIndexLanguages();
         if (!$ls) {
           continue;
         }
         $dep_projects = $project->getSymbolIndexProjects();
         $dep_projects[] = $project->getPHID();
         foreach ($ls as $lang) {
           if (!isset($langs[$lang])) {
             $langs[$lang] = array();
           }
           $langs[$lang] += $dep_projects + array($project);
         }
       }
 
       $lang = last(explode('.', $drequest->getPath()));
 
       if (isset($langs[$lang])) {
         Javelin::initBehavior(
           'repository-crossreference',
           array(
             'container' => $id,
             'lang' => $lang,
             'projects' => $langs[$lang],
           ));
       }
 
       $corpus = phutil_tag(
         'div',
         array(
           'id' => $id,
         ),
         $corpus_table);
 
       Javelin::initBehavior('load-blame', array('id' => $id));
     }
 
     $edit = $this->renderEditButton();
     $file = $this->renderFileButton();
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('File Contents'))
       ->addActionLink($edit)
       ->addActionLink($file);
 
     $corpus = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($corpus);
 
     return $corpus;
   }
 
   private function enrichActionView(
     PhabricatorActionListView $view,
     DiffusionRequest $drequest,
     $show_blame,
     $show_color) {
 
     $viewer = $this->getRequest()->getUser();
     $base_uri = $this->getRequest()->getRequestURI();
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Show Last Change'))
         ->setHref(
           $drequest->generateURI(
             array(
               'action' => 'change',
             )))
         ->setIcon('fa-backward'));
 
     if ($show_blame) {
       $blame_text = pht('Disable Blame');
       $blame_icon = 'fa-exclamation-circle lightgreytext';
       $blame_value = 0;
     } else {
       $blame_text = pht('Enable Blame');
       $blame_icon = 'fa-exclamation-circle';
       $blame_value = 1;
     }
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName($blame_text)
         ->setHref($base_uri->alter('blame', $blame_value))
         ->setIcon($blame_icon)
         ->setUser($viewer)
         ->setRenderAsForm($viewer->isLoggedIn()));
 
     if ($show_color) {
       $highlight_text = pht('Disable Highlighting');
       $highlight_icon = 'fa-star-o grey';
       $highlight_value = 0;
     } else {
       $highlight_text = pht('Enable Highlighting');
       $highlight_icon = 'fa-star';
       $highlight_value = 1;
     }
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName($highlight_text)
         ->setHref($base_uri->alter('color', $highlight_value))
         ->setIcon($highlight_icon)
         ->setUser($viewer)
         ->setRenderAsForm($viewer->isLoggedIn()));
 
     $href = null;
     if ($this->getRequest()->getStr('lint') !== null) {
       $lint_text = pht('Hide %d Lint Message(s)', count($this->lintMessages));
       $href = $base_uri->alter('lint', null);
 
     } else if ($this->lintCommit === null) {
       $lint_text = pht('Lint not Available');
     } else {
       $lint_text = pht(
         'Show %d Lint Message(s)',
         count($this->lintMessages));
       $href = $this->getDiffusionRequest()->generateURI(array(
         'action' => 'browse',
         'commit' => $this->lintCommit,
       ))->alter('lint', '');
     }
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName($lint_text)
         ->setHref($href)
         ->setIcon('fa-exclamation-triangle')
         ->setDisabled(!$href));
 
     return $view;
   }
 
   private function renderEditButton() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $drequest = $this->getDiffusionRequest();
 
     $repository = $drequest->getRepository();
     $path = $drequest->getPath();
     $line = nonempty((int)$drequest->getLine(), 1);
 
     $callsign = $repository->getCallsign();
     $editor_link = $user->loadEditorLink($path, $line, $callsign);
     $template = $user->loadEditorLink($path, '%l', $callsign);
 
     $icon_edit = id(new PHUIIconView())
       ->setIconFont('fa-pencil');
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText(pht('Open in Editor'))
       ->setHref($editor_link)
       ->setIcon($icon_edit)
       ->setID('editor_link')
       ->setMetadata(array('link_template' => $template))
       ->setDisabled(!$editor_link);
 
     return $button;
   }
 
   private function renderFileButton($file_uri = null) {
 
     $base_uri = $this->getRequest()->getRequestURI();
 
     if ($file_uri) {
       $text = pht('Download Raw File');
       $href = $file_uri;
       $icon = 'fa-download';
     } else {
       $text = pht('View Raw File');
       $href = $base_uri->alter('view', 'raw');
       $icon = 'fa-file-text';
     }
 
     $iconview = id(new PHUIIconView())
       ->setIconFont($icon);
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText($text)
       ->setHref($href)
       ->setIcon($iconview);
 
     return $button;
   }
 
 
   private function buildDisplayRows(
     array $text_list,
     array $rev_list,
     array $blame_dict,
     $needs_blame,
     DiffusionRequest $drequest,
     $show_blame,
     $show_color) {
 
     $handles = array();
     if ($blame_dict) {
       $epoch_list  = ipull(ifilter($blame_dict, 'epoch'), 'epoch');
       $epoch_min   = min($epoch_list);
       $epoch_max   = max($epoch_list);
       $epoch_range = ($epoch_max - $epoch_min) + 1;
 
       $author_phids = ipull(ifilter($blame_dict, 'authorPHID'), 'authorPHID');
       $handles = $this->loadViewerHandles($author_phids);
     }
 
     $line_arr = array();
     $line_str = $drequest->getLine();
     $ranges = explode(',', $line_str);
     foreach ($ranges as $range) {
       if (strpos($range, '-') !== false) {
         list($min, $max) = explode('-', $range, 2);
         $line_arr[] = array(
           'min' => min($min, $max),
           'max' => max($min, $max),
         );
       } else if (strlen($range)) {
         $line_arr[] = array(
           'min' => $range,
           'max' => $range,
         );
       }
     }
 
     $display = array();
 
     $line_number = 1;
     $last_rev = null;
     $color = null;
     foreach ($text_list as $k => $line) {
       $display_line = array(
         'epoch'       => null,
         'commit'      => null,
         'author'      => null,
         'target'      => null,
         'highlighted' => null,
         'line'        => $line_number,
         'data'        => $line,
       );
 
       if ($show_blame) {
         // If the line's rev is same as the line above, show empty content
         // with same color; otherwise generate blame info. The newer a change
         // is, the more saturated the color.
 
         $rev = idx($rev_list, $k, $last_rev);
 
         if ($last_rev == $rev) {
           $display_line['color'] = $color;
         } else {
           $blame = $blame_dict[$rev];
 
           if (!isset($blame['epoch'])) {
             $color = '#ffd'; // Render as warning.
           } else {
             $color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range;
             $color_value = 0xE6 * (1.0 - $color_ratio);
             $color = sprintf(
               '#%02x%02x%02x',
               $color_value,
               0xF6,
               $color_value);
           }
 
           $display_line['epoch'] = idx($blame, 'epoch');
           $display_line['color'] = $color;
           $display_line['commit'] = $rev;
 
           $author_phid = idx($blame, 'authorPHID');
           if ($author_phid && $handles[$author_phid]) {
             $author_link = $handles[$author_phid]->renderLink();
           } else {
             $author_link = $blame['author'];
           }
           $display_line['author'] = $author_link;
 
           $last_rev = $rev;
         }
       }
 
       if ($line_arr) {
         if ($line_number == $line_arr[0]['min']) {
           $display_line['target'] = true;
         }
         foreach ($line_arr as $range) {
           if ($line_number >= $range['min'] &&
               $line_number <= $range['max']) {
             $display_line['highlighted'] = true;
           }
         }
       }
 
       $display[] = $display_line;
       ++$line_number;
     }
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $commits = array_filter(ipull($display, 'commit'));
     if ($commits) {
       $commits = id(new DiffusionCommitQuery())
         ->setViewer($viewer)
         ->withRepository($drequest->getRepository())
         ->withIdentifiers($commits)
         ->execute();
       $commits = mpull($commits, null, 'getCommitIdentifier');
     }
 
     $revision_ids = id(new DifferentialRevision())
       ->loadIDsByCommitPHIDs(mpull($commits, 'getPHID'));
     $revisions = array();
     if ($revision_ids) {
       $revisions = id(new DifferentialRevisionQuery())
         ->setViewer($viewer)
         ->withIDs($revision_ids)
         ->execute();
     }
 
     $phids = array();
     foreach ($commits as $commit) {
       if ($commit->getAuthorPHID()) {
         $phids[] = $commit->getAuthorPHID();
       }
     }
     foreach ($revisions as $revision) {
       if ($revision->getAuthorPHID()) {
         $phids[] = $revision->getAuthorPHID();
       }
     }
     $handles = $this->loadViewerHandles($phids);
 
     Javelin::initBehavior('phabricator-oncopy', array());
 
     $engine = null;
     $inlines = array();
     if ($this->getRequest()->getStr('lint') !== null && $this->lintMessages) {
       $engine = new PhabricatorMarkupEngine();
       $engine->setViewer($viewer);
 
       foreach ($this->lintMessages as $message) {
         $inline = id(new PhabricatorAuditInlineComment())
           ->setID($message['id'])
           ->setSyntheticAuthor(
             ArcanistLintSeverity::getStringForSeverity($message['severity']).
             ' '.$message['code'].' ('.$message['name'].')')
           ->setLineNumber($message['line'])
           ->setContent($message['description']);
         $inlines[$message['line']][] = $inline;
 
         $engine->addObject(
           $inline,
           PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
       }
 
       $engine->process();
       require_celerity_resource('differential-changeset-view-css');
     }
 
     $rows = $this->renderInlines(
       idx($inlines, 0, array()),
       $show_blame,
       (bool)$this->coverage,
       $engine);
 
     foreach ($display as $line) {
 
       $line_href = $drequest->generateURI(
         array(
           'action'  => 'browse',
           'line'    => $line['line'],
           'stable'  => true,
         ));
 
       $blame = array();
       $style = null;
       if (array_key_exists('color', $line)) {
         if ($line['color']) {
           $style = 'background: '.$line['color'].';';
         }
 
         $before_link = null;
         $commit_link = null;
         $revision_link = null;
         if (idx($line, 'commit')) {
           $commit = $line['commit'];
 
           if (idx($commits, $commit)) {
             $tooltip = $this->renderCommitTooltip(
               $commits[$commit],
               $handles,
               $line['author']);
           } else {
             $tooltip = null;
           }
 
           Javelin::initBehavior('phabricator-tooltips', array());
           require_celerity_resource('aphront-tooltip-css');
 
           $commit_link = javelin_tag(
             'a',
             array(
               'href' => $drequest->generateURI(
                 array(
                   'action' => 'commit',
                   'commit' => $line['commit'],
                 )),
               'sigil' => 'has-tooltip',
               'meta'  => array(
                 'tip'   => $tooltip,
                 'align' => 'E',
                 'size'  => 600,
               ),
             ),
             phutil_utf8_shorten($line['commit'], 9, ''));
 
           $revision_id = null;
           if (idx($commits, $commit)) {
             $revision_id = idx($revision_ids, $commits[$commit]->getPHID());
           }
 
           if ($revision_id) {
             $revision = idx($revisions, $revision_id);
             if ($revision) {
               $tooltip = $this->renderRevisionTooltip($revision, $handles);
               $revision_link = javelin_tag(
                 'a',
                 array(
                   'href' => '/D'.$revision->getID(),
                   'sigil' => 'has-tooltip',
                   'meta'  => array(
                     'tip'   => $tooltip,
                     'align' => 'E',
                     'size'  => 600,
                   ),
                 ),
                 'D'.$revision->getID());
             }
           }
 
           $uri = $line_href->alter('before', $commit);
           $before_link = javelin_tag(
             'a',
             array(
               'href'  => $uri->setQueryParam('view', 'blame'),
               'sigil' => 'has-tooltip',
               'meta'  => array(
                 'tip'     => pht('Skip Past This Commit'),
                 'align'   => 'E',
                 'size'    => 300,
               ),
             ),
             "\xC2\xAB");
         }
 
         $blame[] = phutil_tag(
           'th',
           array(
             'class' => 'diffusion-blame-link',
           ),
           $before_link);
 
         $object_links = array();
         $object_links[] = $commit_link;
         if ($revision_link) {
           $object_links[] = phutil_tag('span', array(), '/');
           $object_links[] = $revision_link;
         }
 
         $blame[] = phutil_tag(
           'th',
           array(
             'class' => 'diffusion-rev-link',
           ),
           $object_links);
       }
 
       $line_link = phutil_tag(
         'a',
         array(
           'href' => $line_href,
           'style' => $style,
         ),
         $line['line']);
 
       $blame[] = javelin_tag(
         'th',
         array(
           'class' => 'diffusion-line-link',
           'sigil' => 'phabricator-source-line',
           'style' => $style,
         ),
         $line_link);
 
       Javelin::initBehavior('phabricator-line-linker');
 
       if ($line['target']) {
         Javelin::initBehavior(
           'diffusion-jump-to',
           array(
             'target' => 'scroll_target',
           ));
         $anchor_text = phutil_tag(
           'a',
           array(
             'id' => 'scroll_target',
           ),
           '');
       } else {
         $anchor_text = null;
       }
 
       $blame[] = phutil_tag(
         'td',
         array(
         ),
         array(
           $anchor_text,
 
           // NOTE: See phabricator-oncopy behavior.
           "\xE2\x80\x8B",
 
           // TODO: [HTML] Not ideal.
           phutil_safe_html(str_replace("\t", '  ', $line['data'])),
         ));
 
       if ($this->coverage) {
         require_celerity_resource('differential-changeset-view-css');
         $cov_index = $line['line'] - 1;
 
         if (isset($this->coverage[$cov_index])) {
           $cov_class = $this->coverage[$cov_index];
         } else {
           $cov_class = 'N';
         }
 
         $blame[] = phutil_tag(
           'td',
           array(
             'class' => 'cov cov-'.$cov_class,
           ),
           '');
       }
 
       $rows[] = phutil_tag(
         'tr',
         array(
           'class' => ($line['highlighted'] ?
                       'phabricator-source-highlight' :
                       null),
         ),
         $blame);
 
       $cur_inlines = $this->renderInlines(
         idx($inlines, $line['line'], array()),
         $show_blame,
         $this->coverage,
         $engine);
       foreach ($cur_inlines as $cur_inline) {
         $rows[] = $cur_inline;
       }
     }
 
     return $rows;
   }
 
   private function renderInlines(
     array $inlines,
     $needs_blame,
     $has_coverage,
     $engine) {
 
     $rows = array();
     foreach ($inlines as $inline) {
       $inline_view = id(new DifferentialInlineCommentView())
         ->setMarkupEngine($engine)
         ->setInlineComment($inline)
         ->render();
 
       $row = array_fill(0, ($needs_blame ? 3 : 1), phutil_tag('th'));
 
       $row[] = phutil_tag('td', array(), $inline_view);
 
       if ($has_coverage) {
         $row[] = phutil_tag(
           'td',
           array(
             'class' => 'cov cov-I',
           ));
       }
 
       $rows[] = phutil_tag('tr', array('class' => 'inline'), $row);
     }
 
     return $rows;
   }
 
   private function loadFileForData($path, $data) {
     $file = PhabricatorFile::buildFromFileDataOrHash(
       $data,
       array(
         'name' => basename($path),
         'ttl' => time() + 60 * 60 * 24,
         'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
       ));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $file->attachToObject(
         $this->getRequest()->getUser(),
         $this->getDiffusionRequest()->getRepository()->getPHID());
     unset($unguarded);
 
     return $file;
   }
 
   private function buildRawResponse($path, $data) {
     $file = $this->loadFileForData($path, $data);
     return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
   }
 
   private function buildImageCorpus($file_uri) {
     $properties = new PHUIPropertyListView();
 
     $properties->addImageContent(
       phutil_tag(
         'img',
         array(
           'src' => $file_uri,
         )));
 
     $file = $this->renderFileButton($file_uri);
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Image'))
       ->addActionLink($file);
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
   }
 
   private function buildBinaryCorpus($file_uri, $data) {
 
     $size = new PhutilNumber(strlen($data));
     $text = pht('This is a binary file. It is %s byte(s) in length.', $size);
     $text = id(new PHUIBoxView())
       ->addPadding(PHUI::PADDING_LARGE)
       ->appendChild($text);
 
     $file = $this->renderFileButton($file_uri);
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Details'))
       ->addActionLink($file);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($text);
 
     return $box;
   }
 
   private function buildBeforeResponse($before) {
     $request = $this->getRequest();
     $drequest = $this->getDiffusionRequest();
 
     // NOTE: We need to get the grandparent so we can capture filename changes
     // in the parent.
 
     $parent = $this->loadParentCommitOf($before);
     $old_filename = null;
     $was_created = false;
     if ($parent) {
       $grandparent = $this->loadParentCommitOf($parent);
 
       if ($grandparent) {
         $rename_query = new DiffusionRenameHistoryQuery();
         $rename_query->setRequest($drequest);
         $rename_query->setOldCommit($grandparent);
         $rename_query->setViewer($request->getUser());
         $old_filename = $rename_query->loadOldFilename();
         $was_created = $rename_query->getWasCreated();
       }
     }
 
     $follow = null;
     if ($was_created) {
       // If the file was created in history, that means older commits won't
       // have it. Since we know it existed at 'before', it must have been
       // created then; jump there.
       $target_commit = $before;
       $follow = 'created';
     } else if ($parent) {
       // If we found a parent, jump to it. This is the normal case.
       $target_commit = $parent;
     } else {
       // If there's no parent, this was probably created in the initial commit?
       // And the "was_created" check will fail because we can't identify the
       // grandparent. Keep the user at 'before'.
       $target_commit = $before;
       $follow = 'first';
     }
 
     $path = $drequest->getPath();
     $renamed = null;
     if ($old_filename !== null &&
         $old_filename !== '/'.$path) {
       $renamed = $path;
       $path = $old_filename;
     }
 
     $line = null;
     // If there's a follow error, drop the line so the user sees the message.
     if (!$follow) {
       $line = $this->getBeforeLineNumber($target_commit);
     }
 
     $before_uri = $drequest->generateURI(
       array(
         'action'    => 'browse',
         'commit'    => $target_commit,
         'line'      => $line,
         'path'      => $path,
       ));
 
     $before_uri->setQueryParams($request->getRequestURI()->getQueryParams());
     $before_uri = $before_uri->alter('before', null);
     $before_uri = $before_uri->alter('renamed', $renamed);
     $before_uri = $before_uri->alter('follow', $follow);
 
     return id(new AphrontRedirectResponse())->setURI($before_uri);
   }
 
   private function getBeforeLineNumber($target_commit) {
     $drequest = $this->getDiffusionRequest();
 
     $line = $drequest->getLine();
     if (!$line) {
       return null;
     }
 
     $raw_diff = $this->callConduitWithDiffusionRequest(
       'diffusion.rawdiffquery',
       array(
         'commit' => $drequest->getCommit(),
         'path' => $drequest->getPath(),
         'againstCommit' => $target_commit));
     $old_line = 0;
     $new_line = 0;
 
     foreach (explode("\n", $raw_diff) as $text) {
       if ($text[0] == '-' || $text[0] == ' ') {
         $old_line++;
       }
       if ($text[0] == '+' || $text[0] == ' ') {
         $new_line++;
       }
       if ($new_line == $line) {
         return $old_line;
       }
     }
 
     // We didn't find the target line.
     return $line;
   }
 
   private function loadParentCommitOf($commit) {
     $drequest = $this->getDiffusionRequest();
     $user = $this->getRequest()->getUser();
 
     $before_req = DiffusionRequest::newFromDictionary(
       array(
         'user' => $user,
         'repository' => $drequest->getRepository(),
         'commit' => $commit,
       ));
 
     $parents = DiffusionQuery::callConduitWithDiffusionRequest(
       $user,
       $before_req,
       'diffusion.commitparentsquery',
       array(
         'commit' => $commit,
       ));
 
     return head($parents);
   }
 
   private function renderRevisionTooltip(
     DifferentialRevision $revision,
     array $handles) {
     $viewer = $this->getRequest()->getUser();
 
     $date = phabricator_date($revision->getDateModified(), $viewer);
     $id = $revision->getID();
     $title = $revision->getTitle();
     $header = "D{$id} {$title}";
 
     $author = $handles[$revision->getAuthorPHID()]->getName();
 
     return "{$header}\n{$date} \xC2\xB7 {$author}";
   }
 
   private function renderCommitTooltip(
     PhabricatorRepositoryCommit $commit,
     array $handles,
     $author) {
 
     $viewer = $this->getRequest()->getUser();
 
     $date = phabricator_date($commit->getEpoch(), $viewer);
     $summary = trim($commit->getSummary());
 
     if ($commit->getAuthorPHID()) {
       $author = $handles[$commit->getAuthorPHID()]->getName();
     }
 
     return "{$summary}\n{$date} \xC2\xB7 {$author}";
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index c6dd87a94..ab156ef07 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -1,1175 +1,1175 @@
 <?php
 
 final class DiffusionCommitController extends DiffusionController {
 
   const CHANGES_LIMIT = 100;
 
   private $auditAuthorityPHIDs;
   private $highlightedAudits;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     // This controller doesn't use blob/path stuff, just pass the dictionary
     // in directly instead of using the AphrontRequest parsing mechanism.
     $data['user'] = $this->getRequest()->getUser();
     $drequest = DiffusionRequest::newFromDictionary($data);
     $this->diffusionRequest = $drequest;
   }
 
   public function processRequest() {
     $drequest = $this->getDiffusionRequest();
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($request->getStr('diff')) {
       return $this->buildRawDiffResponse($drequest);
     }
 
     $repository = $drequest->getRepository();
     $callsign = $repository->getCallsign();
 
     $content = array();
     $commit = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser())
       ->withRepository($repository)
       ->withIdentifiers(array($drequest->getCommit()))
       ->needCommitData(true)
       ->needAuditRequests(true)
       ->executeOne();
 
     $crumbs = $this->buildCrumbs(array(
       'commit' => true,
     ));
 
     if (!$commit) {
       $exists = $this->callConduitWithDiffusionRequest(
         'diffusion.existsquery',
         array('commit' => $drequest->getCommit()));
       if (!$exists) {
         return new Aphront404Response();
       }
 
       $error = id(new AphrontErrorView())
         ->setTitle(pht('Commit Still Parsing'))
         ->appendChild(
           pht(
             'Failed to load the commit because the commit has not been '.
             'parsed yet.'));
 
       return $this->buildApplicationPage(
         array(
           $crumbs,
           $error,
         ),
         array(
           'title' => pht('Commit Still Parsing'),
         ));
     }
 
 
     $top_anchor = id(new PhabricatorAnchorView())
       ->setAnchorName('top')
       ->setNavigationMarker(true);
 
     $audit_requests = $commit->getAudits();
     $this->auditAuthorityPHIDs =
       PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);
 
     $commit_data = $commit->getCommitData();
     $is_foreign = $commit_data->getCommitDetail('foreign-svn-stub');
     $changesets = null;
     if ($is_foreign) {
       $subpath = $commit_data->getCommitDetail('svn-subpath');
 
       $error_panel = new AphrontErrorView();
       $error_panel->setTitle(pht('Commit Not Tracked'));
       $error_panel->setSeverity(AphrontErrorView::SEVERITY_WARNING);
       $error_panel->appendChild(
         pht("This Diffusion repository is configured to track only one ".
         "subdirectory of the entire Subversion repository, and this commit ".
         "didn't affect the tracked subdirectory ('%s'), so no ".
         "information is available.", $subpath));
       $content[] = $error_panel;
       $content[] = $top_anchor;
     } else {
       $engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
       $engine->setConfig('viewer', $user);
 
       require_celerity_resource('diffusion-commit-view-css');
       require_celerity_resource('phabricator-remarkup-css');
 
       $parents = $this->callConduitWithDiffusionRequest(
         'diffusion.commitparentsquery',
         array('commit' => $drequest->getCommit()));
 
       if ($parents) {
         $parents = id(new DiffusionCommitQuery())
           ->setViewer($user)
           ->withRepository($repository)
           ->withIdentifiers($parents)
           ->execute();
       }
 
       $headsup_view = id(new PHUIHeaderView())
         ->setHeader(nonempty($commit->getSummary(), pht('Commit Detail')));
 
       $headsup_actions = $this->renderHeadsupActionList($commit, $repository);
 
       $commit_properties = $this->loadCommitProperties(
         $commit,
         $commit_data,
         $parents,
         $audit_requests);
       $property_list = id(new PHUIPropertyListView())
         ->setHasKeyboardShortcuts(true)
         ->setUser($user)
         ->setObject($commit);
       foreach ($commit_properties as $key => $value) {
         $property_list->addProperty($key, $value);
       }
 
       $message = $commit_data->getCommitMessage();
 
       $revision = $commit->getCommitIdentifier();
       $message = $this->linkBugtraq($message);
 
       $message = $engine->markupText($message);
 
       $property_list->invokeWillRenderEvent();
       $property_list->setActionList($headsup_actions);
 
       $detail_list = new PHUIPropertyListView();
       $detail_list->addSectionHeader(
         pht('Description'),
         PHUIPropertyListView::ICON_SUMMARY);
       $detail_list->addTextContent(
         phutil_tag(
           'div',
           array(
             'class' => 'diffusion-commit-message phabricator-remarkup',
           ),
           $message));
       $content[] = $top_anchor;
 
       $object_box = id(new PHUIObjectBoxView())
         ->setHeader($headsup_view)
         ->addPropertyList($property_list)
         ->addPropertyList($detail_list);
 
       $content[] = $object_box;
     }
 
     $content[] = $this->buildComments($commit);
 
     $hard_limit = 1000;
 
     if ($commit->isImported()) {
       $change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
         $drequest);
       $change_query->setLimit($hard_limit + 1);
       $changes = $change_query->loadChanges();
     } else {
       $changes = array();
     }
 
     $was_limited = (count($changes) > $hard_limit);
     if ($was_limited) {
       $changes = array_slice($changes, 0, $hard_limit);
     }
 
     $content[] = $this->buildMergesTable($commit);
 
     $highlighted_audits = $commit->getAuthorityAudits(
       $user,
       $this->auditAuthorityPHIDs);
 
     $owners_paths = array();
     if ($highlighted_audits) {
       $packages = id(new PhabricatorOwnersPackage())->loadAllWhere(
         'phid IN (%Ls)',
         mpull($highlighted_audits, 'getAuditorPHID'));
       if ($packages) {
         $owners_paths = id(new PhabricatorOwnersPath())->loadAllWhere(
           'repositoryPHID = %s AND packageID IN (%Ld)',
           $repository->getPHID(),
           mpull($packages, 'getID'));
       }
     }
 
     $change_table = new DiffusionCommitChangeTableView();
     $change_table->setDiffusionRequest($drequest);
     $change_table->setPathChanges($changes);
     $change_table->setOwnersPaths($owners_paths);
 
     $count = count($changes);
 
     $bad_commit = null;
     if ($count == 0) {
       $bad_commit = queryfx_one(
         id(new PhabricatorRepository())->establishConnection('r'),
         'SELECT * FROM %T WHERE fullCommitName = %s',
         PhabricatorRepository::TABLE_BADCOMMIT,
         'r'.$callsign.$commit->getCommitIdentifier());
     }
 
     if ($bad_commit) {
       $content[] = $this->renderStatusMessage(
         pht('Bad Commit'),
         $bad_commit['description']);
     } else if ($is_foreign) {
       // Don't render anything else.
     } else if (!$commit->isImported()) {
       $content[] = $this->renderStatusMessage(
         pht('Still Importing...'),
         pht(
           'This commit is still importing. Changes will be visible once '.
           'the import finishes.'));
     } else if (!count($changes)) {
       $content[] = $this->renderStatusMessage(
         pht('Empty Commit'),
         pht(
           'This commit is empty and does not affect any paths.'));
     } else if ($was_limited) {
       $content[] = $this->renderStatusMessage(
         pht('Enormous Commit'),
         pht(
           'This commit is enormous, and affects more than %d files. '.
           'Changes are not shown.',
           $hard_limit));
     } else {
       // The user has clicked "Show All Changes", and we should show all the
       // changes inline even if there are more than the soft limit.
       $show_all_details = $request->getBool('show_all');
 
       $change_panel = new PHUIObjectBoxView();
       $header = new PHUIHeaderView();
-      $header->setHeader("Changes (".number_format($count).")");
+      $header->setHeader('Changes ('.number_format($count).')');
       $change_panel->setID('toc');
       if ($count > self::CHANGES_LIMIT && !$show_all_details) {
 
         $icon = id(new PHUIIconView())
           ->setIconFont('fa-files-o');
 
         $button = id(new PHUIButtonView())
           ->setText(pht('Show All Changes'))
           ->setHref('?show_all=true')
           ->setTag('a')
           ->setIcon($icon);
 
         $warning_view = id(new AphrontErrorView())
           ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
           ->setTitle('Very Large Commit')
           ->appendChild(
-            pht("This commit is very large. Load each file individually."));
+            pht('This commit is very large. Load each file individually.'));
 
         $change_panel->setErrorView($warning_view);
         $header->addActionLink($button);
       }
 
       $change_panel->appendChild($change_table);
       $change_panel->setHeader($header);
 
       $content[] = $change_panel;
 
       $changesets = DiffusionPathChange::convertToDifferentialChangesets(
         $changes);
 
       $vcs = $repository->getVersionControlSystem();
       switch ($vcs) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
           $vcs_supports_directory_changes = true;
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
           $vcs_supports_directory_changes = false;
           break;
         default:
-          throw new Exception("Unknown VCS.");
+          throw new Exception('Unknown VCS.');
       }
 
       $references = array();
       foreach ($changesets as $key => $changeset) {
         $file_type = $changeset->getFileType();
         if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
           if (!$vcs_supports_directory_changes) {
             unset($changesets[$key]);
             continue;
           }
         }
 
         $references[$key] = $drequest->generateURI(
           array(
             'action' => 'rendering-ref',
             'path'   => $changeset->getFilename(),
           ));
       }
 
       // TODO: Some parts of the views still rely on properties of the
       // DifferentialChangeset. Make the objects ephemeral to make sure we don't
       // accidentally save them, and then set their ID to the appropriate ID for
       // this application (the path IDs).
       $path_ids = array_flip(mpull($changes, 'getPath'));
       foreach ($changesets as $changeset) {
         $changeset->makeEphemeral();
         $changeset->setID($path_ids[$changeset->getFilename()]);
       }
 
       if ($count <= self::CHANGES_LIMIT || $show_all_details) {
         $visible_changesets = $changesets;
       } else {
         $visible_changesets = array();
         $inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
           'commitPHID = %s AND (auditCommentID IS NOT NULL OR authorPHID = %s)',
           $commit->getPHID(),
           $user->getPHID());
         $path_ids = mpull($inlines, null, 'getPathID');
         foreach ($changesets as $key => $changeset) {
           if (array_key_exists($changeset->getID(), $path_ids)) {
             $visible_changesets[$key] = $changeset;
           }
         }
       }
 
       $change_list_title = DiffusionView::nameCommit(
         $repository,
         $commit->getCommitIdentifier());
       $change_list = new DifferentialChangesetListView();
       $change_list->setTitle($change_list_title);
       $change_list->setChangesets($changesets);
       $change_list->setVisibleChangesets($visible_changesets);
       $change_list->setRenderingReferences($references);
       $change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
       $change_list->setRepository($repository);
       $change_list->setUser($user);
 
       // TODO: Try to setBranch() to something reasonable here?
 
       $change_list->setStandaloneURI(
         '/diffusion/'.$callsign.'/diff/');
       $change_list->setRawFileURIs(
         // TODO: Implement this, somewhat tricky if there's an octopus merge
         // or whatever?
         null,
         '/diffusion/'.$callsign.'/diff/?view=r');
 
       $change_list->setInlineCommentControllerURI(
         '/diffusion/inline/edit/'.phutil_escape_uri($commit->getPHID()).'/');
 
       $change_references = array();
       foreach ($changesets as $key => $changeset) {
         $change_references[$changeset->getID()] = $references[$key];
       }
       $change_table->setRenderingReferences($change_references);
 
       $content[] = $change_list->render();
     }
 
     $content[] = $this->renderAddCommentPanel($commit, $audit_requests);
 
     $commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
     $short_name = DiffusionView::nameCommit(
       $repository,
       $commit->getCommitIdentifier());
 
     $prefs = $user->loadPreferences();
     $pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
     $pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
     $show_filetree = $prefs->getPreference($pref_filetree);
     $collapsed = $prefs->getPreference($pref_collapse);
 
     if ($changesets && $show_filetree) {
       $nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
         ->setAnchorName('top')
         ->setTitle($short_name)
         ->setBaseURI(new PhutilURI('/'.$commit_id))
         ->build($changesets)
         ->setCrumbs($crumbs)
         ->setCollapsed((bool)$collapsed)
         ->appendChild($content);
       $content = $nav;
     } else {
       $content = array($crumbs, $content);
     }
 
     return $this->buildApplicationPage(
       $content,
       array(
         'title' => $commit_id,
         'pageObjects' => array($commit->getPHID()),
       ));
   }
 
   private function loadCommitProperties(
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepositoryCommitData $data,
     array $parents,
     array $audit_requests) {
 
     assert_instances_of($parents, 'PhabricatorRepositoryCommit');
     $viewer = $this->getRequest()->getUser();
     $commit_phid = $commit->getPHID();
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     $edge_query = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array($commit_phid))
       ->withEdgeTypes(array(
         PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK,
         PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT,
         PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV,
       ));
 
     $edges = $edge_query->execute();
 
     $task_phids = array_keys(
       $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK]);
     $proj_phids = array_keys(
       $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT]);
     $revision_phid = key(
       $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV]);
 
     $phids = $edge_query->getDestinationPHIDs(array($commit_phid));
 
     if ($data->getCommitDetail('authorPHID')) {
       $phids[] = $data->getCommitDetail('authorPHID');
     }
     if ($data->getCommitDetail('reviewerPHID')) {
       $phids[] = $data->getCommitDetail('reviewerPHID');
     }
     if ($data->getCommitDetail('committerPHID')) {
       $phids[] = $data->getCommitDetail('committerPHID');
     }
     if ($parents) {
       foreach ($parents as $parent) {
         $phids[] = $parent->getPHID();
       }
     }
 
     // NOTE: We should never normally have more than a single push log, but
     // it can occur naturally if a commit is pushed, then the branch it was
     // on is deleted, then the commit is pushed again (or through other similar
     // chains of events). This should be rare, but does not indicate a bug
     // or data issue.
 
     // NOTE: We never query push logs in SVN because the commiter is always
     // the pusher and the commit time is always the push time; the push log
     // is redundant and we save a query by skipping it.
 
     $push_logs = array();
     if ($repository->isHosted() && !$repository->isSVN()) {
       $push_logs = id(new PhabricatorRepositoryPushLogQuery())
         ->setViewer($viewer)
         ->withRepositoryPHIDs(array($repository->getPHID()))
         ->withNewRefs(array($commit->getCommitIdentifier()))
         ->withRefTypes(array(PhabricatorRepositoryPushLog::REFTYPE_COMMIT))
         ->execute();
       foreach ($push_logs as $log) {
         $phids[] = $log->getPusherPHID();
       }
     }
 
     $handles = array();
     if ($phids) {
       $handles = $this->loadViewerHandles($phids);
     }
 
     $props = array();
 
     if ($commit->getAuditStatus()) {
       $status = PhabricatorAuditCommitStatusConstants::getStatusName(
         $commit->getAuditStatus());
       $tag = id(new PHUITagView())
         ->setType(PHUITagView::TYPE_STATE)
         ->setName($status);
 
       switch ($commit->getAuditStatus()) {
         case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
           $tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
           break;
         case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
           $tag->setBackgroundColor(PHUITagView::COLOR_RED);
           break;
         case PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED:
           $tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
           break;
         case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
           $tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
           break;
       }
 
       $props['Status'] = $tag;
     }
 
     if ($audit_requests) {
       $user_requests = array();
       $other_requests = array();
       foreach ($audit_requests as $audit_request) {
         if ($audit_request->isUser()) {
           $user_requests[] = $audit_request;
         } else {
           $other_requests[] = $audit_request;
         }
       }
 
       if ($user_requests) {
         $props['Auditors'] = $this->renderAuditStatusView(
           $user_requests);
       }
 
       if ($other_requests) {
         $props['Project/Package Auditors'] = $this->renderAuditStatusView(
           $other_requests);
       }
     }
 
     $author_phid = $data->getCommitDetail('authorPHID');
     $author_name = $data->getAuthorName();
 
     if (!$repository->isSVN()) {
       $authored_info = id(new PHUIStatusItemView());
       // TODO: In Git, a distinct authorship date is available. When present,
       // we should show it here.
 
       if ($author_phid) {
         $authored_info->setTarget($handles[$author_phid]->renderLink());
       } else if (strlen($author_name)) {
         $authored_info->setTarget($author_name);
       }
 
       $props['Authored'] = id(new PHUIStatusListView())
         ->addItem($authored_info);
     }
 
     $committed_info = id(new PHUIStatusItemView())
       ->setNote(phabricator_datetime($commit->getEpoch(), $viewer));
 
     $committer_phid = $data->getCommitDetail('committerPHID');
     $committer_name = $data->getCommitDetail('committer');
     if ($committer_phid) {
       $committed_info->setTarget($handles[$committer_phid]->renderLink());
     } else if (strlen($committer_name)) {
       $committed_info->setTarget($committer_name);
     } else if ($author_phid) {
       $committed_info->setTarget($handles[$author_phid]->renderLink());
     } else if (strlen($author_name)) {
       $committed_info->setTarget($author_name);
     }
 
     $props['Committed'] = id(new PHUIStatusListView())
       ->addItem($committed_info);
 
     if ($push_logs) {
       $pushed_list = new PHUIStatusListView();
 
       foreach ($push_logs as $push_log) {
         $pushed_item = id(new PHUIStatusItemView())
           ->setTarget($handles[$push_log->getPusherPHID()]->renderLink())
           ->setNote(phabricator_datetime($push_log->getEpoch(), $viewer));
         $pushed_list->addItem($pushed_item);
       }
 
       $props['Pushed'] = $pushed_list;
     }
 
     $reviewer_phid = $data->getCommitDetail('reviewerPHID');
     if ($reviewer_phid) {
       $props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
     }
 
     if ($revision_phid) {
       $props['Differential Revision'] = $handles[$revision_phid]->renderLink();
     }
 
     if ($parents) {
       $parent_links = array();
       foreach ($parents as $parent) {
         $parent_links[] = $handles[$parent->getPHID()]->renderLink();
       }
       $props['Parents'] = phutil_implode_html(" \xC2\xB7 ", $parent_links);
     }
 
     $props['Branches'] = phutil_tag(
       'span',
       array(
         'id' => 'commit-branches',
       ),
       pht('Unknown'));
     $props['Tags'] = phutil_tag(
       'span',
       array(
         'id' => 'commit-tags',
       ),
       pht('Unknown'));
 
     $callsign = $repository->getCallsign();
     $root = '/diffusion/'.$callsign.'/commit/'.$commit->getCommitIdentifier();
     Javelin::initBehavior(
       'diffusion-commit-branches',
       array(
         $root.'/branches/' => 'commit-branches',
         $root.'/tags/' => 'commit-tags',
       ));
 
     $refs = $this->buildRefs($drequest);
     if ($refs) {
       $props['References'] = $refs;
     }
 
     if ($task_phids) {
       $task_list = array();
       foreach ($task_phids as $phid) {
         $task_list[] = $handles[$phid]->renderLink();
       }
       $task_list = phutil_implode_html(phutil_tag('br'), $task_list);
       $props['Tasks'] = $task_list;
     }
 
     if ($proj_phids) {
       $proj_list = array();
       foreach ($proj_phids as $phid) {
         $proj_list[] = $handles[$phid]->renderLink();
       }
       $proj_list = phutil_implode_html(phutil_tag('br'), $proj_list);
       $props['Projects'] = $proj_list;
     }
 
     return $props;
   }
 
   private function buildComments(PhabricatorRepositoryCommit $commit) {
     $user = $this->getRequest()->getUser();
     $comments = id(new PhabricatorAuditComment())->loadAllWhere(
       'targetPHID = %s ORDER BY dateCreated ASC',
       $commit->getPHID());
 
     $inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
       'commitPHID = %s AND auditCommentID IS NOT NULL',
       $commit->getPHID());
 
     $path_ids = mpull($inlines, 'getPathID');
 
     $path_map = array();
     if ($path_ids) {
       $path_map = id(new DiffusionPathQuery())
         ->withPathIDs($path_ids)
         ->execute();
       $path_map = ipull($path_map, 'path', 'id');
     }
 
     $engine = new PhabricatorMarkupEngine();
     $engine->setViewer($user);
 
     foreach ($comments as $comment) {
       $engine->addObject(
         $comment,
         PhabricatorAuditComment::MARKUP_FIELD_BODY);
     }
 
     foreach ($inlines as $inline) {
       $engine->addObject(
         $inline,
         PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
     }
 
     $engine->process();
 
     $view = new DiffusionCommentListView();
     $view->setMarkupEngine($engine);
     $view->setUser($user);
     $view->setComments($comments);
     $view->setInlineComments($inlines);
     $view->setPathMap($path_map);
 
     $phids = $view->getRequiredHandlePHIDs();
     $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     return $view;
   }
 
   private function renderAddCommentPanel(
     PhabricatorRepositoryCommit $commit,
     array $audit_requests) {
     assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if (!$user->isLoggedIn()) {
       return id(new PhabricatorApplicationTransactionCommentView())
         ->setUser($user)
         ->setRequestURI($request->getRequestURI());
     }
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     $pane_id = celerity_generate_unique_node_id();
     Javelin::initBehavior(
       'differential-keyboard-navigation',
       array(
         'haunt' => $pane_id,
       ));
 
     $draft = id(new PhabricatorDraft())->loadOneWhere(
       'authorPHID = %s AND draftKey = %s',
       $user->getPHID(),
       'diffusion-audit-'.$commit->getID());
     if ($draft) {
       $draft = $draft->getDraft();
     } else {
       $draft = null;
     }
 
     $actions = $this->getAuditActions($commit, $audit_requests);
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->setAction('/audit/addcomment/')
       ->addHiddenInput('commit', $commit->getPHID())
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Action'))
           ->setName('action')
           ->setID('audit-action')
           ->setOptions($actions))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setLabel(pht('Add Auditors'))
           ->setName('auditors')
           ->setControlID('add-auditors')
           ->setControlStyle('display: none')
           ->setID('add-auditors-tokenizer')
           ->setDisableBehavior(true))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setLabel(pht('Add CCs'))
           ->setName('ccs')
           ->setControlID('add-ccs')
           ->setControlStyle('display: none')
           ->setID('add-ccs-tokenizer')
           ->setDisableBehavior(true))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setLabel(pht('Comments'))
           ->setName('content')
           ->setValue($draft)
           ->setID('audit-content')
           ->setUser($user))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Submit')));
 
     $header = new PHUIHeaderView();
     $header->setHeader(
       $is_serious ? pht('Audit Commit') : pht('Creative Accounting'));
 
     require_celerity_resource('phabricator-transaction-view-css');
 
     Javelin::initBehavior(
       'differential-add-reviewers-and-ccs',
       array(
         'dynamic' => array(
           'add-auditors-tokenizer' => array(
             'actions' => array('add_auditors' => 1),
             'src' => '/typeahead/common/usersprojectsorpackages/',
             'row' => 'add-auditors',
             'placeholder' => pht('Type a user, project, or package name...'),
           ),
           'add-ccs-tokenizer' => array(
             'actions' => array('add_ccs' => 1),
             'src' => '/typeahead/common/mailable/',
             'row' => 'add-ccs',
             'placeholder' => pht('Type a user or mailing list...'),
           ),
         ),
         'select' => 'audit-action',
       ));
 
     Javelin::initBehavior('differential-feedback-preview', array(
       'uri'       => '/audit/preview/'.$commit->getID().'/',
       'preview'   => 'audit-preview',
       'content'   => 'audit-content',
       'action'    => 'audit-action',
       'previewTokenizers' => array(
         'auditors' => 'add-auditors-tokenizer',
         'ccs'      => 'add-ccs-tokenizer',
       ),
       'inline'     => 'inline-comment-preview',
       'inlineuri'  => '/diffusion/inline/preview/'.$commit->getPHID().'/',
     ));
 
     $loading = phutil_tag_div(
       'aphront-panel-preview-loading-text',
       pht('Loading preview...'));
 
     $preview_panel = phutil_tag_div(
       'aphront-panel-preview aphront-panel-flush',
       array(
         phutil_tag('div', array('id' => 'audit-preview'), $loading),
         phutil_tag('div', array('id' => 'inline-comment-preview'))
       ));
 
     // TODO: This is pretty awkward, unify the CSS between Diffusion and
     // Differential better.
     require_celerity_resource('differential-core-view-css');
 
     $anchor = id(new PhabricatorAnchorView())
       ->setAnchorName('comment')
       ->setNavigationMarker(true)
       ->render();
 
     $comment_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($form);
 
     return phutil_tag(
       'div',
       array(
         'id' => $pane_id,
       ),
       phutil_tag_div(
         'differential-add-comment-panel',
         array($anchor, $comment_box, $preview_panel)));
   }
 
   /**
    * Return a map of available audit actions for rendering into a <select />.
    * This shows the user valid actions, and does not show nonsense/invalid
    * actions (like closing an already-closed commit, or resigning from a commit
    * you have no association with).
    */
   private function getAuditActions(
     PhabricatorRepositoryCommit $commit,
     array $audit_requests) {
     assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
     $user = $this->getRequest()->getUser();
 
     $user_is_author = ($commit->getAuthorPHID() == $user->getPHID());
 
     $user_request = null;
     foreach ($audit_requests as $audit_request) {
       if ($audit_request->getAuditorPHID() == $user->getPHID()) {
         $user_request = $audit_request;
         break;
       }
     }
 
     $actions = array();
     $actions[PhabricatorAuditActionConstants::COMMENT] = true;
     $actions[PhabricatorAuditActionConstants::ADD_CCS] = true;
     $actions[PhabricatorAuditActionConstants::ADD_AUDITORS] = true;
 
     // We allow you to accept your own commits. A use case here is that you
     // notice an issue with your own commit and "Raise Concern" as an indicator
     // to other auditors that you're on top of the issue, then later resolve it
     // and "Accept". You can not accept on behalf of projects or packages,
     // however.
     $actions[PhabricatorAuditActionConstants::ACCEPT]  = true;
     $actions[PhabricatorAuditActionConstants::CONCERN] = true;
 
 
     // To resign, a user must have authority on some request and not be the
     // commit's author.
     if (!$user_is_author) {
       $may_resign = false;
 
       $authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
       foreach ($audit_requests as $request) {
         if (empty($authority_map[$request->getAuditorPHID()])) {
           continue;
         }
         $may_resign = true;
         break;
       }
 
       // If the user has already resigned, don't show "Resign...".
       $status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
       if ($user_request) {
         if ($user_request->getAuditStatus() == $status_resigned) {
           $may_resign = false;
         }
       }
 
       if ($may_resign) {
         $actions[PhabricatorAuditActionConstants::RESIGN] = true;
       }
     }
 
     $status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
     $concern_raised = ($commit->getAuditStatus() == $status_concern);
     $can_close_option = PhabricatorEnv::getEnvConfig(
       'audit.can-author-close-audit');
     if ($can_close_option && $user_is_author && $concern_raised) {
       $actions[PhabricatorAuditActionConstants::CLOSE] = true;
     }
 
     foreach ($actions as $constant => $ignored) {
       $actions[$constant] =
         PhabricatorAuditActionConstants::getActionName($constant);
     }
 
     return $actions;
   }
 
   private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
     $drequest = $this->getDiffusionRequest();
     $limit = 50;
 
     $merges = array();
     try {
       $merges = $this->callConduitWithDiffusionRequest(
         'diffusion.mergedcommitsquery',
         array(
           'commit' => $drequest->getCommit(),
           'limit' => $limit + 1));
     } catch (ConduitException $ex) {
       if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
         throw $ex;
       }
     }
 
     if (!$merges) {
       return null;
     }
 
     $caption = null;
     if (count($merges) > $limit) {
       $merges = array_slice($merges, 0, $limit);
       $caption =
         "This commit merges more than {$limit} changes. Only the first ".
         "{$limit} are shown.";
     }
 
     $history_table = new DiffusionHistoryTableView();
     $history_table->setUser($this->getRequest()->getUser());
     $history_table->setDiffusionRequest($drequest);
     $history_table->setHistory($merges);
     $history_table->loadRevisions();
 
     $phids = $history_table->getRequiredHandlePHIDs();
     $handles = $this->loadViewerHandles($phids);
     $history_table->setHandles($handles);
 
     $panel = new AphrontPanelView();
     $panel->setHeader(pht('Merged Changes'));
     $panel->setCaption($caption);
     $panel->appendChild($history_table);
     $panel->setNoBackground();
 
     return $panel;
   }
 
   private function renderHeadsupActionList(
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepository $repository) {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($user)
       ->setObject($commit)
       ->setObjectURI($request->getRequestURI());
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
       $commit,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $uri = '/diffusion/'.$repository->getCallsign().'/commit/'.
            $commit->getCommitIdentifier().'/edit/';
 
     $action = id(new PhabricatorActionView())
       ->setName(pht('Edit Commit'))
       ->setHref($uri)
       ->setIcon('fa-pencil')
       ->setDisabled(!$can_edit)
       ->setWorkflow(!$can_edit);
     $actions->addAction($action);
 
     require_celerity_resource('phabricator-object-selector-css');
     require_celerity_resource('javelin-behavior-phabricator-object-selector');
 
     $maniphest = 'PhabricatorApplicationManiphest';
     if (PhabricatorApplication::isClassInstalled($maniphest)) {
       $action = id(new PhabricatorActionView())
         ->setName(pht('Edit Maniphest Tasks'))
         ->setIcon('fa-anchor')
         ->setHref('/search/attach/'.$commit->getPHID().'/TASK/edge/')
         ->setWorkflow(true)
         ->setDisabled(!$can_edit);
       $actions->addAction($action);
     }
 
     $action = id(new PhabricatorActionView())
       ->setName(pht('Download Raw Diff'))
       ->setHref($request->getRequestURI()->alter('diff', true))
       ->setIcon('fa-download');
     $actions->addAction($action);
 
     return $actions;
   }
 
   private function buildRefs(DiffusionRequest $request) {
     // this is git-only, so save a conduit round trip and just get out of
     // here if the repository isn't git
     $type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
     $repository = $request->getRepository();
     if ($repository->getVersionControlSystem() != $type_git) {
       return null;
     }
 
     $results = $this->callConduitWithDiffusionRequest(
       'diffusion.refsquery',
       array('commit' => $request->getCommit()));
     $ref_links = array();
     foreach ($results as $ref_data) {
       $ref_links[] = phutil_tag('a',
         array('href' => $ref_data['href']),
         $ref_data['ref']);
     }
     return phutil_implode_html(', ', $ref_links);
   }
 
   private function buildRawDiffResponse(DiffusionRequest $drequest) {
     $raw_diff = $this->callConduitWithDiffusionRequest(
       'diffusion.rawdiffquery',
       array(
         'commit' => $drequest->getCommit(),
         'path' => $drequest->getPath()));
 
     $file = PhabricatorFile::buildFromFileDataOrHash(
       $raw_diff,
       array(
         'name' => $drequest->getCommit().'.diff',
         'ttl' => (60 * 60 * 24),
         'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
       ));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $file->attachToObject(
         $this->getRequest()->getUser(),
         $drequest->getRepository()->getPHID());
     unset($unguarded);
 
     return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
   }
 
   private function renderAuditStatusView(array $audit_requests) {
     assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
 
     $phids = mpull($audit_requests, 'getAuditorPHID');
     $this->loadHandles($phids);
 
     $authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
 
     $view = new PHUIStatusListView();
     foreach ($audit_requests as $request) {
       $item = new PHUIStatusItemView();
 
       switch ($request->getAuditStatus()) {
         case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
           $item->setIcon(
             PHUIStatusItemView::ICON_OPEN,
             'blue',
             pht('Commented'));
           break;
         case PhabricatorAuditStatusConstants::AUDIT_REQUIRED:
           $item->setIcon(
             PHUIStatusItemView::ICON_WARNING,
             'blue',
             pht('Audit Required'));
           break;
         case PhabricatorAuditStatusConstants::CONCERNED:
           $item->setIcon(
             PHUIStatusItemView::ICON_REJECT,
             'red',
             pht('Concern Raised'));
           break;
         case PhabricatorAuditStatusConstants::ACCEPTED:
           $item->setIcon(
             PHUIStatusItemView::ICON_ACCEPT,
             'green',
             pht('Accepted'));
           break;
         case PhabricatorAuditStatusConstants::AUDIT_REQUESTED:
           $item->setIcon(
             PHUIStatusItemView::ICON_WARNING,
             'dark',
             pht('Audit Requested'));
           break;
         case PhabricatorAuditStatusConstants::RESIGNED:
           $item->setIcon(
             PHUIStatusItemView::ICON_OPEN,
             'dark',
             pht('Resigned'));
           break;
         case PhabricatorAuditStatusConstants::CLOSED:
           $item->setIcon(
             PHUIStatusItemView::ICON_ACCEPT,
             'blue',
             pht('Closed'));
           break;
         case PhabricatorAuditStatusConstants::CC:
           $item->setIcon(
             PHUIStatusItemView::ICON_INFO,
             'dark',
             pht('Subscribed'));
           break;
         default:
           $item->setIcon(
             PHUIStatusItemView::ICON_QUESTION,
             'dark',
             pht('%s?', $request->getAuditStatus()));
           break;
       }
 
       $note = array();
       foreach ($request->getAuditReasons() as $reason) {
         $note[] = phutil_tag('div', array(), $reason);
       }
       $item->setNote($note);
 
       $auditor_phid = $request->getAuditorPHID();
       $target = $this->getHandle($auditor_phid)->renderLink();
       $item->setTarget($target);
 
       if (isset($authority_map[$auditor_phid])) {
         $item->setHighlighted(true);
       }
 
       $view->addItem($item);
     }
 
     return $view;
   }
 
   private function linkBugtraq($corpus) {
     $url = PhabricatorEnv::getEnvConfig('bugtraq.url');
     if (!strlen($url)) {
       return $corpus;
     }
 
     $regexes = PhabricatorEnv::getEnvConfig('bugtraq.logregex');
     if (!$regexes) {
       return $corpus;
     }
 
     $parser = id(new PhutilBugtraqParser())
       ->setBugtraqPattern("[[ {$url} | %BUGID% ]]")
       ->setBugtraqCaptureExpression(array_shift($regexes));
 
     $select = array_shift($regexes);
     if ($select) {
       $parser->setBugtraqSelectExpression($select);
     }
 
     return $parser->processCorpus($corpus);
   }
 
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index 2a76156a5..a8c42eab1 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -1,238 +1,238 @@
 <?php
 
 abstract class DiffusionController extends PhabricatorController {
 
   protected $diffusionRequest;
 
   public function setDiffusionRequest(DiffusionRequest $request) {
     $this->diffusionRequest = $request;
     return $this;
   }
 
   protected function getDiffusionRequest() {
     if (!$this->diffusionRequest) {
-      throw new Exception("No Diffusion request object!");
+      throw new Exception('No Diffusion request object!');
     }
     return $this->diffusionRequest;
   }
 
   public function willBeginExecution() {
     $request = $this->getRequest();
 
     // Check if this is a VCS request, e.g. from "git clone", "hg clone", or
     // "svn checkout". If it is, we jump off into repository serving code to
     // process the request.
     if (DiffusionServeController::isVCSRequest($request)) {
       $serve_controller = id(new DiffusionServeController($request))
         ->setCurrentApplication($this->getCurrentApplication());
       return $this->delegateToController($serve_controller);
     }
 
     return parent::willBeginExecution();
   }
 
   public function willProcessRequest(array $data) {
     if (isset($data['callsign'])) {
       $drequest = DiffusionRequest::newFromAphrontRequestDictionary(
         $data,
         $this->getRequest());
       $this->setDiffusionRequest($drequest);
     }
   }
 
   public function buildCrumbs(array $spec = array()) {
     $crumbs = $this->buildApplicationCrumbs();
     $crumb_list = $this->buildCrumbList($spec);
     foreach ($crumb_list as $crumb) {
       $crumbs->addCrumb($crumb);
     }
     return $crumbs;
   }
 
   private function buildCrumbList(array $spec = array()) {
 
     $spec = $spec + array(
       'commit'  => null,
       'tags'    => null,
       'branches'    => null,
       'view'    => null,
     );
 
     $crumb_list = array();
 
     // On the home page, we don't have a DiffusionRequest.
     if ($this->diffusionRequest) {
       $drequest = $this->getDiffusionRequest();
       $repository = $drequest->getRepository();
     } else {
       $drequest = null;
       $repository = null;
     }
 
     if (!$repository) {
       return $crumb_list;
     }
 
     $callsign = $repository->getCallsign();
     $repository_name = $repository->getName();
 
     if (!$spec['commit'] && !$spec['tags'] && !$spec['branches']) {
       $branch_name = $drequest->getBranch();
       if ($branch_name) {
         $repository_name .= ' ('.$branch_name.')';
       }
     }
 
     $crumb = id(new PhabricatorCrumbView())
       ->setName($repository_name);
     if (!$spec['view'] && !$spec['commit'] &&
         !$spec['tags'] && !$spec['branches']) {
       $crumb_list[] = $crumb;
       return $crumb_list;
     }
     $crumb->setHref(
       $drequest->generateURI(
         array(
           'action' => 'branch',
           'path' => '/',
         )));
     $crumb_list[] = $crumb;
 
     $stable_commit = $drequest->getStableCommit();
 
     if ($spec['tags']) {
       $crumb = new PhabricatorCrumbView();
       if ($spec['commit']) {
         $crumb->setName(
-          pht("Tags for %s", 'r'.$callsign.$stable_commit));
+          pht('Tags for %s', 'r'.$callsign.$stable_commit));
         $crumb->setHref($drequest->generateURI(
           array(
             'action' => 'commit',
             'commit' => $drequest->getStableCommit(),
           )));
       } else {
         $crumb->setName(pht('Tags'));
       }
       $crumb_list[] = $crumb;
       return $crumb_list;
     }
 
     if ($spec['branches']) {
       $crumb = id(new PhabricatorCrumbView())
         ->setName(pht('Branches'));
       $crumb_list[] = $crumb;
       return $crumb_list;
     }
 
     if ($spec['commit']) {
       $crumb = id(new PhabricatorCrumbView())
         ->setName("r{$callsign}{$stable_commit}")
         ->setHref("r{$callsign}{$stable_commit}");
       $crumb_list[] = $crumb;
       return $crumb_list;
     }
 
     $crumb = new PhabricatorCrumbView();
     $view = $spec['view'];
 
     switch ($view) {
       case 'history':
         $view_name = pht('History');
         break;
       case 'browse':
         $view_name = pht('Browse');
         break;
       case 'lint':
         $view_name = pht('Lint');
         break;
       case 'change':
         $view_name = pht('Change');
         break;
     }
 
     $crumb = id(new PhabricatorCrumbView())
       ->setName($view_name);
 
     $crumb_list[] = $crumb;
     return $crumb_list;
   }
 
   protected function callConduitWithDiffusionRequest(
     $method,
     array $params = array()) {
 
     $user = $this->getRequest()->getUser();
     $drequest = $this->getDiffusionRequest();
 
     return DiffusionQuery::callConduitWithDiffusionRequest(
       $user,
       $drequest,
       $method,
       $params);
   }
 
   protected function getRepositoryControllerURI(
     PhabricatorRepository $repository,
     $path) {
     return $this->getApplicationURI($repository->getCallsign().'/'.$path);
   }
 
   protected function renderPathLinks(DiffusionRequest $drequest, $action) {
     $path = $drequest->getPath();
     $path_parts = array_filter(explode('/', trim($path, '/')));
 
     $divider = phutil_tag(
       'span',
       array(
         'class' => 'phui-header-divider'),
       '/');
 
     $links = array();
     if ($path_parts) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $drequest->generateURI(
             array(
               'action' => $action,
               'path' => '',
             )),
         ),
         'r'.$drequest->getRepository()->getCallsign());
       $links[] = $divider;
       $accum = '';
       $last_key = last_key($path_parts);
       foreach ($path_parts as $key => $part) {
         $accum .= '/'.$part;
         if ($key === $last_key) {
           $links[] = $part;
         } else {
           $links[] = phutil_tag(
             'a',
             array(
               'href' => $drequest->generateURI(
                 array(
                   'action' => $action,
                   'path' => $accum.'/',
                 )),
             ),
             $part);
           $links[] = $divider;
         }
       }
     } else {
       $links[] = 'r'.$drequest->getRepository()->getCallsign();
       $links[] = $divider;
     }
 
     return $links;
   }
 
   protected function renderStatusMessage($title, $body) {
     return id(new AphrontErrorView())
       ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
       ->setTitle($title)
       ->appendChild($body);
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php
index cc322a303..98285c847 100644
--- a/src/applications/diffusion/controller/DiffusionExternalController.php
+++ b/src/applications/diffusion/controller/DiffusionExternalController.php
@@ -1,143 +1,143 @@
 <?php
 
 final class DiffusionExternalController extends DiffusionController {
 
   public function willProcessRequest(array $data) {
     // Don't build a DiffusionRequest.
   }
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
 
     $uri = $request->getStr('uri');
     $id  = $request->getStr('id');
 
     $repositories = id(new PhabricatorRepositoryQuery())
       ->setViewer($request->getUser())
       ->execute();
 
     if ($uri) {
       $uri_path = id(new PhutilURI($uri))->getPath();
       $matches = array();
 
       // Try to figure out which tracked repository this external lives in by
       // comparing repository metadata. We look for an exact match, but accept
       // a partial match.
 
       foreach ($repositories as $key => $repository) {
         $remote_uri = new PhutilURI($repository->getRemoteURI());
         if ($remote_uri->getPath() == $uri_path) {
           $matches[$key] = 1;
         }
         if ($repository->getPublicCloneURI() == $uri) {
           $matches[$key] = 2;
         }
         if ($repository->getRemoteURI() == $uri) {
           $matches[$key] = 3;
         }
       }
 
       arsort($matches);
       $best_match = head_key($matches);
 
       if ($best_match) {
         $repository = $repositories[$best_match];
         $redirect = DiffusionRequest::generateDiffusionURI(
           array(
             'action'    => 'browse',
             'callsign'  => $repository->getCallsign(),
             'branch'    => $repository->getDefaultBranch(),
             'commit'    => $id,
           ));
         return id(new AphrontRedirectResponse())->setURI($redirect);
       }
     }
 
     // TODO: This is a rare query but does a table scan, add a key?
 
     $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
       'commitIdentifier = %s',
       $id);
 
     if (empty($commits)) {
       $desc = null;
       if ($uri) {
         $desc = $uri.', at ';
       }
       $desc .= $id;
 
       $content = id(new AphrontErrorView())
         ->setTitle(pht('Unknown External'))
         ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
         ->appendChild(phutil_tag(
           'p',
           array(),
-          pht("This external (%s) does not appear in any tracked ".
-          "repository. It may exist in an untracked repository that ".
-          "Diffusion does not know about.", $desc)));
+          pht('This external (%s) does not appear in any tracked '.
+          'repository. It may exist in an untracked repository that '.
+          'Diffusion does not know about.', $desc)));
     } else if (count($commits) == 1) {
       $commit = head($commits);
       $repo = $repositories[$commit->getRepositoryID()];
       $redirect = DiffusionRequest::generateDiffusionURI(
         array(
           'action'    => 'browse',
           'callsign'  => $repo->getCallsign(),
           'branch'    => $repo->getDefaultBranch(),
           'commit'    => $commit->getCommitIdentifier(),
         ));
       return id(new AphrontRedirectResponse())->setURI($redirect);
     } else {
 
       $rows = array();
       foreach ($commits as $commit) {
         $repo = $repositories[$commit->getRepositoryID()];
         $href = DiffusionRequest::generateDiffusionURI(
           array(
             'action'    => 'browse',
             'callsign'  => $repo->getCallsign(),
             'branch'    => $repo->getDefaultBranch(),
             'commit'    => $commit->getCommitIdentifier(),
           ));
         $rows[] = array(
           phutil_tag(
             'a',
             array(
               'href' => $href,
             ),
               'r'.$repo->getCallsign().$commit->getCommitIdentifier()),
           $commit->loadCommitData()->getSummary(),
         );
       }
 
       $table = new AphrontTableView($rows);
       $table->setHeaders(
         array(
           pht('Commit'),
           pht('Description'),
         ));
       $table->setColumnClasses(
         array(
           'pri',
           'wide',
         ));
 
       $content = new AphrontPanelView();
       $content->setHeader(pht('Multiple Matching Commits'));
       $content->setCaption(
         pht('This external reference matches multiple known commits.'));
       $content->appendChild($table);
     }
 
     return $this->buildApplicationPage(
       $content,
       array(
         'title' => pht('Unresolvable External'),
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionInlineCommentController.php b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
index 78df83292..c0e816951 100644
--- a/src/applications/diffusion/controller/DiffusionInlineCommentController.php
+++ b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
@@ -1,87 +1,87 @@
 <?php
 
 final class DiffusionInlineCommentController
   extends PhabricatorInlineCommentController {
 
   private $commitPHID;
 
   public function willProcessRequest(array $data) {
     $this->commitPHID = $data['phid'];
   }
 
   protected function createComment() {
 
     // Verify commit and path correspond to actual objects.
     $commit_phid = $this->commitPHID;
     $path_id = $this->getChangesetID();
 
     $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
       'phid = %s',
       $commit_phid);
     if (!$commit) {
-      throw new Exception("Invalid commit ID!");
+      throw new Exception('Invalid commit ID!');
     }
 
     // TODO: Write a real PathQuery object?
 
     $path = queryfx_one(
       id(new PhabricatorRepository())->establishConnection('r'),
       'SELECT path FROM %T WHERE id = %d',
       PhabricatorRepository::TABLE_PATH,
       $path_id);
 
     if (!$path) {
-      throw new Exception("Invalid path ID!");
+      throw new Exception('Invalid path ID!');
     }
 
     return id(new PhabricatorAuditInlineComment())
       ->setCommitPHID($commit_phid)
       ->setPathID($path_id);
   }
 
   protected function loadComment($id) {
     return id(new PhabricatorAuditInlineComment())->load($id);
   }
 
   protected function loadCommentForEdit($id) {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $inline = $this->loadComment($id);
     if (!$this->canEditInlineComment($user, $inline)) {
-      throw new Exception("That comment is not editable!");
+      throw new Exception('That comment is not editable!');
     }
     return $inline;
   }
 
   private function canEditInlineComment(
     PhabricatorUser $user,
     PhabricatorAuditInlineComment $inline) {
 
     // Only the author may edit a comment.
     if ($inline->getAuthorPHID() != $user->getPHID()) {
       return false;
     }
 
     // Saved comments may not be edited.
     if ($inline->getAuditCommentID()) {
       return false;
     }
 
     // Inline must be attached to the active revision.
     if ($inline->getCommitPHID() != $this->commitPHID) {
       return false;
     }
 
     return true;
   }
 
   protected function deleteComment(PhabricatorInlineCommentInterface $inline) {
     return $inline->delete();
   }
 
   protected function saveComment(PhabricatorInlineCommentInterface $inline) {
     return $inline->save();
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index f58e9d3c8..149b55da4 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -1,640 +1,640 @@
 <?php
 
 final class DiffusionRepositoryController extends DiffusionController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function processRequest() {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     $content = array();
 
     $crumbs = $this->buildCrumbs();
     $content[] = $crumbs;
 
     $content[] = $this->buildPropertiesTable($drequest->getRepository());
     $phids = array();
 
     try {
       $history_results = $this->callConduitWithDiffusionRequest(
         'diffusion.historyquery',
         array(
           'commit' => $drequest->getCommit(),
           'path' => $drequest->getPath(),
           'offset' => 0,
           'limit' => 15));
       $history = DiffusionPathChange::newFromConduit(
         $history_results['pathChanges']);
 
       foreach ($history as $item) {
         $data = $item->getCommitData();
         if ($data) {
           if ($data->getCommitDetail('authorPHID')) {
             $phids[$data->getCommitDetail('authorPHID')] = true;
           }
           if ($data->getCommitDetail('committerPHID')) {
             $phids[$data->getCommitDetail('committerPHID')] = true;
           }
         }
       }
       $history_exception = null;
     } catch (Exception $ex) {
       $history_results = null;
       $history = null;
       $history_exception = $ex;
     }
 
     try {
       $browse_results = DiffusionBrowseResultSet::newFromConduit(
         $this->callConduitWithDiffusionRequest(
           'diffusion.browsequery',
           array(
             'path' => $drequest->getPath(),
             'commit' => $drequest->getCommit(),
           )));
       $browse_paths = $browse_results->getPaths();
 
       foreach ($browse_paths as $item) {
         $data = $item->getLastCommitData();
         if ($data) {
           if ($data->getCommitDetail('authorPHID')) {
             $phids[$data->getCommitDetail('authorPHID')] = true;
           }
           if ($data->getCommitDetail('committerPHID')) {
             $phids[$data->getCommitDetail('committerPHID')] = true;
           }
         }
       }
 
       $browse_exception = null;
     } catch (Exception $ex) {
       $browse_results = null;
       $browse_paths = null;
       $browse_exception = $ex;
     }
 
     $phids = array_keys($phids);
     $handles = $this->loadViewerHandles($phids);
 
     if ($browse_results) {
       $readme = $this->callConduitWithDiffusionRequest(
         'diffusion.readmequery',
         array(
          'paths' => $browse_results->getPathDicts(),
          'commit' => $drequest->getStableCommit(),
         ));
     } else {
       $readme = null;
     }
 
     $content[] = $this->buildBrowseTable(
       $browse_results,
       $browse_paths,
       $browse_exception,
       $handles);
 
     $content[] = $this->buildHistoryTable(
       $history_results,
       $history,
       $history_exception,
       $handles);
 
     try {
       $content[] = $this->buildTagListTable($drequest);
     } catch (Exception $ex) {
       if (!$repository->isImporting()) {
         $content[] = $this->renderStatusMessage(
           pht('Unable to Load Tags'),
           $ex->getMessage());
       }
     }
 
     try {
       $content[] = $this->buildBranchListTable($drequest);
     } catch (Exception $ex) {
       if (!$repository->isImporting()) {
         $content[] = $this->renderStatusMessage(
           pht('Unable to Load Branches'),
           $ex->getMessage());
       }
     }
 
     if ($readme) {
       $box = new PHUIBoxView();
       $box->appendChild($readme);
       $box->addPadding(PHUI::PADDING_LARGE);
 
       $panel = new PHUIObjectBoxView();
       $panel->setHeaderText(pht('README'));
       $panel->appendChild($box);
       $content[] = $panel;
     }
 
     return $this->buildApplicationPage(
       $content,
       array(
         'title' => $drequest->getRepository()->getName(),
         'device' => true,
       ));
   }
 
   private function buildPropertiesTable(PhabricatorRepository $repository) {
     $user = $this->getRequest()->getUser();
 
     $header = id(new PHUIHeaderView())
       ->setHeader($repository->getName())
       ->setUser($user)
       ->setPolicyObject($repository);
 
     if (!$repository->isTracked()) {
       $header->setStatus('fa-ban', 'dark', pht('Inactive'));
     } else if ($repository->isImporting()) {
       $header->setStatus('fa-clock-o', 'indigo', pht('Importing...'));
     } else {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
     }
 
 
     $actions = $this->buildActionList($repository);
 
     $view = id(new PHUIPropertyListView())
       ->setUser($user);
 
     $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $repository->getPHID(),
       PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT);
     if ($project_phids) {
       $this->loadHandles($project_phids);
       $view->addProperty(
         pht('Projects'),
         $this->renderHandlesForPHIDs($project_phids));
     }
 
     if ($repository->isHosted()) {
       $ssh_uri = $repository->getSSHCloneURIObject();
       if ($ssh_uri) {
         $clone_uri = $this->renderCloneCommand(
           $repository,
           $ssh_uri,
           $repository->getServeOverSSH(),
           '/settings/panel/ssh/');
 
         $view->addProperty(
           $repository->isSVN()
             ? pht('Checkout (SSH)')
             : pht('Clone (SSH)'),
           $clone_uri);
       }
 
       $http_uri = $repository->getHTTPCloneURIObject();
       if ($http_uri) {
         $clone_uri = $this->renderCloneCommand(
           $repository,
           $http_uri,
           $repository->getServeOverHTTP(),
           PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')
             ? '/settings/panel/vcspassword/'
             : null);
 
         $view->addProperty(
           $repository->isSVN()
             ? pht('Checkout (HTTP)')
             : pht('Clone (HTTP)'),
           $clone_uri);
       }
     } else {
       switch ($repository->getVersionControlSystem()) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
           $view->addProperty(
             pht('Clone'),
             $this->renderCloneCommand(
               $repository,
               $repository->getPublicCloneURI()));
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
           $view->addProperty(
             pht('Checkout'),
             $this->renderCloneCommand(
               $repository,
               $repository->getPublicCloneURI()));
           break;
       }
     }
 
     $description = $repository->getDetail('description');
     if (strlen($description)) {
       $description = PhabricatorMarkupEngine::renderOneObject(
         $repository,
         'description',
         $user);
       $view->addSectionHeader(pht('Description'));
       $view->addTextContent($description);
     }
 
     $view->setActionList($actions);
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($view);
 
   }
 
   private function buildBranchListTable(DiffusionRequest $drequest) {
     $viewer = $this->getRequest()->getUser();
 
     if ($drequest->getBranch() === null) {
       return null;
     }
 
     $limit = 15;
 
     $branches = $this->callConduitWithDiffusionRequest(
       'diffusion.branchquery',
       array(
         'limit' => $limit + 1,
       ));
     if (!$branches) {
       return null;
     }
 
     $more_branches = (count($branches) > $limit);
     $branches = array_slice($branches, 0, $limit);
 
     $branches = DiffusionRepositoryRef::loadAllFromDictionaries($branches);
 
     $commits = id(new DiffusionCommitQuery())
       ->setViewer($viewer)
       ->withIdentifiers(mpull($branches, 'getCommitIdentifier'))
       ->withRepository($drequest->getRepository())
       ->execute();
 
     $table = id(new DiffusionBranchTableView())
       ->setUser($viewer)
       ->setDiffusionRequest($drequest)
       ->setBranches($branches)
       ->setCommits($commits);
 
     $panel = new PHUIObjectBoxView();
     $header = new PHUIHeaderView();
     $header->setHeader(pht('Branches'));
 
     if ($more_branches) {
       $header->setSubHeader(pht('Showing %d branches.', $limit));
     }
 
     $icon = id(new PHUIIconView())
       ->setIconFont('fa-fork');
 
     $button = new PHUIButtonView();
-    $button->setText(pht("Show All Branches"));
+    $button->setText(pht('Show All Branches'));
     $button->setTag('a');
     $button->setIcon($icon);
     $button->setHref($drequest->generateURI(
             array(
               'action' => 'branches',
             )));
 
     $header->addActionLink($button);
     $panel->setHeader($header);
     $panel->appendChild($table);
 
     return $panel;
   }
 
   private function buildTagListTable(DiffusionRequest $drequest) {
     $viewer = $this->getRequest()->getUser();
 
     $tag_limit = 15;
     $tags = array();
     try {
       $tags = DiffusionRepositoryTag::newFromConduit(
         $this->callConduitWithDiffusionRequest(
           'diffusion.tagsquery',
           array(
             // On the home page, we want to find tags on any branch.
             'commit' => null,
             'limit' => $tag_limit + 1,
           )));
     } catch (ConduitException $e) {
       if ($e->getMessage() != 'ERR-UNSUPPORTED-VCS') {
         throw $e;
       }
     }
 
     if (!$tags) {
       return null;
     }
 
     $more_tags = (count($tags) > $tag_limit);
     $tags = array_slice($tags, 0, $tag_limit);
 
     $commits = id(new DiffusionCommitQuery())
       ->setViewer($viewer)
       ->withIdentifiers(mpull($tags, 'getCommitIdentifier'))
       ->withRepository($drequest->getRepository())
       ->needCommitData(true)
       ->execute();
 
     $view = id(new DiffusionTagListView())
       ->setUser($viewer)
       ->setDiffusionRequest($drequest)
       ->setTags($tags)
       ->setCommits($commits);
 
     $phids = $view->getRequiredHandlePHIDs();
     $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new PHUIObjectBoxView();
     $header = new PHUIHeaderView();
     $header->setHeader(pht('Tags'));
 
     if ($more_tags) {
       $header->setSubHeader(
         pht('Showing the %d most recent tags.', $tag_limit));
     }
 
     $icon = id(new PHUIIconView())
       ->setIconFont('fa-tag');
 
     $button = new PHUIButtonView();
-    $button->setText(pht("Show All Tags"));
+    $button->setText(pht('Show All Tags'));
     $button->setTag('a');
     $button->setIcon($icon);
     $button->setHref($drequest->generateURI(
       array(
         'action' => 'tags',
       )));
 
     $header->addActionLink($button);
 
     $panel->setHeader($header);
     $panel->appendChild($view);
 
     return $panel;
   }
 
   private function buildActionList(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view_uri = $this->getApplicationURI($repository->getCallsign().'/');
     $edit_uri = $this->getApplicationURI($repository->getCallsign().'/edit/');
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($repository)
       ->setObjectURI($view_uri);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $repository,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Repository'))
         ->setIcon('fa-pencil')
         ->setHref($edit_uri)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit));
 
     if ($repository->isHosted()) {
       $callsign = $repository->getCallsign();
       $push_uri = $this->getApplicationURI(
         'pushlog/?repositories=r'.$callsign);
 
       $view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View Push Logs'))
           ->setIcon('fa-list-alt')
           ->setHref($push_uri));
     }
 
     return $view;
   }
 
   private function buildHistoryTable(
     $history_results,
     $history,
     $history_exception,
     array $handles) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     if ($history_exception) {
       if ($repository->isImporting()) {
         return $this->renderStatusMessage(
           pht('Still Importing...'),
           pht(
             'This repository is still importing. History is not yet '.
             'available.'));
       } else {
         return $this->renderStatusMessage(
           pht('Unable to Retrieve History'),
           $history_exception->getMessage());
       }
     }
 
     $history_table = id(new DiffusionHistoryTableView())
       ->setUser($viewer)
       ->setDiffusionRequest($drequest)
       ->setHandles($handles)
       ->setHistory($history);
 
     // TODO: Super sketchy.
     $history_table->loadRevisions();
 
     if ($history_results) {
       $history_table->setParents($history_results['parents']);
     }
 
     $history_table->setIsHead(true);
     $callsign = $drequest->getRepository()->getCallsign();
 
     $icon = id(new PHUIIconView())
       ->setIconFont('fa-list-alt');
 
     $button = id(new PHUIButtonView())
       ->setText(pht('View Full History'))
       ->setHref($drequest->generateURI(
         array(
           'action' => 'history',
         )))
       ->setTag('a')
       ->setIcon($icon);
 
     $panel = new PHUIObjectBoxView();
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Recent Commits'))
       ->addActionLink($button);
     $panel->setHeader($header);
     $panel->appendChild($history_table);
 
     return $panel;
   }
 
   private function buildBrowseTable(
     $browse_results,
     $browse_paths,
     $browse_exception,
     array $handles) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     if ($browse_exception) {
       if ($repository->isImporting()) {
         // The history table renders a useful message.
         return null;
       } else {
         return $this->renderStatusMessage(
           pht('Unable to Retrieve Paths'),
           $browse_exception->getMessage());
       }
     }
 
     $browse_table = id(new DiffusionBrowseTableView())
       ->setUser($viewer)
       ->setDiffusionRequest($drequest)
       ->setHandles($handles);
     if ($browse_paths) {
       $browse_table->setPaths($browse_paths);
     } else {
       $browse_table->setPaths(array());
     }
 
     $browse_uri = $drequest->generateURI(array('action' => 'browse'));
 
     $browse_panel = new PHUIObjectBoxView();
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Repository'));
 
     $icon = id(new PHUIIconView())
       ->setIconFont('fa-folder-open');
 
     $button = new PHUIButtonView();
     $button->setText(pht('Browse Repository'));
     $button->setTag('a');
     $button->setIcon($icon);
     $button->setHref($browse_uri);
 
     $header->addActionLink($button);
     $browse_panel->setHeader($header);
 
     if ($repository->canUsePathTree()) {
       Javelin::initBehavior(
         'diffusion-locate-file',
         array(
           'controlID' => 'locate-control',
           'inputID' => 'locate-input',
           'browseBaseURI' => (string)$drequest->generateURI(
             array(
               'action' => 'browse',
             )),
           'uri' => (string)$drequest->generateURI(
             array(
               'action' => 'pathtree',
             )),
         ));
 
       $form = id(new AphrontFormView())
         ->setUser($viewer)
         ->appendChild(
           id(new AphrontFormTypeaheadControl())
             ->setHardpointID('locate-control')
             ->setID('locate-input')
             ->setLabel(pht('Locate File')));
       $browse_panel->appendChild($form->buildLayoutView());
     }
 
     $browse_panel->appendChild($browse_table);
 
     return $browse_panel;
   }
 
   private function renderCloneCommand(
     PhabricatorRepository $repository,
     $uri,
     $serve_mode = null,
     $manage_uri = null) {
 
     require_celerity_resource('diffusion-icons-css');
 
     Javelin::initBehavior('select-on-click');
 
     switch ($repository->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $command = csprintf(
           'git clone %R',
           $uri);
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $command = csprintf(
           'hg clone %R',
           $uri);
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         if ($repository->isHosted()) {
           $command = csprintf(
             'svn checkout %R %R',
             $uri,
             $repository->getCloneName());
         } else {
           $command = csprintf(
             'svn checkout %R',
             $uri);
         }
         break;
     }
 
     $input = javelin_tag(
       'input',
       array(
         'type' => 'text',
         'value' => (string)$command,
         'class' => 'diffusion-clone-uri',
         'sigil' => 'select-on-click',
         'readonly' => 'true',
       ));
 
     $extras = array();
     if ($serve_mode) {
       if ($serve_mode === PhabricatorRepository::SERVE_READONLY) {
         $extras[] = pht('(Read Only)');
       }
     }
 
     if ($manage_uri) {
       if ($this->getRequest()->getUser()->isLoggedIn()) {
         $extras[] = phutil_tag(
           'a',
           array(
             'href' => $manage_uri,
           ),
           pht('Manage Credentials'));
       }
     }
 
     if ($extras) {
       $extras = phutil_implode_html(' ', $extras);
       $extras = phutil_tag(
         'div',
         array(
           'class' => 'diffusion-clone-extras',
         ),
         $extras);
     }
 
     return array($input, $extras);
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
index f4390c0c7..9a65a5bfd 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
@@ -1,920 +1,920 @@
 <?php
 
 final class DiffusionRepositoryCreateController
   extends DiffusionRepositoryEditController {
 
   private $edit;
   private $repository;
 
   public function willProcessRequest(array $data) {
     parent::willProcessRequest($data);
     $this->edit = $data['edit'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     // NOTE: We can end up here via either "Create Repository", or via
     // "Import Repository", or via "Edit Remote", or via "Edit Policies". In
     // the latter two cases, we show only a few of the pages.
 
     $repository = null;
     switch ($this->edit) {
       case 'remote':
       case 'policy':
         $repository = $this->getDiffusionRequest()->getRepository();
 
         // Make sure we have CAN_EDIT.
         PhabricatorPolicyFilter::requireCapability(
           $viewer,
           $repository,
           PhabricatorPolicyCapability::CAN_EDIT);
 
         $this->setRepository($repository);
 
         $cancel_uri = $this->getRepositoryControllerURI($repository, 'edit/');
         break;
       case 'import':
       case 'create':
         $this->requireApplicationCapability(
           DiffusionCapabilityCreateRepositories::CAPABILITY);
 
         $cancel_uri = $this->getApplicationURI('new/');
         break;
       default:
-        throw new Exception("Invalid edit operation!");
+        throw new Exception('Invalid edit operation!');
     }
 
     $form = id(new PHUIPagedFormView())
       ->setUser($viewer)
       ->setCancelURI($cancel_uri);
 
     switch ($this->edit) {
       case 'remote':
         $title = pht('Edit Remote');
         $form
           ->addPage('remote-uri', $this->buildRemoteURIPage())
           ->addPage('auth', $this->buildAuthPage());
         break;
       case 'policy':
         $title = pht('Edit Policies');
         $form
           ->addPage('policy', $this->buildPolicyPage());
         break;
       case 'create':
         $title = pht('Create Repository');
         $form
           ->addPage('vcs', $this->buildVCSPage())
           ->addPage('name', $this->buildNamePage())
           ->addPage('policy', $this->buildPolicyPage())
           ->addPage('done', $this->buildDonePage());
         break;
       case 'import':
         $title = pht('Import Repository');
         $form
           ->addPage('vcs', $this->buildVCSPage())
           ->addPage('name', $this->buildNamePage())
           ->addPage('remote-uri', $this->buildRemoteURIPage())
           ->addPage('auth', $this->buildAuthPage())
           ->addPage('policy', $this->buildPolicyPage())
           ->addPage('done', $this->buildDonePage());
         break;
     }
 
     if ($request->isFormPost()) {
       $form->readFromRequest($request);
       if ($form->isComplete()) {
 
         $is_create = ($this->edit === 'import' || $this->edit === 'create');
         $is_auth = ($this->edit == 'import' || $this->edit == 'remote');
         $is_policy = ($this->edit != 'remote');
         $is_init = ($this->edit == 'create');
 
         if ($is_create) {
           $repository = PhabricatorRepository::initializeNewRepository(
             $viewer);
         }
 
         $template = id(new PhabricatorRepositoryTransaction());
 
         $type_name = PhabricatorRepositoryTransaction::TYPE_NAME;
         $type_vcs = PhabricatorRepositoryTransaction::TYPE_VCS;
         $type_activate = PhabricatorRepositoryTransaction::TYPE_ACTIVATE;
         $type_local_path = PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH;
         $type_remote_uri = PhabricatorRepositoryTransaction::TYPE_REMOTE_URI;
         $type_hosting = PhabricatorRepositoryTransaction::TYPE_HOSTING;
         $type_credential = PhabricatorRepositoryTransaction::TYPE_CREDENTIAL;
         $type_view = PhabricatorTransactions::TYPE_VIEW_POLICY;
         $type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
         $type_push = PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY;
 
         $xactions = array();
 
         // If we're creating a new repository, set all this core stuff.
         if ($is_create) {
           $callsign = $form->getPage('name')
             ->getControl('callsign')->getValue();
 
           // We must set this to a unique value to save the repository
           // initially, and it's immutable, so we don't bother using
           // transactions to apply this change.
           $repository->setCallsign($callsign);
 
           // Put the repository in "Importing" mode until we finish
           // parsing it.
           $repository->setDetail('importing', true);
 
           $xactions[] = id(clone $template)
             ->setTransactionType($type_name)
             ->setNewValue(
               $form->getPage('name')->getControl('name')->getValue());
 
           $xactions[] = id(clone $template)
             ->setTransactionType($type_vcs)
             ->setNewValue(
               $form->getPage('vcs')->getControl('vcs')->getValue());
 
           $activate = $form->getPage('done')
             ->getControl('activate')->getValue();
           $xactions[] = id(clone $template)
             ->setTransactionType($type_activate)
             ->setNewValue(
               ($activate == 'start'));
 
           $default_local_path = PhabricatorEnv::getEnvConfig(
             'repository.default-local-path');
 
           $default_local_path = rtrim($default_local_path, '/');
           $default_local_path = $default_local_path.'/'.$callsign.'/';
 
           $xactions[] = id(clone $template)
             ->setTransactionType($type_local_path)
             ->setNewValue($default_local_path);
         }
 
         if ($is_init) {
           $xactions[] = id(clone $template)
             ->setTransactionType($type_hosting)
             ->setNewValue(true);
         }
 
         if ($is_auth) {
           $xactions[] = id(clone $template)
             ->setTransactionType($type_remote_uri)
             ->setNewValue(
               $form->getPage('remote-uri')->getControl('remoteURI')
                 ->getValue());
 
           $xactions[] = id(clone $template)
             ->setTransactionType($type_credential)
             ->setNewValue(
               $form->getPage('auth')->getControl('credential')->getValue());
         }
 
         if ($is_policy) {
           $xactions[] = id(clone $template)
             ->setTransactionType($type_view)
             ->setNewValue(
               $form->getPage('policy')->getControl('viewPolicy')->getValue());
 
           $xactions[] = id(clone $template)
             ->setTransactionType($type_edit)
             ->setNewValue(
               $form->getPage('policy')->getControl('editPolicy')->getValue());
 
           if ($is_init || $repository->isHosted()) {
             $xactions[] = id(clone $template)
               ->setTransactionType($type_push)
               ->setNewValue(
                 $form->getPage('policy')->getControl('pushPolicy')->getValue());
           }
         }
 
         id(new PhabricatorRepositoryEditor())
           ->setContinueOnNoEffect(true)
           ->setContentSourceFromRequest($request)
           ->setActor($viewer)
           ->applyTransactions($repository, $xactions);
 
         $repo_uri = $this->getRepositoryControllerURI($repository, 'edit/');
         return id(new AphrontRedirectResponse())->setURI($repo_uri);
       }
     } else {
       $dict = array();
       if ($repository) {
         $dict = array(
           'remoteURI' => $repository->getRemoteURI(),
           'credential' => $repository->getCredentialPHID(),
           'viewPolicy' => $repository->getViewPolicy(),
           'editPolicy' => $repository->getEditPolicy(),
           'pushPolicy' => $repository->getPushPolicy(),
         );
       }
       $form->readFromObject($dict);
     }
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 
 /* -(  Page: VCS Type  )----------------------------------------------------- */
 
 
   private function buildVCSPage() {
 
     $is_import = ($this->edit == 'import');
 
     if ($is_import) {
       $git_str = pht(
         'Import a Git repository (for example, a repository hosted '.
         'on GitHub).');
       $hg_str = pht(
         'Import a Mercurial repository (for example, a repository '.
         'hosted on Bitbucket).');
       $svn_str = pht('Import a Subversion repository.');
     } else {
       $git_str = pht('Create a new, empty Git repository.');
       $hg_str = pht('Create a new, empty Mercurial repository.');
       $svn_str = pht('Create a new, empty Subversion repository.');
     }
 
     $control = id(new AphrontFormRadioButtonControl())
       ->setName('vcs')
       ->setLabel(pht('Type'))
       ->addButton(
         PhabricatorRepositoryType::REPOSITORY_TYPE_GIT,
         pht('Git'),
         $git_str)
       ->addButton(
         PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL,
         pht('Mercurial'),
         $hg_str)
       ->addButton(
         PhabricatorRepositoryType::REPOSITORY_TYPE_SVN,
         pht('Subversion'),
         $svn_str);
 
     if ($is_import) {
       $control->addButton(
         PhabricatorRepositoryType::REPOSITORY_TYPE_PERFORCE,
         pht('Perforce'),
         pht(
           'Perforce is not directly supported, but you can import '.
           'a Perforce repository as a Git repository using %s.',
           phutil_tag(
             'a',
             array(
               'href' =>
                 'http://www.perforce.com/product/components/git-fusion',
               'target' => '_blank',
             ),
             pht('Perforce Git Fusion'))),
         'disabled',
         $disabled = true);
     }
 
     return id(new PHUIFormPageView())
       ->setPageName(pht('Repository Type'))
       ->setUser($this->getRequest()->getUser())
       ->setValidateFormPageCallback(array($this, 'validateVCSPage'))
       ->addControl($control);
   }
 
   public function validateVCSPage(PHUIFormPageView $page) {
     $valid = array(
       PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => true,
       PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => true,
       PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => true,
     );
 
     $c_vcs = $page->getControl('vcs');
     $v_vcs = $c_vcs->getValue();
     if (!$v_vcs) {
       $c_vcs->setError(pht('Required'));
       $page->addPageError(
         pht('You must select a version control system.'));
     } else if (empty($valid[$v_vcs])) {
       $c_vcs->setError(pht('Invalid'));
       $page->addPageError(
         pht('You must select a valid version control system.'));
     }
 
     return $c_vcs->isValid();
   }
 
 
 /* -(  Page: Name and Callsign  )-------------------------------------------- */
 
 
   private function buildNamePage() {
     return id(new PHUIFormPageView())
       ->setUser($this->getRequest()->getUser())
       ->setPageName(pht('Repository Name and Location'))
       ->setValidateFormPageCallback(array($this, 'validateNamePage'))
       ->addRemarkupInstructions(
         pht(
           '**Choose a human-readable name for this repository**, like '.
           '"CompanyName Mobile App" or "CompanyName Backend Server". You '.
           'can change this later.'))
       ->addControl(
         id(new AphrontFormTextControl())
           ->setName('name')
           ->setLabel(pht('Name'))
           ->setCaption(pht('Human-readable repository name.')))
       ->addRemarkupInstructions(
         pht(
           '**Choose a "Callsign" for the repository.** This is a short, '.
           'unique string which identifies commits elsewhere in Phabricator. '.
           'For example, you might use `M` for your mobile app repository '.
           'and `B` for your backend repository.'.
           "\n\n".
           '**Callsigns must be UPPERCASE**, and can not be edited after the '.
           'repository is created. Generally, you should choose short '.
           'callsigns.'))
       ->addControl(
         id(new AphrontFormTextControl())
           ->setName('callsign')
           ->setLabel(pht('Callsign'))
           ->setCaption(pht('Short UPPERCASE identifier.')));
   }
 
   public function validateNamePage(PHUIFormPageView $page) {
     $c_name = $page->getControl('name');
     $v_name = $c_name->getValue();
     if (!strlen($v_name)) {
       $c_name->setError(pht('Required'));
       $page->addPageError(
         pht('You must choose a name for this repository.'));
     }
 
     $c_call = $page->getControl('callsign');
     $v_call = $c_call->getValue();
     if (!strlen($v_call)) {
       $c_call->setError(pht('Required'));
       $page->addPageError(
         pht('You must choose a callsign for this repository.'));
     } else if (!preg_match('/^[A-Z]+\z/', $v_call)) {
       $c_call->setError(pht('Invalid'));
       $page->addPageError(
         pht('The callsign must contain only UPPERCASE letters.'));
     } else {
       $exists = false;
       try {
         $repo = id(new PhabricatorRepositoryQuery())
           ->setViewer($this->getRequest()->getUser())
           ->withCallsigns(array($v_call))
           ->executeOne();
         $exists = (bool)$repo;
       } catch (PhabricatorPolicyException $ex) {
         $exists = true;
       }
       if ($exists) {
         $c_call->setError(pht('Not Unique'));
         $page->addPageError(
           pht(
             'Another repository already uses that callsign. You must choose '.
             'a unique callsign.'));
       }
     }
 
     return $c_name->isValid() &&
            $c_call->isValid();
   }
 
 
 /* -(  Page: Remote URI  )--------------------------------------------------- */
 
 
   private function buildRemoteURIPage() {
     return id(new PHUIFormPageView())
       ->setUser($this->getRequest()->getUser())
       ->setPageName(pht('Repository Remote URI'))
       ->setValidateFormPageCallback(array($this, 'validateRemoteURIPage'))
       ->setAdjustFormPageCallback(array($this, 'adjustRemoteURIPage'))
       ->addControl(
         id(new AphrontFormTextControl())
           ->setName('remoteURI'));
   }
 
   public function adjustRemoteURIPage(PHUIFormPageView $page) {
     $form = $page->getForm();
 
     $is_git = false;
     $is_svn = false;
     $is_mercurial = false;
 
     if ($this->getRepository()) {
       $vcs = $this->getRepository()->getVersionControlSystem();
     } else {
       $vcs = $form->getPage('vcs')->getControl('vcs')->getValue();
     }
 
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $is_git = true;
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $is_svn = true;
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $is_mercurial = true;
         break;
       default:
-        throw new Exception("Unsupported VCS!");
+        throw new Exception('Unsupported VCS!');
     }
 
     $has_local = ($is_git || $is_mercurial);
     if ($is_git) {
       $uri_label = pht('Remote URI');
       $instructions = pht(
         'Enter the URI to clone this Git repository from. It should usually '.
         'look like one of these examples:'.
         "\n\n".
         "| Example Git Remote URIs |\n".
         "| ----------------------- |\n".
         "| `git@github.com:example/example.git` |\n".
         "| `ssh://user@host.com/git/example.git` |\n".
         "| `file:///local/path/to/repo` |\n".
         "| `https://example.com/repository.git` |\n");
     } else if ($is_mercurial) {
       $uri_label = pht('Remote URI');
       $instructions = pht(
         'Enter the URI to clone this Mercurial repository from. It should '.
         'usually look like one of these examples:'.
         "\n\n".
         "| Example Mercurial Remote URIs |\n".
         "| ----------------------- |\n".
         "| `ssh://hg@bitbucket.org/example/repository` |\n".
         "| `file:///local/path/to/repo` |\n");
     } else if ($is_svn) {
       $uri_label = pht('Repository Root');
       $instructions = pht(
         'Enter the **Repository Root** for this Subversion repository. '.
         'You can figure this out by running `svn info` in a working copy '.
         'and looking at the value in the `Repository Root` field. It '.
         'should be a URI and will usually look like these:'.
         "\n\n".
         "| Example Subversion Repository Root URIs |\n".
         "| ------------------------------ |\n".
         "| `http://svn.example.org/svnroot/` |\n".
         "| `svn+ssh://svn.example.com/svnroot/` |\n".
         "| `svn://svn.example.net/svnroot/` |\n".
         "| `file:///local/path/to/svnroot/` |\n".
         "\n\n".
         "You **MUST** specify the root of the repository, not a ".
         "subdirectory. (If you want to import only part of a Subversion ".
         "repository, use the //Import Only// option at the end of this ".
         "workflow.)");
     } else {
-      throw new Exception("Unsupported VCS!");
+      throw new Exception('Unsupported VCS!');
     }
 
     $page->addRemarkupInstructions($instructions, 'remoteURI');
     $page->getControl('remoteURI')->setLabel($uri_label);
   }
 
   public function validateRemoteURIPage(PHUIFormPageView $page) {
     $c_remote = $page->getControl('remoteURI');
     $v_remote = $c_remote->getValue();
 
     if (!strlen($v_remote)) {
       $c_remote->setError(pht('Required'));
       $page->addPageError(
-        pht("You must specify a URI."));
+        pht('You must specify a URI.'));
     } else {
       $proto = $this->getRemoteURIProtocol($v_remote);
 
       if ($proto === 'file') {
         if (!preg_match('@^file:///@', $v_remote)) {
           $c_remote->setError(pht('Invalid'));
           $page->addPageError(
             pht(
               "URIs using the 'file://' protocol should have three slashes ".
               "(e.g., 'file:///absolute/path/to/file'). You only have two. ".
               "Add another one."));
         }
       }
 
       // Catch confusion between Git/SCP-style URIs and normal URIs. See T3619
       // for discussion. This is usually a user adding "ssh://" to an implicit
       // SSH Git URI.
       if ($proto == 'ssh') {
         if (preg_match('(^[^:@]+://[^/:]+:[^\d])', $v_remote)) {
           $c_remote->setError(pht('Invalid'));
           $page->addPageError(
             pht(
               "The Remote URI is not formatted correctly. Remote URIs ".
               "with an explicit protocol should be in the form ".
               "'proto://domain/path', not 'proto://domain:/path'. ".
               "The ':/path' syntax is only valid in SCP-style URIs."));
         }
       }
 
       switch ($proto) {
         case 'ssh':
         case 'http':
         case 'https':
         case 'file':
         case 'git':
         case 'svn':
         case 'svn+ssh':
           break;
         default:
           $c_remote->setError(pht('Invalid'));
           $page->addPageError(
             pht(
               "The URI protocol is unrecognized. It should begin ".
               "'ssh://', 'http://', 'https://', 'file://', 'git://', ".
               "'svn://', 'svn+ssh://', or be in the form ".
               "'git@domain.com:path'."));
           break;
       }
     }
 
     return $c_remote->isValid();
   }
 
 
 /* -(  Page: Authentication  )----------------------------------------------- */
 
 
   public function buildAuthPage() {
     return id(new PHUIFormPageView())
       ->setPageName(pht('Authentication'))
       ->setUser($this->getRequest()->getUser())
       ->setAdjustFormPageCallback(array($this, 'adjustAuthPage'))
       ->addControl(
         id(new PassphraseCredentialControl())
           ->setName('credential'));
   }
 
 
   public function adjustAuthPage($page) {
     $form = $page->getForm();
 
     if ($this->getRepository()) {
       $vcs = $this->getRepository()->getVersionControlSystem();
     } else {
       $vcs = $form->getPage('vcs')->getControl('vcs')->getValue();
     }
 
     $remote_uri = $form->getPage('remote-uri')
       ->getControl('remoteURI')
       ->getValue();
     $proto = $this->getRemoteURIProtocol($remote_uri);
     $remote_user = $this->getRemoteURIUser($remote_uri);
 
     $c_credential = $page->getControl('credential');
     $c_credential->setDefaultUsername($remote_user);
 
     if ($this->isSSHProtocol($proto)) {
       $c_credential->setLabel(pht('SSH Key'));
       $c_credential->setCredentialType(
         PassphraseCredentialTypeSSHPrivateKeyText::CREDENTIAL_TYPE);
       $provides_type = PassphraseCredentialTypeSSHPrivateKey::PROVIDES_TYPE;
 
       $page->addRemarkupInstructions(
         pht(
           'Choose or add the SSH credentials to use to connect to the the '.
           'repository hosted at:'.
           "\n\n".
           "  lang=text\n".
           "  %s",
           $remote_uri),
         'credential');
     } else if ($this->isUsernamePasswordProtocol($proto)) {
       $c_credential->setLabel(pht('Password'));
       $c_credential->setAllowNull(true);
       $c_credential->setCredentialType(
         PassphraseCredentialTypePassword::CREDENTIAL_TYPE);
       $provides_type = PassphraseCredentialTypePassword::PROVIDES_TYPE;
 
       $page->addRemarkupInstructions(
         pht(
           'Choose the username and password used to connect to the '.
           'repository hosted at:'.
           "\n\n".
           "  lang=text\n".
           "  %s".
           "\n\n".
           "If this repository does not require a username or password, ".
           "you can continue to the next step.",
           $remote_uri),
         'credential');
     } else if ($proto == 'file') {
       $c_credential->setHidden(true);
       $provides_type = null;
 
       $page->addRemarkupInstructions(
         pht(
           'You do not need to configure any credentials for repositories '.
           'accessed over the `file://` protocol. Continue to the next step.'),
         'credential');
     } else {
-      throw new Exception("Unknown URI protocol!");
+      throw new Exception('Unknown URI protocol!');
     }
 
     if ($provides_type) {
       $viewer = $this->getRequest()->getUser();
 
       $options = id(new PassphraseCredentialQuery())
         ->setViewer($viewer)
         ->withIsDestroyed(false)
         ->withProvidesTypes(array($provides_type))
         ->execute();
 
       $c_credential->setOptions($options);
     }
 
   }
 
   public function validateAuthPage(PHUIFormPageView $page) {
     $form = $page->getForm();
     $remote_uri = $form->getPage('remote')->getControl('remoteURI')->getValue();
     $proto = $this->getRemoteURIProtocol($remote_uri);
 
     $c_credential = $page->getControl('credential');
     $v_credential = $c_credential->getValue();
 
     // NOTE: We're using the omnipotent user here because the viewer might be
     // editing a repository they're allowed to edit which uses a credential they
     // are not allowed to see. This is fine, as long as they don't change it.
     $credential = id(new PassphraseCredentialQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($v_credential))
       ->executeOne();
 
     if ($this->isSSHProtocol($proto)) {
       if (!$credential) {
         $c_credential->setError(pht('Required'));
         $page->addPageError(
           pht('You must choose an SSH credential to connect over SSH.'));
       }
 
       $ssh_type = PassphraseCredentialTypeSSHPrivateKey::PROVIDES_TYPE;
       if ($credential->getProvidesType() !== $ssh_type) {
         $c_credential->setError(pht('Invalid'));
         $page->addPageError(
           pht(
             'You must choose an SSH credential, not some other type '.
             'of credential.'));
       }
 
     } else if ($this->isUsernamePasswordProtocol($proto)) {
       if ($credential) {
         $password_type = PassphraseCredentialTypePassword::PROVIDES_TYPE;
         if ($credential->getProvidesType() !== $password_type) {
         $c_credential->setError(pht('Invalid'));
         $page->addPageError(
           pht(
             'You must choose a username/password credential, not some other '.
             'type of credential.'));
         }
       }
 
       return $c_credential->isValid();
     } else {
       return true;
     }
   }
 
 
 /* -(  Page: Policy  )------------------------------------------------------- */
 
 
   private function buildPolicyPage() {
     $viewer = $this->getRequest()->getUser();
     if ($this->getRepository()) {
       $repository = $this->getRepository();
     } else {
       $repository = PhabricatorRepository::initializeNewRepository($viewer);
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($repository)
       ->execute();
 
     $view_policy = id(new AphrontFormPolicyControl())
       ->setUser($viewer)
       ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
       ->setPolicyObject($repository)
       ->setPolicies($policies)
       ->setName('viewPolicy');
 
     $edit_policy = id(new AphrontFormPolicyControl())
       ->setUser($viewer)
       ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
       ->setPolicyObject($repository)
       ->setPolicies($policies)
       ->setName('editPolicy');
 
     $push_policy = id(new AphrontFormPolicyControl())
       ->setUser($viewer)
       ->setCapability(DiffusionCapabilityPush::CAPABILITY)
       ->setPolicyObject($repository)
       ->setPolicies($policies)
       ->setName('pushPolicy');
 
     return id(new PHUIFormPageView())
         ->setPageName(pht('Policies'))
         ->setValidateFormPageCallback(array($this, 'validatePolicyPage'))
         ->setAdjustFormPageCallback(array($this, 'adjustPolicyPage'))
         ->setUser($viewer)
         ->addRemarkupInstructions(
           pht(
-            "Select access policies for this repository."))
+            'Select access policies for this repository.'))
         ->addControl($view_policy)
         ->addControl($edit_policy)
         ->addControl($push_policy);
   }
 
   public function adjustPolicyPage(PHUIFormPageView $page) {
     if ($this->getRepository()) {
       $repository = $this->getRepository();
       $show_push = $repository->isHosted();
     } else {
       $show_push = ($this->edit == 'create');
     }
 
     if (!$show_push) {
       $c_push = $page->getControl('pushPolicy');
       $c_push->setHidden(true);
     }
   }
 
   public function validatePolicyPage(PHUIFormPageView $page) {
     $form = $page->getForm();
     $viewer = $this->getRequest()->getUser();
 
     $c_view = $page->getControl('viewPolicy');
     $c_edit = $page->getControl('editPolicy');
     $c_push = $page->getControl('pushPolicy');
     $v_view = $c_view->getValue();
     $v_edit = $c_edit->getValue();
     $v_push = $c_push->getValue();
 
     if ($this->getRepository()) {
       $repository = $this->getRepository();
     } else {
       $repository = PhabricatorRepository::initializeNewRepository($viewer);
     }
 
     $proxy = clone $repository;
     $proxy->setViewPolicy($v_view);
     $proxy->setEditPolicy($v_edit);
 
     $can_view = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $proxy,
       PhabricatorPolicyCapability::CAN_VIEW);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $proxy,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     if (!$can_view) {
       $c_view->setError(pht('Invalid'));
       $page->addPageError(
         pht(
           'You can not use the selected policy, because you would be unable '.
           'to see the repository.'));
     }
 
     if (!$can_edit) {
       $c_edit->setError(pht('Invalid'));
       $page->addPageError(
         pht(
           'You can not use the selected edit policy, because you would be '.
           'unable to edit the repository.'));
     }
 
     return $c_view->isValid() &&
            $c_edit->isValid();
   }
 
 /* -(  Page: Done  )--------------------------------------------------------- */
 
 
   private function buildDonePage() {
 
     $is_create = ($this->edit == 'create');
     if ($is_create) {
       $now_label = pht('Create Repository Now');
       $now_caption = pht(
         'Create the repository right away. This will create the repository '.
         'using default settings.');
 
       $wait_label = pht('Configure More Options First');
       $wait_caption = pht(
         'Configure more options before creating the repository. '.
         'This will let you fine-tune settings. You can create the repository '.
         'whenever you are ready.');
     } else {
       $now_label = pht('Start Import Now');
       $now_caption = pht(
         'Start importing the repository right away. This will import '.
         'the entire repository using default settings.');
 
       $wait_label = pht('Configure More Options First');
       $wait_caption = pht(
         'Configure more options before beginning the repository '.
         'import. This will let you fine-tune settings. You can '.
         'start the import whenever you are ready.');
     }
 
     return id(new PHUIFormPageView())
       ->setPageName(pht('Repository Ready!'))
       ->setValidateFormPageCallback(array($this, 'validateDonePage'))
       ->setUser($this->getRequest()->getUser())
       ->addControl(
         id(new AphrontFormRadioButtonControl())
           ->setName('activate')
           ->setLabel(pht('Start Now'))
           ->addButton(
             'start',
             $now_label,
             $now_caption)
           ->addButton(
             'wait',
             $wait_label,
             $wait_caption));
   }
 
   public function validateDonePage(PHUIFormPageView $page) {
     $c_activate = $page->getControl('activate');
     $v_activate = $c_activate->getValue();
 
     if ($v_activate != 'start' && $v_activate != 'wait') {
       $c_activate->setError(pht('Required'));
       $page->addPageError(
         pht('Make a choice about repository activation.'));
     }
 
     return $c_activate->isValid();
   }
 
 
 /* -(  Internal  )----------------------------------------------------------- */
 
 
   private function getRemoteURIProtocol($raw_uri) {
     $uri = new PhutilURI($raw_uri);
     if ($uri->getProtocol()) {
       return strtolower($uri->getProtocol());
     }
 
     $git_uri = new PhutilGitURI($raw_uri);
     if (strlen($git_uri->getDomain()) && strlen($git_uri->getPath())) {
       return 'ssh';
     }
 
     return null;
   }
 
   private function getRemoteURIUser($raw_uri) {
     $uri = new PhutilURI($raw_uri);
     if ($uri->getUser()) {
       return $uri->getUser();
     }
 
     $git_uri = new PhutilGitURI($raw_uri);
     if (strlen($git_uri->getDomain()) && strlen($git_uri->getPath())) {
       return $git_uri->getUser();
     }
 
     return null;
   }
 
   private function isSSHProtocol($proto) {
     return ($proto == 'git' || $proto == 'ssh' || $proto == 'svn+ssh');
   }
 
   private function isUsernamePasswordProtocol($proto) {
     return ($proto == 'http' || $proto == 'https' || $proto == 'svn');
   }
 
   private function setRepository(PhabricatorRepository $repository) {
     $this->repository = $repository;
     return $this;
   }
 
   private function getRepository() {
     return $this->repository;
   }
 
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index e8b238053..315423111 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -1,603 +1,603 @@
 <?php
 
 final class DiffusionServeController extends DiffusionController {
 
   public static function isVCSRequest(AphrontRequest $request) {
     if (!self::getCallsign($request)) {
       return null;
     }
 
     $content_type = $request->getHTTPHeader('Content-Type');
     $user_agent = idx($_SERVER, 'HTTP_USER_AGENT');
 
     $vcs = null;
     if ($request->getExists('service')) {
       $service = $request->getStr('service');
       // We get this initially for `info/refs`.
       // Git also gives us a User-Agent like "git/1.8.2.3".
       $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
-    } else if (strncmp($user_agent, "git/", 4) === 0) {
+    } else if (strncmp($user_agent, 'git/', 4) === 0) {
       $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
     } else if ($content_type == 'application/x-git-upload-pack-request') {
       // We get this for `git-upload-pack`.
       $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
     } else if ($content_type == 'application/x-git-receive-pack-request') {
       // We get this for `git-receive-pack`.
       $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
     } else if ($request->getExists('cmd')) {
       // Mercurial also sends an Accept header like
       // "application/mercurial-0.1", and a User-Agent like
       // "mercurial/proto-1.0".
       $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL;
     } else {
       // Subversion also sends an initial OPTIONS request (vs GET/POST), and
       // has a User-Agent like "SVN/1.8.3 (x86_64-apple-darwin11.4.2)
       // serf/1.3.2".
       $dav = $request->getHTTPHeader('DAV');
       $dav = new PhutilURI($dav);
       if ($dav->getDomain() === 'subversion.tigris.org') {
         $vcs = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN;
       }
     }
 
     return $vcs;
   }
 
   private static function getCallsign(AphrontRequest $request) {
     $uri = $request->getRequestURI();
 
     $regex = '@^/diffusion/(?P<callsign>[A-Z]+)(/|$)@';
     $matches = null;
     if (!preg_match($regex, (string)$uri, $matches)) {
       return null;
     }
 
     return $matches['callsign'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $callsign = self::getCallsign($request);
 
     // If authentication credentials have been provided, try to find a user
     // that actually matches those credentials.
     if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
       $username = $_SERVER['PHP_AUTH_USER'];
       $password = new PhutilOpaqueEnvelope($_SERVER['PHP_AUTH_PW']);
 
       $viewer = $this->authenticateHTTPRepositoryUser($username, $password);
       if (!$viewer) {
         return new PhabricatorVCSResponse(
           403,
           pht('Invalid credentials.'));
       }
     } else {
       // User hasn't provided credentials, which means we count them as
       // being "not logged in".
       $viewer = new PhabricatorUser();
     }
 
     $allow_public = PhabricatorEnv::getEnvConfig('policy.allow-public');
     $allow_auth = PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth');
     if (!$allow_public) {
       if (!$viewer->isLoggedIn()) {
         if ($allow_auth) {
           return new PhabricatorVCSResponse(
             401,
             pht('You must log in to access repositories.'));
         } else {
           return new PhabricatorVCSResponse(
             403,
             pht('Public and authenticated HTTP access are both forbidden.'));
         }
       }
     }
 
     try {
       $repository = id(new PhabricatorRepositoryQuery())
         ->setViewer($viewer)
         ->withCallsigns(array($callsign))
         ->executeOne();
       if (!$repository) {
         return new PhabricatorVCSResponse(
           404,
           pht('No such repository exists.'));
       }
     } catch (PhabricatorPolicyException $ex) {
       if ($viewer->isLoggedIn()) {
         return new PhabricatorVCSResponse(
           403,
           pht('You do not have permission to access this repository.'));
       } else {
         if ($allow_auth) {
           return new PhabricatorVCSResponse(
             401,
             pht('You must log in to access this repository.'));
         } else {
           return new PhabricatorVCSResponse(
             403,
             pht(
               'This repository requires authentication, which is forbidden '.
               'over HTTP.'));
         }
       }
     }
 
     if (!$repository->isTracked()) {
       return new PhabricatorVCSResponse(
         403,
         pht('This repository is inactive.'));
     }
 
     $is_push = !$this->isReadOnlyRequest($repository);
 
     switch ($repository->getServeOverHTTP()) {
       case PhabricatorRepository::SERVE_READONLY:
         if ($is_push) {
           return new PhabricatorVCSResponse(
             403,
             pht('This repository is read-only over HTTP.'));
         }
         break;
       case PhabricatorRepository::SERVE_READWRITE:
         if ($is_push) {
           $can_push = PhabricatorPolicyFilter::hasCapability(
             $viewer,
             $repository,
             DiffusionCapabilityPush::CAPABILITY);
           if (!$can_push) {
             if ($viewer->isLoggedIn()) {
               return new PhabricatorVCSResponse(
                 403,
                 pht('You do not have permission to push to this repository.'));
             } else {
               if ($allow_auth) {
                 return new PhabricatorVCSResponse(
                   401,
                   pht('You must log in to push to this repository.'));
               } else {
                 return new PhabricatorVCSResponse(
                   403,
                   pht(
                     'Pushing to this repository requires authentication, '.
                     'which is forbidden over HTTP.'));
               }
             }
           }
         }
         break;
       case PhabricatorRepository::SERVE_OFF:
       default:
         return new PhabricatorVCSResponse(
           403,
           pht('This repository is not available over HTTP.'));
     }
 
     $vcs_type = $repository->getVersionControlSystem();
     $req_type = $this->isVCSRequest($request);
 
     if ($vcs_type != $req_type) {
       switch ($req_type) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
           $result = new PhabricatorVCSResponse(
             500,
             pht('This is not a Git repository.'));
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
           $result = new PhabricatorVCSResponse(
             500,
             pht('This is not a Mercurial repository.'));
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
           $result = new PhabricatorVCSResponse(
             500,
             pht('This is not a Subversion repository.'));
           break;
         default:
           $result = new PhabricatorVCSResponse(
             500,
             pht('Unknown request type.'));
           break;
       }
     } else {
       switch ($vcs_type) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
           $result = $this->serveGitRequest($repository, $viewer);
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
           $result = $this->serveMercurialRequest($repository, $viewer);
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
           $result = new PhabricatorVCSResponse(
             500,
             pht(
               'Phabricator does not support HTTP access to Subversion '.
               'repositories.'));
           break;
         default:
           $result = new PhabricatorVCSResponse(
             500,
             pht('Unknown version control system.'));
           break;
       }
     }
 
     $code = $result->getHTTPResponseCode();
 
     if ($is_push && ($code == 200)) {
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         $repository->writeStatusMessage(
           PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE,
           PhabricatorRepositoryStatusMessage::CODE_OKAY);
       unset($unguarded);
     }
 
     return $result;
   }
 
   private function isReadOnlyRequest(
     PhabricatorRepository $repository) {
     $request = $this->getRequest();
     $method = $_SERVER['REQUEST_METHOD'];
 
     // TODO: This implementation is safe by default, but very incomplete.
 
     switch ($repository->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $service = $request->getStr('service');
         $path = $this->getRequestDirectoryPath($repository);
         // NOTE: Service names are the reverse of what you might expect, as they
         // are from the point of view of the server. The main read service is
         // "git-upload-pack", and the main write service is "git-receive-pack".
 
         if ($method == 'GET' &&
             $path == '/info/refs' &&
             $service == 'git-upload-pack') {
           return true;
         }
 
         if ($path == '/git-upload-pack') {
           return true;
         }
 
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $cmd = $request->getStr('cmd');
         if ($cmd == 'batch') {
           $cmds = idx($this->getMercurialArguments(), 'cmds');
           return DiffusionMercurialWireProtocol::isReadOnlyBatchCommand($cmds);
         }
         return DiffusionMercurialWireProtocol::isReadOnlyCommand($cmd);
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         break;
     }
 
     return false;
   }
 
   /**
    * @phutil-external-symbol class PhabricatorStartup
    */
   private function serveGitRequest(
     PhabricatorRepository $repository,
     PhabricatorUser $viewer) {
     $request = $this->getRequest();
 
     $request_path = $this->getRequestDirectoryPath($repository);
     $repository_root = $repository->getLocalPath();
 
     // Rebuild the query string to strip `__magic__` parameters and prevent
     // issues where we might interpret inputs like "service=read&service=write"
     // differently than the server does and pass it an unsafe command.
 
     // NOTE: This does not use getPassthroughRequestParameters() because
     // that code is HTTP-method agnostic and will encode POST data.
 
     $query_data = $_GET;
     foreach ($query_data as $key => $value) {
       if (!strncmp($key, '__', 2)) {
         unset($query_data[$key]);
       }
     }
     $query_string = http_build_query($query_data, '', '&');
 
     // We're about to wipe out PATH with the rest of the environment, so
     // resolve the binary first.
     $bin = Filesystem::resolveBinary('git-http-backend');
     if (!$bin) {
-      throw new Exception("Unable to find `git-http-backend` in PATH!");
+      throw new Exception('Unable to find `git-http-backend` in PATH!');
     }
 
     $env = array(
       'REQUEST_METHOD' => $_SERVER['REQUEST_METHOD'],
       'QUERY_STRING' => $query_string,
       'CONTENT_TYPE' => $request->getHTTPHeader('Content-Type'),
       'HTTP_CONTENT_ENCODING' => $request->getHTTPHeader('Content-Encoding'),
       'REMOTE_ADDR' => $_SERVER['REMOTE_ADDR'],
       'GIT_PROJECT_ROOT' => $repository_root,
       'GIT_HTTP_EXPORT_ALL' => '1',
       'PATH_INFO' => $request_path,
 
       'REMOTE_USER' => $viewer->getUsername(),
 
       // TODO: Set these correctly.
       // GIT_COMMITTER_NAME
       // GIT_COMMITTER_EMAIL
     ) + $this->getCommonEnvironment($viewer);
 
     $input = PhabricatorStartup::getRawInput();
 
     $command = csprintf('%s', $bin);
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);
 
     list($err, $stdout, $stderr) = id(new ExecFuture('%C', $command))
       ->setEnv($env, true)
       ->write($input)
       ->resolve();
 
     if ($err) {
       if ($this->isValidGitShallowCloneResponse($stdout, $stderr)) {
         // Ignore the error if the response passes this special check for
         // validity.
         $err = 0;
       }
     }
 
     if ($err) {
       return new PhabricatorVCSResponse(
         500,
         pht('Error %d: %s', $err, $stderr));
     }
 
     return id(new DiffusionGitResponse())->setGitData($stdout);
   }
 
   private function getRequestDirectoryPath(PhabricatorRepository $repository) {
     $request = $this->getRequest();
     $request_path = $request->getRequestURI()->getPath();
     $base_path = preg_replace('@^/diffusion/[A-Z]+@', '', $request_path);
 
     // For Git repositories, strip an optional directory component if it
     // isn't the name of a known Git resource. This allows users to clone
     // repositories as "/diffusion/X/anything.git", for example.
     if ($repository->isGit()) {
       $known = array(
         'info',
         'git-upload-pack',
         'git-receive-pack',
       );
 
       foreach ($known as $key => $path) {
         $known[$key] = preg_quote($path, '@');
       }
 
       $known = implode('|', $known);
 
       if (preg_match('@^/([^/]+)/('.$known.')(/|$)@', $base_path)) {
         $base_path = preg_replace('@^/([^/]+)@', '', $base_path);
       }
     }
 
     return $base_path;
   }
 
   private function authenticateHTTPRepositoryUser(
     $username,
     PhutilOpaqueEnvelope $password) {
 
     if (!PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')) {
       // No HTTP auth permitted.
       return null;
     }
 
     if (!strlen($username)) {
       // No username.
       return null;
     }
 
     if (!strlen($password->openEnvelope())) {
       // No password.
       return null;
     }
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withUsernames(array($username))
       ->executeOne();
     if (!$user) {
       // Username doesn't match anything.
       return null;
     }
 
     if (!$user->isUserActivated()) {
       // User is not activated.
       return null;
     }
 
     $password_entry = id(new PhabricatorRepositoryVCSPassword())
       ->loadOneWhere('userPHID = %s', $user->getPHID());
     if (!$password_entry) {
       // User doesn't have a password set.
       return null;
     }
 
     if (!$password_entry->comparePassword($password, $user)) {
       // Password doesn't match.
       return null;
     }
 
     // If the user's password is stored using a less-than-optimal hash, upgrade
     // them to the strongest available hash.
 
     $hash_envelope = new PhutilOpaqueEnvelope(
       $password_entry->getPasswordHash());
     if (PhabricatorPasswordHasher::canUpgradeHash($hash_envelope)) {
       $password_entry->setPassword($password, $user);
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         $password_entry->save();
       unset($unguarded);
     }
 
     return $user;
   }
 
   private function serveMercurialRequest(
     PhabricatorRepository $repository,
     PhabricatorUser $viewer) {
     $request = $this->getRequest();
 
     $bin = Filesystem::resolveBinary('hg');
     if (!$bin) {
-      throw new Exception("Unable to find `hg` in PATH!");
+      throw new Exception('Unable to find `hg` in PATH!');
     }
 
     $env = $this->getCommonEnvironment($viewer);
     $input = PhabricatorStartup::getRawInput();
 
     $cmd = $request->getStr('cmd');
 
     $args = $this->getMercurialArguments();
     $args = $this->formatMercurialArguments($cmd, $args);
 
     if (strlen($input)) {
       $input = strlen($input)."\n".$input."0\n";
     }
 
     $command = csprintf('%s serve --stdio', $bin);
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);
 
     list($err, $stdout, $stderr) = id(new ExecFuture('%C', $command))
       ->setEnv($env, true)
       ->setCWD($repository->getLocalPath())
       ->write("{$cmd}\n{$args}{$input}")
       ->resolve();
 
     if ($err) {
       return new PhabricatorVCSResponse(
         500,
         pht('Error %d: %s', $err, $stderr));
     }
 
     if ($cmd == 'getbundle' ||
         $cmd == 'changegroup' ||
         $cmd == 'changegroupsubset') {
       // We're not completely sure that "changegroup" and "changegroupsubset"
       // actually work, they're for very old Mercurial.
       $body = gzcompress($stdout);
     } else if ($cmd == 'unbundle') {
       // This includes diagnostic information and anything echoed by commit
       // hooks. We ignore `stdout` since it just has protocol garbage, and
       // substitute `stderr`.
       $body = strlen($stderr)."\n".$stderr;
     } else {
       list($length, $body) = explode("\n", $stdout, 2);
     }
 
     return id(new DiffusionMercurialResponse())->setContent($body);
   }
 
 
   private function getMercurialArguments() {
     // Mercurial sends arguments in HTTP headers. "Why?", you might wonder,
     // "Why would you do this?".
 
     $args_raw = array();
-    for ($ii = 1; ; $ii++) {
+    for ($ii = 1;; $ii++) {
       $header = 'HTTP_X_HGARG_'.$ii;
       if (!array_key_exists($header, $_SERVER)) {
         break;
       }
       $args_raw[] = $_SERVER[$header];
     }
     $args_raw = implode('', $args_raw);
 
     return id(new PhutilQueryStringParser())
       ->parseQueryString($args_raw);
   }
 
   private function formatMercurialArguments($command, array $arguments) {
     $spec = DiffusionMercurialWireProtocol::getCommandArgs($command);
 
     $out = array();
 
     // Mercurial takes normal arguments like this:
     //
     //   name <length(value)>
     //   value
 
     $has_star = false;
     foreach ($spec as $arg_key) {
       if ($arg_key == '*') {
         $has_star = true;
         continue;
       }
       if (isset($arguments[$arg_key])) {
         $value = $arguments[$arg_key];
         $size = strlen($value);
         $out[] = "{$arg_key} {$size}\n{$value}";
         unset($arguments[$arg_key]);
       }
     }
 
     if ($has_star) {
 
       // Mercurial takes arguments for variable argument lists roughly like
       // this:
       //
       //   * <count(args)>
       //   argname1 <length(argvalue1)>
       //   argvalue1
       //   argname2 <length(argvalue2)>
       //   argvalue2
 
       $count = count($arguments);
 
       $out[] = "* {$count}\n";
 
       foreach ($arguments as $key => $value) {
         if (in_array($key, $spec)) {
           // We already added this argument above, so skip it.
           continue;
         }
         $size = strlen($value);
         $out[] = "{$key} {$size}\n{$value}";
       }
     }
 
     return implode('', $out);
   }
 
   private function isValidGitShallowCloneResponse($stdout, $stderr) {
     // If you execute `git clone --depth N ...`, git sends a request which
     // `git-http-backend` responds to by emitting valid output and then exiting
     // with a failure code and an error message. If we ignore this error,
     // everything works.
 
     // This is a pretty funky fix: it would be nice to more precisely detect
     // that a request is a `--depth N` clone request, but we don't have any code
     // to decode protocol frames yet. Instead, look for reasonable evidence
     // in the error and output that we're looking at a `--depth` clone.
 
     // For evidence this isn't completely crazy, see:
     // https://github.com/schacon/grack/pull/7
 
     $stdout_regexp = '(^Content-Type: application/x-git-upload-pack-result)m';
     $stderr_regexp = '(The remote end hung up unexpectedly)';
 
     $has_pack = preg_match($stdout_regexp, $stdout);
     $is_hangup = preg_match($stderr_regexp, $stderr);
 
     return $has_pack && $is_hangup;
   }
 
   private function getCommonEnvironment(PhabricatorUser $viewer) {
     $remote_addr = $this->getRequest()->getRemoteAddr();
 
     return array(
       DiffusionCommitHookEngine::ENV_USER => $viewer->getUsername(),
       DiffusionCommitHookEngine::ENV_REMOTE_ADDRESS => $remote_addr,
       DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL => 'http',
     );
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
index c389ee105..07ff1bae5 100644
--- a/src/applications/diffusion/controller/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/DiffusionSymbolController.php
@@ -1,155 +1,155 @@
 <?php
 
 final class DiffusionSymbolController extends DiffusionController {
 
   private $name;
 
   public function willProcessRequest(array $data) {
     $this->name = $data['name'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $query = new DiffusionSymbolQuery();
     $query->setName($this->name);
 
     if ($request->getStr('context') !== null) {
       $query->setContext($request->getStr('context'));
     }
 
     if ($request->getStr('type')) {
       $query->setType($request->getStr('type'));
     }
 
     if ($request->getStr('lang')) {
       $query->setLanguage($request->getStr('lang'));
     }
 
     if ($request->getStr('projects')) {
       $phids = $request->getStr('projects');
       $phids = explode(',', $phids);
       $phids = array_filter($phids);
 
       if ($phids) {
         $projects = id(new PhabricatorRepositoryArcanistProject())
           ->loadAllWhere(
             'phid IN (%Ls)',
             $phids);
         $projects = mpull($projects, 'getID');
         if ($projects) {
           $query->setProjectIDs($projects);
         }
       }
     }
 
     $query->needPaths(true);
     $query->needArcanistProjects(true);
     $query->needRepositories(true);
 
     $symbols = $query->execute();
 
     // For PHP builtins, jump to php.net documentation.
     if ($request->getBool('jump') && count($symbols) == 0) {
       if ($request->getStr('lang', 'php') == 'php') {
         if ($request->getStr('type', 'function') == 'function') {
           $functions = get_defined_functions();
           if (in_array($this->name, $functions['internal'])) {
             return id(new AphrontRedirectResponse())
               ->setURI('http://www.php.net/function.'.$this->name);
           }
         }
         if ($request->getStr('type', 'class') == 'class') {
           if (class_exists($this->name, false) ||
               interface_exists($this->name, false)) {
             if (id(new ReflectionClass($this->name))->isInternal()) {
               return id(new AphrontRedirectResponse())
                 ->setURI('http://www.php.net/class.'.$this->name);
             }
           }
         }
       }
     }
 
     $rows = array();
     foreach ($symbols as $symbol) {
       $project = $symbol->getArcanistProject();
       if ($project) {
         $project_name = $project->getName();
       } else {
         $project_name = '-';
       }
 
       $file = $symbol->getPath();
       $line = $symbol->getLineNumber();
 
       $repo = $symbol->getRepository();
       if ($repo) {
         $href = $symbol->getURI();
 
         if ($request->getBool('jump') && count($symbols) == 1) {
           // If this is a clickthrough from Differential, just jump them
           // straight to the target if we got a single hit.
           return id(new AphrontRedirectResponse())->setURI($href);
         }
 
         $location = phutil_tag(
           'a',
           array(
             'href' => $href,
           ),
           $file.':'.$line);
       } else if ($file) {
         $location = $file.':'.$line;
       } else {
         $location = '?';
       }
 
       $rows[] = array(
         $symbol->getSymbolType(),
         $symbol->getSymbolContext(),
         $symbol->getSymbolName(),
         $symbol->getSymbolLanguage(),
         $project_name,
         $location,
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setHeaders(
       array(
         pht('Type'),
         pht('Context'),
         pht('Name'),
         pht('Language'),
         pht('Project'),
         pht('File'),
       ));
     $table->setColumnClasses(
       array(
         '',
         '',
         'pri',
         '',
         '',
         '',
       ));
     $table->setNoDataString(
-      pht("No matching symbol could be found in any indexed project."));
+      pht('No matching symbol could be found in any indexed project.'));
 
     $panel = new AphrontPanelView();
     $panel->setHeader(pht('Similar Symbols'));
     $panel->appendChild($table);
 
     return $this->buildApplicationPage(
       array(
         $panel,
       ),
       array(
         'title' => pht('Find Symbol'),
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/diffusion/data/DiffusionRepositoryTag.php b/src/applications/diffusion/data/DiffusionRepositoryTag.php
index a8e3696b4..12e71185b 100644
--- a/src/applications/diffusion/data/DiffusionRepositoryTag.php
+++ b/src/applications/diffusion/data/DiffusionRepositoryTag.php
@@ -1,117 +1,117 @@
 <?php
 
 final class DiffusionRepositoryTag {
 
   private $author;
   private $epoch;
   private $commitIdentifier;
   private $name;
   private $description;
   private $type;
 
   private $message = false;
 
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
   public function getType() {
     return $this->type;
   }
 
   public function setDescription($description) {
     $this->description = $description;
     return $this;
   }
 
   public function getDescription() {
     return $this->description;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->name;
   }
 
   public function setCommitIdentifier($commit_identifier) {
     $this->commitIdentifier = $commit_identifier;
     return $this;
   }
 
   public function getCommitIdentifier() {
     return $this->commitIdentifier;
   }
 
   public function setEpoch($epoch) {
     $this->epoch = $epoch;
     return $this;
   }
 
   public function getEpoch() {
     return $this->epoch;
   }
 
   public function setAuthor($author) {
     $this->author = $author;
     return $this;
   }
 
   public function getAuthor() {
     return $this->author;
   }
 
   public function attachMessage($message) {
     $this->message = $message;
     return $this;
   }
 
   public function getMessage() {
     if ($this->message === false) {
-      throw new Exception("Message is not attached!");
+      throw new Exception('Message is not attached!');
     }
     return $this->message;
   }
 
   public function toDictionary() {
     $dict = array(
       'author' => $this->getAuthor(),
       'epoch' => $this->getEpoch(),
       'commitIdentifier' => $this->getCommitIdentifier(),
       'name' => $this->getName(),
       'description' => $this->getDescription(),
       'type' => $this->getType(),
     );
 
     if ($this->message !== false) {
       $dict['message'] = $this->message;
     }
 
     return $dict;
   }
 
   public static function newFromConduit(array $dicts) {
     $tags = array();
     foreach ($dicts as $dict) {
       $tag = id(new DiffusionRepositoryTag())
         ->setAuthor($dict['author'])
         ->setEpoch($dict['epoch'])
         ->setCommitIdentifier($dict['commitIdentifier'])
         ->setName($dict['name'])
         ->setDescription($dict['description'])
         ->setType($dict['type']);
 
       if (array_key_exists('message', $dict)) {
         $tag->attachMessage($dict['message']);
       }
 
       $tags[] = $tag;
     }
     return $tags;
   }
 
 }
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index d4f0df94b..430417fcf 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -1,1184 +1,1184 @@
 <?php
 
 /**
  * @task config   Configuring the Hook Engine
  * @task hook     Hook Execution
  * @task git      Git Hooks
  * @task hg       Mercurial Hooks
  * @task svn      Subversion Hooks
  * @task internal Internals
  */
 final class DiffusionCommitHookEngine extends Phobject {
 
   const ENV_USER = 'PHABRICATOR_USER';
   const ENV_REMOTE_ADDRESS = 'PHABRICATOR_REMOTE_ADDRESS';
   const ENV_REMOTE_PROTOCOL = 'PHABRICATOR_REMOTE_PROTOCOL';
 
   const EMPTY_HASH = '0000000000000000000000000000000000000000';
 
   private $viewer;
   private $repository;
   private $stdin;
   private $originalArgv;
   private $subversionTransaction;
   private $subversionRepository;
   private $remoteAddress;
   private $remoteProtocol;
   private $transactionKey;
   private $mercurialHook;
   private $mercurialCommits = array();
   private $gitCommits = array();
 
   private $heraldViewerProjects;
   private $rejectCode = PhabricatorRepositoryPushLog::REJECT_BROKEN;
   private $rejectDetails;
   private $emailPHIDs = array();
 
 
 /* -(  Config  )------------------------------------------------------------- */
 
 
   public function setRemoteProtocol($remote_protocol) {
     $this->remoteProtocol = $remote_protocol;
     return $this;
   }
 
   public function getRemoteProtocol() {
     return $this->remoteProtocol;
   }
 
   public function setRemoteAddress($remote_address) {
     $this->remoteAddress = $remote_address;
     return $this;
   }
 
   public function getRemoteAddress() {
     return $this->remoteAddress;
   }
 
   private function getRemoteAddressForLog() {
     // If whatever we have here isn't a valid IPv4 address, just store `null`.
     // Older versions of PHP return `-1` on failure instead of `false`.
     $remote_address = $this->getRemoteAddress();
     $remote_address = max(0, ip2long($remote_address));
     $remote_address = nonempty($remote_address, null);
     return $remote_address;
   }
 
   public function setSubversionTransactionInfo($transaction, $repository) {
     $this->subversionTransaction = $transaction;
     $this->subversionRepository = $repository;
     return $this;
   }
 
   public function setStdin($stdin) {
     $this->stdin = $stdin;
     return $this;
   }
 
   public function getStdin() {
     return $this->stdin;
   }
 
   public function setOriginalArgv(array $original_argv) {
     $this->originalArgv = $original_argv;
     return $this;
   }
 
   public function getOriginalArgv() {
     return $this->originalArgv;
   }
 
   public function setRepository(PhabricatorRepository $repository) {
     $this->repository = $repository;
     return $this;
   }
 
   public function getRepository() {
     return $this->repository;
   }
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
   public function getViewer() {
     return $this->viewer;
   }
 
   public function setMercurialHook($mercurial_hook) {
     $this->mercurialHook = $mercurial_hook;
     return $this;
   }
 
   public function getMercurialHook() {
     return $this->mercurialHook;
   }
 
 
 /* -(  Hook Execution  )----------------------------------------------------- */
 
 
   public function execute() {
     $ref_updates = $this->findRefUpdates();
     $all_updates = $ref_updates;
 
     $caught = null;
     try {
 
       try {
         $this->rejectDangerousChanges($ref_updates);
       } catch (DiffusionCommitHookRejectException $ex) {
         // If we're rejecting dangerous changes, flag everything that we've
         // seen as rejected so it's clear that none of it was accepted.
         $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_DANGEROUS;
         throw $ex;
       }
 
       $this->applyHeraldRefRules($ref_updates, $all_updates);
 
       $content_updates = $this->findContentUpdates($ref_updates);
       $all_updates = array_merge($all_updates, $content_updates);
 
       $this->applyHeraldContentRules($content_updates, $all_updates);
 
       // Run custom scripts in `hook.d/` directories.
       $this->applyCustomHooks($all_updates);
 
       // If we make it this far, we're accepting these changes. Mark all the
       // logs as accepted.
       $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_ACCEPT;
     } catch (Exception $ex) {
       // We'll throw this again in a minute, but we want to save all the logs
       // first.
       $caught = $ex;
     }
 
     // Save all the logs no matter what the outcome was.
     $event = $this->newPushEvent();
 
     $event->setRejectCode($this->rejectCode);
     $event->setRejectDetails($this->rejectDetails);
 
     $event->openTransaction();
       $event->save();
       foreach ($all_updates as $update) {
         $update->setPushEventPHID($event->getPHID());
         $update->save();
       }
     $event->saveTransaction();
 
     if ($caught) {
       throw $caught;
     }
 
     if ($this->emailPHIDs) {
       // If Herald rules triggered email to users, queue a worker to send the
       // mail. We do this out-of-process so that we block pushes as briefly
       // as possible.
 
       // (We do need to pull some commit info here because the commit objects
       // may not exist yet when this worker runs, which could be immediately.)
 
       PhabricatorWorker::scheduleTask(
         'PhabricatorRepositoryPushMailWorker',
         array(
           'eventPHID' => $event->getPHID(),
           'emailPHIDs' => array_values($this->emailPHIDs),
           'info' => $this->loadCommitInfoForWorker($all_updates),
         ));
     }
 
     return 0;
   }
 
   private function findRefUpdates() {
     $type = $this->getRepository()->getVersionControlSystem();
     switch ($type) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         return $this->findGitRefUpdates();
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return $this->findMercurialRefUpdates();
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         return $this->findSubversionRefUpdates();
       default:
         throw new Exception(pht('Unsupported repository type "%s"!', $type));
     }
   }
 
   private function rejectDangerousChanges(array $ref_updates) {
     assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog');
 
     $repository = $this->getRepository();
     if ($repository->shouldAllowDangerousChanges()) {
       return;
     }
 
     $flag_dangerous = PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS;
 
     foreach ($ref_updates as $ref_update) {
       if (!$ref_update->hasChangeFlags($flag_dangerous)) {
         // This is not a dangerous change.
         continue;
       }
 
       // We either have a branch deletion or a non fast-forward branch update.
       // Format a message and reject the push.
 
       $message = pht(
         "DANGEROUS CHANGE: %s\n".
         "Dangerous change protection is enabled for this repository.\n".
         "Edit the repository configuration before making dangerous changes.",
         $ref_update->getDangerousChangeDescription());
 
       throw new DiffusionCommitHookRejectException($message);
     }
   }
 
   private function findContentUpdates(array $ref_updates) {
     assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog');
 
     $type = $this->getRepository()->getVersionControlSystem();
     switch ($type) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         return $this->findGitContentUpdates($ref_updates);
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return $this->findMercurialContentUpdates($ref_updates);
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         return $this->findSubversionContentUpdates($ref_updates);
       default:
         throw new Exception(pht('Unsupported repository type "%s"!', $type));
     }
   }
 
 
 /* -(  Herald  )------------------------------------------------------------- */
 
   private function applyHeraldRefRules(
     array $ref_updates,
     array $all_updates) {
     $this->applyHeraldRules(
       $ref_updates,
       new HeraldPreCommitRefAdapter(),
       $all_updates);
   }
 
   private function applyHeraldContentRules(
     array $content_updates,
     array $all_updates) {
     $this->applyHeraldRules(
       $content_updates,
       new HeraldPreCommitContentAdapter(),
       $all_updates);
   }
 
   private function applyHeraldRules(
     array $updates,
     HeraldAdapter $adapter_template,
     array $all_updates) {
 
     if (!$updates) {
       return;
     }
 
     $adapter_template->setHookEngine($this);
 
     $engine = new HeraldEngine();
     $rules = null;
     $blocking_effect = null;
     $blocked_update = null;
     foreach ($updates as $update) {
       $adapter = id(clone $adapter_template)
         ->setPushLog($update);
 
       if ($rules === null) {
         $rules = $engine->loadRulesForAdapter($adapter);
       }
 
       $effects = $engine->applyRules($rules, $adapter);
       $engine->applyEffects($effects, $adapter, $rules);
       $xscript = $engine->getTranscript();
 
       // Store any PHIDs we want to send email to for later.
       foreach ($adapter->getEmailPHIDs() as $email_phid) {
         $this->emailPHIDs[$email_phid] = $email_phid;
       }
 
       if ($blocking_effect === null) {
         foreach ($effects as $effect) {
           if ($effect->getAction() == HeraldAdapter::ACTION_BLOCK) {
             $blocking_effect = $effect;
             $blocked_update = $update;
             break;
           }
         }
       }
     }
 
     if ($blocking_effect) {
       $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_HERALD;
       $this->rejectDetails = $blocking_effect->getRulePHID();
 
       $message = $blocking_effect->getTarget();
       if (!strlen($message)) {
         $message = pht('(None.)');
       }
 
       $rules = mpull($rules, null, 'getID');
       $rule = idx($rules, $effect->getRuleID());
       if ($rule && strlen($rule->getName())) {
         $rule_name = $rule->getName();
       } else {
         $rule_name = pht('Unnamed Herald Rule');
       }
 
       $blocked_ref_name = coalesce(
         $blocked_update->getRefName(),
         $blocked_update->getRefNewShort());
       $blocked_name = $blocked_update->getRefType().'/'.$blocked_ref_name;
 
       throw new DiffusionCommitHookRejectException(
         pht(
           "This push was rejected by Herald push rule %s.\n".
           "Change: %s\n".
           "  Rule: %s\n".
           "Reason: %s",
           'H'.$blocking_effect->getRuleID(),
           $blocked_name,
           $rule_name,
           $message));
     }
   }
 
   public function loadViewerProjectPHIDsForHerald() {
     // This just caches the viewer's projects so we don't need to load them
     // over and over again when applying Herald rules.
     if ($this->heraldViewerProjects === null) {
       $this->heraldViewerProjects = id(new PhabricatorProjectQuery())
         ->setViewer($this->getViewer())
         ->withMemberPHIDs(array($this->getViewer()->getPHID()))
         ->execute();
     }
 
     return mpull($this->heraldViewerProjects, 'getPHID');
   }
 
 
 /* -(  Git  )---------------------------------------------------------------- */
 
 
   private function findGitRefUpdates() {
     $ref_updates = array();
 
     // First, parse stdin, which lists all the ref changes. The input looks
     // like this:
     //
     //   <old hash> <new hash> <ref>
 
     $stdin = $this->getStdin();
     $lines = phutil_split_lines($stdin, $retain_endings = false);
     foreach ($lines as $line) {
       $parts = explode(' ', $line, 3);
       if (count($parts) != 3) {
         throw new Exception(pht('Expected "old new ref", got "%s".', $line));
       }
 
       $ref_old = $parts[0];
       $ref_new = $parts[1];
       $ref_raw = $parts[2];
 
       if (preg_match('(^refs/heads/)', $ref_raw)) {
         $ref_type = PhabricatorRepositoryPushLog::REFTYPE_BRANCH;
         $ref_raw = substr($ref_raw, strlen('refs/heads/'));
       } else if (preg_match('(^refs/tags/)', $ref_raw)) {
         $ref_type = PhabricatorRepositoryPushLog::REFTYPE_TAG;
         $ref_raw = substr($ref_raw, strlen('refs/tags/'));
       } else {
         throw new Exception(
           pht(
             "Unable to identify the reftype of '%s'. Rejecting push.",
             $ref_raw));
       }
 
       $ref_update = $this->newPushLog()
         ->setRefType($ref_type)
         ->setRefName($ref_raw)
         ->setRefOld($ref_old)
         ->setRefNew($ref_new);
 
       $ref_updates[] = $ref_update;
     }
 
     $this->findGitMergeBases($ref_updates);
     $this->findGitChangeFlags($ref_updates);
 
     return $ref_updates;
   }
 
 
   private function findGitMergeBases(array $ref_updates) {
     assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog');
 
     $futures = array();
     foreach ($ref_updates as $key => $ref_update) {
       // If the old hash is "00000...", the ref is being created (either a new
       // branch, or a new tag). If the new hash is "00000...", the ref is being
       // deleted. If both are nonempty, the ref is being updated. For updates,
       // we'll figure out the `merge-base` of the old and new objects here. This
       // lets us reject non-FF changes cheaply; later, we'll figure out exactly
       // which commits are new.
       $ref_old = $ref_update->getRefOld();
       $ref_new = $ref_update->getRefNew();
 
       if (($ref_old === self::EMPTY_HASH) ||
           ($ref_new === self::EMPTY_HASH)) {
         continue;
       }
 
       $futures[$key] = $this->getRepository()->getLocalCommandFuture(
         'merge-base %s %s',
         $ref_old,
         $ref_new);
     }
 
     foreach (Futures($futures)->limit(8) as $key => $future) {
 
       // If 'old' and 'new' have no common ancestors (for example, a force push
       // which completely rewrites a ref), `git merge-base` will exit with
       // an error and no output. It would be nice to find a positive test
       // for this instead, but I couldn't immediately come up with one. See
       // T4224. Assume this means there are no ancestors.
 
       list($err, $stdout) = $future->resolve();
 
       if ($err) {
         $merge_base = null;
       } else {
         $merge_base = rtrim($stdout, "\n");
       }
 
       $ref_update = $ref_updates[$key];
       $ref_update->setMergeBase($merge_base);
     }
 
     return $ref_updates;
   }
 
 
   private function findGitChangeFlags(array $ref_updates) {
     assert_instances_of($ref_updates, 'PhabricatorRepositoryPushLog');
 
     foreach ($ref_updates as $key => $ref_update) {
       $ref_old = $ref_update->getRefOld();
       $ref_new = $ref_update->getRefNew();
       $ref_type = $ref_update->getRefType();
 
       $ref_flags = 0;
       $dangerous = null;
 
       if ($ref_old === self::EMPTY_HASH) {
         $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD;
       } else if ($ref_new === self::EMPTY_HASH) {
         $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE;
         if ($ref_type == PhabricatorRepositoryPushLog::REFTYPE_BRANCH) {
           $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS;
           $dangerous = pht(
             "The change you're attempting to push deletes the branch '%s'.",
             $ref_update->getRefName());
         }
       } else {
         $merge_base = $ref_update->getMergeBase();
         if ($merge_base == $ref_old) {
           // This is a fast-forward update to an existing branch.
           // These are safe.
           $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND;
         } else {
           $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE;
 
           // For now, we don't consider deleting or moving tags to be a
           // "dangerous" update. It's way harder to get wrong and should be easy
           // to recover from once we have better logging. Only add the dangerous
           // flag if this ref is a branch.
 
           if ($ref_type == PhabricatorRepositoryPushLog::REFTYPE_BRANCH) {
             $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS;
 
             $dangerous = pht(
               "The change you're attempting to push updates the branch '%s' ".
               "from '%s' to '%s', but this is not a fast-forward. Pushes ".
               "which rewrite published branch history are dangerous.",
               $ref_update->getRefName(),
               $ref_update->getRefOldShort(),
               $ref_update->getRefNewShort());
           }
         }
       }
 
       $ref_update->setChangeFlags($ref_flags);
       if ($dangerous !== null) {
         $ref_update->attachDangerousChangeDescription($dangerous);
       }
     }
 
     return $ref_updates;
   }
 
 
   private function findGitContentUpdates(array $ref_updates) {
     $flag_delete = PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE;
 
     $futures = array();
     foreach ($ref_updates as $key => $ref_update) {
       if ($ref_update->hasChangeFlags($flag_delete)) {
         // Deleting a branch or tag can never create any new commits.
         continue;
       }
 
       // NOTE: This piece of magic finds all new commits, by walking backward
       // from the new value to the value of *any* existing ref in the
       // repository. Particularly, this will cover the cases of a new branch, a
       // completely moved tag, etc.
       $futures[$key] = $this->getRepository()->getLocalCommandFuture(
         'log --format=%s %s --not --all',
         '%H',
         $ref_update->getRefNew());
     }
 
     $content_updates = array();
     foreach (Futures($futures)->limit(8) as $key => $future) {
       list($stdout) = $future->resolvex();
 
       if (!strlen(trim($stdout))) {
         // This change doesn't have any new commits. One common case of this
         // is creating a new tag which points at an existing commit.
         continue;
       }
 
       $commits = phutil_split_lines($stdout, $retain_newlines = false);
 
       // If we're looking at a branch, mark all of the new commits as on that
       // branch. It's only possible for these commits to be on updated branches,
       // since any other branch heads are necessarily behind them.
       $branch_name = null;
       $ref_update = $ref_updates[$key];
       $type_branch = PhabricatorRepositoryPushLog::REFTYPE_BRANCH;
       if ($ref_update->getRefType() == $type_branch) {
         $branch_name = $ref_update->getRefName();
       }
 
       foreach ($commits as $commit) {
         if ($branch_name) {
           $this->gitCommits[$commit][] = $branch_name;
         }
         $content_updates[$commit] = $this->newPushLog()
           ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_COMMIT)
           ->setRefNew($commit)
           ->setChangeFlags(PhabricatorRepositoryPushLog::CHANGEFLAG_ADD);
       }
     }
 
     return $content_updates;
   }
 
 /* -(  Custom  )------------------------------------------------------------- */
 
   private function applyCustomHooks(array $updates) {
     $args = $this->getOriginalArgv();
     $stdin = $this->getStdin();
     $console = PhutilConsole::getConsole();
 
     $env = array(
       'PHABRICATOR_REPOSITORY' => $this->getRepository()->getCallsign(),
       self::ENV_USER => $this->getViewer()->getUsername(),
       self::ENV_REMOTE_PROTOCOL => $this->getRemoteProtocol(),
       self::ENV_REMOTE_ADDRESS => $this->getRemoteAddress(),
     );
 
     $directories = $this->getRepository()->getHookDirectories();
     foreach ($directories as $directory) {
       $hooks = $this->getExecutablesInDirectory($directory);
       sort($hooks);
       foreach ($hooks as $hook) {
         // NOTE: We're explicitly running the hooks in sequential order to
         // make this more predictable.
         $future = id(new ExecFuture('%s %Ls', $hook, $args))
           ->setEnv($env, $wipe_process_env = false)
           ->write($stdin);
 
         list($err, $stdout, $stderr) = $future->resolve();
         if (!$err) {
           // This hook ran OK, but echo its output in case there was something
           // informative.
-          $console->writeOut("%s", $stdout);
-          $console->writeErr("%s", $stderr);
+          $console->writeOut('%s', $stdout);
+          $console->writeErr('%s', $stderr);
           continue;
         }
 
         $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_EXTERNAL;
         $this->rejectDetails = basename($hook);
 
         throw new DiffusionCommitHookRejectException(
           pht(
             "This push was rejected by custom hook script '%s':\n\n%s%s",
             basename($hook),
             $stdout,
             $stderr));
       }
     }
   }
 
   private function getExecutablesInDirectory($directory) {
     $executables = array();
 
     if (!Filesystem::pathExists($directory)) {
       return $executables;
     }
 
     foreach (Filesystem::listDirectory($directory) as $path) {
       $full_path = $directory.DIRECTORY_SEPARATOR.$path;
       if (!is_executable($full_path)) {
         // Don't include non-executable files.
         continue;
       }
 
       if (basename($full_path) == 'README') {
         // Don't include README, even if it is marked as executable. It almost
         // certainly got caught in the crossfire of a sweeping `chmod`, since
         // users do this with some frequency.
         continue;
       }
 
       $executables[] = $full_path;
     }
 
     return $executables;
   }
 
 
 /* -(  Mercurial  )---------------------------------------------------------- */
 
 
   private function findMercurialRefUpdates() {
     $hook = $this->getMercurialHook();
     switch ($hook) {
       case 'pretxnchangegroup':
         return $this->findMercurialChangegroupRefUpdates();
       case 'prepushkey':
         return $this->findMercurialPushKeyRefUpdates();
       default:
         throw new Exception(pht('Unrecognized hook "%s"!', $hook));
     }
   }
 
   private function findMercurialChangegroupRefUpdates() {
     $hg_node = getenv('HG_NODE');
     if (!$hg_node) {
       throw new Exception(pht('Expected HG_NODE in environment!'));
     }
 
     // NOTE: We need to make sure this is passed to subprocesses, or they won't
     // be able to see new commits. Mercurial uses this as a marker to determine
     // whether the pending changes are visible or not.
     $_ENV['HG_PENDING'] = getenv('HG_PENDING');
     $repository = $this->getRepository();
 
     $futures = array();
 
     foreach (array('old', 'new') as $key) {
       $futures[$key] = $repository->getLocalCommandFuture(
         'heads --template %s',
         '{node}\1{branches}\2');
     }
     // Wipe HG_PENDING out of the old environment so we see the pre-commit
     // state of the repository.
     $futures['old']->updateEnv('HG_PENDING', null);
 
     $futures['commits'] = $repository->getLocalCommandFuture(
       'log --rev %s --template %s',
       hgsprintf('%s:%s', $hg_node, 'tip'),
       '{node}\1{branches}\2');
 
     // Resolve all of the futures now. We don't need the 'commits' future yet,
     // but it simplifies the logic to just get it out of the way.
     foreach (Futures($futures) as $future) {
       $future->resolve();
     }
 
     list($commit_raw) = $futures['commits']->resolvex();
     $commit_map = $this->parseMercurialCommits($commit_raw);
     $this->mercurialCommits = $commit_map;
 
     // NOTE: `hg heads` exits with an error code and no output if the repository
     // has no heads. Most commonly this happens on a new repository. We know
     // we can run `hg` successfully since the `hg log` above didn't error, so
     // just ignore the error code.
 
     list($err, $old_raw) = $futures['old']->resolve();
     $old_refs = $this->parseMercurialHeads($old_raw);
 
     list($err, $new_raw) = $futures['new']->resolve();
     $new_refs = $this->parseMercurialHeads($new_raw);
 
     $all_refs = array_keys($old_refs + $new_refs);
 
     $ref_updates = array();
     foreach ($all_refs as $ref) {
       $old_heads = idx($old_refs, $ref, array());
       $new_heads = idx($new_refs, $ref, array());
 
       sort($old_heads);
       sort($new_heads);
 
       if (!$old_heads && !$new_heads) {
         // This should never be possible, as it makes no sense. Explode.
         throw new Exception(
           pht(
             'Mercurial repository has no new or old heads for branch "%s" '.
             'after push. This makes no sense; rejecting change.',
             $ref));
       }
 
       if ($old_heads === $new_heads) {
         // No changes to this branch, so skip it.
         continue;
       }
 
       $stray_heads = array();
 
       if ($old_heads && !$new_heads) {
         // This is a branch deletion with "--close-branch".
         $head_map = array();
         foreach ($old_heads as $old_head) {
           $head_map[$old_head] = array(self::EMPTY_HASH);
         }
       } else if (count($old_heads) > 1) {
         // HORRIBLE: In Mercurial, branches can have multiple heads. If the
         // old branch had multiple heads, we need to figure out which new
         // heads descend from which old heads, so we can tell whether you're
         // actively creating new heads (dangerous) or just working in a
         // repository that's already full of garbage (strongly discouraged but
         // not as inherently dangerous). These cases should be very uncommon.
 
         // NOTE: We're only looking for heads on the same branch. The old
         // tip of the branch may be the branchpoint for other branches, but that
         // is OK.
 
         $dfutures = array();
         foreach ($old_heads as $old_head) {
           $dfutures[$old_head] = $repository->getLocalCommandFuture(
             'log --branch %s --rev %s --template %s',
             $ref,
             hgsprintf('(descendants(%s) and head())', $old_head),
             '{node}\1');
         }
 
         $head_map = array();
         foreach (Futures($dfutures) as $future_head => $dfuture) {
           list($stdout) = $dfuture->resolvex();
           $descendant_heads = array_filter(explode("\1", $stdout));
           if ($descendant_heads) {
             // This old head has at least one descendant in the push.
             $head_map[$future_head] = $descendant_heads;
           } else {
             // This old head has no descendants, so it is being deleted.
             $head_map[$future_head] = array(self::EMPTY_HASH);
           }
         }
 
         // Now, find all the new stray heads this push creates, if any. These
         // are new heads which do not descend from the old heads.
         $seen = array_fuse(array_mergev($head_map));
         foreach ($new_heads as $new_head) {
           if ($new_head === self::EMPTY_HASH) {
             // If a branch head is being deleted, don't insert it as an add.
             continue;
           }
           if (empty($seen[$new_head])) {
             $head_map[self::EMPTY_HASH][] = $new_head;
           }
         }
       } else if ($old_heads) {
         $head_map[head($old_heads)] = $new_heads;
       } else {
         $head_map[self::EMPTY_HASH] = $new_heads;
       }
 
       foreach ($head_map as $old_head => $child_heads) {
         foreach ($child_heads as $new_head) {
           if ($new_head === $old_head) {
             continue;
           }
 
           $ref_flags = 0;
           $dangerous = null;
           if ($old_head == self::EMPTY_HASH) {
             $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD;
           } else {
             $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND;
           }
 
 
           $deletes_existing_head = ($new_head == self::EMPTY_HASH);
           $splits_existing_head = (count($child_heads) > 1);
           $creates_duplicate_head = ($old_head == self::EMPTY_HASH) &&
                                     (count($head_map) > 1);
 
           if ($splits_existing_head || $creates_duplicate_head) {
             $readable_child_heads = array();
             foreach ($child_heads as $child_head) {
               $readable_child_heads[] = substr($child_head, 0, 12);
             }
 
             $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DANGEROUS;
 
             if ($splits_existing_head) {
               // We're splitting an existing head into two or more heads.
               // This is dangerous, and a super bad idea. Note that we're only
               // raising this if you're actively splitting a branch head. If a
               // head split in the past, we don't consider appends to it
               // to be dangerous.
               $dangerous = pht(
                 "The change you're attempting to push splits the head of ".
                 "branch '%s' into multiple heads: %s. This is inadvisable ".
                 "and dangerous.",
                 $ref,
                 implode(', ', $readable_child_heads));
             } else {
               // We're adding a second (or more) head to a branch. The new
               // head is not a descendant of any old head.
               $dangerous = pht(
                 "The change you're attempting to push creates new, divergent ".
                 "heads for the branch '%s': %s. This is inadvisable and ".
                 "dangerous.",
                 $ref,
                 implode(', ', $readable_child_heads));
             }
           }
 
           if ($deletes_existing_head) {
             // TODO: Somewhere in here we should be setting CHANGEFLAG_REWRITE
             // if we are also creating at least one other head to replace
             // this one.
 
             // NOTE: In Git, this is a dangerous change, but it is not dangerous
             // in Mercurial. Mercurial branches are version controlled, and
             // Mercurial does not prompt you for any special flags when pushing
             // a `--close-branch` commit by default.
 
             $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE;
           }
 
           $ref_update = $this->newPushLog()
             ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_BRANCH)
             ->setRefName($ref)
             ->setRefOld($old_head)
             ->setRefNew($new_head)
             ->setChangeFlags($ref_flags);
 
           if ($dangerous !== null) {
             $ref_update->attachDangerousChangeDescription($dangerous);
           }
 
           $ref_updates[] = $ref_update;
         }
       }
     }
 
     return $ref_updates;
   }
 
   private function findMercurialPushKeyRefUpdates() {
     $key_namespace = getenv('HG_NAMESPACE');
 
     if ($key_namespace === 'phases') {
       // Mercurial changes commit phases as part of normal push operations. We
       // just ignore these, as they don't seem to represent anything
       // interesting.
       return array();
     }
 
     $key_name = getenv('HG_KEY');
 
     $key_old = getenv('HG_OLD');
     if (!strlen($key_old)) {
       $key_old = null;
     }
 
     $key_new = getenv('HG_NEW');
     if (!strlen($key_new)) {
       $key_new = null;
     }
 
     if ($key_namespace !== 'bookmarks') {
       throw new Exception(
         pht(
           "Unknown Mercurial key namespace '%s', with key '%s' (%s -> %s). ".
           "Rejecting push.",
           $key_namespace,
           $key_name,
           coalesce($key_old, pht('null')),
           coalesce($key_new, pht('null'))));
     }
 
     if ($key_old === $key_new) {
       // We get a callback when the bookmark doesn't change. Just ignore this,
       // as it's a no-op.
       return array();
     }
 
     $ref_flags = 0;
     $merge_base = null;
     if ($key_old === null) {
       $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD;
     } else if ($key_new === null) {
       $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_DELETE;
     } else {
       list($merge_base_raw) = $this->getRepository()->execxLocalCommand(
         'log --template %s --rev %s',
         '{node}',
         hgsprintf('ancestor(%s, %s)', $key_old, $key_new));
 
       if (strlen(trim($merge_base_raw))) {
         $merge_base = trim($merge_base_raw);
       }
 
       if ($merge_base && ($merge_base === $key_old)) {
         $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND;
       } else {
         $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_REWRITE;
       }
     }
 
     $ref_update = $this->newPushLog()
       ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_BOOKMARK)
       ->setRefName($key_name)
       ->setRefOld(coalesce($key_old, self::EMPTY_HASH))
       ->setRefNew(coalesce($key_new, self::EMPTY_HASH))
       ->setChangeFlags($ref_flags);
 
     return array($ref_update);
   }
 
   private function findMercurialContentUpdates(array $ref_updates) {
     $content_updates = array();
 
     foreach ($this->mercurialCommits as $commit => $branches) {
       $content_updates[$commit] = $this->newPushLog()
         ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_COMMIT)
         ->setRefNew($commit)
         ->setChangeFlags(PhabricatorRepositoryPushLog::CHANGEFLAG_ADD);
     }
 
     return $content_updates;
   }
 
   private function parseMercurialCommits($raw) {
     $commits_lines = explode("\2", $raw);
     $commits_lines = array_filter($commits_lines);
     $commit_map = array();
     foreach ($commits_lines as $commit_line) {
       list($node, $branches_raw) = explode("\1", $commit_line);
 
       if (!strlen($branches_raw)) {
         $branches = array('default');
       } else {
         $branches = explode(' ', $branches_raw);
       }
 
       $commit_map[$node] = $branches;
     }
 
     return $commit_map;
   }
 
   private function parseMercurialHeads($raw) {
     $heads_map = $this->parseMercurialCommits($raw);
 
     $heads = array();
     foreach ($heads_map as $commit => $branches) {
       foreach ($branches as $branch) {
         $heads[$branch][] = $commit;
       }
     }
 
     return $heads;
   }
 
 
 /* -(  Subversion  )--------------------------------------------------------- */
 
 
   private function findSubversionRefUpdates() {
     // Subversion doesn't have any kind of mutable ref metadata.
     return array();
   }
 
   private function findSubversionContentUpdates(array $ref_updates) {
     list($youngest) = execx(
       'svnlook youngest %s',
       $this->subversionRepository);
     $ref_new = (int)$youngest + 1;
 
     $ref_flags = 0;
     $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_ADD;
     $ref_flags |= PhabricatorRepositoryPushLog::CHANGEFLAG_APPEND;
 
     $ref_content = $this->newPushLog()
       ->setRefType(PhabricatorRepositoryPushLog::REFTYPE_COMMIT)
       ->setRefNew($ref_new)
       ->setChangeFlags($ref_flags);
 
     return array($ref_content);
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   private function newPushLog() {
     // NOTE: We generate PHIDs up front so the Herald transcripts can pick them
     // up.
     $phid = id(new PhabricatorRepositoryPushLog())->generatePHID();
 
     return PhabricatorRepositoryPushLog::initializeNewLog($this->getViewer())
       ->setPHID($phid)
       ->setRepositoryPHID($this->getRepository()->getPHID())
       ->attachRepository($this->getRepository())
       ->setEpoch(time());
   }
 
   private function newPushEvent() {
     $viewer = $this->getViewer();
     return PhabricatorRepositoryPushEvent::initializeNewEvent($viewer)
       ->setRepositoryPHID($this->getRepository()->getPHID())
       ->setRemoteAddress($this->getRemoteAddressForLog())
       ->setRemoteProtocol($this->getRemoteProtocol())
       ->setEpoch(time());
   }
 
   public function loadChangesetsForCommit($identifier) {
     $byte_limit = HeraldCommitAdapter::getEnormousByteLimit();
     $time_limit = HeraldCommitAdapter::getEnormousTimeLimit();
 
     $vcs = $this->getRepository()->getVersionControlSystem();
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         // For git and hg, we can use normal commands.
         $drequest = DiffusionRequest::newFromDictionary(
           array(
             'repository' => $this->getRepository(),
             'user' => $this->getViewer(),
             'commit' => $identifier,
           ));
 
         $raw_diff = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest)
           ->setTimeout($time_limit)
           ->setByteLimit($byte_limit)
           ->setLinesOfContext(0)
           ->loadRawDiff();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         // TODO: This diff has 3 lines of context, which produces slightly
         // incorrect "added file content" and "removed file content" results.
         // This may also choke on binaries, but "svnlook diff" does not support
         // the "--diff-cmd" flag.
 
         // For subversion, we need to use `svnlook`.
         $future = new ExecFuture(
           'svnlook diff -t %s %s',
           $this->subversionTransaction,
           $this->subversionRepository);
 
         $future->setTimeout($time_limit);
         $future->setStdoutSizeLimit($byte_limit);
         $future->setStderrSizeLimit($byte_limit);
 
         list($raw_diff) = $future->resolvex();
         break;
       default:
         throw new Exception(pht("Unknown VCS '%s!'", $vcs));
     }
 
     if (strlen($raw_diff) >= $byte_limit) {
       throw new Exception(
         pht(
           'The raw text of this change is enormous (larger than %d '.
           'bytes). Herald can not process it.',
           $byte_limit));
     }
 
     if (!strlen($raw_diff)) {
       // If the commit is actually empty, just return no changesets.
       return array();
     }
 
     $parser = new ArcanistDiffParser();
     $changes = $parser->parseDiff($raw_diff);
     $diff = DifferentialDiff::newFromRawChanges($changes);
     return $diff->getChangesets();
   }
 
   public function loadCommitRefForCommit($identifier) {
     $repository = $this->getRepository();
     $vcs = $repository->getVersionControlSystem();
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return id(new DiffusionLowLevelCommitQuery())
           ->setRepository($repository)
           ->withIdentifier($identifier)
           ->execute();
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         // For subversion, we need to use `svnlook`.
         list($message) = execx(
           'svnlook log -t %s %s',
           $this->subversionTransaction,
           $this->subversionRepository);
 
         return id(new DiffusionCommitRef())
           ->setMessage($message);
         break;
       default:
         throw new Exception(pht("Unknown VCS '%s!'", $vcs));
     }
   }
 
   public function loadBranches($identifier) {
     $repository = $this->getRepository();
     $vcs = $repository->getVersionControlSystem();
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         return idx($this->gitCommits, $identifier, array());
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return idx($this->mercurialCommits, $identifier, array());
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         // Subversion doesn't have branches.
         return array();
     }
   }
 
   private function loadCommitInfoForWorker(array $all_updates) {
     $type_commit = PhabricatorRepositoryPushLog::REFTYPE_COMMIT;
 
     $map = array();
     foreach ($all_updates as $update) {
       if ($update->getRefType() != $type_commit) {
         continue;
       }
       $map[$update->getRefNew()] = array();
     }
 
     foreach ($map as $identifier => $info) {
       $ref = $this->loadCommitRefForCommit($identifier);
       $map[$identifier] += array(
         'summary'  => $ref->getSummary(),
         'branches' => $this->loadBranches($identifier),
       );
     }
 
     return $map;
   }
 
 }
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
index 1b7b90d70..73a922172 100644
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -1,515 +1,515 @@
 <?php
 
 final class DiffusionCommitQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
   private $defaultRepository;
   private $identifiers;
   private $repositoryIDs;
   private $identifierMap;
 
   private $needAuditRequests;
   private $auditIDs;
   private $auditorPHIDs;
   private $auditAwaitingUser;
   private $auditStatus;
   const AUDIT_STATUS_ANY       = 'audit-status-any';
   const AUDIT_STATUS_OPEN      = 'audit-status-open';
   const AUDIT_STATUS_CONCERN   = 'audit-status-concern';
   private $loadAuditIds;
 
   private $needCommitData;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $phids) {
     $this->authorPHIDs = $phids;
     return $this;
   }
 
   /**
    * Load commits by partial or full identifiers, e.g. "rXab82393", "rX1234",
    * or "a9caf12". When an identifier matches multiple commits, they will all
    * be returned; callers should be prepared to deal with more results than
    * they queried for.
    */
   public function withIdentifiers(array $identifiers) {
     $this->identifiers = $identifiers;
     return $this;
   }
 
   /**
    * Look up commits in a specific repository. This is a shorthand for calling
    * @{method:withDefaultRepository} and @{method:withRepositoryIDs}.
    */
   public function withRepository(PhabricatorRepository $repository) {
     $this->withDefaultRepository($repository);
     $this->withRepositoryIDs(array($repository->getID()));
     return $this;
   }
 
   /**
    * If a default repository is provided, ambiguous commit identifiers will
    * be assumed to belong to the default repository.
    *
    * For example, "r123" appearing in a commit message in repository X is
    * likely to be unambiguously "rX123". Normally the reference would be
    * considered ambiguous, but if you provide a default repository it will
    * be correctly resolved.
    */
   public function withDefaultRepository(PhabricatorRepository $repository) {
     $this->defaultRepository = $repository;
     return $this;
   }
 
   public function withRepositoryIDs(array $repository_ids) {
     $this->repositoryIDs = $repository_ids;
     return $this;
   }
 
   public function needCommitData($need) {
     $this->needCommitData = $need;
     return $this;
   }
 
   public function needAuditRequests($need) {
     $this->needAuditRequests = $need;
     return $this;
   }
 
   /**
    * Retuns true if we should join the audit table, either because we're
    * interested in the information if it's available or because matching
    * rows must always have it.
    */
   private function shouldJoinAudits() {
     return
       $this->needAuditRequests ||
       $this->auditStatus ||
       $this->rowsMustHaveAudits();
   }
 
 
   /**
    * Return true if we should `JOIN` (vs `LEFT JOIN`) the audit table, because
    * matching commits will always have audit rows.
    */
   private function rowsMustHaveAudits() {
     return
       $this->auditIDs ||
       $this->auditorPHIDs ||
       $this->auditAwaitingUser;
   }
 
   public function withAuditIDs(array $ids) {
     $this->auditIDs = $ids;
     return $this;
   }
 
   public function withAuditorPHIDs(array $auditor_phids) {
     $this->auditorPHIDs = $auditor_phids;
     return $this;
   }
 
   public function withAuditAwaitingUser(PhabricatorUser $user) {
     $this->auditAwaitingUser = $user;
     return $this;
   }
 
   public function withAuditStatus($status) {
     $this->auditStatus = $status;
     return $this;
   }
 
   public function getIdentifierMap() {
     if ($this->identifierMap === null) {
       throw new Exception(
-        "You must execute() the query before accessing the identifier map.");
+        'You must execute() the query before accessing the identifier map.');
     }
     return $this->identifierMap;
   }
 
   protected function getPagingColumn() {
     return 'commit.id';
   }
 
   protected function willExecute() {
     if ($this->identifierMap === null) {
       $this->identifierMap = array();
     }
   }
 
   protected function loadPage() {
     $table = new PhabricatorRepositoryCommit();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT commit.* %Q FROM %T commit %Q %Q %Q %Q',
       $this->buildAuditSelect($conn_r),
       $table->getTableName(),
       $this->buildJoinClause($conn_r),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     if ($this->shouldJoinAudits()) {
       $this->loadAuditIds = ipull($data, 'audit_id');
     }
 
     return $table->loadAllFromArray($data);
   }
 
   private function buildAuditSelect($conn_r) {
     if ($this->shouldJoinAudits()) {
       return qsprintf(
         $conn_r,
         ', audit.id as audit_id');
     }
 
     return '';
   }
 
   protected function willFilterPage(array $commits) {
     $repository_ids = mpull($commits, 'getRepositoryID', 'getRepositoryID');
     $repos = id(new PhabricatorRepositoryQuery())
       ->setViewer($this->getViewer())
       ->withIDs($repository_ids)
       ->execute();
 
     foreach ($commits as $key => $commit) {
       $repo = idx($repos, $commit->getRepositoryID());
       if ($repo) {
         $commit->attachRepository($repo);
       } else {
         unset($commits[$key]);
       }
     }
 
     if ($this->identifiers !== null) {
       $ids = array_fuse($this->identifiers);
       $min_qualified = PhabricatorRepository::MINIMUM_QUALIFIED_HASH;
 
       $result = array();
       foreach ($commits as $commit) {
         $prefix = 'r'.$commit->getRepository()->getCallsign();
         $suffix = $commit->getCommitIdentifier();
 
         if ($commit->getRepository()->isSVN()) {
           if (isset($ids[$prefix.$suffix])) {
             $result[$prefix.$suffix][] = $commit;
           }
         } else {
           // This awkward contruction is so we can link the commits up in O(N)
           // time instead of O(N^2).
           for ($ii = $min_qualified; $ii <= strlen($suffix); $ii++) {
             $part = substr($suffix, 0, $ii);
             if (isset($ids[$prefix.$part])) {
               $result[$prefix.$part][] = $commit;
             }
             if (isset($ids[$part])) {
               $result[$part][] = $commit;
             }
           }
         }
       }
 
       foreach ($result as $identifier => $matching_commits) {
         if (count($matching_commits) == 1) {
           $result[$identifier] = head($matching_commits);
         } else {
           // This reference is ambiguous (it matches more than one commit) so
           // don't link it
           unset($result[$identifier]);
         }
       }
 
       $this->identifierMap += $result;
     }
 
     return $commits;
   }
 
   protected function didFilterPage(array $commits) {
 
     if ($this->needCommitData) {
       $data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
         'commitID in (%Ld)',
         mpull($commits, 'getID'));
       $data = mpull($data, null, 'getCommitID');
       foreach ($commits as $commit) {
         $commit_data = idx($data, $commit->getID());
         if (!$commit_data) {
           $commit_data = new PhabricatorRepositoryCommitData();
         }
         $commit->attachCommitData($commit_data);
       }
     }
 
     if ($this->shouldJoinAudits()) {
       $load_ids = array_filter($this->loadAuditIds);
       if ($load_ids) {
         $requests = id(new PhabricatorRepositoryAuditRequest())
           ->loadAllWhere('id IN (%Ld)', $this->loadAuditIds);
       } else {
         $requests = array();
       }
 
       $requests = mgroup($requests, 'getCommitPHID');
       foreach ($commits as $commit) {
         $audit_requests = idx($requests, $commit->getPHID(), array());
         $commit->attachAudits($audit_requests);
         foreach ($audit_requests as $audit_request) {
           $audit_request->attachCommit($commit);
         }
       }
     }
 
     return $commits;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn_r,
         'commit.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn_r,
         'commit.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->repositoryIDs !== null) {
       $where[] = qsprintf(
         $conn_r,
         'commit.repositoryID IN (%Ld)',
         $this->repositoryIDs);
     }
 
     if ($this->authorPHIDs !== null) {
       $where[] = qsprintf(
         $conn_r,
         'commit.authorPHID IN (%Ls)',
         $this->authorPHIDs);
     }
 
     if ($this->identifiers !== null) {
       $min_unqualified = PhabricatorRepository::MINIMUM_UNQUALIFIED_HASH;
       $min_qualified   = PhabricatorRepository::MINIMUM_QUALIFIED_HASH;
 
       $refs = array();
       $bare = array();
       foreach ($this->identifiers as $identifier) {
         $matches = null;
         preg_match('/^(?:r([A-Z]+))?(.*)$/', $identifier, $matches);
         $repo = nonempty($matches[1], null);
         $identifier = nonempty($matches[2], null);
 
         if ($repo === null) {
           if ($this->defaultRepository) {
             $repo = $this->defaultRepository->getCallsign();
           }
         }
 
         if ($repo === null) {
           if (strlen($identifier) < $min_unqualified) {
             continue;
           }
           $bare[] = $identifier;
         } else {
           $refs[] = array(
             'callsign' => $repo,
             'identifier' => $identifier,
           );
         }
       }
 
       $sql = array();
 
       foreach ($bare as $identifier) {
         $sql[] = qsprintf(
           $conn_r,
           '(commit.commitIdentifier LIKE %> AND '.
           'LENGTH(commit.commitIdentifier) = 40)',
           $identifier);
       }
 
       if ($refs) {
         $callsigns = ipull($refs, 'callsign');
         $repos = id(new PhabricatorRepositoryQuery())
           ->setViewer($this->getViewer())
           ->withCallsigns($callsigns)
           ->execute();
         $repos = mpull($repos, null, 'getCallsign');
 
         foreach ($refs as $key => $ref) {
           $repo = idx($repos, $ref['callsign']);
           if (!$repo) {
             continue;
           }
 
           if ($repo->isSVN()) {
             if (!ctype_digit($ref['identifier'])) {
               continue;
             }
             $sql[] = qsprintf(
               $conn_r,
               '(commit.repositoryID = %d AND commit.commitIdentifier = %s)',
               $repo->getID(),
               // NOTE: Because the 'commitIdentifier' column is a string, MySQL
               // ignores the index if we hand it an integer. Hand it a string.
               // See T3377.
               (int)$ref['identifier']);
           } else {
             if (strlen($ref['identifier']) < $min_qualified) {
               continue;
             }
             $sql[] = qsprintf(
               $conn_r,
               '(commit.repositoryID = %d AND commit.commitIdentifier LIKE %>)',
               $repo->getID(),
               $ref['identifier']);
           }
         }
       }
 
       if (!$sql) {
         // If we discarded all possible identifiers (e.g., they all referenced
         // bogus repositories or were all too short), make sure the query finds
         // nothing.
         throw new PhabricatorEmptyQueryException(
           pht('No commit identifiers.'));
       }
 
       $where[] = '('.implode(' OR ', $sql).')';
     }
 
     if ($this->auditIDs !== null) {
       $where[] = qsprintf(
         $conn_r,
         'audit.id IN (%Ld)',
         $this->auditIDs);
     }
 
     if ($this->auditorPHIDs !== null) {
       $where[] = qsprintf(
         $conn_r,
         'audit.auditorPHID IN (%Ls)',
         $this->auditorPHIDs);
     }
 
     if ($this->auditAwaitingUser) {
       $awaiting_user_phid = $this->auditAwaitingUser->getPHID();
       // Exclude package and project audits associated with commits where
       // the user is the author.
       $where[] = qsprintf(
         $conn_r,
         '(commit.authorPHID IS NULL OR commit.authorPHID != %s)
           OR (audit.auditorPHID = %s)',
         $awaiting_user_phid,
         $awaiting_user_phid);
     }
 
     $status = $this->auditStatus;
     if ($status !== null) {
       switch ($status) {
         case self::AUDIT_STATUS_CONCERN:
           $where[] = qsprintf(
             $conn_r,
             'audit.auditStatus = %s',
             PhabricatorAuditStatusConstants::CONCERNED);
           break;
         case self::AUDIT_STATUS_OPEN:
           $where[] = qsprintf(
             $conn_r,
             'audit.auditStatus in (%Ls)',
             PhabricatorAuditStatusConstants::getOpenStatusConstants());
           if ($this->auditAwaitingUser) {
             $where[] = qsprintf(
               $conn_r,
               'awaiting.auditStatus IS NULL OR awaiting.auditStatus != %s',
               PhabricatorAuditStatusConstants::RESIGNED);
           }
           break;
         case self::AUDIT_STATUS_ANY:
           break;
         default:
           $valid = array(
             self::AUDIT_STATUS_ANY,
             self::AUDIT_STATUS_OPEN,
             self::AUDIT_STATUS_CONCERN,
           );
           throw new Exception(
             "Unknown audit status '{$status}'! Valid statuses are: ".
             implode(', ', $valid));
       }
     }
 
     $where[] = $this->buildPagingClause($conn_r);
 
     return $this->formatWhereClause($where);
   }
 
   public function didFilterResults(array $filtered) {
     if ($this->identifierMap) {
       foreach ($this->identifierMap as $name => $commit) {
         if (isset($filtered[$commit->getPHID()])) {
           unset($this->identifierMap[$name]);
         }
       }
     }
   }
 
   private function buildJoinClause($conn_r) {
     $joins = array();
     $audit_request = new PhabricatorRepositoryAuditRequest();
 
     if ($this->shouldJoinAudits()) {
       $joins[] = qsprintf(
         $conn_r,
         '%Q %T audit ON commit.phid = audit.commitPHID',
         ($this->rowsMustHaveAudits() ? 'JOIN' : 'LEFT JOIN'),
         $audit_request->getTableName());
     }
 
     if ($this->auditAwaitingUser) {
       // Join the request table on the awaiting user's requests, so we can
       // filter out package and project requests which the user has resigned
       // from.
       $joins[] = qsprintf(
         $conn_r,
         'LEFT JOIN %T awaiting ON audit.commitPHID = awaiting.commitPHID AND
         awaiting.auditorPHID = %s',
         $audit_request->getTableName(),
         $this->auditAwaitingUser->getPHID());
     }
 
     if ($joins) {
       return implode(' ', $joins);
     } else {
       return '';
     }
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationDiffusion';
   }
 
 }
diff --git a/src/applications/diffusion/query/DiffusionLintCountQuery.php b/src/applications/diffusion/query/DiffusionLintCountQuery.php
index 1b227815f..89fca4cde 100644
--- a/src/applications/diffusion/query/DiffusionLintCountQuery.php
+++ b/src/applications/diffusion/query/DiffusionLintCountQuery.php
@@ -1,120 +1,120 @@
 <?php
 
 final class DiffusionLintCountQuery extends PhabricatorQuery {
 
   private $branchIDs;
   private $paths;
   private $codes;
 
   public function withBranchIDs(array $branch_ids) {
     $this->branchIDs = $branch_ids;
     return $this;
   }
 
   public function withPaths(array $paths) {
     $this->paths = $paths;
     return $this;
   }
 
   public function withCodes(array $codes) {
     $this->codes = $codes;
     return $this;
   }
 
   public function execute() {
     if (!$this->paths) {
-      throw new Exception(pht("Call withPaths() before execute()!"));
+      throw new Exception(pht('Call withPaths() before execute()!'));
     }
 
     if (!$this->branchIDs) {
-      throw new Exception(pht("Call withBranchIDs() before execute()!"));
+      throw new Exception(pht('Call withBranchIDs() before execute()!'));
     }
 
     $conn_r = id(new PhabricatorRepositoryCommit())->establishConnection('r');
 
     $this->paths = array_unique($this->paths);
     list($dirs, $paths) = $this->processPaths();
 
     $parts = array();
     foreach ($dirs as $dir) {
       $parts[$dir] = qsprintf(
         $conn_r,
         'path LIKE %>',
         $dir);
     }
     foreach ($paths as $path) {
       $parts[$path] = qsprintf(
         $conn_r,
         'path = %s',
         $path);
     }
 
     $queries = array();
     foreach ($parts as $key => $part) {
       $queries[] = qsprintf(
         $conn_r,
         'SELECT %s path_prefix, COUNT(*) N FROM %T %Q',
         $key,
         PhabricatorRepository::TABLE_LINTMESSAGE,
         $this->buildWhereClause($conn_r, $part));
     }
 
     $huge_union_query = '('.implode(') UNION ALL (', $queries).')';
 
     $data = queryfx_all(
       $conn_r,
       '%Q',
       $huge_union_query);
 
     return $this->processResults($data);
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r, $part) {
     $where = array();
 
     $where[] = $part;
 
     if ($this->codes !== null) {
       $where[] = qsprintf(
         $conn_r,
         'code IN (%Ls)',
         $this->codes);
     }
 
     if ($this->branchIDs !== null) {
       $where[] = qsprintf(
         $conn_r,
         'branchID IN (%Ld)',
         $this->branchIDs);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function processPaths() {
     $dirs = array();
     $paths = array();
     foreach ($this->paths as $path) {
       $path = '/'.$path;
       if (substr($path, -1) == '/') {
         $dirs[] = $path;
       } else {
         $paths[] = $path;
       }
     }
     return array($dirs, $paths);
   }
 
   private function processResults(array $data) {
     $data = ipull($data, 'N', 'path_prefix');
 
     // Strip the leading "/" back off each path.
     $output = array();
     foreach ($data as $path => $count) {
       $output[substr($path, 1)] = $count;
     }
 
     return $output;
   }
 
 }
diff --git a/src/applications/diffusion/query/DiffusionQuery.php b/src/applications/diffusion/query/DiffusionQuery.php
index 2b189d226..f54a7a0eb 100644
--- a/src/applications/diffusion/query/DiffusionQuery.php
+++ b/src/applications/diffusion/query/DiffusionQuery.php
@@ -1,203 +1,203 @@
 <?php
 
 abstract class DiffusionQuery extends PhabricatorQuery {
 
   private $request;
 
   final protected function __construct() {
     // <protected>
   }
 
   protected static function newQueryObject(
     $base_class,
     DiffusionRequest $request) {
 
     $repository = $request->getRepository();
 
     $obj = self::initQueryObject($base_class, $repository);
     $obj->request = $request;
 
     return $obj;
   }
 
   final protected static function initQueryObject(
     $base_class,
     PhabricatorRepository $repository) {
 
     $map = array(
       PhabricatorRepositoryType::REPOSITORY_TYPE_GIT        => 'Git',
       PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL  => 'Mercurial',
       PhabricatorRepositoryType::REPOSITORY_TYPE_SVN        => 'Svn',
     );
 
     $name = idx($map, $repository->getVersionControlSystem());
     if (!$name) {
-      throw new Exception("Unsupported VCS!");
+      throw new Exception('Unsupported VCS!');
     }
 
     $class = str_replace('Diffusion', 'Diffusion'.$name, $base_class);
     $obj = new $class();
     return $obj;
   }
 
   final protected function getRequest() {
     return $this->request;
   }
 
   final public static function callConduitWithDiffusionRequest(
     PhabricatorUser $user,
     DiffusionRequest $drequest,
     $method,
     array $params = array()) {
 
     $repository = $drequest->getRepository();
 
     $core_params = array(
       'callsign' => $repository->getCallsign(),
     );
 
     if ($drequest->getBranch() !== null) {
       $core_params['branch'] = $drequest->getBranch();
     }
 
     $params = $params + $core_params;
 
     return id(new ConduitCall(
       $method,
       $params
     ))
     ->setUser($user)
     ->execute();
   }
 
   public function execute() {
     return $this->executeQuery();
   }
 
   abstract protected function executeQuery();
 
 
 /* -(  Query Utilities  )---------------------------------------------------- */
 
 
   final public static function loadCommitsByIdentifiers(
     array $identifiers,
     DiffusionRequest $drequest) {
     if (!$identifiers) {
       return array();
     }
 
     $commits = array();
     $commit_data = array();
 
     $repository = $drequest->getRepository();
 
     $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
       'repositoryID = %d AND commitIdentifier IN (%Ls)',
         $repository->getID(),
       $identifiers);
     $commits = mpull($commits, null, 'getCommitIdentifier');
 
     // Build empty commit objects for every commit, so we can show unparsed
     // commits in history views (as "Importing") instead of not showing them.
     // This makes the process of importing and parsing commits clearer to the
     // user.
 
     $commit_list = array();
     foreach ($identifiers as $identifier) {
       $commit_obj = idx($commits, $identifier);
       if (!$commit_obj) {
         $commit_obj = new PhabricatorRepositoryCommit();
         $commit_obj->setRepositoryID($repository->getID());
         $commit_obj->setCommitIdentifier($identifier);
         $commit_obj->makeEphemeral();
       }
       $commit_list[$identifier] = $commit_obj;
     }
     $commits = $commit_list;
 
     $commit_ids = array_filter(mpull($commits, 'getID'));
     if ($commit_ids) {
       $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
         'commitID in (%Ld)',
         $commit_ids);
       $commit_data = mpull($commit_data, null, 'getCommitID');
     }
 
     foreach ($commits as $commit) {
       if (!$commit->getID()) {
         continue;
       }
       if (idx($commit_data, $commit->getID())) {
         $commit->attachCommitData($commit_data[$commit->getID()]);
       }
     }
 
     return $commits;
   }
 
   final public static function loadHistoryForCommitIdentifiers(
     array $identifiers,
     DiffusionRequest $drequest) {
 
     if (!$identifiers) {
       return array();
     }
 
     $repository = $drequest->getRepository();
     $commits = self::loadCommitsByIdentifiers($identifiers, $drequest);
 
     if (!$commits) {
       return array();
     }
 
     $path = $drequest->getPath();
 
     $conn_r = $repository->establishConnection('r');
 
     $path_normal = DiffusionPathIDQuery::normalizePath($path);
     $paths = queryfx_all(
       $conn_r,
       'SELECT id, path FROM %T WHERE pathHash IN (%Ls)',
       PhabricatorRepository::TABLE_PATH,
       array(md5($path_normal)));
     $paths = ipull($paths, 'id', 'path');
     $path_id = idx($paths, $path_normal);
 
     $commit_ids = array_filter(mpull($commits, 'getID'));
 
     $path_changes = array();
     if ($path_id && $commit_ids) {
       $path_changes = queryfx_all(
         $conn_r,
         'SELECT * FROM %T WHERE commitID IN (%Ld) AND pathID = %d',
         PhabricatorRepository::TABLE_PATHCHANGE,
         $commit_ids,
         $path_id);
       $path_changes = ipull($path_changes, null, 'commitID');
     }
 
     $history = array();
     foreach ($identifiers as $identifier) {
       $item = new DiffusionPathChange();
       $item->setCommitIdentifier($identifier);
       $commit = idx($commits, $identifier);
       if ($commit) {
         $item->setCommit($commit);
         try {
           $item->setCommitData($commit->getCommitData());
         } catch (Exception $ex) {
           // Ignore, commit just doesn't have data.
         }
         $change = idx($path_changes, $commit->getID());
         if ($change) {
           $item->setChangeType($change['changeType']);
           $item->setFileType($change['fileType']);
         }
       }
       $history[] = $item;
     }
 
     return $history;
   }
 }
diff --git a/src/applications/diffusion/query/DiffusionSymbolQuery.php b/src/applications/diffusion/query/DiffusionSymbolQuery.php
index ec546ec1a..a9341d34f 100644
--- a/src/applications/diffusion/query/DiffusionSymbolQuery.php
+++ b/src/applications/diffusion/query/DiffusionSymbolQuery.php
@@ -1,287 +1,287 @@
 <?php
 
 /**
  * Query symbol information (class and function names and location), returning
  * a list of matching @{class:PhabricatorRepositorySymbol} objects and possibly
  * attached data.
  *
  * @task config   Configuring the Query
  * @task exec     Executing the Query
  * @task internal Internals
  *
  * @group diffusion
  */
 final class DiffusionSymbolQuery extends PhabricatorOffsetPagedQuery {
 
   private $context;
   private $namePrefix;
   private $name;
 
   private $projectIDs;
   private $language;
   private $type;
 
   private $needPaths;
   private $needArcanistProject;
   private $needRepositories;
 
 
 /* -(  Configuring the Query  )---------------------------------------------- */
 
 
   /**
    * @task config
    */
   public function setContext($context) {
     $this->context = $context;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setNamePrefix($name_prefix) {
     $this->namePrefix = $name_prefix;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setProjectIDs(array $project_ids) {
     $this->projectIDs = $project_ids;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setLanguage($language) {
     $this->language = $language;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function needPaths($need_paths) {
     $this->needPaths = $need_paths;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function needArcanistProjects($need_arcanist_projects) {
     $this->needArcanistProjects = $need_arcanist_projects;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function needRepositories($need_repositories) {
     $this->needRepositories = $need_repositories;
     return $this;
   }
 
 
 /* -(  Executing the Query  )------------------------------------------------ */
 
 
   /**
    * @task exec
    */
   public function execute() {
     if ($this->name && $this->namePrefix) {
       throw new Exception(
-        "You can not set both a name and a name prefix!");
+        'You can not set both a name and a name prefix!');
     } else if (!$this->name && !$this->namePrefix) {
       throw new Exception(
-        "You must set a name or a name prefix!");
+        'You must set a name or a name prefix!');
     }
 
     $symbol = new PhabricatorRepositorySymbol();
     $conn_r = $symbol->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $symbol->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $symbols = $symbol->loadAllFromArray($data);
 
     if ($symbols) {
       if ($this->needPaths) {
         $this->loadPaths($symbols);
       }
       if ($this->needArcanistProjects || $this->needRepositories) {
         $this->loadArcanistProjects($symbols);
       }
       if ($this->needRepositories) {
         $this->loadRepositories($symbols);
       }
 
     }
 
     return $symbols;
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   private function buildOrderClause($conn_r) {
     return qsprintf(
       $conn_r,
       'ORDER BY symbolName ASC');
   }
 
 
   /**
    * @task internal
    */
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if (isset($this->context)) {
       $where[] = qsprintf(
         $conn_r,
         'symbolContext = %s',
         $this->context);
     }
 
     if ($this->name) {
       $where[] = qsprintf(
         $conn_r,
         'symbolName = %s',
         $this->name);
     }
 
     if ($this->namePrefix) {
       $where[] = qsprintf(
         $conn_r,
         'symbolName LIKE %>',
         $this->namePrefix);
     }
 
     if ($this->projectIDs) {
       $where[] = qsprintf(
         $conn_r,
         'arcanistProjectID IN (%Ld)',
         $this->projectIDs);
     }
 
     if ($this->language) {
       $where[] = qsprintf(
         $conn_r,
         'symbolLanguage = %s',
         $this->language);
     }
 
     if ($this->type) {
       $where[] = qsprintf(
         $conn_r,
         'symbolType = %s',
         $this->type);
     }
 
     return $this->formatWhereClause($where);
   }
 
 
   /**
    * @task internal
    */
   private function loadPaths(array $symbols) {
     assert_instances_of($symbols, 'PhabricatorRepositorySymbol');
     $path_map = queryfx_all(
       id(new PhabricatorRepository())->establishConnection('r'),
       'SELECT * FROM %T WHERE id IN (%Ld)',
       PhabricatorRepository::TABLE_PATH,
       mpull($symbols, 'getPathID'));
     $path_map = ipull($path_map, 'path', 'id');
     foreach ($symbols as $symbol) {
       $symbol->attachPath(idx($path_map, $symbol->getPathID()));
     }
   }
 
 
   /**
    * @task internal
    */
   private function loadArcanistProjects(array $symbols) {
     assert_instances_of($symbols, 'PhabricatorRepositorySymbol');
     $projects = id(new PhabricatorRepositoryArcanistProject())->loadAllWhere(
       'id IN (%Ld)',
       mpull($symbols, 'getArcanistProjectID'));
     foreach ($symbols as $symbol) {
       $project = idx($projects, $symbol->getArcanistProjectID());
       $symbol->attachArcanistProject($project);
     }
   }
 
 
   /**
    * @task internal
    */
   private function loadRepositories(array $symbols) {
     assert_instances_of($symbols, 'PhabricatorRepositorySymbol');
 
     $projects = mpull($symbols, 'getArcanistProject');
     $projects = array_filter($projects);
 
     $repo_ids = mpull($projects, 'getRepositoryID');
     $repo_ids = array_filter($repo_ids);
 
     if ($repo_ids) {
       // TODO: (T603) Provide a viewer here.
       $repos = id(new PhabricatorRepository())->loadAllWhere(
         'id IN (%Ld)',
         $repo_ids);
     } else {
       $repos = array();
     }
 
     foreach ($symbols as $symbol) {
       $proj = $symbol->getArcanistProject();
       if ($proj) {
         $symbol->attachRepository(idx($repos, $proj->getRepositoryID()));
       } else {
         $symbol->attachRepository(null);
       }
     }
   }
 
 
 }
diff --git a/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php
index 94e269704..2f3493737 100644
--- a/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php
+++ b/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php
@@ -1,155 +1,155 @@
 <?php
 
 /**
  * NOTE: this class should only be used where local access to the repository
  * is guaranteed and NOT from within the Diffusion application. Diffusion
  * should use Conduit method 'diffusion.filecontentquery' to get this sort
  * of data.
  */
 abstract class DiffusionFileContentQuery extends DiffusionQuery {
 
   private $needsBlame;
   private $fileContent;
   private $viewer;
 
   final public static function newFromDiffusionRequest(
     DiffusionRequest $request) {
     return parent::newQueryObject(__CLASS__, $request);
   }
 
   abstract public function getFileContentFuture();
   abstract protected function executeQueryFromFuture(Future $future);
 
   final public function loadFileContentFromFuture(Future $future) {
     $this->fileContent = $this->executeQueryFromFuture($future);
 
     $repository = $this->getRequest()->getRepository();
     $try_encoding = $repository->getDetail('encoding');
     if ($try_encoding) {
         $this->fileContent->setCorpus(
           phutil_utf8_convert(
-            $this->fileContent->getCorpus(), "UTF-8", $try_encoding));
+            $this->fileContent->getCorpus(), 'UTF-8', $try_encoding));
     }
 
     return $this->fileContent;
   }
 
   final protected function executeQuery() {
     return $this->loadFileContentFromFuture($this->getFileContentFuture());
   }
 
   final public function loadFileContent() {
     return $this->executeQuery();
   }
 
   final public function getRawData() {
     return $this->fileContent->getCorpus();
   }
 
   /**
    * Pretty hairy function. If getNeedsBlame is false, this returns
    *
    *   ($text_list, array(), array())
    *
    * Where $text_list is the raw file content with trailing new lines stripped.
    *
    * If getNeedsBlame is true, this returns
    *
    *   ($text_list, $line_rev_dict, $blame_dict)
    *
    * Where $text_list is just the lines of code -- the raw file content will
    * contain lots of blame data, $line_rev_dict is a dictionary of line number
    * => revision id, and $blame_dict is another complicated data structure.
    * In detail, $blame_dict contains [revision id][author] keys, as well
    * as [commit id][authorPhid] and [commit id][epoch] keys.
    *
    * @return ($text_list, $line_rev_dict, $blame_dict)
    */
   final public function getBlameData() {
     $raw_data = preg_replace('/\n$/', '', $this->getRawData());
 
     $text_list = array();
     $line_rev_dict = array();
     $blame_dict = array();
 
     if (!$this->getNeedsBlame()) {
       $text_list = explode("\n", $raw_data);
     } else if ($raw_data != '') {
       $lines = array();
       foreach (explode("\n", $raw_data) as $k => $line) {
         $lines[$k] = $this->tokenizeLine($line);
 
         list($rev_id, $author, $text) = $lines[$k];
         $text_list[$k] = $text;
         $line_rev_dict[$k] = $rev_id;
       }
 
       $line_rev_dict = $this->processRevList($line_rev_dict);
 
       foreach ($lines as $k => $line) {
         list($rev_id, $author, $text) = $line;
         $rev_id = $line_rev_dict[$k];
 
         if (!isset($blame_dict[$rev_id])) {
           $blame_dict[$rev_id]['author'] = $author;
         }
       }
 
       $repository = $this->getRequest()->getRepository();
 
       $commits = id(new DiffusionCommitQuery())
         ->setViewer($this->getViewer())
         ->withDefaultRepository($repository)
         ->withIdentifiers(array_unique($line_rev_dict))
         ->execute();
 
       foreach ($commits as $commit) {
         $blame_dict[$commit->getCommitIdentifier()]['epoch'] =
           $commit->getEpoch();
       }
 
       if ($commits) {
         $commits_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
           'commitID IN (%Ls)',
           mpull($commits, 'getID'));
 
         foreach ($commits_data as $data) {
           $author_phid = $data->getCommitDetail('authorPHID');
           if (!$author_phid) {
             continue;
           }
           $commit = $commits[$data->getCommitID()];
           $commit_identifier = $commit->getCommitIdentifier();
           $blame_dict[$commit_identifier]['authorPHID'] = $author_phid;
         }
       }
 
    }
 
     return array($text_list, $line_rev_dict, $blame_dict);
   }
 
   abstract protected function tokenizeLine($line);
 
   public function setNeedsBlame($needs_blame) {
     $this->needsBlame = $needs_blame;
     return $this;
   }
 
   public function getNeedsBlame() {
     return $this->needsBlame;
   }
 
   public function setViewer(PhabricatorUser $user) {
     $this->viewer = $user;
     return $this;
   }
 
   public function getViewer() {
     return $this->viewer;
   }
 
   protected function processRevList(array $rev_list) {
     return $rev_list;
   }
 }
diff --git a/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
index c78b6f9b9..d87db3ec8 100644
--- a/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
+++ b/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
@@ -1,55 +1,55 @@
 <?php
 
 final class DiffusionSvnFileContentQuery extends DiffusionFileContentQuery {
 
   public function getFileContentFuture() {
     $drequest = $this->getRequest();
 
     $repository = $drequest->getRepository();
     $path = $drequest->getPath();
     $commit = $drequest->getCommit();
 
     return $repository->getRemoteCommandFuture(
       '%C %s',
       $this->getNeedsBlame() ? 'blame --force' : 'cat',
       $repository->getSubversionPathURI($path, $commit));
   }
 
   protected function executeQueryFromFuture(Future $future) {
     try {
       list($corpus) = $future->resolvex();
     } catch (CommandException $ex) {
       $stderr = $ex->getStdErr();
       if (preg_match('/path not found$/', trim($stderr))) {
         // TODO: Improve user experience for this. One way to end up here
         // is to have the parser behind and look at a file which was recently
         // nuked; Diffusion will think it still exists and try to grab content
         // at HEAD.
         throw new Exception(
-          "Failed to retrieve file content from Subversion. The file may ".
-          "have been recently deleted, or the Diffusion cache may be out of ".
-          "date.");
+          'Failed to retrieve file content from Subversion. The file may '.
+          'have been recently deleted, or the Diffusion cache may be out of '.
+          'date.');
       } else {
         throw $ex;
       }
     }
 
     $file_content = new DiffusionFileContent();
     $file_content->setCorpus($corpus);
 
     return $file_content;
   }
 
   protected function tokenizeLine($line) {
     // sample line:
     // 347498       yliu     function print();
     $m = array();
     preg_match('/^\s*(\d+)\s+(\S+)(?: (.*))?$/', $line, $m);
     $rev_id = $m[1];
     $author = $m[2];
     $text = idx($m, 3);
 
     return array($rev_id, $author, $text);
   }
 
 }
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php
index 82de8e404..751fbc4a9 100644
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php
@@ -1,135 +1,135 @@
 <?php
 
 /**
  * Execute and parse a low-level Git ref query using `git for-each-ref`. This
  * is useful for returning a list of tags or branches.
  *
  *
  */
 final class DiffusionLowLevelGitRefQuery extends DiffusionLowLevelQuery {
 
   private $isTag;
   private $isOriginBranch;
 
   public function withIsTag($is_tag) {
     $this->isTag = $is_tag;
     return $this;
   }
 
   public function withIsOriginBranch($is_origin_branch) {
     $this->isOriginBranch = $is_origin_branch;
     return $this;
   }
 
   protected function executeQuery() {
     $repository = $this->getRepository();
 
     if ($this->isTag && $this->isOriginBranch) {
-      throw new Exception("Specify tags or origin branches, not both!");
+      throw new Exception('Specify tags or origin branches, not both!');
     } else if ($this->isTag) {
       $prefix = 'refs/tags/';
     } else if ($this->isOriginBranch) {
       if ($repository->isWorkingCopyBare()) {
         $prefix = 'refs/heads/';
       } else {
         $remote = DiffusionGitBranch::DEFAULT_GIT_REMOTE;
         $prefix = 'refs/remotes/'.$remote.'/';
       }
     } else {
-      throw new Exception("Specify tags or origin branches!");
+      throw new Exception('Specify tags or origin branches!');
     }
 
     $order = '-creatordate';
 
     list($stdout) = $repository->execxLocalCommand(
       'for-each-ref --sort=%s --format=%s %s',
       $order,
       $this->getFormatString(),
       $prefix);
 
     $stdout = rtrim($stdout);
     if (!strlen($stdout)) {
       return array();
     }
 
     // NOTE: Although git supports --count, we can't apply any offset or limit
     // logic until the very end because we may encounter a HEAD which we want
     // to discard.
 
     $lines = explode("\n", $stdout);
     $results = array();
     foreach ($lines as $line) {
       $fields = $this->extractFields($line);
 
       $creator = $fields['creator'];
       $matches = null;
       if (preg_match('/^(.*) ([0-9]+) ([0-9+-]+)$/', $creator, $matches)) {
         $fields['author'] = $matches[1];
         $fields['epoch'] = (int)$matches[2];
       } else {
         $fields['author'] = null;
         $fields['epoch'] = null;
       }
 
       $commit = nonempty($fields['*objectname'], $fields['objectname']);
 
       $short = substr($fields['refname'], strlen($prefix));
       if ($short == 'HEAD') {
         continue;
       }
 
       $ref = id(new DiffusionRepositoryRef())
         ->setShortName($short)
         ->setCommitIdentifier($commit)
         ->setRawFields($fields);
 
       $results[] = $ref;
     }
 
     return $results;
   }
 
   /**
    * List of git `--format` fields we want to grab.
    */
   private function getFields() {
     return array(
       'objectname',
       'objecttype',
       'refname',
       '*objectname',
       '*objecttype',
       'subject',
       'creator',
     );
   }
 
   /**
    * Get a string for `--format` which enumerates all the fields we want.
    */
   private function getFormatString() {
     $fields = $this->getFields();
 
     foreach ($fields as $key => $field) {
       $fields[$key] = '%('.$field.')';
     }
 
-    return implode("%01", $fields);
+    return implode('%01', $fields);
   }
 
   /**
    * Parse a line back into fields.
    */
   private function extractFields($line) {
     $fields = $this->getFields();
     $parts = explode("\1", $line, count($fields));
 
     $dict = array();
     foreach ($fields as $index => $field) {
       $dict[$field] = idx($parts, $index);
     }
 
     return $dict;
   }
 
 }
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php
index 9f0a61bfc..6c19f9839 100644
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php
@@ -1,26 +1,26 @@
 <?php
 
 abstract class DiffusionLowLevelQuery extends Phobject {
 
   private $repository;
 
   abstract protected function executeQuery();
 
   public function setRepository(PhabricatorRepository $repository) {
     $this->repository = $repository;
     return $this;
   }
 
   public function getRepository() {
     return $this->repository;
   }
 
   public function execute() {
     if (!$this->getRepository()) {
-      throw new Exception("Call setRepository() before execute()!");
+      throw new Exception('Call setRepository() before execute()!');
     }
 
     return $this->executeQuery();
   }
 
 }
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
index abc7ae1c2..0d18d9601 100644
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
@@ -1,225 +1,225 @@
 <?php
 
 /**
  * Resolves references (like short commit names, branch names, tag names, etc.)
  * into canonical, stable commit identifiers. This query works for all
  * repository types.
  */
 final class DiffusionLowLevelResolveRefsQuery
   extends DiffusionLowLevelQuery {
 
   private $refs;
 
   public function withRefs(array $refs) {
     $this->refs = $refs;
     return $this;
   }
 
   public function executeQuery() {
     if (!$this->refs) {
       return array();
     }
 
     switch ($this->getRepository()->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $result = $this->resolveGitRefs();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $result = $this->resolveMercurialRefs();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $result = $this->resolveSubversionRefs();
         break;
       default:
-        throw new Exception("Unsupported repository type!");
+        throw new Exception('Unsupported repository type!');
     }
 
     return $result;
   }
 
   private function resolveGitRefs() {
     $repository = $this->getRepository();
 
     $future = $repository->getLocalCommandFuture('cat-file --batch-check');
     $future->write(implode("\n", $this->refs));
     list($stdout) = $future->resolvex();
 
     $lines = explode("\n", rtrim($stdout, "\n"));
     if (count($lines) !== count($this->refs)) {
-      throw new Exception("Unexpected line count from `git cat-file`!");
+      throw new Exception('Unexpected line count from `git cat-file`!');
     }
 
     $hits = array();
     $tags = array();
 
     $lines = array_combine($this->refs, $lines);
     foreach ($lines as $ref => $line) {
       $parts = explode(' ', $line);
       if (count($parts) < 2) {
         throw new Exception("Failed to parse `git cat-file` output: {$line}");
       }
       list($identifier, $type) = $parts;
 
       if ($type == 'missing') {
         // This is either an ambiguous reference which resolves to several
         // objects, or an invalid reference. For now, always treat it as
         // invalid. It would be nice to resolve all possibilities for
         // ambiguous references at some point, although the strategy for doing
         // so isn't clear to me.
         continue;
       }
 
       switch ($type) {
         case 'commit':
           break;
         case 'tag':
           $tags[] = $identifier;
           break;
         default:
           throw new Exception(
             "Unexpected object type from `git cat-file`: {$line}");
       }
 
       $hits[] = array(
         'ref' => $ref,
         'type' => $type,
         'identifier' => $identifier,
       );
     }
 
     $tag_map = array();
     if ($tags) {
       // If some of the refs were tags, just load every tag in order to figure
       // out which commits they map to. This might be somewhat inefficient in
       // repositories with a huge number of tags.
       $tag_refs = id(new DiffusionLowLevelGitRefQuery())
         ->setRepository($repository)
         ->withIsTag(true)
         ->executeQuery();
       foreach ($tag_refs as $tag_ref) {
         $tag_map[$tag_ref->getShortName()] = $tag_ref->getCommitIdentifier();
       }
     }
 
     $results = array();
     foreach ($hits as $hit) {
       $type = $hit['type'];
       $ref = $hit['ref'];
 
       $alternate = null;
       if ($type == 'tag') {
         $alternate = $identifier;
         $identifier = idx($tag_map, $ref);
         if (!$identifier) {
           throw new Exception("Failed to look up tag '{$ref}'!");
         }
       }
 
       $result = array(
         'type' => $type,
         'identifier' => $identifier,
       );
 
       if ($alternate !== null) {
         $result['alternate'] = $alternate;
       }
 
       $results[$ref][] = $result;
     }
 
     return $results;
   }
 
   private function resolveMercurialRefs() {
     $repository = $this->getRepository();
 
     $futures = array();
     foreach ($this->refs as $ref) {
       // TODO: There was a note about `--rev 'a b'` not working for branches
       // with spaces in their names in older code, but I suspect this was
       // misidentified and resulted from the branch name being interpeted as
       // a revset. Use hgsprintf() to avoid that. If this doesn't break for a
       // bit, remove this comment. Otherwise, consider `-b %s --limit 1`.
 
       $futures[$ref] = $repository->getLocalCommandFuture(
         'log --template=%s --rev %s',
         '{node}',
         hgsprintf('%s', $ref));
     }
 
     $results = array();
     foreach (Futures($futures) as $ref => $future) {
       try {
         list($stdout) = $future->resolvex();
       } catch (CommandException $ex) {
         if (preg_match('/ambiguous identifier/', $ex->getStdErr())) {
           // This indicates that the ref ambiguously matched several things.
           // Eventually, it would be nice to return all of them, but it is
           // unclear how to best do that. For now, treat it as a miss instead.
           continue;
         }
         throw $ex;
       }
 
       // It doesn't look like we can figure out the type (commit/branch/rev)
       // from this output very easily. For now, just call everything a commit.
       $type = 'commit';
 
       $results[$ref][] = array(
         'type' => $type,
         'identifier' => trim($stdout),
       );
     }
 
     return $results;
   }
 
   private function resolveSubversionRefs() {
     $repository = $this->getRepository();
 
     $max_commit = id(new PhabricatorRepositoryCommit())
       ->loadOneWhere(
         'repositoryID = %d ORDER BY epoch DESC, id DESC LIMIT 1',
         $repository->getID());
     if (!$max_commit) {
       // This repository is empty or hasn't parsed yet, so none of the refs are
       // going to resolve.
       return array();
     }
 
     $max_commit_id = (int)$max_commit->getCommitIdentifier();
 
     $results = array();
     foreach ($this->refs as $ref) {
       if ($ref == 'HEAD') {
         // Resolve "HEAD" to mean "the most recent commit".
         $results[$ref][] = array(
           'type' => 'commit',
           'identifier' => $max_commit_id,
         );
         continue;
       }
 
       if (!preg_match('/^\d+$/', $ref)) {
         // This ref is non-numeric, so it doesn't resolve to anything.
         continue;
       }
 
       // Resolve other commits if we can deduce their existence.
 
       // TODO: When we import only part of a repository, we won't necessarily
       // have all of the smaller commits. Should we fail to resolve them here
       // for repositories with a subpath? It might let us simplify other things
       // elsewhere.
       if ((int)$ref <= $max_commit_id) {
         $results[$ref][] = array(
           'type' => 'commit',
           'identifier' => (int)$ref,
         );
       }
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
index 566f8f9d0..c7fdeb0e3 100644
--- a/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
@@ -1,70 +1,70 @@
 <?php
 
 final class DiffusionGitRawDiffQuery extends DiffusionRawDiffQuery {
 
   protected function executeQuery() {
     $drequest = $this->getRequest();
     $repository = $drequest->getRepository();
 
     $commit = $this->getAnchorCommit();
 
     $options = array(
       '-M',
       '-C',
       '--no-ext-diff',
       '--no-color',
       '--src-prefix=a/',
       '--dst-prefix=b/',
       '-U'.(int)$this->getLinesOfContext(),
     );
     $options = implode(' ', $options);
 
     $against = $this->getAgainstCommit();
     if ($against === null) {
       $against = $commit.'^';
     }
 
     // If there's no path, get the entire raw diff.
     $path = nonempty($drequest->getPath(), '.');
 
     $future = $repository->getLocalCommandFuture(
-      "diff %C %s %s -- %s",
+      'diff %C %s %s -- %s',
       $options,
       $against,
       $commit,
       $path);
 
     $this->configureFuture($future);
 
     try {
       list($raw_diff) = $future->resolvex();
     } catch (CommandException $ex) {
       // Check if this is the root commit by seeing if it has parents.
       list($parents) = $repository->execxLocalCommand(
         'log --format=%s %s --',
         '%P', // "parents"
         $commit);
 
       if (strlen(trim($parents))) {
         throw $ex;
       }
 
       // No parents means we're looking at the root revision. Diff against
       // the empty tree hash instead, since there is no parent so "^" does
       // not work. See ArcanistGitAPI for more discussion.
       $future = $repository->getLocalCommandFuture(
         'diff %C %s %s -- %s',
         $options,
         ArcanistGitAPI::GIT_MAGIC_ROOT_COMMIT,
         $commit,
         $drequest->getPath());
 
       $this->configureFuture($future);
 
       list($raw_diff) = $future->resolvex();
     }
 
     return $raw_diff;
   }
 
 }
diff --git a/src/applications/diffusion/request/DiffusionGitRequest.php b/src/applications/diffusion/request/DiffusionGitRequest.php
index f42f7a57b..d8c9e932e 100644
--- a/src/applications/diffusion/request/DiffusionGitRequest.php
+++ b/src/applications/diffusion/request/DiffusionGitRequest.php
@@ -1,32 +1,32 @@
 <?php
 
 final class DiffusionGitRequest extends DiffusionRequest {
 
   protected function getSupportsBranches() {
     return true;
   }
 
   protected function isStableCommit($symbol) {
     return preg_match('/^[a-f0-9]{40}\z/', $symbol);
   }
 
   public function getBranch() {
     if ($this->branch) {
       return $this->branch;
     }
     if ($this->repository) {
       return $this->repository->getDefaultBranch();
     }
-    throw new Exception("Unable to determine branch!");
+    throw new Exception('Unable to determine branch!');
   }
 
   protected function getResolvableBranchName($branch) {
     if ($this->repository->isWorkingCopyBare()) {
       return $branch;
     } else {
       $remote = DiffusionGitBranch::DEFAULT_GIT_REMOTE;
       return $remote.'/'.$branch;
     }
   }
 
 }
diff --git a/src/applications/diffusion/request/DiffusionMercurialRequest.php b/src/applications/diffusion/request/DiffusionMercurialRequest.php
index b76d0597d..d518f3b70 100644
--- a/src/applications/diffusion/request/DiffusionMercurialRequest.php
+++ b/src/applications/diffusion/request/DiffusionMercurialRequest.php
@@ -1,25 +1,25 @@
 <?php
 
 final class DiffusionMercurialRequest extends DiffusionRequest {
 
   protected function getSupportsBranches() {
     return true;
   }
 
   protected function isStableCommit($symbol) {
     return preg_match('/^[a-f0-9]{40}\z/', $symbol);
   }
 
   public function getBranch() {
     if ($this->branch) {
       return $this->branch;
     }
 
     if ($this->repository) {
       return $this->repository->getDefaultBranch();
     }
 
-    throw new Exception("Unable to determine branch!");
+    throw new Exception('Unable to determine branch!');
   }
 
 }
diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php
index e2c21367c..e18f2a357 100644
--- a/src/applications/diffusion/request/DiffusionRequest.php
+++ b/src/applications/diffusion/request/DiffusionRequest.php
@@ -1,759 +1,759 @@
 <?php
 
 /**
  * Contains logic to parse Diffusion requests, which have a complicated URI
  * structure.
  *
  * @task new Creating Requests
  * @task uri Managing Diffusion URIs
  */
 abstract class DiffusionRequest {
 
   protected $callsign;
   protected $path;
   protected $line;
   protected $branch;
   protected $lint;
 
   protected $symbolicCommit;
   protected $symbolicType;
   protected $stableCommit;
 
   protected $repository;
   protected $repositoryCommit;
   protected $repositoryCommitData;
   protected $arcanistProjects;
 
   private $initFromConduit = true;
   private $user;
   private $branchObject = false;
 
   abstract protected function getSupportsBranches();
   abstract protected function isStableCommit($symbol);
 
   protected function didInitialize() {
     return null;
   }
 
 
 /* -(  Creating Requests  )-------------------------------------------------- */
 
 
   /**
    * Create a new synthetic request from a parameter dictionary. If you need
    * a @{class:DiffusionRequest} object in order to issue a DiffusionQuery, you
    * can use this method to build one.
    *
    * Parameters are:
    *
    *   - `callsign` Repository callsign. Provide this or `repository`.
    *   - `user` Viewing user. Required if `callsign` is provided.
    *   - `repository` Repository object. Provide this or `callsign`.
    *   - `branch` Optional, branch name.
    *   - `path` Optional, file path.
    *   - `commit` Optional, commit identifier.
    *   - `line` Optional, line range.
    *
    * @param   map                 See documentation.
    * @return  DiffusionRequest    New request object.
    * @task new
    */
   final public static function newFromDictionary(array $data) {
     if (isset($data['repository']) && isset($data['callsign'])) {
       throw new Exception(
         "Specify 'repository' or 'callsign', but not both.");
     } else if (!isset($data['repository']) && !isset($data['callsign'])) {
       throw new Exception(
         "One of 'repository' and 'callsign' is required.");
     } else if (isset($data['callsign']) && empty($data['user'])) {
       throw new Exception(
         "Parameter 'user' is required if 'callsign' is provided.");
     }
 
     if (isset($data['repository'])) {
       $object = self::newFromRepository($data['repository']);
     } else {
       $object = self::newFromCallsign($data['callsign'], $data['user']);
     }
 
     $object->initializeFromDictionary($data);
 
     return $object;
   }
 
 
   /**
    * Create a new request from an Aphront request dictionary. This is an
    * internal method that you generally should not call directly; instead,
    * call @{method:newFromDictionary}.
    *
    * @param   map                 Map of Aphront request data.
    * @return  DiffusionRequest    New request object.
    * @task new
    */
   final public static function newFromAphrontRequestDictionary(
     array $data,
     AphrontRequest $request) {
 
     $callsign = phutil_unescape_uri_path_component(idx($data, 'callsign'));
     $object = self::newFromCallsign($callsign, $request->getUser());
 
     $use_branches = $object->getSupportsBranches();
     $parsed = self::parseRequestBlob(idx($data, 'dblob'), $use_branches);
 
     $object->setUser($request->getUser());
     $object->initializeFromDictionary($parsed);
     $object->lint = $request->getStr('lint');
     return $object;
   }
 
 
   /**
    * Internal.
    *
    * @task new
    */
   final private function __construct() {
     // <private>
   }
 
 
   /**
    * Internal. Use @{method:newFromDictionary}, not this method.
    *
    * @param   string              Repository callsign.
    * @param   PhabricatorUser     Viewing user.
    * @return  DiffusionRequest    New request object.
    * @task new
    */
   final private static function newFromCallsign(
     $callsign,
     PhabricatorUser $viewer) {
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($viewer)
       ->withCallsigns(array($callsign))
       ->executeOne();
 
     if (!$repository) {
       throw new Exception("No such repository '{$callsign}'.");
     }
 
     return self::newFromRepository($repository);
   }
 
 
   /**
    * Internal. Use @{method:newFromDictionary}, not this method.
    *
    * @param   PhabricatorRepository   Repository object.
    * @return  DiffusionRequest        New request object.
    * @task new
    */
   final private static function newFromRepository(
     PhabricatorRepository $repository) {
 
     $map = array(
       PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'DiffusionGitRequest',
       PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => 'DiffusionSvnRequest',
       PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL =>
         'DiffusionMercurialRequest',
     );
 
     $class = idx($map, $repository->getVersionControlSystem());
 
     if (!$class) {
-      throw new Exception("Unknown version control system!");
+      throw new Exception('Unknown version control system!');
     }
 
     $object = new $class();
 
     $object->repository = $repository;
     $object->callsign   = $repository->getCallsign();
 
     return $object;
   }
 
 
   /**
    * Internal. Use @{method:newFromDictionary}, not this method.
    *
    * @param map Map of parsed data.
    * @return void
    * @task new
    */
   final private function initializeFromDictionary(array $data) {
     $this->path            = idx($data, 'path');
     $this->line            = idx($data, 'line');
     $this->initFromConduit = idx($data, 'initFromConduit', true);
 
     $this->symbolicCommit = idx($data, 'commit');
     if ($this->getSupportsBranches()) {
       $this->branch = idx($data, 'branch');
     }
 
     if (!$this->getUser()) {
       $user = idx($data, 'user');
       if (!$user) {
         throw new Exception(
           'You must provide a PhabricatorUser in the dictionary!');
       }
       $this->setUser($user);
     }
 
     $this->didInitialize();
   }
 
   final protected function shouldInitFromConduit() {
     return $this->initFromConduit;
   }
 
   final public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
   final public function getUser() {
     return $this->user;
   }
 
   public function getRepository() {
     return $this->repository;
   }
 
   public function getCallsign() {
     return $this->callsign;
   }
 
   public function setPath($path) {
     $this->path = $path;
     return $this;
   }
 
   public function getPath() {
     return $this->path;
   }
 
   public function getLine() {
     return $this->line;
   }
 
   public function getCommit() {
 
     // TODO: Probably remove all of this.
 
     if ($this->getSymbolicCommit() !== null) {
       return $this->getSymbolicCommit();
     }
 
     return $this->getStableCommit();
   }
 
   /**
    * Get the symbolic commit associated with this request.
    *
    * A symbolic commit may be a commit hash, an abbreviated commit hash, a
    * branch name, a tag name, or an expression like "HEAD^^^". The symbolic
    * commit may also be absent.
    *
    * This method always returns the symbol present in the original request,
    * in unmodified form.
    *
    * See also @{method:getStableCommit}.
    *
    * @return string|null  Symbolic commit, if one was present in the request.
    */
   public function getSymbolicCommit() {
     return $this->symbolicCommit;
   }
 
 
   /**
    * Modify the request to move the symbolic commit elsewhere.
    *
    * @param string New symbolic commit.
    * @return this
    */
   public function updateSymbolicCommit($symbol) {
     $this->symbolicCommit = $symbol;
     $this->symbolicType = null;
     $this->stableCommit = null;
     return $this;
   }
 
 
   /**
    * Get the ref type (`commit` or `tag`) of the location associated with this
    * request.
    *
    * If a symbolic commit is present in the request, this method identifies
    * the type of the symbol. Otherwise, it identifies the type of symbol of
    * the location the request is implicitly associated with. This will probably
    * always be `commit`.
    *
    * @return string   Symbolic commit type (`commit` or `tag`).
    */
   public function getSymbolicType() {
     if ($this->symbolicType === null) {
       // As a side effect, this resolves the symbolic type.
       $this->getStableCommit();
     }
     return $this->symbolicType;
   }
 
 
   /**
    * Retrieve the stable, permanent commit name identifying the repository
    * location associated with this request.
    *
    * This returns a non-symbolic identifier for the current commit: in Git and
    * Mercurial, a 40-character SHA1; in SVN, a revision number.
    *
    * See also @{method:getSymbolicCommit}.
    *
    * @return string Stable commit name, like a git hash or SVN revision. Not
    *                a symbolic commit reference.
    */
   public function getStableCommit() {
     if (!$this->stableCommit) {
       if ($this->isStableCommit($this->symbolicCommit)) {
         $this->stableCommit = $this->symbolicCommit;
         $this->symbolicType = 'commit';
       } else {
         $this->queryStableCommit();
       }
     }
     return $this->stableCommit;
   }
 
 
   public function getBranch() {
     return $this->branch;
   }
 
   public function getLint() {
     return $this->lint;
   }
 
   protected function getArcanistBranch() {
     return $this->getBranch();
   }
 
   public function loadBranch() {
     // TODO: Get rid of this and do real Queries on real objects.
 
     if ($this->branchObject === false) {
       $this->branchObject = PhabricatorRepositoryBranch::loadBranch(
         $this->getRepository()->getID(),
         $this->getArcanistBranch());
     }
 
     return $this->branchObject;
   }
 
   public function loadCoverage() {
     // TODO: This should also die.
     $branch = $this->loadBranch();
     if (!$branch) {
       return;
     }
 
     $path = $this->getPath();
     $path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs();
 
     $coverage_row = queryfx_one(
       id(new PhabricatorRepository())->establishConnection('r'),
       'SELECT * FROM %T WHERE branchID = %d AND pathID = %d
         ORDER BY commitID DESC LIMIT 1',
       'repository_coverage',
       $branch->getID(),
       $path_map[$path]);
 
     if (!$coverage_row) {
       return null;
     }
 
     return idx($coverage_row, 'coverage');
   }
 
 
   public function loadCommit() {
     if (empty($this->repositoryCommit)) {
       $repository = $this->getRepository();
 
       // TODO: (T603) This should be a real query, but we need to sort out
       // the viewer.
       $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
         'repositoryID = %d AND commitIdentifier = %s',
         $repository->getID(),
         $this->getStableCommit());
       if ($commit) {
         $commit->attachRepository($repository);
       }
       $this->repositoryCommit = $commit;
     }
     return $this->repositoryCommit;
   }
 
   public function loadArcanistProjects() {
     if (empty($this->arcanistProjects)) {
       $projects = id(new PhabricatorRepositoryArcanistProject())->loadAllWhere(
         'repositoryID = %d',
         $this->getRepository()->getID());
       $this->arcanistProjects = $projects;
     }
     return $this->arcanistProjects;
   }
 
   public function loadCommitData() {
     if (empty($this->repositoryCommitData)) {
       $commit = $this->loadCommit();
       $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
         'commitID = %d',
         $commit->getID());
       if (!$data) {
         $data = new PhabricatorRepositoryCommitData();
         $data->setCommitMessage(
           '(This commit has not been fully parsed yet.)');
       }
       $this->repositoryCommitData = $data;
     }
     return $this->repositoryCommitData;
   }
 
 /* -(  Managing Diffusion URIs  )-------------------------------------------- */
 
 
   /**
    * Generate a Diffusion URI using this request to provide defaults. See
    * @{method:generateDiffusionURI} for details. This method is the same, but
    * preserves the request parameters if they are not overridden.
    *
    * @param   map         See @{method:generateDiffusionURI}.
    * @return  PhutilURI   Generated URI.
    * @task uri
    */
   public function generateURI(array $params) {
     if (empty($params['stable'])) {
       $default_commit = $this->getSymbolicCommit();
     } else {
       $default_commit = $this->getStableCommit();
     }
 
     $defaults = array(
       'callsign'  => $this->getCallsign(),
       'path'      => $this->getPath(),
       'branch'    => $this->getBranch(),
       'commit'    => $default_commit,
       'lint'      => idx($params, 'lint', $this->getLint()),
     );
     foreach ($defaults as $key => $val) {
       if (!isset($params[$key])) { // Overwrite NULL.
         $params[$key] = $val;
       }
     }
     return self::generateDiffusionURI($params);
   }
 
 
   /**
    * Generate a Diffusion URI from a parameter map. Applies the correct encoding
    * and formatting to the URI. Parameters are:
    *
    *   - `action` One of `history`, `browse`, `change`, `lastmodified`,
    *     `branch`, `tags`, `branches`,  or `revision-ref`. The action specified
    *      by the URI.
    *   - `callsign` Repository callsign.
    *   - `branch` Optional if action is not `branch`, branch name.
    *   - `path` Optional, path to file.
    *   - `commit` Optional, commit identifier.
    *   - `line` Optional, line range.
    *   - `lint` Optional, lint code.
    *   - `params` Optional, query parameters.
    *
    * The function generates the specified URI and returns it.
    *
    * @param   map         See documentation.
    * @return  PhutilURI   Generated URI.
    * @task uri
    */
   public static function generateDiffusionURI(array $params) {
     $action = idx($params, 'action');
 
     $callsign = idx($params, 'callsign');
     $path     = idx($params, 'path');
     $branch   = idx($params, 'branch');
     $commit   = idx($params, 'commit');
     $line     = idx($params, 'line');
 
     if (strlen($callsign)) {
       $callsign = phutil_escape_uri_path_component($callsign).'/';
     }
 
     if (strlen($branch)) {
       $branch = phutil_escape_uri_path_component($branch).'/';
     }
 
     if (strlen($path)) {
       $path = ltrim($path, '/');
       $path = str_replace(array(';', '$'), array(';;', '$$'), $path);
       $path = phutil_escape_uri($path);
     }
 
     $path = "{$branch}{$path}";
 
     if (strlen($commit)) {
       $commit = str_replace('$', '$$', $commit);
       $commit = ';'.phutil_escape_uri($commit);
     }
 
     if (strlen($line)) {
       $line = '$'.phutil_escape_uri($line);
     }
 
     $req_callsign = false;
     $req_branch   = false;
     $req_commit   = false;
 
     switch ($action) {
       case 'history':
       case 'browse':
       case 'change':
       case 'lastmodified':
       case 'tags':
       case 'branches':
       case 'lint':
         $req_callsign = true;
         break;
       case 'branch':
         $req_callsign = true;
         $req_branch = true;
         break;
       case 'commit':
         $req_callsign = true;
         $req_commit = true;
         break;
     }
 
     if ($req_callsign && !strlen($callsign)) {
       throw new Exception(
         "Diffusion URI action '{$action}' requires callsign!");
     }
 
     if ($req_commit && !strlen($commit)) {
       throw new Exception(
         "Diffusion URI action '{$action}' requires commit!");
     }
 
     switch ($action) {
       case 'change':
       case 'history':
       case 'browse':
       case 'lastmodified':
       case 'tags':
       case 'branches':
       case 'lint':
       case 'pathtree':
         $uri = "/diffusion/{$callsign}{$action}/{$path}{$commit}{$line}";
         break;
       case 'branch':
         if (strlen($path)) {
           $uri = "/diffusion/{$callsign}repository/{$path}";
         } else {
           $uri = "/diffusion/{$callsign}";
         }
         break;
       case 'external':
         $commit = ltrim($commit, ';');
         $uri = "/diffusion/external/{$commit}/";
         break;
       case 'rendering-ref':
         // This isn't a real URI per se, it's passed as a query parameter to
         // the ajax changeset stuff but then we parse it back out as though
         // it came from a URI.
         $uri = rawurldecode("{$path}{$commit}");
         break;
       case 'commit':
         $commit = ltrim($commit, ';');
         $callsign = rtrim($callsign, '/');
         $uri = "/r{$callsign}{$commit}";
         break;
       default:
         throw new Exception("Unknown Diffusion URI action '{$action}'!");
     }
 
     if ($action == 'rendering-ref') {
       return $uri;
     }
 
     $uri = new PhutilURI($uri);
 
     if (isset($params['lint'])) {
       $params['params'] = idx($params, 'params', array()) + array(
         'lint' => $params['lint'],
       );
     }
 
     if (idx($params, 'params')) {
       $uri->setQueryParams($params['params']);
     }
 
     return $uri;
   }
 
 
   /**
    * Internal. Public only for unit tests.
    *
    * Parse the request URI into components.
    *
    * @param   string  URI blob.
    * @param   bool    True if this VCS supports branches.
    * @return  map     Parsed URI.
    *
    * @task uri
    */
   public static function parseRequestBlob($blob, $supports_branches) {
     $result = array(
       'branch'  => null,
       'path'    => null,
       'commit'  => null,
       'line'    => null,
     );
 
     $matches = null;
 
     if ($supports_branches) {
       // Consume the front part of the URI, up to the first "/". This is the
       // path-component encoded branch name.
       if (preg_match('@^([^/]+)/@', $blob, $matches)) {
         $result['branch'] = phutil_unescape_uri_path_component($matches[1]);
         $blob = substr($blob, strlen($matches[1]) + 1);
       }
     }
 
     // Consume the back part of the URI, up to the first "$". Use a negative
     // lookbehind to prevent matching '$$'. We double the '$' symbol when
     // encoding so that files with names like "money/$100" will survive.
     $pattern = '@(?:(?:^|[^$])(?:[$][$])*)[$]([\d-,]+)$@';
     if (preg_match($pattern, $blob, $matches)) {
       $result['line'] = $matches[1];
       $blob = substr($blob, 0, -(strlen($matches[1]) + 1));
     }
 
     // We've consumed the line number if it exists, so unescape "$" in the
     // rest of the string.
     $blob = str_replace('$$', '$', $blob);
 
     // Consume the commit name, stopping on ';;'. We allow any character to
     // appear in commits names, as they can sometimes be symbolic names (like
     // tag names or refs).
     if (preg_match('@(?:(?:^|[^;])(?:;;)*);([^;].*)$@', $blob, $matches)) {
       $result['commit'] = $matches[1];
       $blob = substr($blob, 0, -(strlen($matches[1]) + 1));
     }
 
     // We've consumed the commit if it exists, so unescape ";" in the rest
     // of the string.
     $blob = str_replace(';;', ';', $blob);
 
     if (strlen($blob)) {
       $result['path'] = $blob;
     }
 
     $parts = explode('/', $result['path']);
     foreach ($parts as $part) {
       // Prevent any hyjinx since we're ultimately shipping this to the
       // filesystem under a lot of workflows.
       if ($part == '..') {
-        throw new Exception("Invalid path URI.");
+        throw new Exception('Invalid path URI.');
       }
     }
 
     return $result;
   }
 
   /**
    * Check that the working copy of the repository is present and readable.
    *
    * @param   string  Path to the working copy.
    */
   protected function validateWorkingCopy($path) {
     if (!is_readable(dirname($path))) {
       $this->raisePermissionException();
     }
 
     if (!Filesystem::pathExists($path)) {
       $this->raiseCloneException();
     }
   }
 
   protected function raisePermissionException() {
     $host = php_uname('n');
     $callsign = $this->getRepository()->getCallsign();
     throw new DiffusionSetupException(
       "The clone of this repository ('{$callsign}') on the local machine " .
       "('{$host}') could not be read. Ensure that the repository is in a " .
       "location where the web server has read permissions.");
   }
 
   protected function raiseCloneException() {
     $host = php_uname('n');
     $callsign = $this->getRepository()->getCallsign();
     throw new DiffusionSetupException(
       "The working copy for this repository ('{$callsign}') hasn't been ".
       "cloned yet on this machine ('{$host}'). Make sure you've started the ".
       "Phabricator daemons. If this problem persists for longer than a clone ".
       "should take, check the daemon logs (in the Daemon Console) to see if ".
       "there were errors cloning the repository. Consult the 'Diffusion User ".
       "Guide' in the documentation for help setting up repositories.");
   }
 
   private function queryStableCommit() {
     if ($this->symbolicCommit) {
       $ref = $this->symbolicCommit;
     } else {
       if ($this->getSupportsBranches()) {
         $ref = $this->getResolvableBranchName($this->getBranch());
       } else {
         $ref = 'HEAD';
       }
     }
 
     $results = $this->resolveRefs(array($ref));
 
     $matches = idx($results, $ref, array());
     if (count($matches) !== 1) {
       $message = pht('Ref "%s" is ambiguous or does not exist.', $ref);
       throw id(new DiffusionRefNotFoundException($message))
         ->setRef($ref);
     }
 
     $match = head($matches);
 
     $this->stableCommit = $match['identifier'];
     $this->symbolicType = $match['type'];
   }
 
   protected function getResolvableBranchName($branch) {
     return $branch;
   }
 
   private function resolveRefs(array $refs) {
     if ($this->shouldInitFromConduit()) {
       return DiffusionQuery::callConduitWithDiffusionRequest(
         $this->getUser(),
         $this,
         'diffusion.resolverefs',
         array(
           'refs' => $refs,
         ));
     } else {
       return id(new DiffusionLowLevelResolveRefsQuery())
         ->setRepository($this->getRepository())
         ->withRefs($refs)
         ->execute();
     }
   }
 
 
 }
diff --git a/src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php
index e7697e608..13bdb9bc3 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php
@@ -1,105 +1,105 @@
 <?php
 
 final class DiffusionSSHMercurialServeWorkflow
   extends DiffusionSSHMercurialWorkflow {
 
   protected $didSeeWrite;
 
   public function didConstruct() {
     $this->setName('hg');
     $this->setArguments(
       array(
         array(
           'name' => 'repository',
           'short' => 'R',
           'param' => 'repo',
         ),
         array(
           'name' => 'stdio',
         ),
         array(
           'name' => 'command',
           'wildcard' => true,
         ),
       ));
   }
 
   protected function executeRepositoryOperations() {
     $args = $this->getArgs();
     $path = $args->getArg('repository');
     $repository = $this->loadRepository($path);
 
     $args = $this->getArgs();
 
     if (!$args->getArg('stdio')) {
-      throw new Exception("Expected `hg ... --stdio`!");
+      throw new Exception('Expected `hg ... --stdio`!');
     }
 
     if ($args->getArg('command') !== array('serve')) {
-      throw new Exception("Expected `hg ... serve`!");
+      throw new Exception('Expected `hg ... serve`!');
     }
 
     $command = csprintf('hg -R %s serve --stdio', $repository->getLocalPath());
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);
 
     $future = id(new ExecFuture('%C', $command))
       ->setEnv($this->getEnvironment());
 
     $io_channel = $this->getIOChannel();
     $protocol_channel = new DiffusionSSHMercurialWireClientProtocolChannel(
       $io_channel);
 
     $err = id($this->newPassthruCommand())
       ->setIOChannel($protocol_channel)
       ->setCommandChannelFromExecFuture($future)
       ->setWillWriteCallback(array($this, 'willWriteMessageCallback'))
       ->execute();
 
     // TODO: It's apparently technically possible to communicate errors to
     // Mercurial over SSH by writing a special "\n<error>\n-\n" string. However,
     // my attempt to implement that resulted in Mercurial closing the socket and
     // then hanging, without showing the error. This might be an issue on our
     // side (we need to close our half of the socket?), or maybe the code
     // for this in Mercurial doesn't actually work, or maybe something else
     // is afoot. At some point, we should look into doing this more cleanly.
     // For now, when we, e.g., reject writes for policy reasons, the user will
     // see "abort: unexpected response: empty string" after the diagnostically
     // useful, e.g., "remote: This repository is read-only over SSH." message.
 
     if (!$err && $this->didSeeWrite) {
       $repository->writeStatusMessage(
         PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE,
         PhabricatorRepositoryStatusMessage::CODE_OKAY);
     }
 
     return $err;
   }
 
   public function willWriteMessageCallback(
     PhabricatorSSHPassthruCommand $command,
     $message) {
 
     $command = $message['command'];
 
     // Check if this is a readonly command.
 
     $is_readonly = false;
     if ($command == 'batch') {
       $cmds = idx($message['arguments'], 'cmds');
       if (DiffusionMercurialWireProtocol::isReadOnlyBatchCommand($cmds)) {
         $is_readonly = true;
       }
     } else if (DiffusionMercurialWireProtocol::isReadOnlyCommand($command)) {
       $is_readonly = true;
     }
 
     if (!$is_readonly) {
       $this->requireWriteAccess();
       $this->didSeeWrite = true;
     }
 
     // If we're good, return the raw message data.
     return $message['raw'];
   }
 
 }
diff --git a/src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php
index 09315d1ef..5d0e4fad3 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php
@@ -1,273 +1,273 @@
 <?php
 
 /**
  * This protocol has a good spec here:
  *
  *   http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_ra_svn/protocol
  *
  */
 final class DiffusionSSHSubversionServeWorkflow
   extends DiffusionSSHSubversionWorkflow {
 
   private $didSeeWrite;
 
   private $inProtocol;
   private $outProtocol;
 
   private $inSeenGreeting;
 
   private $outPhaseCount = 0;
 
   private $internalBaseURI;
   private $externalBaseURI;
 
   public function didConstruct() {
     $this->setName('svnserve');
     $this->setArguments(
       array(
         array(
           'name' => 'tunnel',
           'short' => 't',
         ),
       ));
   }
 
   protected function executeRepositoryOperations() {
     $args = $this->getArgs();
     if (!$args->getArg('tunnel')) {
-      throw new Exception("Expected `svnserve -t`!");
+      throw new Exception('Expected `svnserve -t`!');
     }
 
     $command = csprintf(
       'svnserve -t --tunnel-user=%s',
       $this->getUser()->getUsername());
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);
 
     $future = new ExecFuture('%C', $command);
 
     $this->inProtocol = new DiffusionSubversionWireProtocol();
     $this->outProtocol = new DiffusionSubversionWireProtocol();
 
     $err = id($this->newPassthruCommand())
       ->setIOChannel($this->getIOChannel())
       ->setCommandChannelFromExecFuture($future)
       ->setWillWriteCallback(array($this, 'willWriteMessageCallback'))
       ->setWillReadCallback(array($this, 'willReadMessageCallback'))
       ->execute();
 
     if (!$err && $this->didSeeWrite) {
       $this->getRepository()->writeStatusMessage(
         PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE,
         PhabricatorRepositoryStatusMessage::CODE_OKAY);
     }
 
     return $err;
   }
 
   public function willWriteMessageCallback(
     PhabricatorSSHPassthruCommand $command,
     $message) {
 
     $proto = $this->inProtocol;
     $messages = $proto->writeData($message);
 
     $result = array();
     foreach ($messages as $message) {
       $message_raw = $message['raw'];
       $struct = $message['structure'];
 
       if (!$this->inSeenGreeting) {
         $this->inSeenGreeting = true;
 
         // The first message the client sends looks like:
         //
         //   ( version ( cap1 ... ) url ... )
         //
         // We want to grab the URL, load the repository, make sure it exists and
         // is accessible, and then replace it with the location of the
         // repository on disk.
 
         $uri = $struct[2]['value'];
         $struct[2]['value'] = $this->makeInternalURI($uri);
 
         $message_raw = $proto->serializeStruct($struct);
       } else if (isset($struct[0]) && $struct[0]['type'] == 'word') {
 
         if (!$proto->isReadOnlyCommand($struct)) {
           $this->didSeeWrite = true;
           $this->requireWriteAccess($struct[0]['value']);
         }
 
         // Several other commands also pass in URLs. We need to translate
         // all of these into the internal representation; this also makes sure
         // they're valid and accessible.
 
         switch ($struct[0]['value']) {
           case 'reparent':
             // ( reparent ( url ) )
             $struct[1]['value'][0]['value'] = $this->makeInternalURI(
               $struct[1]['value'][0]['value']);
             $message_raw = $proto->serializeStruct($struct);
             break;
           case 'switch':
             // ( switch ( ( rev ) target recurse url ... ) )
             $struct[1]['value'][3]['value'] = $this->makeInternalURI(
               $struct[1]['value'][3]['value']);
             $message_raw = $proto->serializeStruct($struct);
             break;
           case 'diff':
             // ( diff ( ( rev ) target recurse ignore-ancestry url ... ) )
             $struct[1]['value'][4]['value'] = $this->makeInternalURI(
               $struct[1]['value'][4]['value']);
             $message_raw = $proto->serializeStruct($struct);
             break;
           case 'add-file':
             // ( add-file ( path dir-token file-token [ copy-path copy-rev ] ) )
             if (isset($struct[1]['value'][3]['value'][0]['value'])) {
               $copy_from = $struct[1]['value'][3]['value'][0]['value'];
               $copy_from = $this->makeInternalURI($copy_from);
               $struct[1]['value'][3]['value'][0]['value'] = $copy_from;
             }
             $message_raw = $proto->serializeStruct($struct);
             break;
         }
       }
 
       $result[] = $message_raw;
     }
 
     if (!$result) {
       return null;
     }
 
     return implode('', $result);
   }
 
   public function willReadMessageCallback(
     PhabricatorSSHPassthruCommand $command,
     $message) {
 
     $proto = $this->outProtocol;
     $messages = $proto->writeData($message);
 
     $result = array();
     foreach ($messages as $message) {
       $message_raw = $message['raw'];
       $struct = $message['structure'];
 
       if (isset($struct[0]) && ($struct[0]['type'] == 'word')) {
 
         if ($struct[0]['value'] == 'success') {
           switch ($this->outPhaseCount) {
             case 0:
               // This is the "greeting", which announces capabilities.
               break;
             case 1:
               // This responds to the client greeting, and announces auth.
               break;
             case 2:
               // This responds to auth, which should be trivial over SSH.
               break;
             case 3:
               // This contains the URI of the repository. We need to edit it;
               // if it does not match what the client requested it will reject
               // the response.
               $struct[1]['value'][1]['value'] = $this->makeExternalURI(
                 $struct[1]['value'][1]['value']);
               $message_raw = $proto->serializeStruct($struct);
               break;
             default:
               // We don't care about other protocol frames.
               break;
           }
 
           $this->outPhaseCount++;
         } else if ($struct[0]['value'] == 'failure') {
           // Find any error messages which include the internal URI, and
           // replace the text with the external URI.
           foreach ($struct[1]['value'] as $key => $error) {
             $code = $error['value'][0]['value'];
             $message = $error['value'][1]['value'];
 
             $message = str_replace(
               $this->internalBaseURI,
               $this->externalBaseURI,
               $message);
 
             // Derp derp derp derp derp. The structure looks like this:
             //   ( failure ( ( code message ... ) ... ) )
             $struct[1]['value'][$key]['value'][1]['value'] = $message;
           }
           $message_raw = $proto->serializeStruct($struct);
         }
 
       }
 
       $result[] = $message_raw;
     }
 
     if (!$result) {
       return null;
     }
 
     return implode('', $result);
   }
 
   private function makeInternalURI($uri_string) {
     $uri = new PhutilURI($uri_string);
 
     $proto = $uri->getProtocol();
     if ($proto !== 'svn+ssh') {
       throw new Exception(
         pht(
           'Protocol for URI "%s" MUST be "svn+ssh".',
           $uri_string));
     }
 
     $path = $uri->getPath();
 
     // Subversion presumably deals with this, but make sure there's nothing
     // skethcy going on with the URI.
     if (preg_match('(/\\.\\./)', $path)) {
       throw new Exception(
         pht(
           'String "/../" is invalid in path specification "%s".',
           $uri_string));
     }
 
     $repository = $this->loadRepository($path);
 
     $path = preg_replace(
       '(^/diffusion/[A-Z]+)',
       rtrim($repository->getLocalPath(), '/'),
       $path);
 
     if (preg_match('(^/diffusion/[A-Z]+/\z)', $path)) {
       $path = rtrim($path, '/');
     }
 
     $uri->setPath($path);
 
     // If this is happening during the handshake, these are the base URIs for
     // the request.
     if ($this->externalBaseURI === null) {
       $pre = (string)id(clone $uri)->setPath('');
       $this->externalBaseURI = $pre.'/diffusion/'.$repository->getCallsign();
       $this->internalBaseURI = $pre.rtrim($repository->getLocalPath(), '/');
     }
 
     return (string)$uri;
   }
 
   private function makeExternalURI($uri) {
     $internal = $this->internalBaseURI;
     $external = $this->externalBaseURI;
 
     if (strncmp($uri, $internal, strlen($internal)) === 0) {
       $uri = $external.substr($uri, strlen($internal));
     }
 
     return $uri;
   }
 
 }
diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
index 74bfcdc72..d62ff1d87 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
@@ -1,139 +1,139 @@
 <?php
 
 abstract class DiffusionSSHWorkflow extends PhabricatorSSHWorkflow {
 
   private $args;
   private $repository;
   private $hasWriteAccess;
 
   public function getRepository() {
     if (!$this->repository) {
-      throw new Exception("Call loadRepository() before getRepository()!");
+      throw new Exception('Call loadRepository() before getRepository()!');
     }
     return $this->repository;
   }
 
   public function getArgs() {
     return $this->args;
   }
 
   public function getEnvironment() {
     $env = array(
       DiffusionCommitHookEngine::ENV_USER => $this->getUser()->getUsername(),
       DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL => 'ssh',
     );
 
     $ssh_client = getenv('SSH_CLIENT');
     if ($ssh_client) {
       // This has the format "<ip> <remote-port> <local-port>". Grab the IP.
       $remote_address = head(explode(' ', $ssh_client));
       $env[DiffusionCommitHookEngine::ENV_REMOTE_ADDRESS] = $remote_address;
     }
 
     return $env;
   }
 
   abstract protected function executeRepositoryOperations();
 
   protected function writeError($message) {
     $this->getErrorChannel()->write($message);
     return $this;
   }
 
   final public function execute(PhutilArgumentParser $args) {
     $this->args = $args;
 
     try {
       return $this->executeRepositoryOperations();
     } catch (Exception $ex) {
       $this->writeError(get_class($ex).': '.$ex->getMessage());
       return 1;
     }
   }
 
   protected function loadRepository($path) {
     $viewer = $this->getUser();
 
     $regex = '@^/?diffusion/(?P<callsign>[A-Z]+)(?:/|\z)@';
     $matches = null;
     if (!preg_match($regex, $path, $matches)) {
       throw new Exception(
         pht(
           'Unrecognized repository path "%s". Expected a path like '.
           '"%s".',
           $path,
-          "/diffusion/X/"));
+          '/diffusion/X/'));
     }
 
     $callsign = $matches[1];
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($viewer)
       ->withCallsigns(array($callsign))
       ->executeOne();
 
     if (!$repository) {
       throw new Exception(
         pht('No repository "%s" exists!', $callsign));
     }
 
     switch ($repository->getServeOverSSH()) {
       case PhabricatorRepository::SERVE_READONLY:
       case PhabricatorRepository::SERVE_READWRITE:
         // If we have read or read/write access, proceed for now. We will
         // check write access when the user actually issues a write command.
         break;
       case PhabricatorRepository::SERVE_OFF:
       default:
         throw new Exception(
           pht('This repository is not available over SSH.'));
     }
 
     $this->repository = $repository;
 
     return $repository;
   }
 
   protected function requireWriteAccess($protocol_command = null) {
     if ($this->hasWriteAccess === true) {
       return;
     }
 
     $repository = $this->getRepository();
     $viewer = $this->getUser();
 
     switch ($repository->getServeOverSSH()) {
       case PhabricatorRepository::SERVE_READONLY:
         if ($protocol_command !== null) {
           throw new Exception(
             pht(
               'This repository is read-only over SSH (tried to execute '.
               'protocol command "%s").',
               $protocol_command));
         } else {
           throw new Exception(
             pht('This repository is read-only over SSH.'));
         }
         break;
       case PhabricatorRepository::SERVE_READWRITE:
         $can_push = PhabricatorPolicyFilter::hasCapability(
           $viewer,
           $repository,
           DiffusionCapabilityPush::CAPABILITY);
         if (!$can_push) {
           throw new Exception(
             pht('You do not have permission to push to this repository.'));
         }
         break;
       case PhabricatorRepository::SERVE_OFF:
       default:
         // This shouldn't be reachable because we don't get this far if the
         // repository isn't enabled, but kick them out anyway.
         throw new Exception(
           pht('This repository is not available over SSH.'));
     }
 
     $this->hasWriteAccess = true;
     return $this->hasWriteAccess;
   }
 
 }
diff --git a/src/applications/diffusion/view/DiffusionCommentView.php b/src/applications/diffusion/view/DiffusionCommentView.php
index defaf49a0..41804e59a 100644
--- a/src/applications/diffusion/view/DiffusionCommentView.php
+++ b/src/applications/diffusion/view/DiffusionCommentView.php
@@ -1,209 +1,209 @@
 <?php
 
 final class DiffusionCommentView extends AphrontView {
 
   private $comment;
   private $commentNumber;
   private $handles;
   private $isPreview;
   private $pathMap;
 
   private $inlineComments;
   private $markupEngine;
 
   public function setComment(PhabricatorAuditComment $comment) {
     $this->comment = $comment;
     return $this;
   }
 
   public function setCommentNumber($comment_number) {
     $this->commentNumber = $comment_number;
     return $this;
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   public function setIsPreview($is_preview) {
     $this->isPreview = $is_preview;
     return $this;
   }
 
   public function setInlineComments(array $inline_comments) {
     assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');
     $this->inlineComments = $inline_comments;
     return $this;
   }
 
   public function setPathMap(array $path_map) {
     $this->pathMap = $path_map;
     return $this;
   }
 
   public function setMarkupEngine(PhabricatorMarkupEngine $markup_engine) {
     $this->markupEngine = $markup_engine;
     return $this;
   }
 
   public function getMarkupEngine() {
     return $this->markupEngine;
   }
 
   public function getRequiredHandlePHIDs() {
     return array($this->comment->getActorPHID());
   }
 
   private function getHandle($phid) {
     if (empty($this->handles[$phid])) {
       throw new Exception("Unloaded handle '{$phid}'!");
     }
     return $this->handles[$phid];
   }
 
   public function render() {
     $comment = $this->comment;
     $author = $this->getHandle($comment->getActorPHID());
     $author_link = $author->renderLink();
 
     $actions = $this->renderActions();
     $content = $this->renderContent();
     $classes = $this->renderClasses();
 
     $xaction_view = id(new PhabricatorTransactionView())
       ->setUser($this->user)
       ->setImageURI($author->getImageURI())
       ->setActions($actions)
       ->appendChild($content);
 
     if ($this->isPreview) {
       $xaction_view->setIsPreview(true);
     } else {
       $xaction_view
         ->setAnchor('comment-'.$this->commentNumber, '#'.$this->commentNumber)
         ->setEpoch($comment->getDateCreated());
     }
 
     foreach ($classes as $class) {
       $xaction_view->addClass($class);
     }
 
     return $xaction_view->render();
   }
 
   private function renderActions() {
     $comment = $this->comment;
     $author = $this->getHandle($comment->getActorPHID());
     $author_link = $author->renderLink();
 
     $action = $comment->getAction();
     $verb = PhabricatorAuditActionConstants::getActionPastTenseVerb($action);
 
     $metadata = $comment->getMetadata();
     $added_auditors = idx(
       $metadata,
       PhabricatorAuditComment::METADATA_ADDED_AUDITORS,
       array());
     $added_ccs = idx(
       $metadata,
       PhabricatorAuditComment::METADATA_ADDED_CCS,
       array());
 
     $actions = array();
     if ($action == PhabricatorAuditActionConstants::ADD_CCS) {
       $rendered_ccs = $this->renderHandleList($added_ccs);
-      $actions[] = pht("%s added CCs: %s.", $author_link, $rendered_ccs);
+      $actions[] = pht('%s added CCs: %s.', $author_link, $rendered_ccs);
     } else if ($action == PhabricatorAuditActionConstants::ADD_AUDITORS) {
       $rendered_auditors = $this->renderHandleList($added_auditors);
       $actions[] = pht(
-        "%s added auditors: %s.",
+        '%s added auditors: %s.',
         $author_link,
         $rendered_auditors);
     } else {
-      $actions[] = hsprintf("%s %s this commit.", $author_link, $verb);
+      $actions[] = hsprintf('%s %s this commit.', $author_link, $verb);
     }
 
     foreach ($actions as $key => $action) {
       $actions[$key] = phutil_tag('div', array(), $action);
     }
 
     return $actions;
   }
 
   private function renderContent() {
     $comment = $this->comment;
     $engine = $this->getMarkupEngine();
 
     if (!strlen($comment->getContent()) && empty($this->inlineComments)) {
       return null;
     } else {
       return phutil_tag_div('phabricator-remarkup', array(
         $engine->getOutput(
           $comment,
           PhabricatorAuditComment::MARKUP_FIELD_BODY),
         $this->renderInlines(),
       ));
     }
   }
 
   private function renderInlines() {
     if (!$this->inlineComments) {
       return null;
     }
 
     $engine = $this->getMarkupEngine();
 
     $inlines_by_path = mgroup($this->inlineComments, 'getPathID');
 
     $view = new PhabricatorInlineSummaryView();
     foreach ($inlines_by_path as $path_id => $inlines) {
       $path = idx($this->pathMap, $path_id);
       if ($path === null) {
         continue;
       }
 
       $items = array();
       foreach ($inlines as $inline) {
         $items[] = array(
           'id'      => $inline->getID(),
           'line'    => $inline->getLineNumber(),
           'length'  => $inline->getLineLength(),
           'content' => $engine->getOutput(
             $inline,
             PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY),
         );
       }
 
       $view->addCommentGroup($path, $items);
     }
 
     return $view;
   }
 
   private function renderHandleList(array $phids) {
     $result = array();
     foreach ($phids as $phid) {
       $result[] = $this->handles[$phid]->renderLink();
     }
     return phutil_implode_html(', ', $result);
   }
 
   private function renderClasses() {
     $comment = $this->comment;
 
     $classes = array();
     switch ($comment->getAction()) {
       case PhabricatorAuditActionConstants::ACCEPT:
         $classes[] = 'audit-accept';
         break;
       case PhabricatorAuditActionConstants::CONCERN:
         $classes[] = 'audit-concern';
         break;
     }
 
     return $classes;
   }
 
 }
diff --git a/src/applications/diffusion/view/DiffusionEmptyResultView.php b/src/applications/diffusion/view/DiffusionEmptyResultView.php
index 66d14ab36..e8a8de764 100644
--- a/src/applications/diffusion/view/DiffusionEmptyResultView.php
+++ b/src/applications/diffusion/view/DiffusionEmptyResultView.php
@@ -1,87 +1,87 @@
 <?php
 
 final class DiffusionEmptyResultView extends DiffusionView {
 
   private $browseResultSet;
   private $view;
 
   public function setDiffusionBrowseResultSet(DiffusionBrowseResultSet $set) {
     $this->browseResultSet = $set;
     return $this;
   }
 
   public function setView($view) {
     $this->view = $view;
     return $this;
   }
 
   public function render() {
     $drequest = $this->getDiffusionRequest();
 
     $commit = $drequest->getCommit();
     $callsign = $drequest->getRepository()->getCallsign();
     if ($commit) {
       $commit = "r{$callsign}{$commit}";
     } else {
       $commit = 'HEAD';
     }
 
     $reason = $this->browseResultSet->getReasonForEmptyResultSet();
     switch ($reason) {
       case DiffusionBrowseResultSet::REASON_IS_NONEXISTENT:
         $title = pht('Path Does Not Exist');
         // TODO: Under git, this error message should be more specific. It
         // may exist on some other branch.
-        $body  = pht("This path does not exist anywhere.");
+        $body  = pht('This path does not exist anywhere.');
         $severity = AphrontErrorView::SEVERITY_ERROR;
         break;
       case DiffusionBrowseResultSet::REASON_IS_EMPTY:
         $title = pht('Empty Directory');
         $body = pht("This path was an empty directory at %s.\n", $commit);
         $severity = AphrontErrorView::SEVERITY_NOTICE;
         break;
       case DiffusionBrowseResultSet::REASON_IS_DELETED:
         $deleted = $this->browseResultSet->getDeletedAtCommit();
         $existed = $this->browseResultSet->getExistedAtCommit();
 
         $browse = $this->linkBrowse(
           $drequest->getPath(),
           array(
             'text' => 'existed',
             'commit' => $existed,
             'params' => array('view' => $this->view),
           ));
 
         $title = pht('Path Was Deleted');
         $body = pht(
-          "This path does not exist at %s. It was deleted in %s and last %s ".
-            "at %s.",
+          'This path does not exist at %s. It was deleted in %s and last %s '.
+            'at %s.',
           $commit,
           self::linkCommit($drequest->getRepository(), $deleted),
           $browse,
           "r{$callsign}{$existed}");
         $severity = AphrontErrorView::SEVERITY_WARNING;
         break;
       case DiffusionBrowseResultSet::REASON_IS_UNTRACKED_PARENT:
         $subdir = $drequest->getRepository()->getDetail('svn-subpath');
         $title = pht('Directory Not Tracked');
         $body =
           pht("This repository is configured to track only one subdirectory ".
           "of the entire repository ('%s'), ".
           "but you aren't looking at something in that subdirectory, so no ".
           "information is available.", $subdir);
         $severity = AphrontErrorView::SEVERITY_WARNING;
         break;
       default:
         throw new Exception("Unknown failure reason: $reason");
     }
 
     $error_view = new AphrontErrorView();
     $error_view->setSeverity($severity);
     $error_view->setTitle($title);
     $error_view->appendChild(phutil_tag('p', array(), $body));
 
     return $error_view->render();
   }
 
 }
diff --git a/src/applications/diviner/atom/DivinerAtom.php b/src/applications/diviner/atom/DivinerAtom.php
index b130dbf2a..f9d10fa52 100644
--- a/src/applications/diviner/atom/DivinerAtom.php
+++ b/src/applications/diviner/atom/DivinerAtom.php
@@ -1,437 +1,437 @@
 <?php
 
 final class DivinerAtom {
 
   const TYPE_FILE      = 'file';
   const TYPE_ARTICLE   = 'article';
   const TYPE_METHOD    = 'method';
   const TYPE_CLASS     = 'class';
   const TYPE_FUNCTION  = 'function';
   const TYPE_INTERFACE = 'interface';
 
   private $type;
   private $name;
   private $file;
   private $line;
   private $hash;
   private $contentRaw;
   private $length;
   private $language;
   private $docblockRaw;
   private $docblockText;
   private $docblockMeta;
   private $warnings = array();
   private $parent;
   private $parentHash;
   private $children = array();
   private $childHashes = array();
   private $context;
   private $extends = array();
   private $links = array();
   private $book;
   private $properties = array();
 
   /**
    * Returns a sorting key which imposes an unambiguous, stable order on atoms.
    */
   public function getSortKey() {
     return implode(
       "\0",
       array(
         $this->getBook(),
         $this->getType(),
         $this->getContext(),
         $this->getName(),
         $this->getFile(),
         sprintf('%08', $this->getLine()),
       ));
   }
 
   public function setBook($book) {
     $this->book = $book;
     return $this;
   }
 
   public function getBook() {
     return $this->book;
   }
 
   public function setContext($context) {
     $this->context = $context;
     return $this;
   }
 
   public function getContext() {
     return $this->context;
   }
 
   public static function getAtomSerializationVersion() {
     return 2;
   }
 
   public function addWarning($warning) {
     $this->warnings[] = $warning;
     return $this;
   }
 
   public function getWarnings() {
     return $this->warnings;
   }
 
   public function setDocblockRaw($docblock_raw) {
     $this->docblockRaw = $docblock_raw;
 
     $parser = new PhutilDocblockParser();
     list($text, $meta) = $parser->parse($docblock_raw);
     $this->docblockText = $text;
     $this->docblockMeta = $meta;
 
     return $this;
   }
 
   public function getDocblockRaw() {
     return $this->docblockRaw;
   }
 
   public function getDocblockText() {
     if ($this->docblockText === null) {
-      throw new Exception("Call setDocblockRaw() before getDocblockText()!");
+      throw new Exception('Call setDocblockRaw() before getDocblockText()!');
     }
     return $this->docblockText;
   }
 
   public function getDocblockMeta() {
     if ($this->docblockMeta === null) {
-      throw new Exception("Call setDocblockRaw() before getDocblockMeta()!");
+      throw new Exception('Call setDocblockRaw() before getDocblockMeta()!');
     }
     return $this->docblockMeta;
   }
 
   public function getDocblockMetaValue($key, $default = null) {
     $meta = $this->getDocblockMeta();
     return idx($meta, $key, $default);
   }
 
   public function setDocblockMetaValue($key, $value) {
     $meta = $this->getDocblockMeta();
     $meta[$key] = $value;
     $this->docblockMeta = $meta;
     return $this;
   }
 
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
   public function getType() {
     return $this->type;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->name;
   }
 
   public function setFile($file) {
     $this->file = $file;
     return $this;
   }
 
   public function getFile() {
     return $this->file;
   }
 
   public function setLine($line) {
     $this->line = $line;
     return $this;
   }
 
   public function getLine() {
     return $this->line;
   }
 
   public function setContentRaw($content_raw) {
     $this->contentRaw = $content_raw;
     return $this;
   }
 
   public function getContentRaw() {
     return $this->contentRaw;
   }
 
   public function setHash($hash) {
     $this->hash = $hash;
     return $this;
   }
 
   public function addLink(DivinerAtomRef $ref) {
     $this->links[] = $ref;
     return $this;
   }
 
   public function addExtends(DivinerAtomRef $ref) {
     $this->extends[] = $ref;
     return $this;
   }
 
   public function getLinkDictionaries() {
     return mpull($this->links, 'toDictionary');
   }
 
   public function getExtendsDictionaries() {
     return mpull($this->extends, 'toDictionary');
   }
 
   public function getExtends() {
     return $this->extends;
   }
 
   public function getHash() {
     if ($this->hash) {
       return $this->hash;
     }
 
     $parts = array(
       $this->getBook(),
       $this->getType(),
       $this->getName(),
       $this->getFile(),
       $this->getLine(),
       $this->getLength(),
       $this->getLanguage(),
       $this->getContentRaw(),
       $this->getDocblockRaw(),
       $this->getProperties(),
       $this->getChildHashes(),
       mpull($this->extends, 'toHash'),
       mpull($this->links, 'toHash'),
     );
 
     $this->hash = md5(serialize($parts)).'N';
     return $this->hash;
   }
 
   public function setLength($length) {
     $this->length = $length;
     return $this;
   }
 
   public function getLength() {
     return $this->length;
   }
 
   public function setLanguage($language) {
     $this->language = $language;
     return $this;
   }
 
   public function getLanguage() {
     return $this->language;
   }
 
   public function addChildHash($child_hash) {
     $this->childHashes[] = $child_hash;
     return $this;
   }
 
   public function getChildHashes() {
     if (!$this->childHashes && $this->children) {
       $this->childHashes = mpull($this->children, 'getHash');
     }
     return $this->childHashes;
   }
 
   public function setParentHash($parent_hash) {
     if ($this->parentHash) {
-      throw new Exception("Atom already has a parent!");
+      throw new Exception('Atom already has a parent!');
     }
     $this->parentHash = $parent_hash;
     return $this;
   }
 
   public function hasParent() {
     return $this->parent || $this->parentHash;
   }
 
   public function setParent(DivinerAtom $atom) {
     if ($this->parentHash) {
-      throw new Exception("Parent hash has already been computed!");
+      throw new Exception('Parent hash has already been computed!');
     }
     $this->parent = $atom;
     return $this;
   }
 
   public function getParentHash() {
     if ($this->parent && !$this->parentHash) {
       $this->parentHash = $this->parent->getHash();
     }
     return $this->parentHash;
   }
 
   public function addChild(DivinerAtom $atom) {
     if ($this->childHashes) {
-      throw new Exception("Child hashes have already been computed!");
+      throw new Exception('Child hashes have already been computed!');
     }
 
     $atom->setParent($this);
     $this->children[] = $atom;
     return $this;
   }
 
   public function getURI() {
     $parts = array();
     $parts[] = phutil_escape_uri_path_component($this->getType());
     if ($this->getContext()) {
       $parts[] = phutil_escape_uri_path_component($this->getContext());
     }
     $parts[] = phutil_escape_uri_path_component($this->getName());
     $parts[] = null;
     return implode('/', $parts);
   }
 
 
   public function toDictionary() {
     // NOTE: If you change this format, bump the format version in
     // getAtomSerializationVersion().
 
     return array(
       'book'        => $this->getBook(),
       'type'        => $this->getType(),
       'name'        => $this->getName(),
       'file'        => $this->getFile(),
       'line'        => $this->getLine(),
       'hash'        => $this->getHash(),
       'uri'         => $this->getURI(),
       'length'      => $this->getLength(),
       'context'     => $this->getContext(),
       'language'    => $this->getLanguage(),
       'docblockRaw' => $this->getDocblockRaw(),
       'warnings'    => $this->getWarnings(),
       'parentHash'  => $this->getParentHash(),
       'childHashes' => $this->getChildHashes(),
       'extends'     => $this->getExtendsDictionaries(),
       'links'       => $this->getLinkDictionaries(),
       'ref'         => $this->getRef()->toDictionary(),
       'properties'  => $this->getProperties(),
     );
   }
 
   public function getRef() {
     $title = null;
     if ($this->docblockMeta) {
       $title = $this->getDocblockMetaValue('title');
     }
 
     return id(new DivinerAtomRef())
       ->setBook($this->getBook())
       ->setContext($this->getContext())
       ->setType($this->getType())
       ->setName($this->getName())
       ->setTitle($title)
       ->setGroup($this->getProperty('group'));
   }
 
   public static function newFromDictionary(array $dictionary) {
     $atom = id(new DivinerAtom())
       ->setBook(idx($dictionary, 'book'))
       ->setType(idx($dictionary, 'type'))
       ->setName(idx($dictionary, 'name'))
       ->setFile(idx($dictionary, 'file'))
       ->setLine(idx($dictionary, 'line'))
       ->setHash(idx($dictionary, 'hash'))
       ->setLength(idx($dictionary, 'length'))
       ->setContext(idx($dictionary, 'context'))
       ->setLanguage(idx($dictionary, 'language'))
       ->setParentHash(idx($dictionary, 'parentHash'))
       ->setDocblockRaw(idx($dictionary, 'docblockRaw'))
       ->setProperties(idx($dictionary, 'properties'));
 
     foreach (idx($dictionary, 'warnings', array()) as $warning) {
       $atom->addWarning($warning);
     }
 
     foreach (idx($dictionary, 'childHashes', array()) as $child) {
       $atom->addChildHash($child);
     }
 
     foreach (idx($dictionary, 'extends', array()) as $extends) {
       $atom->addExtends(DivinerAtomRef::newFromDictionary($extends));
     }
 
     return $atom;
   }
 
   public function getProperty($key, $default = null) {
     return idx($this->properties, $key, $default);
   }
 
   public function setProperty($key, $value) {
     $this->properties[$key] = $value;
   }
 
   public function getProperties() {
     return $this->properties;
   }
 
   public function setProperties(array $properties) {
     $this->properties = $properties;
     return $this;
   }
 
   public static function getThisAtomIsNotDocumentedString($type) {
     switch ($type) {
       case self::TYPE_FILE:
         return pht('This file is not documented.');
       case self::TYPE_FUNCTION:
         return pht('This function is not documented.');
       case self::TYPE_CLASS:
         return pht('This class is not documented.');
       case self::TYPE_ARTICLE:
         return pht('This article is not documented.');
       case self::TYPE_METHOD:
         return pht('This method is not documented.');
       case self::TYPE_INTERFACE:
         return pht('This interface is not documented.');
       default:
         phlog("Need translation for '{$type}'.");
         return pht('This %s is not documented.', $type);
     }
   }
 
   public static function getAllTypes() {
     return array(
       self::TYPE_FILE,
       self::TYPE_FUNCTION,
       self::TYPE_CLASS,
       self::TYPE_ARTICLE,
       self::TYPE_METHOD,
       self::TYPE_INTERFACE,
     );
   }
 
   public static function getAtomTypeNameString($type) {
     switch ($type) {
       case self::TYPE_FILE:
         return pht('File');
       case self::TYPE_FUNCTION:
         return pht('Function');
       case self::TYPE_CLASS:
         return pht('Class');
       case self::TYPE_ARTICLE:
         return pht('Article');
       case self::TYPE_METHOD:
         return pht('Method');
       case self::TYPE_INTERFACE:
         return pht('Interface');
       default:
         phlog("Need translation for '{$type}'.");
         return ucwords($type);
     }
   }
 
 }
diff --git a/src/applications/diviner/atomizer/DivinerArticleAtomizer.php b/src/applications/diviner/atomizer/DivinerArticleAtomizer.php
index 3a6f0bf82..62f568d3e 100644
--- a/src/applications/diviner/atomizer/DivinerArticleAtomizer.php
+++ b/src/applications/diviner/atomizer/DivinerArticleAtomizer.php
@@ -1,35 +1,35 @@
 <?php
 
 final class DivinerArticleAtomizer extends DivinerAtomizer {
 
   protected function executeAtomize($file_name, $file_data) {
     $atom = $this->newAtom(DivinerAtom::TYPE_ARTICLE)
       ->setLine(1)
       ->setLength(count(explode("\n", $file_data)))
       ->setLanguage('human');
 
     $block = "/**\n".str_replace("\n", "\n * ", $file_data)."\n */";
     $atom->setDocblockRaw($block);
 
     $meta = $atom->getDocblockMeta();
 
     $title = idx($meta, 'title');
     if (!strlen($title)) {
       $title = pht('Untitled Article "%s"', basename($file_name));
-      $atom->addWarning("Article has no @title!");
+      $atom->addWarning('Article has no @title!');
       $atom->setDocblockMetaValue('title', $title);
     }
 
     // If the article has no @name, use the filename after stripping any
     // extension.
     $name = idx($meta, 'name');
     if (!$name) {
       $name = basename($file_name);
       $name = preg_replace('/\\.[^.]+$/', '', $name);
     }
     $atom->setName($name);
 
     return array($atom);
   }
 
 }
diff --git a/src/applications/diviner/publisher/DivinerPublisher.php b/src/applications/diviner/publisher/DivinerPublisher.php
index 33109933a..298d0b42e 100644
--- a/src/applications/diviner/publisher/DivinerPublisher.php
+++ b/src/applications/diviner/publisher/DivinerPublisher.php
@@ -1,156 +1,156 @@
 <?php
 
 abstract class DivinerPublisher {
 
   private $atomCache;
   private $atomGraphHashToNodeHashMap;
   private $atomMap = array();
   private $renderer;
   private $config;
   private $symbolReverseMap;
   private $dropCaches;
 
   public function setDropCaches($drop_caches) {
     $this->dropCaches = $drop_caches;
     return $this;
   }
 
   public function setRenderer(DivinerRenderer $renderer) {
     $renderer->setPublisher($this);
     $this->renderer = $renderer;
     return $this;
   }
 
   public function getRenderer() {
     return $this->renderer;
   }
 
   public function setConfig(array $config) {
     $this->config = $config;
     return $this;
   }
 
   public function getConfig($key, $default = null) {
     return idx($this->config, $key, $default);
   }
 
   public function getConfigurationData() {
     return $this->config;
   }
 
   public function setAtomCache(DivinerAtomCache $cache) {
     $this->atomCache = $cache;
     $graph_map = $this->atomCache->getGraphMap();
     $this->atomGraphHashToNodeHashMap = array_flip($graph_map);
   }
 
   protected function getAtomFromGraphHash($graph_hash) {
     if (empty($this->atomGraphHashToNodeHashMap[$graph_hash])) {
       throw new Exception("No such atom '{$graph_hash}'!");
     }
 
     return $this->getAtomFromNodeHash(
       $this->atomGraphHashToNodeHashMap[$graph_hash]);
   }
 
   protected function getAtomFromNodeHash($node_hash) {
     if (empty($this->atomMap[$node_hash])) {
       $dict = $this->atomCache->getAtom($node_hash);
       $this->atomMap[$node_hash] = DivinerAtom::newFromDictionary($dict);
     }
     return $this->atomMap[$node_hash];
   }
 
   protected function getSimilarAtoms(DivinerAtom $atom) {
     if ($this->symbolReverseMap === null) {
       $rmap = array();
       $smap = $this->atomCache->getSymbolMap();
       foreach ($smap as $nhash => $shash) {
         $rmap[$shash][$nhash] = true;
       }
       $this->symbolReverseMap = $rmap;
     }
 
     $shash = $atom->getRef()->toHash();
 
     if (empty($this->symbolReverseMap[$shash])) {
-      throw new Exception("Atom has no symbol map entry!");
+      throw new Exception('Atom has no symbol map entry!');
     }
 
     $hashes = $this->symbolReverseMap[$shash];
 
     $atoms = array();
     foreach ($hashes as $hash => $ignored) {
       $atoms[] = $this->getAtomFromNodeHash($hash);
     }
 
     $atoms = msort($atoms, 'getSortKey');
     return $atoms;
   }
 
   /**
    * If a book contains multiple definitions of some atom, like some function
    * "f()", we assign them an arbitrary (but fairly stable) order and publish
    * them as "function/f/1/", "function/f/2/", etc., or similar.
    */
   protected function getAtomSimilarIndex(DivinerAtom $atom) {
     $atoms = $this->getSimilarAtoms($atom);
     if (count($atoms) == 1) {
       return 0;
     }
 
     $index = 1;
     foreach ($atoms as $similar_atom) {
       if ($atom === $similar_atom) {
         return $index;
       }
       $index++;
     }
 
-    throw new Exception("Expected to find atom while disambiguating!");
+    throw new Exception('Expected to find atom while disambiguating!');
   }
 
 
   abstract protected function loadAllPublishedHashes();
   abstract protected function deleteDocumentsByHash(array $hashes);
   abstract protected function createDocumentsByHash(array $hashes);
   abstract public function findAtomByRef(DivinerAtomRef $ref);
 
   final public function publishAtoms(array $hashes) {
     $existing = $this->loadAllPublishedHashes();
 
     if ($this->dropCaches) {
       $deleted = $existing;
       $created = $hashes;
     } else {
       $existing_map = array_fill_keys($existing, true);
       $hashes_map = array_fill_keys($hashes, true);
 
       $deleted = array_diff_key($existing_map, $hashes_map);
       $created = array_diff_key($hashes_map, $existing_map);
 
       $deleted = array_keys($deleted);
       $created = array_keys($created);
     }
 
     echo pht('Deleting %d documents.', count($deleted))."\n";
     $this->deleteDocumentsByHash($deleted);
 
     echo pht('Creating %d documents.', count($created))."\n";
     $this->createDocumentsByHash($created);
   }
 
   protected function shouldGenerateDocumentForAtom(DivinerAtom $atom) {
     switch ($atom->getType()) {
       case DivinerAtom::TYPE_METHOD:
       case DivinerAtom::TYPE_FILE:
         return false;
       case DivinerAtom::TYPE_ARTICLE:
       default:
         break;
     }
 
     return true;
   }
 
 }
diff --git a/src/applications/diviner/workflow/DivinerAtomizeWorkflow.php b/src/applications/diviner/workflow/DivinerAtomizeWorkflow.php
index aff3312bb..2694eb9a0 100644
--- a/src/applications/diviner/workflow/DivinerAtomizeWorkflow.php
+++ b/src/applications/diviner/workflow/DivinerAtomizeWorkflow.php
@@ -1,137 +1,137 @@
 <?php
 
 final class DivinerAtomizeWorkflow extends DivinerWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('atomize')
       ->setSynopsis(pht('Build atoms from source.'))
       ->setArguments(
         array(
           array(
             'name' => 'atomizer',
             'param' => 'class',
             'help' => pht('Specify a subclass of DivinerAtomizer.'),
           ),
           array(
             'name' => 'book',
             'param' => 'path',
             'help' => pht('Path to a Diviner book configuration.'),
           ),
           array(
             'name' => 'files',
             'wildcard' => true,
           ),
           array(
             'name' => 'ugly',
             'help' => pht('Produce ugly (but faster) output.'),
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $this->readBookConfiguration($args->getArg('book'));
 
     $console = PhutilConsole::getConsole();
 
     $atomizer_class = $args->getArg('atomizer');
     if (!$atomizer_class) {
-      throw new Exception("Specify an atomizer class with --atomizer.");
+      throw new Exception('Specify an atomizer class with --atomizer.');
     }
 
     $symbols = id(new PhutilSymbolLoader())
       ->setName($atomizer_class)
       ->setConcreteOnly(true)
       ->setAncestorClass('DivinerAtomizer')
       ->selectAndLoadSymbols();
     if (!$symbols) {
       throw new Exception(
         "Atomizer class '{$atomizer_class}' must be a concrete subclass of ".
         "DivinerAtomizer.");
     }
 
     $atomizer = newv($atomizer_class, array());
 
     $files = $args->getArg('files');
     if (!$files) {
-      throw new Exception("Specify one or more files to atomize.");
+      throw new Exception('Specify one or more files to atomize.');
     }
 
     $file_atomizer = new DivinerFileAtomizer();
 
     foreach (array($atomizer, $file_atomizer) as $configure) {
       $configure->setBook($this->getConfig('name'));
     }
 
     $group_rules = array();
     foreach ($this->getConfig('groups', array()) as $group => $spec) {
       $include = (array)idx($spec, 'include', array());
       foreach ($include as $pattern) {
         $group_rules[$pattern] = $group;
       }
     }
 
     $all_atoms = array();
     $context = array(
       'group' => null,
     );
     foreach ($files as $file) {
       $abs_path = Filesystem::resolvePath($file, $this->getConfig('root'));
       $data = Filesystem::readFile($abs_path);
 
       if (!$this->shouldAtomizeFile($file, $data)) {
         $console->writeLog("Skipping %s...\n", $file);
         continue;
       } else {
         $console->writeLog("Atomizing %s...\n", $file);
       }
 
       $context['group'] = null;
       foreach ($group_rules as $rule => $group) {
         if (preg_match($rule, $file)) {
           $context['group'] = $group;
           break;
         }
       }
 
       $file_atoms = $file_atomizer->atomize($file, $data, $context);
       $all_atoms[] = $file_atoms;
 
       if (count($file_atoms) !== 1) {
-        throw new Exception("Expected exactly one atom from file atomizer.");
+        throw new Exception('Expected exactly one atom from file atomizer.');
       }
       $file_atom = head($file_atoms);
 
       $atoms = $atomizer->atomize($file, $data, $context);
 
       foreach ($atoms as $atom) {
         if (!$atom->hasParent()) {
           $file_atom->addChild($atom);
         }
       }
 
       $all_atoms[] = $atoms;
     }
 
     $all_atoms = array_mergev($all_atoms);
 
     $all_atoms = mpull($all_atoms, 'toDictionary');
     $all_atoms = ipull($all_atoms, null, 'hash');
 
     if ($args->getArg('ugly')) {
       $json = json_encode($all_atoms);
     } else {
       $json_encoder = new PhutilJSON();
       $json = $json_encoder->encodeFormatted($all_atoms);
     }
 
     $console->writeOut('%s', $json);
 
     return 0;
   }
 
   private function shouldAtomizeFile($file_name, $file_data) {
     return (strpos($file_data, '@'.'undivinable') === false);
   }
 
 }
diff --git a/src/applications/diviner/workflow/DivinerGenerateWorkflow.php b/src/applications/diviner/workflow/DivinerGenerateWorkflow.php
index 6975f85c7..ac1d29c33 100644
--- a/src/applications/diviner/workflow/DivinerGenerateWorkflow.php
+++ b/src/applications/diviner/workflow/DivinerGenerateWorkflow.php
@@ -1,525 +1,525 @@
 <?php
 
 final class DivinerGenerateWorkflow extends DivinerWorkflow {
 
   private $atomCache;
 
   public function didConstruct() {
     $this
       ->setName('generate')
       ->setSynopsis(pht('Generate documentation.'))
       ->setArguments(
         array(
           array(
             'name' => 'clean',
             'help' => 'Clear the caches before generating documentation.',
           ),
           array(
             'name' => 'book',
             'param' => 'path',
             'help' => 'Path to a Diviner book configuration.',
           ),
         ));
   }
 
   protected function getAtomCache() {
     if (!$this->atomCache) {
       $book_root = $this->getConfig('root');
       $book_name = $this->getConfig('name');
       $cache_directory = $book_root.'/.divinercache/'.$book_name;
       $this->atomCache = new DivinerAtomCache($cache_directory);
     }
     return $this->atomCache;
   }
 
   protected function log($message) {
     $console = PhutilConsole::getConsole();
     $console->writeErr($message."\n");
   }
 
   public function execute(PhutilArgumentParser $args) {
     $book = $args->getArg('book');
     if ($book) {
       $books = array($book);
     } else {
       $cwd = getcwd();
       $this->log(pht('FINDING DOCUMENTATION BOOKS'));
       $books = id(new FileFinder($cwd))
         ->withType('f')
         ->withSuffix('book')
         ->find();
 
       if (!$books) {
         throw new PhutilArgumentUsageException(
           pht(
             "There are no Diviner '.book' files anywhere beneath the ".
             "current directory. Use '--book <book>' to specify a ".
             "documentation book to generate."));
       } else {
         $this->log(pht('Found %s book(s).', new PhutilNumber(count($books))));
       }
     }
 
     foreach ($books as $book) {
       $short_name = basename($book);
 
       $this->log(pht('Generating book "%s"...', $short_name));
       $this->generateBook($book, $args);
       $this->log(pht('Completed generation of "%s".', $short_name)."\n");
     }
   }
 
   private function generateBook($book, PhutilArgumentParser $args) {
     $this->atomCache = null;
 
     $this->readBookConfiguration($book);
 
     if ($args->getArg('clean')) {
       $this->log(pht('CLEARING CACHES'));
       $this->getAtomCache()->delete();
       $this->log(pht('Done.')."\n");
     }
 
     // The major challenge of documentation generation is one of dependency
     // management. When regenerating documentation, we want to do the smallest
     // amount of work we can, so that regenerating documentation after minor
     // changes is quick.
     //
     // ATOM CACHE
     //
     // In the first stage, we find all the direct changes to source code since
     // the last run. This stage relies on two data structures:
     //
     //  - File Hash Map: map<file_hash, node_hash>
     //  - Atom Map: map<node_hash, true>
     //
     // First, we hash all the source files in the project to detect any which
     // have changed since the previous run (i.e., their hash is not present in
     // the File Hash Map). If a file's content hash appears in the map, it has
     // not changed, so we don't need to reparse it.
     //
     // We break the contents of each file into "atoms", which represent a unit
     // of source code (like a function, method, class or file). Each atom has a
     // "node hash" based on the content of the atom: if a function definition
     // changes, the node hash of the atom changes too. The primary output of
     // the atom cache is a list of node hashes which exist in the project. This
     // is the Atom Map. The node hash depends only on the definition of the atom
     // and the atomizer implementation. It ends with an "N", for "node".
     //
     // (We need the Atom Map in addition to the File Hash Map because each file
     // may have several atoms in it (e.g., multiple functions, or a class and
     // its methods). The File Hash Map contains an exhaustive list of all atoms
     // with type "file", but not child atoms of those top-level atoms.)
     //
     // GRAPH CACHE
     //
     // We now know which atoms exist, and can compare the Atom Map to some
     // existing cache to figure out what has changed. However, this isn't
     // sufficient to figure out which documentation actually needs to be
     // regnerated, because atoms depend on other atoms. For example, if "B
     // extends A" and the definition for A changes, we need to regenerate the
     // documentation in B. Similarly, if X links to Y and Y changes, we should
     // regenerate X. (In both these cases, the documentation for the connected
     // atom may not acutally change, but in some cases it will, and the extra
     // work we need to do is generally very small compared to the size of the
     // project.)
     //
     // To figure out which other nodes have changed, we compute a "graph hash"
     // for each node. This hash combines the "node hash" with the node hashes
     // of connected nodes. Our primary output is a list of graph hashes, which
     // a documentation generator can use to easily determine what work needs
     // to be done by comparing the list with a list of cached graph hashes,
     // then generating documentation for new hashes and deleting documentation
     // for missing hashes. The graph hash ends with a "G", for "graph".
     //
     // In this stage, we rely on three data structures:
     //
     //  - Symbol Map: map<node_hash, symbol_hash>
     //  - Edge Map: map<node_hash, list<symbol_hash>>
     //  - Graph Map: map<node_hash, graph_hash>
     //
     // Calculating the graph hash requires several steps, because we need to
     // figure out which nodes an atom is attached to. The atom contains symbolic
     // references to other nodes by name (e.g., "extends SomeClass") in the form
     // of DivinerAtomRefs. We can also build a symbolic reference for any atom
     // from the atom itself. Each DivinerAtomRef generates a symbol hash,
     // which ends with an "S", for "symbol".
     //
     // First, we update the symbol map. We remove (and mark dirty) any symbols
     // associated with node hashes which no longer exist (e.g., old/dead nodes).
     // Second, we add (and mark dirty) any symbols associated with new nodes.
     // We also add edges defined by new nodes to the graph.
     //
     // We initialize a list of dirty nodes to the list of new nodes, then
     // find all nodes connected to dirty symbols and add them to the dirty
     // node list. This list now contains every node with a new or changed
     // graph hash.
     //
     // We walk the dirty list and compute the new graph hashes, adding them
     // to the graph hash map. This Graph Map can then be passed to an actual
     // documentation generator, which can compare the graph hashes to a list
     // of already-generated graph hashes and easily assess which documents need
     // to be regenerated and which can be deleted.
 
     $this->buildAtomCache();
     $this->buildGraphCache();
 
     $this->publishDocumentation($args->getArg('clean'));
   }
 
 /* -(  Atom Cache  )--------------------------------------------------------- */
 
   private function buildAtomCache() {
     $this->log(pht('BUILDING ATOM CACHE'));
 
     $file_hashes = $this->findFilesInProject();
 
     $this->log(pht('Found %d file(s) in project.', count($file_hashes)));
 
     $this->deleteDeadAtoms($file_hashes);
 
     $atomize = $this->getFilesToAtomize($file_hashes);
 
     $this->log(pht('Found %d unatomized, uncached file(s).', count($atomize)));
 
     $file_atomizers = $this->getAtomizersForFiles($atomize);
 
     $this->log(pht('Found %d file(s) to atomize.', count($file_atomizers)));
 
     $futures = $this->buildAtomizerFutures($file_atomizers);
 
     $this->log(pht('Atomizing %d file(s).', count($file_atomizers)));
 
     if ($futures) {
       $this->resolveAtomizerFutures($futures, $file_hashes);
-      $this->log(pht("Atomization complete."));
+      $this->log(pht('Atomization complete.'));
     } else {
-      $this->log(pht("Atom cache is up to date, no files to atomize."));
+      $this->log(pht('Atom cache is up to date, no files to atomize.'));
     }
 
-    $this->log(pht("Writing atom cache."));
+    $this->log(pht('Writing atom cache.'));
 
     $this->getAtomCache()->saveAtoms();
 
     $this->log(pht('Done.')."\n");
   }
 
   private function getAtomizersForFiles(array $files) {
     $rules = $this->getRules();
     $exclude = $this->getExclude();
 
     $atomizers = array();
 
     foreach ($files as $file) {
       foreach ($exclude as $pattern) {
         if (preg_match($pattern, $file)) {
           continue 2;
         }
       }
 
       foreach ($rules as $rule => $atomizer) {
         $ok = preg_match($rule, $file);
         if ($ok === false) {
           throw new Exception(
             "Rule '{$rule}' is not a valid regular expression.");
         }
         if ($ok) {
           $atomizers[$file] = $atomizer;
           continue;
         }
       }
     }
 
     return $atomizers;
   }
 
   private function getRules() {
     $rules = $this->getConfig('rules', array(
       '/\\.diviner$/' => 'DivinerArticleAtomizer',
       '/\\.php$/' => 'DivinerPHPAtomizer',
     ));
 
     return $rules;
   }
 
   private function getExclude() {
     $exclude = (array)$this->getConfig('exclude', array());
     return $exclude;
   }
 
 
   private function findFilesInProject() {
     $raw_hashes = id(new FileFinder($this->getConfig('root')))
       ->excludePath('*/.*')
       ->withType('f')
       ->setGenerateChecksums(true)
       ->find();
 
     $version = $this->getDivinerAtomWorldVersion();
 
     $file_hashes = array();
     foreach ($raw_hashes as $file => $md5_hash) {
       $rel_file = Filesystem::readablePath($file, $this->getConfig('root'));
       // We want the hash to change if the file moves or Diviner gets updated,
       // not just if the file content changes. Derive a hash from everything
       // we care about.
       $file_hashes[$rel_file] = md5("{$rel_file}\0{$md5_hash}\0{$version}").'F';
     }
 
     return $file_hashes;
   }
 
   private function deleteDeadAtoms(array $file_hashes) {
     $atom_cache = $this->getAtomCache();
 
     $hash_to_file = array_flip($file_hashes);
     foreach ($atom_cache->getFileHashMap() as $hash => $atom) {
       if (empty($hash_to_file[$hash])) {
         $atom_cache->deleteFileHash($hash);
       }
     }
   }
 
   private function getFilesToAtomize(array $file_hashes) {
     $atom_cache = $this->getAtomCache();
 
     $atomize = array();
     foreach ($file_hashes as $file => $hash) {
       if (!$atom_cache->fileHashExists($hash)) {
         $atomize[] = $file;
       }
     }
 
     return $atomize;
   }
 
   private function buildAtomizerFutures(array $file_atomizers) {
     $atomizers = array();
     foreach ($file_atomizers as $file => $atomizer) {
       $atomizers[$atomizer][] = $file;
     }
 
     $root = dirname(phutil_get_library_root('phabricator'));
     $config_root = $this->getConfig('root');
 
     $bar = id(new PhutilConsoleProgressBar())
       ->setTotal(count($file_atomizers));
 
     $futures = array();
     foreach ($atomizers as $class => $files) {
       foreach (array_chunk($files, 32) as $chunk) {
         $future = new ExecFuture(
           '%s atomize --ugly --book %s --atomizer %s -- %Ls',
           $root.'/bin/diviner',
           $this->getBookConfigPath(),
           $class,
           $chunk);
         $future->setCWD($config_root);
 
         $futures[] = $future;
 
         $bar->update(count($chunk));
       }
     }
 
     $bar->done();
 
     return $futures;
   }
 
   private function resolveAtomizerFutures(array $futures, array $file_hashes) {
     assert_instances_of($futures, 'Future');
 
     $atom_cache = $this->getAtomCache();
     $bar = id(new PhutilConsoleProgressBar())
       ->setTotal(count($futures));
     foreach (Futures($futures)->limit(4) as $key => $future) {
       $atoms = $future->resolveJSON();
 
       foreach ($atoms as $atom) {
         if ($atom['type'] == DivinerAtom::TYPE_FILE) {
           $file_hash = $file_hashes[$atom['file']];
           $atom_cache->addFileHash($file_hash, $atom['hash']);
         }
         $atom_cache->addAtom($atom);
       }
 
       $bar->update(1);
     }
     $bar->done();
   }
 
 
   /**
    * Get a global version number, which changes whenever any atom or atomizer
    * implementation changes in a way which is not backward-compatible.
    */
   private function getDivinerAtomWorldVersion() {
     $version = array();
     $version['atom'] = DivinerAtom::getAtomSerializationVersion();
     $version['rules'] = $this->getRules();
 
     $atomizers = id(new PhutilSymbolLoader())
       ->setAncestorClass('DivinerAtomizer')
       ->setConcreteOnly(true)
       ->selectAndLoadSymbols();
 
     $atomizer_versions = array();
     foreach ($atomizers as $atomizer) {
       $atomizer_versions[$atomizer['name']] = call_user_func(
         array(
           $atomizer['name'],
           'getAtomizerVersion',
         ));
     }
 
     ksort($atomizer_versions);
     $version['atomizers'] = $atomizer_versions;
 
     return md5(serialize($version));
   }
 
 
 /* -(  Graph Cache  )-------------------------------------------------------- */
 
 
   private function buildGraphCache() {
     $this->log(pht('BUILDING GRAPH CACHE'));
 
     $atom_cache = $this->getAtomCache();
     $symbol_map = $atom_cache->getSymbolMap();
     $atoms = $atom_cache->getAtomMap();
 
     $dirty_symbols = array();
     $dirty_nhashes = array();
 
     $del_atoms = array_diff_key($symbol_map, $atoms);
     $this->log(pht('Found %d obsolete atom(s) in graph.', count($del_atoms)));
     foreach ($del_atoms as $nhash => $shash) {
       $atom_cache->deleteSymbol($nhash);
       $dirty_symbols[$shash] = true;
 
       $atom_cache->deleteEdges($nhash);
       $atom_cache->deleteGraph($nhash);
     }
 
     $new_atoms = array_diff_key($atoms, $symbol_map);
     $this->log(pht('Found %d new atom(s) in graph.', count($new_atoms)));
     foreach ($new_atoms as $nhash => $ignored) {
       $shash = $this->computeSymbolHash($nhash);
       $atom_cache->addSymbol($nhash, $shash);
       $dirty_symbols[$shash] = true;
 
       $atom_cache->addEdges(
         $nhash,
         $this->getEdges($nhash));
 
       $dirty_nhashes[$nhash] = true;
     }
 
     $this->log(pht('Propagating changes through the graph.'));
 
     // Find all the nodes which point at a dirty node, and dirty them. Then
     // find all the nodes which point at those nodes and dirty them, and so
     // on. (This is slightly overkill since we probably don't need to propagate
     // dirtiness across documentation "links" between symbols, but we do want
     // to propagate it across "extends", and we suffer only a little bit of
     // collateral damage by over-dirtying as long as the documentation isn't
     // too well-connected.)
 
     $symbol_stack = array_keys($dirty_symbols);
     while ($symbol_stack) {
       $symbol_hash = array_pop($symbol_stack);
 
       foreach ($atom_cache->getEdgesWithDestination($symbol_hash) as $edge) {
         $dirty_nhashes[$edge] = true;
         $src_hash = $this->computeSymbolHash($edge);
         if (empty($dirty_symbols[$src_hash])) {
           $dirty_symbols[$src_hash] = true;
           $symbol_stack[] = $src_hash;
         }
       }
     }
 
     $this->log(pht('Found %d affected atoms.', count($dirty_nhashes)));
 
     foreach ($dirty_nhashes as $nhash => $ignored) {
       $atom_cache->addGraph($nhash, $this->computeGraphHash($nhash));
     }
 
     $this->log(pht('Writing graph cache.'));
 
     $atom_cache->saveGraph();
     $atom_cache->saveEdges();
     $atom_cache->saveSymbols();
 
     $this->log(pht('Done.')."\n");
   }
 
   private function computeSymbolHash($node_hash) {
     $atom_cache = $this->getAtomCache();
     $atom = $atom_cache->getAtom($node_hash);
 
     if (!$atom) {
       throw new Exception("No such atom with node hash '{$node_hash}'!");
     }
 
     $ref = DivinerAtomRef::newFromDictionary($atom['ref']);
     return $ref->toHash();
   }
 
   private function getEdges($node_hash) {
     $atom_cache = $this->getAtomCache();
     $atom = $atom_cache->getAtom($node_hash);
 
     $refs = array();
 
     // Make the atom depend on its own symbol, so that all atoms with the same
     // symbol are dirtied (e.g., if a codebase defines the function "f()"
     // several times, all of them should be dirtied when one is dirtied).
     $refs[DivinerAtomRef::newFromDictionary($atom)->toHash()] = true;
 
     foreach (array_merge($atom['extends'], $atom['links']) as $ref_dict) {
       $ref = DivinerAtomRef::newFromDictionary($ref_dict);
       if ($ref->getBook() == $atom['book']) {
         $refs[$ref->toHash()] = true;
       }
     }
 
     return array_keys($refs);
   }
 
   private function computeGraphHash($node_hash) {
     $atom_cache = $this->getAtomCache();
     $atom = $atom_cache->getAtom($node_hash);
 
     $edges = $this->getEdges($node_hash);
     sort($edges);
 
     $inputs = array(
       'atomHash' => $atom['hash'],
       'edges' => $edges,
     );
 
     return md5(serialize($inputs)).'G';
   }
 
 
   private function publishDocumentation($clean) {
     $atom_cache = $this->getAtomCache();
     $graph_map = $atom_cache->getGraphMap();
 
     $this->log(pht('PUBLISHING DOCUMENTATION'));
 
     $publisher = new DivinerLivePublisher();
     $publisher->setDropCaches($clean);
     $publisher->setConfig($this->getAllConfig());
     $publisher->setAtomCache($atom_cache);
     $publisher->setRenderer(new DivinerDefaultRenderer());
     $publisher->publishAtoms(array_values($graph_map));
 
     $this->log(pht('Done.'));
   }
 
 
 }
diff --git a/src/applications/diviner/workflow/DivinerWorkflow.php b/src/applications/diviner/workflow/DivinerWorkflow.php
index 896aa63e8..25b71760b 100644
--- a/src/applications/diviner/workflow/DivinerWorkflow.php
+++ b/src/applications/diviner/workflow/DivinerWorkflow.php
@@ -1,76 +1,76 @@
 <?php
 
 abstract class DivinerWorkflow extends PhabricatorManagementWorkflow {
 
   private $config;
   private $bookConfigPath;
 
   public function getBookConfigPath() {
     return $this->bookConfigPath;
   }
 
   protected function getConfig($key, $default = null) {
     return idx($this->config, $key, $default);
   }
 
   protected function getAllConfig() {
     return $this->config;
   }
 
   protected function readBookConfiguration($book_path) {
     if ($book_path === null) {
       throw new PhutilArgumentUsageException(
-        "Specify a Diviner book configuration file with --book.");
+        'Specify a Diviner book configuration file with --book.');
     }
 
     $book_data = Filesystem::readFile($book_path);
     $book = json_decode($book_data, true);
     if (!is_array($book)) {
       throw new PhutilArgumentUsageException(
         "Book configuration '{$book_path}' is not in JSON format.");
     }
 
     PhutilTypeSpec::checkMap(
       $book,
       array(
         'name' => 'string',
         'title' => 'optional string',
         'short' => 'optional string',
         'preface' => 'optional string',
         'root' => 'optional string',
         'uri.source' => 'optional string',
         'rules' => 'optional map<regex, string>',
         'exclude' => 'optional regex|list<regex>',
         'groups' => 'optional map<string, map<string, wild>>',
       ));
 
     // If the book specifies a "root", resolve it; otherwise, use the directory
     // the book configuration file lives in.
     $full_path = dirname(Filesystem::resolvePath($book_path));
     if (empty($book['root'])) {
       $book['root'] = '.';
     }
     $book['root'] = Filesystem::resolvePath($book['root'], $full_path);
 
     if (!preg_match('/^[a-z][a-z-]*\z/', $book['name'])) {
       $name = $book['name'];
       throw new PhutilArgumentUsageException(
         "Book configuration '{$book_path}' has name '{$name}', but book names ".
         "must include only lowercase letters and hyphens.");
     }
 
     foreach (idx($book, 'groups', array()) as $group) {
       PhutilTypeSpec::checkmap(
         $group,
         array(
           'name' => 'string',
           'include' => 'optional regex|list<regex>',
         ));
 
     }
 
     $this->bookConfigPath = $book_path;
     $this->config = $book;
   }
 
 }
diff --git a/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php b/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php
index aa76571fe..0244532bc 100644
--- a/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php
+++ b/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php
@@ -1,126 +1,126 @@
 <?php
 
 final class DoorkeeperObjectRef extends Phobject {
 
   private $objectKey;
   private $applicationType;
   private $applicationDomain;
   private $objectType;
   private $objectID;
   private $attributes = array();
   private $isVisible;
   private $syncFailed;
   private $externalObject;
 
   public function newExternalObject() {
     return id(new DoorkeeperExternalObject())
       ->setApplicationType($this->getApplicationType())
       ->setApplicationDomain($this->getApplicationDomain())
       ->setObjectType($this->getObjectType())
       ->setObjectID($this->getObjectID())
       ->setViewPolicy(PhabricatorPolicies::POLICY_USER);
   }
 
   public function attachExternalObject(
     DoorkeeperExternalObject $external_object) {
     $this->externalObject = $external_object;
     return $this;
   }
 
   public function getExternalObject() {
     if (!$this->externalObject) {
       throw new Exception(
-        "Call attachExternalObject() before getExternalObject()!");
+        'Call attachExternalObject() before getExternalObject()!');
     }
     return $this->externalObject;
   }
 
   public function setIsVisible($is_visible) {
     $this->isVisible = $is_visible;
     return $this;
   }
 
   public function getIsVisible() {
     return $this->isVisible;
   }
 
   public function setSyncFailed($sync_failed) {
     $this->syncFailed = $sync_failed;
     return $this;
   }
 
   public function getSyncFailed() {
     return $this->syncFailed;
   }
 
   public function getAttribute($key, $default = null) {
     return idx($this->attributes, $key, $default);
   }
 
   public function setAttribute($key, $value) {
     $this->attributes[$key] = $value;
     return $this;
   }
 
   public function setObjectID($object_id) {
     $this->objectID = $object_id;
     return $this;
   }
 
   public function getObjectID() {
     return $this->objectID;
   }
 
 
   public function setObjectType($object_type) {
     $this->objectType = $object_type;
     return $this;
   }
 
   public function getObjectType() {
     return $this->objectType;
   }
 
 
   public function setApplicationDomain($application_domain) {
     $this->applicationDomain = $application_domain;
     return $this;
   }
 
   public function getApplicationDomain() {
     return $this->applicationDomain;
   }
 
 
   public function setApplicationType($application_type) {
     $this->applicationType = $application_type;
     return $this;
   }
 
   public function getApplicationType() {
     return $this->applicationType;
   }
 
   public function getFullName() {
     return coalesce(
       $this->getAttribute('fullname'),
       $this->getAttribute('name'),
       pht('External Object'));
   }
 
   public function getObjectKey() {
     if (!$this->objectKey) {
       $this->objectKey = PhabricatorHash::digestForIndex(
         implode(
           ':',
           array(
             $this->getApplicationType(),
             $this->getApplicationDomain(),
             $this->getObjectType(),
             $this->getObjectID(),
           )));
     }
     return $this->objectKey;
   }
 
 }
diff --git a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
index 48f984372..33b32dc28 100644
--- a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
+++ b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
@@ -1,148 +1,148 @@
 <?php
 
 final class PhabricatorAsanaConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Integration with Asana");
+    return pht('Integration with Asana');
   }
 
   public function getDescription() {
-    return pht("Asana integration options.");
+    return pht('Asana integration options.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('asana.workspace-id', 'string', null)
-        ->setSummary(pht("Asana Workspace ID to publish into."))
+        ->setSummary(pht('Asana Workspace ID to publish into.'))
         ->setDescription(
           pht(
             'To enable synchronization into Asana, enter an Asana Workspace '.
             'ID here.'.
             "\n\n".
             "NOTE: This feature is new and experimental.")),
       $this->newOption('asana.project-ids', 'wild', null)
-        ->setSummary(pht("Optional Asana projects to use as application tags."))
+        ->setSummary(pht('Optional Asana projects to use as application tags.'))
         ->setDescription(
           pht(
             'When Phabricator creates tasks in Asana, it can add the tasks '.
             'to Asana projects based on which application the corresponding '.
             'object in Phabricator comes from. For example, you can add code '.
             'reviews in Asana to a "Differential" project.'.
             "\n\n".
             'NOTE: This feature is new and experimental.'))
     );
   }
 
   public function renderContextualDescription(
     PhabricatorConfigOption $option,
     AphrontRequest $request) {
 
     switch ($option->getKey()) {
       case 'asana.workspace-id':
         break;
       case 'asana.project-ids':
         return $this->renderContextualProjectDescription($option, $request);
       default:
         return parent::renderContextualDescription($option, $request);
     }
 
     $viewer = $request->getUser();
 
     $provider = PhabricatorAuthProviderOAuthAsana::getAsanaProvider();
     if (!$provider) {
       return null;
     }
 
     $account = id(new PhabricatorExternalAccountQuery())
       ->setViewer($viewer)
       ->withUserPHIDs(array($viewer->getPHID()))
       ->withAccountTypes(array($provider->getProviderType()))
       ->withAccountDomains(array($provider->getProviderDomain()))
       ->executeOne();
     if (!$account) {
       return null;
     }
 
     $token = $provider->getOAuthAccessToken($account);
     if (!$token) {
       return null;
     }
 
     try {
       $workspaces = id(new PhutilAsanaFuture())
         ->setAccessToken($token)
         ->setRawAsanaQuery('workspaces')
         ->resolve();
     } catch (Exception $ex) {
       return null;
     }
 
     if (!$workspaces) {
       return null;
     }
 
     $out = array();
-    $out[] = pht("| Workspace ID | Workspace Name |");
-    $out[] =     "| ------------ | -------------- |";
+    $out[] = pht('| Workspace ID | Workspace Name |');
+    $out[] =     '| ------------ | -------------- |';
     foreach ($workspaces as $workspace) {
       $out[] = sprintf('| `%s` | `%s` |', $workspace['id'], $workspace['name']);
     }
 
     $out = implode("\n", $out);
 
     $out = pht(
       "The Asana Workspaces your linked account has access to are:\n\n%s",
       $out);
 
     return PhabricatorMarkupEngine::renderOneObject(
       id(new PhabricatorMarkupOneOff())->setContent($out),
       'default',
       $viewer);
   }
 
   private function renderContextualProjectDescription(
     PhabricatorConfigOption $option,
     AphrontRequest $request) {
 
     $viewer = $request->getUser();
 
     $publishers = id(new PhutilSymbolLoader())
       ->setAncestorClass('DoorkeeperFeedStoryPublisher')
       ->loadObjects();
 
     $out = array();
     $out[] = pht(
       'To specify projects to add tasks to, enter a JSON map with publisher '.
       'class names as keys and a list of project IDs as values. For example, '.
       'to put Differential tasks into Asana projects with IDs `123` and '.
       '`456`, enter:'.
       "\n\n".
       "  lang=txt\n".
       "  {\n".
       "    \"DifferentialDoorkeeperRevisionFeedStoryPublisher\" : [123, 456]\n".
       "  }\n");
 
     $out[] = pht('Available publishers class names are:');
     foreach ($publishers as $publisher) {
       $out[] = '  - `'.get_class($publisher).'`';
     }
 
     $out[] = pht(
       'You can find an Asana project ID by clicking the project in Asana and '.
       'then examining the URL:'.
       "\n\n".
       "  lang=txt\n".
       "  https://app.asana.com/0/12345678901234567890/111111111111111111\n".
       "                          ^^^^^^^^^^^^^^^^^^^^\n".
       "                        This is the ID to use.\n");
 
     $out = implode("\n", $out);
 
     return PhabricatorMarkupEngine::renderOneObject(
       id(new PhabricatorMarkupOneOff())->setContent($out),
       'default',
       $viewer);
   }
 
 }
diff --git a/src/applications/doorkeeper/worker/DoorkeeperFeedWorkerAsana.php b/src/applications/doorkeeper/worker/DoorkeeperFeedWorkerAsana.php
index 6e71dab3b..50a2dfabf 100644
--- a/src/applications/doorkeeper/worker/DoorkeeperFeedWorkerAsana.php
+++ b/src/applications/doorkeeper/worker/DoorkeeperFeedWorkerAsana.php
@@ -1,691 +1,691 @@
 <?php
 
 /**
  * Publishes tasks representing work that needs to be done into Asana, and
  * updates the tasks as the corresponding Phabricator objects are updated.
  */
 final class DoorkeeperFeedWorkerAsana extends DoorkeeperFeedWorker {
 
   private $provider;
 
 
 /* -(  Publishing Stories  )------------------------------------------------- */
 
 
   /**
    * This worker is enabled when an Asana workspace ID is configured with
    * `asana.workspace-id`.
    */
   public function isEnabled() {
     return (bool)$this->getWorkspaceID();
   }
 
 
   /**
    * Publish stories into Asana using the Asana API.
    */
   protected function publishFeedStory() {
     $story = $this->getFeedStory();
     $data = $story->getStoryData();
 
     $viewer = $this->getViewer();
     $provider = $this->getProvider();
     $workspace_id = $this->getWorkspaceID();
 
     $object = $this->getStoryObject();
     $src_phid = $object->getPHID();
 
     $publisher = $this->getPublisher();
 
     // Figure out all the users related to the object. Users go into one of
     // four buckets:
     //
     //   - Owner: the owner of the object. This user becomes the assigned owner
     //     of the parent task.
     //   - Active: users who are responsible for the object and need to act on
     //     it. For example, reviewers of a "needs review" revision.
     //   - Passive: users who are responsible for the object, but do not need
     //     to act on it right now. For example, reviewers of a "needs revision"
     //     revision.
     //   - Follow: users who are following the object; generally CCs.
 
     $owner_phid = $publisher->getOwnerPHID($object);
     $active_phids = $publisher->getActiveUserPHIDs($object);
     $passive_phids = $publisher->getPassiveUserPHIDs($object);
     $follow_phids = $publisher->getCCUserPHIDs($object);
 
     $all_phids = array();
     $all_phids = array_merge(
       array($owner_phid),
       $active_phids,
       $passive_phids,
       $follow_phids);
     $all_phids = array_unique(array_filter($all_phids));
 
     $phid_aid_map = $this->lookupAsanaUserIDs($all_phids);
     if (!$phid_aid_map) {
       throw new PhabricatorWorkerPermanentFailureException(
         'No related users have linked Asana accounts.');
     }
 
     $owner_asana_id = idx($phid_aid_map, $owner_phid);
     $all_asana_ids = array_select_keys($phid_aid_map, $all_phids);
     $all_asana_ids = array_values($all_asana_ids);
 
     // Even if the actor isn't a reviewer, etc., try to use their account so
     // we can post in the correct voice. If we miss, we'll try all the other
     // related users.
 
     $try_users = array_merge(
       array($data->getAuthorPHID()),
       array_keys($phid_aid_map));
     $try_users = array_filter($try_users);
 
     $access_info = $this->findAnyValidAsanaAccessToken($try_users);
     list($possessed_user, $possessed_asana_id, $oauth_token) = $access_info;
 
     if (!$oauth_token) {
       throw new PhabricatorWorkerPermanentFailureException(
         'Unable to find any Asana user with valid credentials to '.
         'pull an OAuth token out of.');
     }
 
     $etype_main = PhabricatorEdgeConfig::TYPE_PHOB_HAS_ASANATASK;
     $etype_sub = PhabricatorEdgeConfig::TYPE_PHOB_HAS_ASANASUBTASK;
 
     $equery = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array($src_phid))
       ->withEdgeTypes(
         array(
           $etype_main,
           $etype_sub,
         ))
       ->needEdgeData(true);
 
     $edges = $equery->execute();
 
     $main_edge = head($edges[$src_phid][$etype_main]);
 
     $main_data = $this->getAsanaTaskData($object) + array(
       'assignee' => $owner_asana_id,
     );
 
     $projects = $this->getAsanaProjectIDs();
 
     $extra_data = array();
     if ($main_edge) {
       $extra_data = $main_edge['data'];
 
       $refs = id(new DoorkeeperImportEngine())
         ->setViewer($possessed_user)
         ->withPHIDs(array($main_edge['dst']))
         ->execute();
 
       $parent_ref = head($refs);
       if (!$parent_ref) {
         throw new PhabricatorWorkerPermanentFailureException(
           'DoorkeeperExternalObject could not be loaded.');
       }
 
       if ($parent_ref->getSyncFailed()) {
         throw new Exception(
           'Synchronization of parent task from Asana failed!');
       } else if (!$parent_ref->getIsVisible()) {
         $this->log("Skipping main task update, object is no longer visible.\n");
         $extra_data['gone'] = true;
       } else {
         $edge_cursor = idx($main_edge['data'], 'cursor', 0);
 
         // TODO: This probably breaks, very rarely, on 32-bit systems.
         if ($edge_cursor <= $story->getChronologicalKey()) {
           $this->log("Updating main task.\n");
           $task_id = $parent_ref->getObjectID();
 
           $this->makeAsanaAPICall(
             $oauth_token,
-            "tasks/".$parent_ref->getObjectID(),
+            'tasks/'.$parent_ref->getObjectID(),
             'PUT',
             $main_data);
         } else {
           $this->log(
             "Skipping main task update, cursor is ahead of the story.\n");
         }
       }
     } else {
       // If there are no followers (CCs), and no active or passive users
       // (reviewers or auditors), and we haven't synchronized the object before,
       // don't synchronize the object.
       if (!$active_phids && !$passive_phids && !$follow_phids) {
         $this->log("Object has no followers or active/passive users.\n");
         return;
       }
 
       $parent = $this->makeAsanaAPICall(
         $oauth_token,
         'tasks',
         'POST',
         array(
           'workspace' => $workspace_id,
           'projects' => $projects,
           // NOTE: We initially create parent tasks in the "Later" state but
           // don't update it afterward, even if the corresponding object
           // becomes actionable. The expectation is that users will prioritize
           // tasks in responses to notifications of state changes, and that
           // we should not overwrite their choices.
           'assignee_status' => 'later',
         ) + $main_data);
 
       $parent_ref = $this->newRefFromResult(
         DoorkeeperBridgeAsana::OBJTYPE_TASK,
         $parent);
 
 
       $extra_data = array(
         'workspace' => $workspace_id,
       );
     }
 
     // Synchronize main task followers.
 
     $task_id = $parent_ref->getObjectID();
 
     // Reviewers are added as followers of the parent task silently, because
     // they receive a notification when they are assigned as the owner of their
     // subtask, so the follow notification is redundant / non-actionable.
     $silent_followers = array_select_keys($phid_aid_map, $active_phids) +
                         array_select_keys($phid_aid_map, $passive_phids);
     $silent_followers = array_values($silent_followers);
 
     // CCs are added as followers of the parent task with normal notifications,
     // since they won't get a secondary subtask notification.
     $noisy_followers = array_select_keys($phid_aid_map, $follow_phids);
     $noisy_followers = array_values($noisy_followers);
 
     // To synchronize follower data, just add all the followers. The task might
     // have additional followers, but we can't really tell how they got there:
     // were they CC'd and then unsubscribed, or did they manually follow the
     // task? Assume the latter since it's easier and less destructive and the
     // former is rare. To be fully consistent, we should enumerate followers
     // and remove unknown followers, but that's a fair amount of work for little
     // benefit, and creates a wider window for race conditions.
 
     // Add the silent followers first so that a user who is both a reviewer and
     // a CC gets silently added and then implicitly skipped by then noisy add.
     // They will get a subtask notification.
 
     // We only do this if the task still exists.
     if (empty($extra_data['gone'])) {
       $this->addFollowers($oauth_token, $task_id, $silent_followers, true);
       $this->addFollowers($oauth_token, $task_id, $noisy_followers);
 
       // We're also going to synchronize project data here.
       $this->addProjects($oauth_token, $task_id, $projects);
     }
 
     $dst_phid = $parent_ref->getExternalObject()->getPHID();
 
     // Update the main edge.
 
     $edge_data = array(
       'cursor' => $story->getChronologicalKey(),
     ) + $extra_data;
 
     $edge_options = array(
       'data' => $edge_data,
     );
 
     id(new PhabricatorEdgeEditor())
       ->setActor($viewer)
       ->addEdge($src_phid, $etype_main, $dst_phid, $edge_options)
       ->save();
 
     if (!$parent_ref->getIsVisible()) {
       throw new PhabricatorWorkerPermanentFailureException(
         'DoorkeeperExternalObject has no visible object on the other side; '.
         'this likely indicates the Asana task has been deleted.');
     }
 
     // Now, handle the subtasks.
 
     $sub_editor = id(new PhabricatorEdgeEditor())
       ->setActor($viewer);
 
     // First, find all the object references in Phabricator for tasks that we
     // know about and import their objects from Asana.
     $sub_edges = $edges[$src_phid][$etype_sub];
     $sub_refs = array();
     $subtask_data = $this->getAsanaSubtaskData($object);
     $have_phids = array();
 
     if ($sub_edges) {
       $refs = id(new DoorkeeperImportEngine())
         ->setViewer($possessed_user)
         ->withPHIDs(array_keys($sub_edges))
         ->execute();
 
       foreach ($refs as $ref) {
         if ($ref->getSyncFailed()) {
           throw new Exception(
             'Synchronization of child task from Asana failed!');
         }
         if (!$ref->getIsVisible()) {
           $ref->getExternalObject()->delete();
           continue;
         }
         $have_phids[$ref->getExternalObject()->getPHID()] = $ref;
       }
     }
 
     // Remove any edges in Phabricator which don't have valid tasks in Asana.
     // These are likely tasks which have been deleted. We're going to respawn
     // them.
     foreach ($sub_edges as $sub_phid => $sub_edge) {
       if (isset($have_phids[$sub_phid])) {
         continue;
       }
 
       $this->log(
         "Removing subtask edge to %s, foreign object is not visible.\n",
         $sub_phid);
       $sub_editor->removeEdge($src_phid, $etype_sub, $sub_phid);
       unset($sub_edges[$sub_phid]);
     }
 
 
     // For each active or passive user, we're looking for an existing, valid
     // task. If we find one we're going to update it; if we don't, we'll
     // create one. We ignore extra subtasks that we didn't create (we gain
     // nothing by deleting them and might be nuking something important) and
     // ignore subtasks which have been moved across workspaces or replanted
     // under new parents (this stuff is too edge-casey to bother checking for
     // and complicated to fix, as it needs extra API calls). However, we do
     // clean up subtasks we created whose owners are no longer associated
     // with the object.
 
     $subtask_states = array_fill_keys($active_phids, false) +
                       array_fill_keys($passive_phids, true);
 
     // Continue with only those users who have Asana credentials.
 
     $subtask_states = array_select_keys(
       $subtask_states,
       array_keys($phid_aid_map));
 
     $need_subtasks = $subtask_states;
 
     $user_to_ref_map = array();
     $nuke_refs = array();
     foreach ($sub_edges as $sub_phid => $sub_edge) {
       $user_phid = idx($sub_edge['data'], 'userPHID');
 
       if (isset($need_subtasks[$user_phid])) {
         unset($need_subtasks[$user_phid]);
         $user_to_ref_map[$user_phid] = $have_phids[$sub_phid];
       } else {
         // This user isn't associated with the object anymore, so get rid
         // of their task and edge.
         $nuke_refs[$sub_phid] = $have_phids[$sub_phid];
       }
     }
 
     // These are tasks we know about but which are no longer relevant -- for
     // example, because a user has been removed as a reviewer. Remove them and
     // their edges.
 
     foreach ($nuke_refs as $sub_phid => $ref) {
       $sub_editor->removeEdge($src_phid, $etype_sub, $sub_phid);
       $this->makeAsanaAPICall(
         $oauth_token,
         'tasks/'.$ref->getObjectID(),
         'DELETE',
         array());
       $ref->getExternalObject()->delete();
     }
 
     // For each user that we don't have a subtask for, create a new subtask.
     foreach ($need_subtasks as $user_phid => $is_completed) {
       $subtask = $this->makeAsanaAPICall(
         $oauth_token,
         'tasks',
         'POST',
         $subtask_data + array(
           'assignee' => $phid_aid_map[$user_phid],
           'completed' => $is_completed,
           'parent' => $parent_ref->getObjectID(),
         ));
 
       $subtask_ref = $this->newRefFromResult(
         DoorkeeperBridgeAsana::OBJTYPE_TASK,
         $subtask);
 
       $user_to_ref_map[$user_phid] = $subtask_ref;
 
       // We don't need to synchronize this subtask's state because we just
       // set it when we created it.
       unset($subtask_states[$user_phid]);
 
       // Add an edge to track this subtask.
       $sub_editor->addEdge(
         $src_phid,
         $etype_sub,
         $subtask_ref->getExternalObject()->getPHID(),
         array(
           'data' => array(
             'userPHID' => $user_phid,
           ),
         ));
     }
 
     // Synchronize all the previously-existing subtasks.
 
     foreach ($subtask_states as $user_phid => $is_completed) {
       $this->makeAsanaAPICall(
         $oauth_token,
         'tasks/'.$user_to_ref_map[$user_phid]->getObjectID(),
         'PUT',
         $subtask_data + array(
           'assignee' => $phid_aid_map[$user_phid],
           'completed' => $is_completed,
         ));
     }
 
     foreach ($user_to_ref_map as $user_phid => $ref) {
       // For each subtask, if the acting user isn't the same user as the subtask
       // owner, remove the acting user as a follower. Currently, the acting user
       // will be added as a follower only when they create the task, but this
       // may change in the future (e.g., closing the task may also mark them
       // as a follower). Wipe every subtask to be sure. The intent here is to
       // leave only the owner as a follower so that the acting user doesn't
       // receive notifications about changes to subtask state. Note that
       // removing followers is silent in all cases in Asana and never produces
       // any kind of notification, so this isn't self-defeating.
       if ($user_phid != $possessed_user->getPHID()) {
         $this->makeAsanaAPICall(
           $oauth_token,
           'tasks/'.$ref->getObjectID().'/removeFollowers',
           'POST',
           array(
             'followers' => array($possessed_asana_id),
           ));
       }
     }
 
     // Update edges on our side.
 
     $sub_editor->save();
 
     // Don't publish the "create" story, since pushing the object into Asana
     // naturally generates a notification which effectively serves the same
     // purpose as the "create" story. Similarly, "close" stories generate a
     // close notification.
     if (!$publisher->isStoryAboutObjectCreation($object) &&
         !$publisher->isStoryAboutObjectClosure($object)) {
       // Post the feed story itself to the main Asana task. We do this last
       // because everything else is idempotent, so this is the only effect we
       // can't safely run more than once.
 
       $text = $publisher
         ->setRenderWithImpliedContext(true)
         ->getStoryText($object);
 
       $this->makeAsanaAPICall(
         $oauth_token,
         'tasks/'.$parent_ref->getObjectID().'/stories',
         'POST',
         array(
           'text' => $text,
         ));
     }
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
   private function getWorkspaceID() {
     return PhabricatorEnv::getEnvConfig('asana.workspace-id');
   }
 
   private function getProvider() {
     if (!$this->provider) {
       $provider = PhabricatorAuthProviderOAuthAsana::getAsanaProvider();
       if (!$provider) {
         throw new PhabricatorWorkerPermanentFailureException(
           'No Asana provider configured.');
       }
       $this->provider = $provider;
     }
     return $this->provider;
   }
 
   private function getAsanaTaskData($object) {
     $publisher = $this->getPublisher();
 
     $title = $publisher->getObjectTitle($object);
     $uri = $publisher->getObjectURI($object);
     $description = $publisher->getObjectDescription($object);
     $is_completed = $publisher->isObjectClosed($object);
 
     $notes = array(
       $description,
       $uri,
       $this->getSynchronizationWarning(),
     );
 
     $notes = implode("\n\n", $notes);
 
     return array(
       'name' => $title,
       'notes' => $notes,
       'completed' => $is_completed,
     );
   }
 
   private function getAsanaSubtaskData($object) {
     $publisher = $this->getPublisher();
 
     $title = $publisher->getResponsibilityTitle($object);
     $uri = $publisher->getObjectURI($object);
     $description = $publisher->getObjectDescription($object);
 
     $notes = array(
       $description,
       $uri,
       $this->getSynchronizationWarning(),
     );
 
     $notes = implode("\n\n", $notes);
 
     return array(
       'name' => $title,
       'notes' => $notes,
     );
   }
 
   private function getSynchronizationWarning() {
     return
       "\xE2\x9A\xA0 DO NOT EDIT THIS TASK \xE2\x9A\xA0\n".
       "\xE2\x98\xA0 Your changes will not be reflected in Phabricator.\n".
       "\xE2\x98\xA0 Your changes will be destroyed the next time state ".
       "is synchronized.";
   }
 
   private function lookupAsanaUserIDs($all_phids) {
     $phid_map = array();
 
     $all_phids = array_unique(array_filter($all_phids));
     if (!$all_phids) {
       return $phid_map;
     }
 
     $provider = PhabricatorAuthProviderOAuthAsana::getAsanaProvider();
 
     $accounts = id(new PhabricatorExternalAccountQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withUserPHIDs($all_phids)
       ->withAccountTypes(array($provider->getProviderType()))
       ->withAccountDomains(array($provider->getProviderDomain()))
       ->execute();
 
     foreach ($accounts as $account) {
       $phid_map[$account->getUserPHID()] = $account->getAccountID();
     }
 
     // Put this back in input order.
     $phid_map = array_select_keys($phid_map, $all_phids);
 
     return $phid_map;
   }
 
   private function findAnyValidAsanaAccessToken(array $user_phids) {
     if (!$user_phids) {
       return array(null, null, null);
     }
 
     $provider = $this->getProvider();
     $viewer = $this->getViewer();
 
     $accounts = id(new PhabricatorExternalAccountQuery())
       ->setViewer($viewer)
       ->withUserPHIDs($user_phids)
       ->withAccountTypes(array($provider->getProviderType()))
       ->withAccountDomains(array($provider->getProviderDomain()))
       ->execute();
 
     // Reorder accounts in the original order.
     // TODO: This needs to be adjusted if/when we allow you to link multiple
     // accounts.
     $accounts = mpull($accounts, null, 'getUserPHID');
     $accounts = array_select_keys($accounts, $user_phids);
 
     $workspace_id = $this->getWorkspaceID();
 
     foreach ($accounts as $account) {
       // Get a token if possible.
       $token = $provider->getOAuthAccessToken($account);
       if (!$token) {
         continue;
       }
 
       // Verify we can actually make a call with the token, and that the user
       // has access to the workspace in question.
       try {
         id(new PhutilAsanaFuture())
           ->setAccessToken($token)
           ->setRawAsanaQuery("workspaces/{$workspace_id}")
           ->resolve();
       } catch (Exception $ex) {
         // This token didn't make it through; try the next account.
         continue;
       }
 
       $user = id(new PhabricatorPeopleQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($account->getUserPHID()))
         ->executeOne();
       if ($user) {
         return array($user, $account->getAccountID(), $token);
       }
     }
 
     return array(null, null, null);
   }
 
   private function makeAsanaAPICall($token, $action, $method, array $params) {
     foreach ($params as $key => $value) {
       if ($value === null) {
         unset($params[$key]);
       } else if (is_array($value)) {
         unset($params[$key]);
         foreach ($value as $skey => $svalue) {
           $params[$key.'['.$skey.']'] = $svalue;
         }
       }
     }
 
     return id(new PhutilAsanaFuture())
       ->setAccessToken($token)
       ->setMethod($method)
       ->setRawAsanaQuery($action, $params)
       ->resolve();
   }
 
   private function newRefFromResult($type, $result) {
     $ref = id(new DoorkeeperObjectRef())
       ->setApplicationType(DoorkeeperBridgeAsana::APPTYPE_ASANA)
       ->setApplicationDomain(DoorkeeperBridgeAsana::APPDOMAIN_ASANA)
       ->setObjectType($type)
       ->setObjectID($result['id'])
       ->setIsVisible(true);
 
     $xobj = $ref->newExternalObject();
     $ref->attachExternalObject($xobj);
 
     $bridge = new DoorkeeperBridgeAsana();
     $bridge->fillObjectFromData($xobj, $result);
 
     $xobj->save();
 
     return $ref;
   }
 
   private function addFollowers(
     $oauth_token,
     $task_id,
     array $followers,
     $silent = false) {
 
     if (!$followers) {
       return;
     }
 
     $data = array(
       'followers' => $followers,
     );
 
     // NOTE: This uses a currently-undocumented API feature to suppress the
     // follow notifications.
     if ($silent) {
       $data['silent'] = true;
     }
 
     $this->makeAsanaAPICall(
       $oauth_token,
       "tasks/{$task_id}/addFollowers",
       'POST',
       $data);
   }
 
   private function getAsanaProjectIDs() {
     $project_ids = array();
 
     $publisher = $this->getPublisher();
     $config = PhabricatorEnv::getEnvConfig('asana.project-ids');
     if (is_array($config)) {
       $ids = idx($config, get_class($publisher));
       if (is_array($ids)) {
         foreach ($ids as $id) {
           if (is_scalar($id)) {
             $project_ids[] = $id;
           }
         }
       }
     }
 
     return $project_ids;
   }
 
   private function addProjects(
     $oauth_token,
     $task_id,
     array $project_ids) {
     foreach ($project_ids as $project_id) {
       $data = array('project' => $project_id);
       $this->makeAsanaAPICall(
         $oauth_token,
         "tasks/{$task_id}/addProject",
         'POST',
         $data);
     }
   }
 
 }
diff --git a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
index 8c4246aa8..34373aaf1 100644
--- a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
@@ -1,461 +1,461 @@
 <?php
 
 /**
  * @task lease      Lease Acquisition
  * @task resource   Resource Allocation
  * @task log        Logging
  */
 abstract class DrydockBlueprintImplementation {
 
   private $activeResource;
   private $activeLease;
   private $instance;
 
   abstract public function getType();
   abstract public function getInterface(
     DrydockResource $resource,
     DrydockLease $lease,
     $type);
 
   abstract public function isEnabled();
 
   abstract public function getBlueprintName();
   abstract public function getDescription();
 
   public function getBlueprintClass() {
     return get_class($this);
   }
 
   protected function loadLease($lease_id) {
     // TODO: Get rid of this?
     $query = id(new DrydockLeaseQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withIDs(array($lease_id))
       ->execute();
 
     $lease = idx($query, $lease_id);
 
     if (!$lease) {
       throw new Exception("No such lease '{$lease_id}'!");
     }
 
     return $lease;
   }
 
   protected function getInstance() {
     if (!$this->instance) {
       throw new Exception(
-        "Attach the blueprint instance to the implementation.");
+        'Attach the blueprint instance to the implementation.');
     }
 
     return $this->instance;
   }
 
   public function attachInstance(DrydockBlueprint $instance) {
     $this->instance = $instance;
     return $this;
   }
 
 
 /* -(  Lease Acquisition  )-------------------------------------------------- */
 
 
   /**
    * @task lease
    */
   final public function filterResource(
     DrydockResource $resource,
     DrydockLease $lease) {
 
     $scope = $this->pushActiveScope($resource, $lease);
 
     return $this->canAllocateLease($resource, $lease);
   }
 
 
   /**
    * Enforce basic checks on lease/resource compatibility. Allows resources to
    * reject leases if they are incompatible, even if the resource types match.
    *
    * For example, if a resource represents a 32-bit host, this method might
    * reject leases that need a 64-bit host. If a resource represents a working
    * copy of repository "X", this method might reject leases which need a
    * working copy of repository "Y". Generally, although the main types of
    * a lease and resource may match (e.g., both "host"), it may not actually be
    * possible to satisfy the lease with a specific resource.
    *
    * This method generally should not enforce limits or perform capacity
    * checks. Perform those in @{method:shouldAllocateLease} instead. It also
    * should not perform actual acquisition of the lease; perform that in
    * @{method:executeAcquireLease} instead.
    *
    * @param   DrydockResource   Candidiate resource to allocate the lease on.
    * @param   DrydockLease      Pending lease that wants to allocate here.
    * @return  bool              True if the resource and lease are compatible.
    * @task lease
    */
   abstract protected function canAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease);
 
 
   /**
    * @task lease
    */
   final public function allocateLease(
     DrydockResource $resource,
     DrydockLease $lease) {
 
     $scope = $this->pushActiveScope($resource, $lease);
 
     $this->log('Trying to Allocate Lease');
 
     $lease->setStatus(DrydockLeaseStatus::STATUS_ACQUIRING);
     $lease->setResourceID($resource->getID());
     $lease->attachResource($resource);
 
     $ephemeral_lease = id(clone $lease)->makeEphemeral();
 
     $allocated = false;
     $allocation_exception = null;
 
     $resource->openTransaction();
       $resource->beginReadLocking();
         $resource->reload();
 
         // TODO: Policy stuff.
         $other_leases = id(new DrydockLease())->loadAllWhere(
           'status IN (%Ld) AND resourceID = %d',
           array(
             DrydockLeaseStatus::STATUS_ACQUIRING,
             DrydockLeaseStatus::STATUS_ACTIVE,
           ),
           $resource->getID());
 
         try {
           $allocated = $this->shouldAllocateLease(
             $resource,
             $ephemeral_lease,
             $other_leases);
         } catch (Exception $ex) {
           $allocation_exception = $ex;
         }
 
         if ($allocated) {
           $lease->save();
         }
       $resource->endReadLocking();
     if ($allocated) {
       $resource->saveTransaction();
       $this->log('Allocated Lease');
     } else {
       $resource->killTransaction();
       $this->log('Failed to Allocate Lease');
     }
 
     if ($allocation_exception) {
       $this->logException($allocation_exception);
     }
 
     return $allocated;
   }
 
 
   /**
    * Enforce lease limits on resources. Allows resources to reject leases if
    * they would become over-allocated by accepting them.
    *
    * For example, if a resource represents disk space, this method might check
    * how much space the lease is asking for (say, 200MB) and how much space is
    * left unallocated on the resource. It could grant the lease (return true)
    * if it has enough remaining space (more than 200MB), and reject the lease
    * (return false) if it does not (less than 200MB).
    *
    * A resource might also allow only exclusive leases. In this case it could
    * accept a new lease (return true) if there are no active leases, or reject
    * the new lease (return false) if there any other leases.
    *
    * A lock is held on the resource while this method executes to prevent
    * multiple processes from allocating leases on the resource simultaneously.
    * However, this means you should implement the method as cheaply as possible.
    * In particular, do not perform any actual acquisition or setup in this
    * method.
    *
    * If allocation is permitted, the lease will be moved to `ACQUIRING` status
    * and @{method:executeAcquireLease} will be called to actually perform
    * acquisition.
    *
    * General compatibility checks unrelated to resource limits and capacity are
    * better implemented in @{method:canAllocateLease}, which serves as a
    * cheap filter before lock acquisition.
    *
    * @param   DrydockResource     Candidate resource to allocate the lease on.
    * @param   DrydockLease        Pending lease that wants to allocate here.
    * @param   list<DrydockLease>  Other allocated and acquired leases on the
    *                              resource. The implementation can inspect them
    *                              to verify it can safely add the new lease.
    * @return  bool                True to allocate the lease on the resource;
    *                              false to reject it.
    * @task lease
    */
   abstract protected function shouldAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease,
     array $other_leases);
 
 
   /**
    * @task lease
    */
   final public function acquireLease(
     DrydockResource $resource,
     DrydockLease $lease) {
 
     $scope = $this->pushActiveScope($resource, $lease);
 
     $this->log('Acquiring Lease');
     $lease->setStatus(DrydockLeaseStatus::STATUS_ACTIVE);
     $lease->setResourceID($resource->getID());
     $lease->attachResource($resource);
 
     $ephemeral_lease = id(clone $lease)->makeEphemeral();
 
     try {
       $this->executeAcquireLease($resource, $ephemeral_lease);
     } catch (Exception $ex) {
       $this->logException($ex);
       throw $ex;
     }
 
     $lease->setAttributes($ephemeral_lease->getAttributes());
     $lease->save();
     $this->log('Acquired Lease');
   }
 
 
   /**
    * Acquire and activate an allocated lease. Allows resources to peform setup
    * as leases are brought online.
    *
    * Following a successful call to @{method:canAllocateLease}, a lease is moved
    * to `ACQUIRING` status and this method is called after resource locks are
    * released. Nothing is locked while this method executes; the implementation
    * is free to perform expensive operations like writing files and directories,
    * executing commands, etc.
    *
    * After this method executes, the lease status is moved to `ACTIVE` and the
    * original leasee may access it.
    *
    * If acquisition fails, throw an exception.
    *
    * @param   DrydockResource   Resource to acquire a lease on.
    * @param   DrydockLease      Lease to acquire.
    * @return  void
    */
   abstract protected function executeAcquireLease(
     DrydockResource $resource,
     DrydockLease $lease);
 
 
 
   final public function releaseLease(
     DrydockResource $resource,
     DrydockLease $lease) {
     $scope = $this->pushActiveScope(null, $lease);
 
     $released = false;
 
     $lease->openTransaction();
       $lease->beginReadLocking();
         $lease->reload();
 
         if ($lease->getStatus() == DrydockLeaseStatus::STATUS_ACTIVE) {
           $lease->setStatus(DrydockLeaseStatus::STATUS_RELEASED);
           $lease->save();
           $released = true;
         }
 
       $lease->endReadLocking();
     $lease->saveTransaction();
 
     if (!$released) {
-      throw new Exception("Unable to release lease: lease not active!");
+      throw new Exception('Unable to release lease: lease not active!');
     }
 
   }
 
 
 
 /* -(  Resource Allocation  )------------------------------------------------ */
 
 
   public function canAllocateMoreResources(array $pool) {
     return true;
   }
 
   abstract protected function executeAllocateResource(DrydockLease $lease);
 
 
   final public function allocateResource(DrydockLease $lease) {
     $scope = $this->pushActiveScope(null, $lease);
 
     $this->log(
       pht(
         "Blueprint '%s': Allocating Resource for '%s'",
         $this->getBlueprintClass(),
         $lease->getLeaseName()));
 
     try {
       $resource = $this->executeAllocateResource($lease);
       $this->validateAllocatedResource($resource);
     } catch (Exception $ex) {
       $this->logException($ex);
       throw $ex;
     }
 
     return $resource;
   }
 
 
 /* -(  Logging  )------------------------------------------------------------ */
 
 
   /**
    * @task log
    */
   protected function logException(Exception $ex) {
     $this->log($ex->getMessage());
   }
 
 
   /**
    * @task log
    */
   protected function log($message) {
     self::writeLog(
       $this->activeResource,
       $this->activeLease,
       $message);
   }
 
 
   /**
    * @task log
    */
   public static function writeLog(
     DrydockResource $resource = null,
     DrydockLease $lease = null,
     $message) {
 
     $log = id(new DrydockLog())
       ->setEpoch(time())
       ->setMessage($message);
 
     if ($resource) {
       $log->setResourceID($resource->getID());
     }
 
     if ($lease) {
       $log->setLeaseID($lease->getID());
     }
 
     $log->save();
   }
 
 
   public static function getAllBlueprintImplementations() {
     static $list = null;
 
     if ($list === null) {
       $blueprints = id(new PhutilSymbolLoader())
         ->setType('class')
         ->setAncestorClass('DrydockBlueprintImplementation')
         ->setConcreteOnly(true)
         ->selectAndLoadSymbols();
       $list = ipull($blueprints, 'name', 'name');
       foreach ($list as $class_name => $ignored) {
         $list[$class_name] = newv($class_name, array());
       }
     }
 
     return $list;
   }
 
   public static function getAllBlueprintImplementationsForResource($type) {
     static $groups = null;
     if ($groups === null) {
       $groups = mgroup(self::getAllBlueprintImplementations(), 'getType');
     }
     return idx($groups, $type, array());
   }
 
   public static function getNamedImplementation($class) {
     return idx(self::getAllBlueprintImplementations(), $class);
   }
 
   protected function newResourceTemplate($name) {
     $resource = id(new DrydockResource())
       ->setBlueprintPHID($this->getInstance()->getPHID())
       ->setBlueprintClass($this->getBlueprintClass())
       ->setType($this->getType())
       ->setStatus(DrydockResourceStatus::STATUS_PENDING)
       ->setName($name)
       ->save();
 
     $this->activeResource = $resource;
 
     $this->log(
       pht(
         "Blueprint '%s': Created New Template",
         $this->getBlueprintClass()));
 
     return $resource;
   }
 
   /**
    * Sanity checks that the blueprint is implemented properly.
    */
   private function validateAllocatedResource($resource) {
     $blueprint = $this->getBlueprintClass();
 
     if (!($resource instanceof DrydockResource)) {
       throw new Exception(
         "Blueprint '{$blueprint}' is not properly implemented: ".
         "executeAllocateResource() must return an object of type ".
         "DrydockResource or throw, but returned something else.");
     }
 
     $current_status = $resource->getStatus();
     $req_status = DrydockResourceStatus::STATUS_OPEN;
     if ($current_status != $req_status) {
       $current_name = DrydockResourceStatus::getNameForStatus($current_status);
       $req_name = DrydockResourceStatus::getNameForStatus($req_status);
       throw new Exception(
         "Blueprint '{$blueprint}' is not properly implemented: ".
         "executeAllocateResource() must return a DrydockResource with ".
         "status '{$req_name}', but returned one with status ".
         "'{$current_name}'.");
     }
   }
 
   private function pushActiveScope(
     DrydockResource $resource = null,
     DrydockLease $lease = null) {
 
     if (($this->activeResource !== null) ||
         ($this->activeLease !== null)) {
-      throw new Exception("There is already an active resource or lease!");
+      throw new Exception('There is already an active resource or lease!');
     }
 
     $this->activeResource = $resource;
     $this->activeLease = $lease;
 
     return new DrydockBlueprintScopeGuard($this);
   }
 
   public function popActiveScope() {
     $this->activeResource = null;
     $this->activeLease = null;
   }
 
 }
diff --git a/src/applications/drydock/blueprint/DrydockLocalHostBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockLocalHostBlueprintImplementation.php
index b1bfac239..43ee8bab6 100644
--- a/src/applications/drydock/blueprint/DrydockLocalHostBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockLocalHostBlueprintImplementation.php
@@ -1,97 +1,97 @@
 <?php
 
 final class DrydockLocalHostBlueprintImplementation
   extends DrydockBlueprintImplementation {
 
   public function isEnabled() {
     return false;
   }
 
   public function getBlueprintName() {
     return pht('Local Host');
   }
 
   public function getDescription() {
     return pht(
       'Allows Drydock to run on the local host.');
   }
 
   public function canAllocateMoreResources(array $pool) {
     assert_instances_of($pool, 'DrydockResource');
 
     // The localhost can be allocated only once.
     foreach ($pool as $resource) {
       if ($resource->getBlueprintClass() == $this->getBlueprintClass()) {
         return false;
       }
     }
 
     return true;
   }
 
   protected function executeAllocateResource(DrydockLease $lease) {
     // TODO: Don't hard-code this.
     $path = '/var/drydock/';
 
     if (!Filesystem::pathExists($path)) {
       throw new Exception(
         "Path '{$path}' does not exist!");
     }
     Filesystem::assertIsDirectory($path);
     Filesystem::assertWritable($path);
 
     $resource = $this->newResourceTemplate('Host (localhost)');
     $resource->setStatus(DrydockResourceStatus::STATUS_OPEN);
     $resource->setAttribute('path', $path);
-    $resource->setAttribute('remote', "false");
-    $resource->setAttribute('preallocated', "false");
+    $resource->setAttribute('remote', 'false');
+    $resource->setAttribute('preallocated', 'false');
     $resource->save();
 
     return $resource;
   }
 
   protected function canAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease) {
     return false;
   }
 
   protected function shouldAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease,
     array $other_leases) {
     return true;
   }
 
   protected function executeAcquireLease(
     DrydockResource $resource,
     DrydockLease $lease) {
 
     $lease_id = $lease->getID();
 
     $full_path = $resource->getAttribute('path').$lease_id.'/';
 
     $cmd = $lease->getInterface('command');
     $cmd->execx('mkdir %s', $full_path);
 
     $lease->setAttribute('path', $full_path);
   }
 
   public function getType() {
     return 'host';
   }
 
   public function getInterface(
     DrydockResource $resource,
     DrydockLease $lease,
     $type) {
 
     switch ($type) {
       case 'command':
         return new DrydockLocalCommandInterface();
     }
 
     throw new Exception("No interface of type '{$type}'.");
   }
 
 }
diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
index ed92311e6..286785748 100644
--- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
@@ -1,113 +1,113 @@
 <?php
 
 final class DrydockWorkingCopyBlueprintImplementation
   extends DrydockBlueprintImplementation {
 
   public function isEnabled() {
     return true;
   }
 
   public function getBlueprintName() {
     return pht('Working Copy');
   }
 
   public function getDescription() {
     return pht('Allows Drydock to check out working copies of repositories.');
   }
 
   protected function canAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease) {
 
     $resource_repo = $resource->getAttribute('repositoryID');
     $lease_repo = $lease->getAttribute('repositoryID');
 
     return ($resource_repo && $lease_repo && ($resource_repo == $lease_repo));
   }
 
   protected function shouldAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease,
     array $other_leases) {
 
     return !$other_leases;
   }
 
   protected function executeAllocateResource(DrydockLease $lease) {
     $repository_id = $lease->getAttribute('repositoryID');
     if (!$repository_id) {
       throw new Exception(
         "Lease is missing required 'repositoryID' attribute.");
     }
 
     // TODO: (T603) Figure out the interaction between policies and
     // Drydock.
     $repository = id(new PhabricatorRepository())->load($repository_id);
 
     if (!$repository) {
       throw new Exception(
         "Repository '{$repository_id}' does not exist!");
     }
 
     switch ($repository->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         break;
       default:
-        throw new Exception("Unsupported VCS!");
+        throw new Exception('Unsupported VCS!');
     }
 
     // TODO: Policy stuff here too.
     $host_lease = id(new DrydockLease())
       ->setResourceType('host')
       ->waitUntilActive();
 
     $path = $host_lease->getAttribute('path').$repository->getCallsign();
 
     $this->log(
       pht('Cloning %s into %s....', $repository->getCallsign(), $path));
 
     $cmd = $host_lease->getInterface('command');
     $cmd->execx(
       'git clone --origin origin %P %s',
       $repository->getRemoteURIEnvelope(),
       $path);
 
     $this->log(pht('Complete.'));
 
     $resource = $this->newResourceTemplate(
       'Working Copy ('.$repository->getCallsign().')');
     $resource->setStatus(DrydockResourceStatus::STATUS_OPEN);
     $resource->setAttribute('lease.host', $host_lease->getID());
     $resource->setAttribute('path', $path);
     $resource->setAttribute('repositoryID', $repository->getID());
     $resource->save();
 
     return $resource;
   }
 
   protected function executeAcquireLease(
     DrydockResource $resource,
     DrydockLease $lease) {
     return;
   }
 
   public function getType() {
     return 'working-copy';
   }
 
   public function getInterface(
     DrydockResource $resource,
     DrydockLease $lease,
     $type) {
 
     switch ($type) {
       case 'command':
         return $this
           ->loadLease($resource->getAttribute('lease.host'))
           ->getInterface($type);
     }
 
     throw new Exception("No interface of type '{$type}'.");
   }
 
 }
diff --git a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
index 3ac20f0f4..70b023f2e 100644
--- a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
+++ b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
@@ -1,55 +1,55 @@
 <?php
 
 final class DrydockSSHCommandInterface extends DrydockCommandInterface {
 
   private $passphraseSSHKey;
 
   private function openCredentialsIfNotOpen() {
     if ($this->passphraseSSHKey !== null) {
       return;
     }
 
     $credential = id(new PassphraseCredentialQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withIDs(array($this->getConfig('credential')))
       ->needSecrets(true)
       ->executeOne();
 
     if ($credential->getProvidesType() !==
       PassphraseCredentialTypeSSHPrivateKey::PROVIDES_TYPE) {
-      throw new Exception("Only private key credentials are supported.");
+      throw new Exception('Only private key credentials are supported.');
     }
 
     $this->passphraseSSHKey = PassphraseSSHKey::loadFromPHID(
       $credential->getPHID(),
       PhabricatorUser::getOmnipotentUser());
   }
 
   public function getExecFuture($command) {
     $this->openCredentialsIfNotOpen();
 
     $argv = func_get_args();
 
     // This assumes there's a UNIX shell living at the other
     // end of the connection, which isn't the case for Windows machines.
     if ($this->getConfig('platform') !== 'windows') {
       $argv = $this->applyWorkingDirectoryToArgv($argv);
     }
 
     $full_command = call_user_func_array('csprintf', $argv);
 
     if ($this->getConfig('platform') === 'windows') {
       // On Windows platforms we need to execute cmd.exe explicitly since
       // most commands are not really executables.
       $full_command = 'C:\\Windows\\system32\\cmd.exe /C '.$full_command;
     }
 
     return new ExecFuture(
       'ssh -o StrictHostKeyChecking=no -p %s -i %P %P@%s -- %s',
       $this->getConfig('port'),
       $this->passphraseSSHKey->getKeyfileEnvelope(),
       $this->passphraseSSHKey->getUsernameEnvelope(),
       $this->getConfig('host'),
       $full_command);
   }
 }
diff --git a/src/applications/drydock/interface/filesystem/DrydockSFTPFilesystemInterface.php b/src/applications/drydock/interface/filesystem/DrydockSFTPFilesystemInterface.php
index bffe85144..6d6265ac6 100644
--- a/src/applications/drydock/interface/filesystem/DrydockSFTPFilesystemInterface.php
+++ b/src/applications/drydock/interface/filesystem/DrydockSFTPFilesystemInterface.php
@@ -1,65 +1,65 @@
 <?php
 
 final class DrydockSFTPFilesystemInterface extends DrydockFilesystemInterface {
 
   private $passphraseSSHKey;
 
   private function openCredentialsIfNotOpen() {
     if ($this->passphraseSSHKey !== null) {
       return;
     }
 
     $credential = id(new PassphraseCredentialQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withIDs(array($this->getConfig('credential')))
       ->needSecrets(true)
       ->executeOne();
 
     if ($credential->getProvidesType() !==
       PassphraseCredentialTypeSSHPrivateKey::PROVIDES_TYPE) {
-      throw new Exception("Only private key credentials are supported.");
+      throw new Exception('Only private key credentials are supported.');
     }
 
     $this->passphraseSSHKey = PassphraseSSHKey::loadFromPHID(
       $credential->getPHID(),
       PhabricatorUser::getOmnipotentUser());
   }
 
   private function getExecFuture($path) {
     $this->openCredentialsIfNotOpen();
 
     return new ExecFuture(
       'sftp -o "StrictHostKeyChecking no" -P %s -i %P %P@%s',
       $this->getConfig('port'),
       $this->passphraseSSHKey->getKeyfileEnvelope(),
       $this->passphraseSSHKey->getUsernameEnvelope(),
       $this->getConfig('host'));
   }
 
   public function readFile($path) {
     $target = new TempFile();
     $future = $this->getExecFuture($path);
-    $future->write(csprintf("get %s %s", $path, $target));
+    $future->write(csprintf('get %s %s', $path, $target));
     $future->resolvex();
     return Filesystem::readFile($target);
   }
 
   public function saveFile($path, $name) {
     $data = $this->readFile($path);
     $file = PhabricatorFile::newFromFileData(
       $data,
       array('name' => $name));
     $file->setName($name);
     $file->save();
     return $file;
   }
 
   public function writeFile($path, $data) {
     $source = new TempFile();
     Filesystem::writeFile($source, $data);
     $future = $this->getExecFuture($path);
-    $future->write(csprintf("put %s %s", $source, $path));
+    $future->write(csprintf('put %s %s', $source, $path));
     $future->resolvex();
   }
 
 }
diff --git a/src/applications/drydock/management/DrydockManagementCloseWorkflow.php b/src/applications/drydock/management/DrydockManagementCloseWorkflow.php
index 684a5333c..774a94b02 100644
--- a/src/applications/drydock/management/DrydockManagementCloseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementCloseWorkflow.php
@@ -1,49 +1,49 @@
 <?php
 
 final class DrydockManagementCloseWorkflow
   extends DrydockManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('close')
       ->setSynopsis('Close a resource.')
       ->setArguments(
         array(
           array(
             'name'      => 'ids',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $ids = $args->getArg('ids');
     if (!$ids) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more resource IDs to close.");
+        'Specify one or more resource IDs to close.');
     }
 
     $viewer = $this->getViewer();
 
     $resources = id(new DrydockResourceQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->execute();
 
     foreach ($ids as $id) {
       $resource = idx($resources, $id);
       if (!$resource) {
         $console->writeErr("Resource %d does not exist!\n", $id);
       } else if ($resource->getStatus() != DrydockResourceStatus::STATUS_OPEN) {
         $console->writeErr("Resource %d is not 'open'!\n", $id);
       } else {
         $resource->closeResource();
         $console->writeErr("Closed resource %d.\n", $id);
       }
     }
 
   }
 
 }
diff --git a/src/applications/drydock/management/DrydockManagementCreateResourceWorkflow.php b/src/applications/drydock/management/DrydockManagementCreateResourceWorkflow.php
index 82259d5d2..eae8e1921 100644
--- a/src/applications/drydock/management/DrydockManagementCreateResourceWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementCreateResourceWorkflow.php
@@ -1,77 +1,77 @@
 <?php
 
 final class DrydockManagementCreateResourceWorkflow
   extends DrydockManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('create-resource')
       ->setSynopsis('Create a resource manually.')
       ->setArguments(
         array(
           array(
             'name'      => 'name',
             'param'     => 'resource_name',
             'help'      => 'Resource name.',
           ),
           array(
             'name'      => 'blueprint',
             'param'     => 'blueprint_id',
             'help'      => 'Blueprint ID.',
           ),
           array(
             'name'      => 'attributes',
             'param'     => 'name=value,...',
             'help'      => 'Resource attributes.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $resource_name = $args->getArg('name');
     if (!$resource_name) {
       throw new PhutilArgumentUsageException(
-        "Specify a resource name with `--name`.");
+        'Specify a resource name with `--name`.');
     }
 
     $blueprint_id = $args->getArg('blueprint');
     if (!$blueprint_id) {
       throw new PhutilArgumentUsageException(
-        "Specify a blueprint ID with `--blueprint`.");
+        'Specify a blueprint ID with `--blueprint`.');
     }
 
     $attributes = $args->getArg('attributes');
     if ($attributes) {
       $options = new PhutilSimpleOptions();
       $options->setCaseSensitive(true);
       $attributes = $options->parse($attributes);
     }
 
     $viewer = $this->getViewer();
 
     $blueprint = id(new DrydockBlueprintQuery())
       ->setViewer($viewer)
       ->withIDs(array($blueprint_id))
       ->executeOne();
     if (!$blueprint) {
       throw new PhutilArgumentUsageException(
-        "Specified blueprint does not exist.");
+        'Specified blueprint does not exist.');
     }
 
     $resource = id(new DrydockResource())
       ->setBlueprintPHID($blueprint->getPHID())
       ->setType($blueprint->getImplementation()->getType())
       ->setName($resource_name)
       ->setStatus(DrydockResourceStatus::STATUS_OPEN);
     if ($attributes) {
       $resource->setAttributes($attributes);
     }
     $resource->save();
 
     $console->writeOut("Created Resource %s\n", $resource->getID());
     return 0;
   }
 
 }
diff --git a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
index 4b60ce2fa..9d910ca2e 100644
--- a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
@@ -1,56 +1,56 @@
 <?php
 
 final class DrydockManagementLeaseWorkflow
   extends DrydockManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('lease')
       ->setSynopsis('Lease a resource.')
       ->setArguments(
         array(
           array(
             'name'      => 'type',
             'param'     => 'resource_type',
             'help'      => 'Resource type.',
           ),
           array(
             'name'      => 'attributes',
             'param'     => 'name=value,...',
             'help'      => 'Resource specficiation.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $resource_type = $args->getArg('type');
     if (!$resource_type) {
       throw new PhutilArgumentUsageException(
-        "Specify a resource type with `--type`.");
+        'Specify a resource type with `--type`.');
     }
 
     $attributes = $args->getArg('attributes');
     if ($attributes) {
       $options = new PhutilSimpleOptions();
       $options->setCaseSensitive(true);
       $attributes = $options->parse($attributes);
     }
 
     PhabricatorWorker::setRunAllTasksInProcess(true);
 
     $lease = id(new DrydockLease())
       ->setResourceType($resource_type);
     if ($attributes) {
       $lease->setAttributes($attributes);
     }
     $lease
       ->queueForActivation()
       ->waitUntilActive();
 
     $console->writeOut("Acquired Lease %s\n", $lease->getID());
     return 0;
   }
 
 }
diff --git a/src/applications/drydock/management/DrydockManagementReleaseWorkflow.php b/src/applications/drydock/management/DrydockManagementReleaseWorkflow.php
index 5913bda44..544fe9bdd 100644
--- a/src/applications/drydock/management/DrydockManagementReleaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementReleaseWorkflow.php
@@ -1,52 +1,52 @@
 <?php
 
 final class DrydockManagementReleaseWorkflow
   extends DrydockManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('release')
       ->setSynopsis('Release a lease.')
       ->setArguments(
         array(
           array(
             'name'      => 'ids',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $ids = $args->getArg('ids');
     if (!$ids) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more lease IDs to release.");
+        'Specify one or more lease IDs to release.');
     }
 
     $viewer = $this->getViewer();
 
     $leases = id(new DrydockLeaseQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->execute();
 
     foreach ($ids as $id) {
       $lease = idx($leases, $id);
       if (!$lease) {
         $console->writeErr("Lease %d does not exist!\n", $id);
       } else if ($lease->getStatus() != DrydockLeaseStatus::STATUS_ACTIVE) {
         $console->writeErr("Lease %d is not 'active'!\n", $id);
       } else {
         $resource = $lease->getResource();
         $blueprint = $resource->getBlueprint();
         $blueprint->releaseLease($resource, $lease);
 
         $console->writeErr("Released lease %d.\n", $id);
       }
     }
 
   }
 
 }
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index 26312ef51..9271d4c4e 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -1,214 +1,214 @@
 <?php
 
 final class DrydockLease extends DrydockDAO
   implements PhabricatorPolicyInterface {
 
   protected $resourceID;
   protected $resourceType;
   protected $until;
   protected $ownerPHID;
   protected $attributes = array();
   protected $status = DrydockLeaseStatus::STATUS_PENDING;
   protected $taskID;
 
   private $resource = self::ATTACHABLE;
   private $releaseOnDestruction;
 
   /**
    * Flag this lease to be released when its destructor is called. This is
    * mostly useful if you have a script which acquires, uses, and then releases
    * a lease, as you don't need to explicitly handle exceptions to properly
    * release the lease.
    */
   public function releaseOnDestruction() {
     $this->releaseOnDestruction = true;
     return $this;
   }
 
   public function __destruct() {
     if ($this->releaseOnDestruction) {
       if ($this->isActive()) {
         $this->release();
       }
     }
   }
 
   public function getLeaseName() {
     return pht('Lease %d', $this->getID());
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'attributes'    => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function setAttribute($key, $value) {
     $this->attributes[$key] = $value;
     return $this;
   }
 
   public function getAttribute($key, $default = null) {
     return idx($this->attributes, $key, $default);
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(DrydockPHIDTypeLease::TYPECONST);
   }
 
   public function getInterface($type) {
     return $this->getResource()->getInterface($this, $type);
   }
 
   public function getResource() {
     return $this->assertAttached($this->resource);
   }
 
   public function attachResource(DrydockResource $resource = null) {
     $this->resource = $resource;
     return $this;
   }
 
   public function hasAttachedResource() {
     return ($this->resource !== null);
   }
 
   public function loadResource() {
     return id(new DrydockResource())->loadOneWhere(
       'id = %d',
       $this->getResourceID());
   }
 
   public function queueForActivation() {
     if ($this->getID()) {
       throw new Exception(
-        "Only new leases may be queued for activation!");
+        'Only new leases may be queued for activation!');
     }
 
     $this->setStatus(DrydockLeaseStatus::STATUS_PENDING);
     $this->save();
 
     $task = PhabricatorWorker::scheduleTask(
       'DrydockAllocatorWorker',
       $this->getID());
 
     // NOTE: Scheduling the task might execute it in-process, if we're running
     // from a CLI script. Reload the lease to make sure we have the most
     // up-to-date information. Normally, this has no effect.
     $this->reload();
 
     $this->setTaskID($task->getID());
     $this->save();
 
     return $this;
   }
 
   public function release() {
     $this->assertActive();
     $this->setStatus(DrydockLeaseStatus::STATUS_RELEASED);
     $this->save();
 
     $this->resource = null;
 
     return $this;
   }
 
   public function isActive() {
     switch ($this->status) {
       case DrydockLeaseStatus::STATUS_ACTIVE:
       case DrydockLeaseStatus::STATUS_ACQUIRING:
         return true;
     }
     return false;
   }
 
   private function assertActive() {
     if (!$this->isActive()) {
       throw new Exception(
-        "Lease is not active! You can not interact with resources through ".
-        "an inactive lease.");
+        'Lease is not active! You can not interact with resources through '.
+        'an inactive lease.');
     }
   }
 
   public static function waitForLeases(array $leases) {
     assert_instances_of($leases, 'DrydockLease');
 
     $task_ids = array_filter(mpull($leases, 'getTaskID'));
 
     PhabricatorWorker::waitForTasks($task_ids);
 
     $unresolved = $leases;
     while (true) {
       foreach ($unresolved as $key => $lease) {
         $lease->reload();
         switch ($lease->getStatus()) {
           case DrydockLeaseStatus::STATUS_ACTIVE:
             unset($unresolved[$key]);
             break;
           case DrydockLeaseStatus::STATUS_RELEASED:
-            throw new Exception("Lease has already been released!");
+            throw new Exception('Lease has already been released!');
           case DrydockLeaseStatus::STATUS_EXPIRED:
-            throw new Exception("Lease has already expired!");
+            throw new Exception('Lease has already expired!');
           case DrydockLeaseStatus::STATUS_BROKEN:
-            throw new Exception("Lease has been broken!");
+            throw new Exception('Lease has been broken!');
           case DrydockLeaseStatus::STATUS_PENDING:
           case DrydockLeaseStatus::STATUS_ACQUIRING:
             break;
           default:
-            throw new Exception("Unknown status??");
+            throw new Exception('Unknown status??');
         }
       }
 
       if ($unresolved) {
         sleep(1);
       } else {
         break;
       }
     }
 
     foreach ($leases as $lease) {
       $lease->attachResource($lease->loadResource());
     }
   }
 
   public function waitUntilActive() {
     if (!$this->getID()) {
       $this->queueForActivation();
     }
 
     self::waitForLeases(array($this));
     return $this;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     if ($this->getResource()) {
       return $this->getResource()->getPolicy($capability);
     }
     return PhabricatorPolicies::getMostOpenPolicy();
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     if ($this->getResource()) {
       return $this->getResource()->hasAutomaticCapability($capability, $viewer);
     }
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return pht('Leases inherit policies from the resources they lease.');
   }
 
 }
diff --git a/src/applications/drydock/worker/DrydockAllocatorWorker.php b/src/applications/drydock/worker/DrydockAllocatorWorker.php
index 0e9d99aa9..3b955f16f 100644
--- a/src/applications/drydock/worker/DrydockAllocatorWorker.php
+++ b/src/applications/drydock/worker/DrydockAllocatorWorker.php
@@ -1,181 +1,181 @@
 <?php
 
 final class DrydockAllocatorWorker extends PhabricatorWorker {
 
   private $lease;
 
   public function getMaximumRetryCount() {
     // TODO: Allow Drydock allocations to retry. For now, every failure is
     // permanent and most of them are because I am bad at programming, so fail
     // fast rather than ending up in limbo.
     return 0;
   }
 
   private function loadLease() {
     if (empty($this->lease)) {
       $lease = id(new DrydockLeaseQuery())
         ->setViewer(PhabricatorUser::getOmnipotentUser())
         ->withIDs(array($this->getTaskData()))
         ->executeOne();
       if (!$lease) {
         throw new PhabricatorWorkerPermanentFailureException(
-          pht("No such lease %d!", $this->getTaskData()));
+          pht('No such lease %d!', $this->getTaskData()));
       }
       $this->lease = $lease;
     }
     return $this->lease;
   }
 
   private function logToDrydock($message) {
     DrydockBlueprintImplementation::writeLog(
       null,
       $this->loadLease(),
       $message);
   }
 
   protected function doWork() {
     $lease = $this->loadLease();
     $this->logToDrydock('Allocating Lease');
 
     try {
       $this->allocateLease($lease);
     } catch (Exception $ex) {
 
       // TODO: We should really do this when archiving the task, if we've
       // suffered a permanent failure. But we don't have hooks for that yet
       // and always fail after the first retry right now, so this is
       // functionally equivalent.
       $lease->reload();
       if ($lease->getStatus() == DrydockLeaseStatus::STATUS_PENDING) {
         $lease->setStatus(DrydockLeaseStatus::STATUS_BROKEN);
         $lease->save();
       }
 
       throw $ex;
     }
   }
 
   private function loadAllBlueprints() {
     $viewer = PhabricatorUser::getOmnipotentUser();
     $instances = id(new DrydockBlueprintQuery())
       ->setViewer($viewer)
       ->execute();
     $blueprints = array();
     foreach ($instances as $instance) {
       $blueprints[$instance->getPHID()] = $instance;
     }
     return $blueprints;
   }
 
   private function allocateLease(DrydockLease $lease) {
     $type = $lease->getResourceType();
 
     $blueprints = $this->loadAllBlueprints();
 
     // TODO: Policy stuff.
     $pool = id(new DrydockResource())->loadAllWhere(
       'type = %s AND status = %s',
       $lease->getResourceType(),
       DrydockResourceStatus::STATUS_OPEN);
 
     $this->logToDrydock(
       pht('Found %d Open Resource(s)', count($pool)));
 
     $candidates = array();
     foreach ($pool as $key => $candidate) {
       if (!isset($blueprints[$candidate->getBlueprintPHID()])) {
         unset($pool[$key]);
         continue;
       }
 
       $blueprint = $blueprints[$candidate->getBlueprintPHID()];
       $implementation = $blueprint->getImplementation();
 
       if ($implementation->filterResource($candidate, $lease)) {
         $candidates[] = $candidate;
       }
     }
 
     $this->logToDrydock(pht('%d Open Resource(s) Remain', count($candidates)));
 
     $resource = null;
     if ($candidates) {
       shuffle($candidates);
       foreach ($candidates as $candidate_resource) {
         $blueprint = $blueprints[$candidate_resource->getBlueprintPHID()]
           ->getImplementation();
         if ($blueprint->allocateLease($candidate_resource, $lease)) {
           $resource = $candidate_resource;
           break;
         }
       }
     }
 
     if (!$resource) {
       $blueprints = DrydockBlueprintImplementation
         ::getAllBlueprintImplementationsForResource($type);
 
       $this->logToDrydock(
         pht('Found %d Blueprints', count($blueprints)));
 
       foreach ($blueprints as $key => $candidate_blueprint) {
         if (!$candidate_blueprint->isEnabled()) {
           unset($blueprints[$key]);
           continue;
         }
       }
 
       $this->logToDrydock(
         pht('%d Blueprints Enabled', count($blueprints)));
 
       foreach ($blueprints as $key => $candidate_blueprint) {
         if (!$candidate_blueprint->canAllocateMoreResources($pool)) {
           unset($blueprints[$key]);
           continue;
         }
       }
 
       $this->logToDrydock(
         pht('%d Blueprints Can Allocate', count($blueprints)));
 
       if (!$blueprints) {
         $lease->setStatus(DrydockLeaseStatus::STATUS_BROKEN);
         $lease->save();
 
         $this->logToDrydock(
           "There are no resources of type '{$type}' available, and no ".
           "blueprints which can allocate new ones.");
 
         return;
       }
 
       // TODO: Rank intelligently.
       shuffle($blueprints);
 
       $blueprint = head($blueprints);
       $resource = $blueprint->allocateResource($lease);
 
       if (!$blueprint->allocateLease($resource, $lease)) {
         // TODO: This "should" happen only if we lost a race with another lease,
         // which happened to acquire this resource immediately after we
         // allocated it. In this case, the right behavior is to retry
         // immediately. However, other things like a blueprint allocating a
         // resource it can't actually allocate the lease on might be happening
         // too, in which case we'd just allocate infinite resources. Probably
         // what we should do is test for an active or allocated lease and retry
         // if we find one (although it might have already been released by now)
         // and fail really hard ("your configuration is a huge broken mess")
         // otherwise. But just throw for now since this stuff is all edge-casey.
         // Alternatively we could bring resources up in a "BESPOKE" status
         // and then switch them to "OPEN" only after the allocating lease gets
         // its grubby mitts on the resource. This might make more sense but
         // is a bit messy.
-        throw new Exception("Lost an allocation race?");
+        throw new Exception('Lost an allocation race?');
       }
     }
 
     $blueprint = $resource->getBlueprint();
     $blueprint->acquireLease($resource, $lease);
   }
 
 }
diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php
index 434bbe077..a9f4f9ab7 100644
--- a/src/applications/fact/controller/PhabricatorFactChartController.php
+++ b/src/applications/fact/controller/PhabricatorFactChartController.php
@@ -1,96 +1,96 @@
 <?php
 
 final class PhabricatorFactChartController extends PhabricatorFactController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $table = new PhabricatorFactRaw();
     $conn_r = $table->establishConnection('r');
     $table_name = $table->getTableName();
 
     $series = $request->getStr('y1');
 
     $specs = PhabricatorFactSpec::newSpecsForFactTypes(
       PhabricatorFactEngine::loadAllEngines(),
       array($series));
     $spec = idx($specs, $series);
 
     $data = queryfx_all(
       $conn_r,
       'SELECT valueX, epoch FROM %T WHERE factType = %s ORDER BY epoch ASC',
       $table_name,
       $series);
 
     $points = array();
     $sum = 0;
     foreach ($data as $key => $row) {
       $sum += (int)$row['valueX'];
       $points[(int)$row['epoch']] = $sum;
     }
 
     if (!$points) {
       // NOTE: Raphael crashes Safari if you hand it series with no points.
-      throw new Exception("No data to show!");
+      throw new Exception('No data to show!');
     }
 
     // Limit amount of data passed to browser.
     $count = count($points);
     $limit = 2000;
     if ($count > $limit) {
       $i = 0;
       $every = ceil($count / $limit);
       foreach ($points as $epoch => $sum) {
         $i++;
         if ($i % $every && $i != $count) {
           unset($points[$epoch]);
         }
       }
     }
 
     $x = array_keys($points);
     $y = array_values($points);
 
     $id = celerity_generate_unique_node_id();
     $chart = phutil_tag(
       'div',
       array(
         'id' => $id,
         'style' => 'border: 1px solid #6f6f6f; '.
                    'margin: 1em 2em; '.
                    'background: #ffffff; '.
                    'height: 400px; ',
       ),
       '');
 
     require_celerity_resource('raphael-core');
     require_celerity_resource('raphael-g');
     require_celerity_resource('raphael-g-line');
 
     Javelin::initBehavior('line-chart', array(
       'hardpoint' => $id,
       'x' => array($x),
       'y' => array($y),
       'xformat' => 'epoch',
       'colors' => array('#0000ff'),
     ));
 
     $panel = new AphrontPanelView();
     $panel->setHeader('Count of '.$spec->getName());
     $panel->appendChild($chart);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Chart'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $panel,
       ),
       array(
         'title' => 'Chart',
       ));
   }
 
 }
diff --git a/src/applications/fact/daemon/PhabricatorFactDaemon.php b/src/applications/fact/daemon/PhabricatorFactDaemon.php
index 64a1c1718..f4f680b23 100644
--- a/src/applications/fact/daemon/PhabricatorFactDaemon.php
+++ b/src/applications/fact/daemon/PhabricatorFactDaemon.php
@@ -1,205 +1,205 @@
 <?php
 
 final class PhabricatorFactDaemon extends PhabricatorDaemon {
 
   private $engines;
 
   const RAW_FACT_BUFFER_LIMIT = 128;
 
   public function run() {
     $this->setEngines(PhabricatorFactEngine::loadAllEngines());
     while (true) {
       $iterators = $this->getAllApplicationIterators();
       foreach ($iterators as $iterator_name => $iterator) {
         $this->processIteratorWithCursor($iterator_name, $iterator);
       }
       $this->processAggregates();
 
-      $this->log("Zzz...");
+      $this->log('Zzz...');
       $this->sleep(60 * 5);
     }
   }
 
   public static function getAllApplicationIterators() {
     $apps = PhabricatorApplication::getAllInstalledApplications();
 
     $iterators = array();
     foreach ($apps as $app) {
       foreach ($app->getFactObjectsForAnalysis() as $object) {
         $iterator = new PhabricatorFactUpdateIterator($object);
         $iterators[get_class($object)] = $iterator;
       }
     }
 
     return $iterators;
   }
 
   public function processIteratorWithCursor($iterator_name, $iterator) {
     $this->log("Processing cursor '{$iterator_name}'.");
 
     $cursor = id(new PhabricatorFactCursor())->loadOneWhere(
       'name = %s',
       $iterator_name);
     if (!$cursor) {
       $cursor = new PhabricatorFactCursor();
       $cursor->setName($iterator_name);
       $position = null;
     } else {
       $position = $cursor->getPosition();
     }
 
     if ($position) {
       $iterator->setPosition($position);
     }
 
     $new_cursor_position = $this->processIterator($iterator);
 
     if ($new_cursor_position) {
       $cursor->setPosition($new_cursor_position);
       $cursor->save();
     }
   }
 
   public function setEngines(array $engines) {
     assert_instances_of($engines, 'PhabricatorFactEngine');
 
     $this->engines = $engines;
     return $this;
   }
 
   public function processIterator($iterator) {
     $result = null;
 
     $raw_facts = array();
     foreach ($iterator as $key => $object) {
       $phid = $object->getPHID();
       $this->log("Processing {$phid}...");
       $raw_facts[$phid] = $this->computeRawFacts($object);
       if (count($raw_facts) > self::RAW_FACT_BUFFER_LIMIT) {
         $this->updateRawFacts($raw_facts);
         $raw_facts = array();
       }
       $result = $key;
     }
 
     if ($raw_facts) {
       $this->updateRawFacts($raw_facts);
       $raw_facts = array();
     }
 
     return $result;
   }
 
   public function processAggregates() {
-    $this->log("Processing aggregates.");
+    $this->log('Processing aggregates.');
 
     $facts = $this->computeAggregateFacts();
     $this->updateAggregateFacts($facts);
   }
 
   private function computeAggregateFacts() {
     $facts = array();
     foreach ($this->engines as $engine) {
       if (!$engine->shouldComputeAggregateFacts()) {
         continue;
       }
       $facts[] = $engine->computeAggregateFacts();
     }
     return array_mergev($facts);
   }
 
   private function computeRawFacts(PhabricatorLiskDAO $object) {
     $facts = array();
     foreach ($this->engines as $engine) {
       if (!$engine->shouldComputeRawFactsForObject($object)) {
         continue;
       }
       $facts[] = $engine->computeRawFactsForObject($object);
     }
 
     return array_mergev($facts);
   }
 
   private function updateRawFacts(array $map) {
     foreach ($map as $phid => $facts) {
       assert_instances_of($facts, 'PhabricatorFactRaw');
     }
 
     $phids = array_keys($map);
     if (!$phids) {
       return;
     }
 
     $table = new PhabricatorFactRaw();
     $conn = $table->establishConnection('w');
     $table_name = $table->getTableName();
 
     $sql = array();
     foreach ($map as $phid => $facts) {
       foreach ($facts as $fact) {
         $sql[] = qsprintf(
           $conn,
           '(%s, %s, %s, %d, %d, %d)',
           $fact->getFactType(),
           $fact->getObjectPHID(),
           $fact->getObjectA(),
           $fact->getValueX(),
           $fact->getValueY(),
           $fact->getEpoch());
       }
     }
 
     $table->openTransaction();
 
       queryfx(
         $conn,
         'DELETE FROM %T WHERE objectPHID IN (%Ls)',
         $table_name,
         $phids);
 
       if ($sql) {
         foreach (array_chunk($sql, 256) as $chunk) {
           queryfx(
             $conn,
             'INSERT INTO %T
               (factType, objectPHID, objectA, valueX, valueY, epoch)
               VALUES %Q',
             $table_name,
             implode(', ', $chunk));
         }
       }
 
     $table->saveTransaction();
   }
 
   private function updateAggregateFacts(array $facts) {
     if (!$facts) {
       return;
     }
 
     $table = new PhabricatorFactAggregate();
     $conn = $table->establishConnection('w');
     $table_name = $table->getTableName();
 
     $sql = array();
     foreach ($facts as $fact) {
       $sql[] = qsprintf(
         $conn,
         '(%s, %s, %d)',
         $fact->getFactType(),
         $fact->getObjectPHID(),
         $fact->getValueX());
     }
 
     foreach (array_chunk($sql, 256) as $chunk) {
       queryfx(
         $conn,
         'INSERT INTO %T (factType, objectPHID, valueX) VALUES %Q
           ON DUPLICATE KEY UPDATE valueX = VALUES(valueX)',
         $table_name,
         implode(', ', $chunk));
     }
 
   }
 
 }
diff --git a/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php
index 741f8f9ca..0aa6d99f2 100644
--- a/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php
+++ b/src/applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php
@@ -1,66 +1,66 @@
 <?php
 
 final class PhabricatorFactManagementCursorsWorkflow
   extends PhabricatorFactManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('cursors')
       ->setSynopsis(pht('Show a list of fact iterators and cursors.'))
       ->setExamples(
         "**cursors**\n".
         "**cursors** --reset __cursor__")
       ->setArguments(
         array(
           array(
             'name'    => 'reset',
             'param'   => 'cursor',
             'repeat'  => true,
             'help'    => 'Reset cursor __cursor__.',
           )
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $reset = $args->getArg('reset');
     if ($reset) {
       foreach ($reset as $name) {
         $cursor = id(new PhabricatorFactCursor())->loadOneWhere(
           'name = %s',
           $name);
         if ($cursor) {
-          $console->writeOut("%s\n", pht("Resetting cursor %s...", $name));
+          $console->writeOut("%s\n", pht('Resetting cursor %s...', $name));
           $cursor->delete();
         } else {
           $console->writeErr(
             "%s\n",
-            pht("Cursor %s does not exist or is already reset.", $name));
+            pht('Cursor %s does not exist or is already reset.', $name));
         }
       }
       return 0;
     }
 
     $iterator_map = PhabricatorFactDaemon::getAllApplicationIterators();
     if (!$iterator_map) {
-      $console->writeErr("%s\n", pht("No cursors."));
+      $console->writeErr("%s\n", pht('No cursors.'));
       return 0;
     }
 
     $cursors = id(new PhabricatorFactCursor())->loadAllWhere(
       'name IN (%Ls)',
       array_keys($iterator_map));
     $cursors = mpull($cursors, 'getPosition', 'getName');
 
     foreach ($iterator_map as $iterator_name => $iterator) {
       $console->writeOut(
         "%s (%s)\n",
         $iterator_name,
         idx($cursors, $iterator_name, 'start'));
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/feed/PhabricatorFeedStoryPublisher.php b/src/applications/feed/PhabricatorFeedStoryPublisher.php
index 552dc795b..3c0dc0b80 100644
--- a/src/applications/feed/PhabricatorFeedStoryPublisher.php
+++ b/src/applications/feed/PhabricatorFeedStoryPublisher.php
@@ -1,235 +1,235 @@
 <?php
 
 final class PhabricatorFeedStoryPublisher {
 
   private $relatedPHIDs;
   private $storyType;
   private $storyData;
   private $storyTime;
   private $storyAuthorPHID;
   private $primaryObjectPHID;
   private $subscribedPHIDs = array();
   private $mailRecipientPHIDs = array();
   private $notifyAuthor;
 
 
   public function setNotifyAuthor($notify_author) {
     $this->notifyAuthor = $notify_author;
     return $this;
   }
 
   public function getNotifyAuthor() {
     return $this->notifyAuthor;
   }
 
   public function setRelatedPHIDs(array $phids) {
     $this->relatedPHIDs = $phids;
     return $this;
   }
 
   public function setSubscribedPHIDs(array $phids) {
     $this->subscribedPHIDs = $phids;
     return $this;
   }
 
   public function setPrimaryObjectPHID($phid) {
     $this->primaryObjectPHID = $phid;
     return $this;
   }
 
   public function setStoryType($story_type) {
     $this->storyType = $story_type;
     return $this;
   }
 
   public function setStoryData(array $data) {
     $this->storyData = $data;
     return $this;
   }
 
   public function setStoryTime($time) {
     $this->storyTime = $time;
     return $this;
   }
 
   public function setStoryAuthorPHID($phid) {
     $this->storyAuthorPHID = $phid;
     return $this;
   }
 
   public function setMailRecipientPHIDs(array $phids) {
     $this->mailRecipientPHIDs = $phids;
     return $this;
   }
 
   public function publish() {
     $class = $this->storyType;
     if (!$class) {
-      throw new Exception("Call setStoryType() before publishing!");
+      throw new Exception('Call setStoryType() before publishing!');
     }
 
     if (!class_exists($class)) {
       throw new Exception(
         "Story type must be a valid class name and must subclass ".
         "PhabricatorFeedStory. ".
         "'{$class}' is not a loadable class.");
     }
 
     if (!is_subclass_of($class, 'PhabricatorFeedStory')) {
       throw new Exception(
         "Story type must be a valid class name and must subclass ".
         "PhabricatorFeedStory. ".
         "'{$class}' is not a subclass of PhabricatorFeedStory.");
     }
 
     $chrono_key = $this->generateChronologicalKey();
 
     $story = new PhabricatorFeedStoryData();
     $story->setStoryType($this->storyType);
     $story->setStoryData($this->storyData);
     $story->setAuthorPHID((string)$this->storyAuthorPHID);
     $story->setChronologicalKey($chrono_key);
     $story->save();
 
     if ($this->relatedPHIDs) {
       $ref = new PhabricatorFeedStoryReference();
 
       $sql = array();
       $conn = $ref->establishConnection('w');
       foreach (array_unique($this->relatedPHIDs) as $phid) {
         $sql[] = qsprintf(
           $conn,
           '(%s, %s)',
           $phid,
           $chrono_key);
       }
 
       queryfx(
         $conn,
         'INSERT INTO %T (objectPHID, chronologicalKey) VALUES %Q',
         $ref->getTableName(),
         implode(', ', $sql));
     }
 
     $this->insertNotifications($chrono_key);
     if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
       $this->sendNotification($chrono_key);
     }
 
     PhabricatorWorker::scheduleTask(
       'FeedPublisherWorker',
       array(
         'key' => $chrono_key,
       ));
 
     return $story;
   }
 
   private function insertNotifications($chrono_key) {
     $subscribed_phids = $this->subscribedPHIDs;
 
     if (!$this->notifyAuthor) {
       $subscribed_phids = array_diff(
         $subscribed_phids,
         array($this->storyAuthorPHID));
     }
 
     if (!$subscribed_phids) {
       return;
     }
 
     if (!$this->primaryObjectPHID) {
       throw new Exception(
-        "You must call setPrimaryObjectPHID() if you setSubscribedPHIDs()!");
+        'You must call setPrimaryObjectPHID() if you setSubscribedPHIDs()!');
     }
 
     $notif = new PhabricatorFeedStoryNotification();
     $sql = array();
     $conn = $notif->establishConnection('w');
 
     $will_receive_mail = array_fill_keys($this->mailRecipientPHIDs, true);
 
     foreach (array_unique($subscribed_phids) as $user_phid) {
       if (isset($will_receive_mail[$user_phid])) {
         $mark_read = 1;
       } else {
         $mark_read = 0;
       }
 
       $sql[] = qsprintf(
         $conn,
         '(%s, %s, %s, %d)',
         $this->primaryObjectPHID,
         $user_phid,
         $chrono_key,
         $mark_read);
     }
 
     queryfx(
       $conn,
       'INSERT INTO %T
      (primaryObjectPHID, userPHID, chronologicalKey, hasViewed)
      VALUES %Q',
       $notif->getTableName(),
       implode(', ', $sql));
   }
 
   private function sendNotification($chrono_key) {
     $data = array(
       'data' => array(
         'key'  => (string)$chrono_key,
         'type' => 'notification',
       ),
       'subscribers' => $this->subscribedPHIDs,
     );
 
     try {
       PhabricatorNotificationClient::postMessage($data);
     } catch (Exception $ex) {
       // Ignore, these are not critical.
     }
   }
 
   /**
    * We generate a unique chronological key for each story type because we want
    * to be able to page through the stream with a cursor (i.e., select stories
    * after ID = X) so we can efficiently perform filtering after selecting data,
    * and multiple stories with the same ID make this cumbersome without putting
    * a bunch of logic in the client. We could use the primary key, but that
    * would prevent publishing stories which happened in the past. Since it's
    * potentially useful to do that (e.g., if you're importing another data
    * source) build a unique key for each story which has chronological ordering.
    *
    * @return string A unique, time-ordered key which identifies the story.
    */
   private function generateChronologicalKey() {
     // Use the epoch timestamp for the upper 32 bits of the key. Default to
     // the current time if the story doesn't have an explicit timestamp.
     $time = nonempty($this->storyTime, time());
 
     // Generate a random number for the lower 32 bits of the key.
     $rand = head(unpack('L', Filesystem::readRandomBytes(4)));
 
     // On 32-bit machines, we have to get creative.
     if (PHP_INT_SIZE < 8) {
       // We're on a 32-bit machine.
       if (function_exists('bcadd')) {
         // Try to use the 'bc' extension.
         return bcadd(bcmul($time, bcpow(2, 32)), $rand);
       } else {
         // Do the math in MySQL. TODO: If we formalize a bc dependency, get
         // rid of this.
         $conn_r = id(new PhabricatorFeedStoryData())->establishConnection('r');
         $result = queryfx_one(
           $conn_r,
           'SELECT (%d << 32) + %d as N',
           $time,
           $rand);
         return $result['N'];
       }
     } else {
       // This is a 64 bit machine, so we can just do the math.
       return ($time << 32) + $rand;
     }
   }
 }
diff --git a/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
index 3fcc18ea7..c7e853b8a 100644
--- a/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
+++ b/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
@@ -1,54 +1,54 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_feed_publish_Method
   extends ConduitAPI_feed_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Publish a story to the feed.";
+    return 'Publish a story to the feed.';
   }
 
   public function defineParamTypes() {
     return array(
       'type' => 'required string',
       'data' => 'required dict',
       'time' => 'optional int',
     );
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   public function defineReturnType() {
     return 'nonempty phid';
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $type = $request->getValue('type');
     $data = $request->getValue('data');
     $time = $request->getValue('time');
 
     $author_phid = $request->getUser()->getPHID();
     $phids = array($author_phid);
 
     $publisher = new PhabricatorFeedStoryPublisher();
     $publisher->setStoryType($type);
     $publisher->setStoryData($data);
     $publisher->setStoryTime($time);
     $publisher->setRelatedPHIDs($phids);
     $publisher->setStoryAuthorPHID($author_phid);
 
     $data = $publisher->publish();
 
     return $data->getPHID();
   }
 
 }
diff --git a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
index b39223366..3c40c3ec1 100644
--- a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
+++ b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
@@ -1,146 +1,146 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_feed_query_Method
   extends ConduitAPI_feed_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Query the feed for stories";
+    return 'Query the feed for stories';
   }
 
   private function getDefaultLimit() {
     return 100;
   }
 
   public function defineParamTypes() {
     return array(
       'filterPHIDs' => 'optional list <phid>',
       'limit' => 'optional int (default '.$this->getDefaultLimit().')',
       'after' => 'optional int',
       'before' => 'optional int',
       'view' => 'optional string (data, html, html-summary, text)',
     );
   }
 
   private function getSupportedViewTypes() {
     return array(
       'html' => 'Full HTML presentation of story',
       'data' => 'Dictionary with various data of the story',
       'html-summary' => 'Story contains only the title of the story',
       'text' => 'Simple one-line plain text representation of story',
     );
   }
 
   public function defineErrorTypes() {
 
     $view_types = array_keys($this->getSupportedViewTypes());
     $view_types = implode(', ', $view_types);
 
     return array(
       'ERR-UNKNOWN-TYPE' =>
         'Unsupported view type, possibles are: ' . $view_types
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $results = array();
     $user = $request->getUser();
 
     $view_type = $request->getValue('view');
     if (!$view_type) {
       $view_type = 'data';
     }
 
     $limit = $request->getValue('limit');
     if (!$limit) {
       $limit = $this->getDefaultLimit();
     }
     $filter_phids = $request->getValue('filterPHIDs');
     if (!$filter_phids) {
       $filter_phids = array();
     }
 
     $query = id(new PhabricatorFeedQuery())
       ->setLimit($limit)
       ->setFilterPHIDs($filter_phids)
       ->setViewer($user);
 
     $after = $request->getValue('after');
     if (strlen($after)) {
       $query->setAfterID($after);
     }
 
     $before = $request->getValue('before');
     if (strlen($before)) {
       $query->setBeforeID($before);
     }
 
     $stories = $query->execute();
 
     if ($stories) {
       foreach ($stories as $story) {
 
         $story_data = $story->getStoryData();
 
         $data = null;
 
         try {
           $view = $story->renderView();
         } catch (Exception $ex) {
           // When stories fail to render, just fail that story.
           phlog($ex);
           continue;
         }
 
         $view->setEpoch($story->getEpoch());
         $view->setUser($user);
 
         switch ($view_type) {
           case 'html':
             $data = $view->render();
           break;
           case 'html-summary':
             $data = $view->render();
           break;
           case 'data':
             $data = array(
               'class' => $story_data->getStoryType(),
               'epoch' => $story_data->getEpoch(),
               'authorPHID' => $story_data->getAuthorPHID(),
               'chronologicalKey' => $story_data->getChronologicalKey(),
               'data' => $story_data->getStoryData(),
             );
           break;
           case 'text':
             $data = array(
               'class' => $story_data->getStoryType(),
               'epoch' => $story_data->getEpoch(),
               'authorPHID' => $story_data->getAuthorPHID(),
               'chronologicalKey' => $story_data->getChronologicalKey(),
               'objectPHID' => $story->getPrimaryObjectPHID(),
               'text' => $story->renderText()
             );
           break;
           default:
             throw new ConduitException('ERR-UNKNOWN-TYPE');
         }
 
         $results[$story_data->getPHID()] = $data;
       }
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/feed/management/PhabricatorFeedManagementRepublishWorkflow.php b/src/applications/feed/management/PhabricatorFeedManagementRepublishWorkflow.php
index 4f6279ba7..34530d2eb 100644
--- a/src/applications/feed/management/PhabricatorFeedManagementRepublishWorkflow.php
+++ b/src/applications/feed/management/PhabricatorFeedManagementRepublishWorkflow.php
@@ -1,61 +1,61 @@
 <?php
 
 final class PhabricatorFeedManagementRepublishWorkflow
   extends PhabricatorFeedManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('republish')
       ->setExamples('**republish** __story_key__')
       ->setSynopsis(
         pht(
           'Republish a feed event to all consumers.'))
       ->setArguments(
         array(
           array(
             'name' => 'key',
             'wildcard' => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $key = $args->getArg('key');
     if (count($key) < 1) {
       throw new PhutilArgumentUsageException(
-        pht("Specify a story key to republish."));
+        pht('Specify a story key to republish.'));
     } else if (count($key) > 1) {
       throw new PhutilArgumentUsageException(
-        pht("Specify exactly one story key to republish."));
+        pht('Specify exactly one story key to republish.'));
     }
     $key = head($key);
 
     $story = id(new PhabricatorFeedQuery())
       ->setViewer($viewer)
       ->withChronologicalKeys(array($key))
       ->executeOne();
 
     if (!$story) {
       throw new PhutilArgumentUsageException(
         pht('No story exists with key "%s"!', $key));
     }
 
-    $console->writeOut("%s\n", pht("Republishing story..."));
+    $console->writeOut("%s\n", pht('Republishing story...'));
 
     PhabricatorWorker::setRunAllTasksInProcess(true);
 
     PhabricatorWorker::scheduleTask(
       'FeedPublisherWorker',
       array(
         'key' => $key,
       ));
 
-    $console->writeOut("%s\n", pht("Done."));
+    $console->writeOut("%s\n", pht('Done.'));
 
     return 0;
   }
 
 }
diff --git a/src/applications/feed/story/PhabricatorFeedStory.php b/src/applications/feed/story/PhabricatorFeedStory.php
index 51118cc83..40fe2674b 100644
--- a/src/applications/feed/story/PhabricatorFeedStory.php
+++ b/src/applications/feed/story/PhabricatorFeedStory.php
@@ -1,379 +1,379 @@
 <?php
 
 /**
  * Manages rendering and aggregation of a story. A story is an event (like a
  * user adding a comment) which may be represented in different forms on
  * different channels (like feed, notifications and realtime alerts).
  *
  * @task load     Loading Stories
  * @task policy   Policy Implementation
  */
 abstract class PhabricatorFeedStory implements PhabricatorPolicyInterface {
 
   private $data;
   private $hasViewed;
   private $framed;
   private $hovercard = false;
   private $renderingTarget = PhabricatorApplicationTransaction::TARGET_HTML;
 
   private $handles  = array();
   private $objects  = array();
 
 /* -(  Loading Stories  )---------------------------------------------------- */
 
 
   /**
    * Given @{class:PhabricatorFeedStoryData} rows, load them into objects and
    * construct appropriate @{class:PhabricatorFeedStory} wrappers for each
    * data row.
    *
    * @param list<dict>  List of @{class:PhabricatorFeedStoryData} rows from the
    *                    database.
    * @return list<PhabricatorFeedStory>   List of @{class:PhabricatorFeedStory}
    *                                      objects.
    * @task load
    */
   public static function loadAllFromRows(array $rows, PhabricatorUser $viewer) {
     $stories = array();
 
     $data = id(new PhabricatorFeedStoryData())->loadAllFromArray($rows);
     foreach ($data as $story_data) {
       $class = $story_data->getStoryType();
 
       try {
         $ok =
           class_exists($class) &&
           is_subclass_of($class, 'PhabricatorFeedStory');
       } catch (PhutilMissingSymbolException $ex) {
         $ok = false;
       }
 
       // If the story type isn't a valid class or isn't a subclass of
       // PhabricatorFeedStory, decline to load it.
       if (!$ok) {
         continue;
       }
 
       $key = $story_data->getChronologicalKey();
       $stories[$key] = newv($class, array($story_data));
     }
 
     $object_phids = array();
     $key_phids = array();
     foreach ($stories as $key => $story) {
       $phids = array();
       foreach ($story->getRequiredObjectPHIDs() as $phid) {
         $phids[$phid] = true;
       }
       if ($story->getPrimaryObjectPHID()) {
         $phids[$story->getPrimaryObjectPHID()] = true;
       }
       $key_phids[$key] = $phids;
       $object_phids += $phids;
     }
 
     $objects = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
       ->withPHIDs(array_keys($object_phids))
       ->execute();
 
     foreach ($key_phids as $key => $phids) {
       if (!$phids) {
         continue;
       }
       $story_objects = array_select_keys($objects, array_keys($phids));
       if (count($story_objects) != count($phids)) {
         // An object this story requires either does not exist or is not visible
         // to the user. Decline to render the story.
         unset($stories[$key]);
         unset($key_phids[$key]);
         continue;
       }
 
       $stories[$key]->setObjects($story_objects);
     }
 
     $handle_phids = array();
     foreach ($stories as $key => $story) {
       foreach ($story->getRequiredHandlePHIDs() as $phid) {
         $key_phids[$key][$phid] = true;
       }
       if ($story->getAuthorPHID()) {
         $key_phids[$key][$story->getAuthorPHID()] = true;
       }
       $handle_phids += $key_phids[$key];
     }
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs(array_keys($handle_phids))
       ->execute();
 
     foreach ($key_phids as $key => $phids) {
       if (!$phids) {
         continue;
       }
       $story_handles = array_select_keys($handles, array_keys($phids));
       $stories[$key]->setHandles($story_handles);
     }
 
     return $stories;
   }
 
   public function setHovercard($hover) {
     $this->hovercard = $hover;
     return $this;
   }
 
   public function setRenderingTarget($target) {
     $this->validateRenderingTarget($target);
     $this->renderingTarget = $target;
     return $this;
   }
 
   public function getRenderingTarget() {
     return $this->renderingTarget;
   }
 
   private function validateRenderingTarget($target) {
     switch ($target) {
       case PhabricatorApplicationTransaction::TARGET_HTML:
       case PhabricatorApplicationTransaction::TARGET_TEXT:
         break;
       default:
         throw new Exception('Unknown rendering target: '.$target);
         break;
     }
   }
 
   public function setObjects(array $objects) {
     $this->objects = $objects;
     return $this;
   }
 
   public function getObject($phid) {
     $object = idx($this->objects, $phid);
     if (!$object) {
       throw new Exception(
         "Story is asking for an object it did not request ('{$phid}')!");
     }
     return $object;
   }
 
   public function getPrimaryObject() {
     $phid = $this->getPrimaryObjectPHID();
     if (!$phid) {
-      throw new Exception("Story has no primary object!");
+      throw new Exception('Story has no primary object!');
     }
     return $this->getObject($phid);
   }
 
   public function getPrimaryObjectPHID() {
     return null;
   }
 
   final public function __construct(PhabricatorFeedStoryData $data) {
     $this->data = $data;
   }
 
   abstract public function renderView();
 
   public function getRequiredHandlePHIDs() {
     return array();
   }
 
   public function getRequiredObjectPHIDs() {
     return array();
   }
 
   public function setHasViewed($has_viewed) {
     $this->hasViewed = $has_viewed;
     return $this;
   }
 
   public function getHasViewed() {
     return $this->hasViewed;
   }
 
   final public function setFramed($framed) {
     $this->framed = $framed;
     return $this;
   }
 
   final public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   final protected function getObjects() {
     return $this->objects;
   }
 
   final protected function getHandles() {
     return $this->handles;
   }
 
   final protected function getHandle($phid) {
     if (isset($this->handles[$phid])) {
       if ($this->handles[$phid] instanceof PhabricatorObjectHandle) {
         return $this->handles[$phid];
       }
     }
 
     $handle = new PhabricatorObjectHandle();
     $handle->setPHID($phid);
     $handle->setName("Unloaded Object '{$phid}'");
 
     return $handle;
   }
 
   final public function getStoryData() {
     return $this->data;
   }
 
   final public function getEpoch() {
     return $this->getStoryData()->getEpoch();
   }
 
   final public function getChronologicalKey() {
     return $this->getStoryData()->getChronologicalKey();
   }
 
   final public function getValue($key, $default = null) {
     return $this->getStoryData()->getValue($key, $default);
   }
 
   final public function getAuthorPHID() {
     return $this->getStoryData()->getAuthorPHID();
   }
 
   final protected function renderHandleList(array $phids) {
     $items = array();
     foreach ($phids as $phid) {
       $items[] = $this->linkTo($phid);
     }
     $list = null;
     switch ($this->getRenderingTarget()) {
       case PhabricatorApplicationTransaction::TARGET_TEXT:
         $list = implode(', ', $items);
         break;
       case PhabricatorApplicationTransaction::TARGET_HTML:
         $list = phutil_implode_html(', ', $items);
         break;
     }
     return $list;
   }
 
   final protected function linkTo($phid) {
     $handle = $this->getHandle($phid);
 
     switch ($this->getRenderingTarget()) {
       case PhabricatorApplicationTransaction::TARGET_TEXT:
         return $handle->getLinkName();
     }
 
     // NOTE: We render our own link here to customize the styling and add
     // the '_top' target for framed feeds.
 
     $class = null;
     if ($handle->getType() == PhabricatorPeoplePHIDTypeUser::TYPECONST) {
       $class = 'phui-link-person';
     }
 
     return javelin_tag(
       'a',
       array(
         'href'    => $handle->getURI(),
         'target'  => $this->framed ? '_top' : null,
         'sigil'   => $this->hovercard ? 'hovercard' : null,
         'meta'    => $this->hovercard ? array('hoverPHID' => $phid) : null,
         'class'   => $class,
       ),
       $handle->getLinkName());
   }
 
   final protected function renderString($str) {
     switch ($this->getRenderingTarget()) {
       case PhabricatorApplicationTransaction::TARGET_TEXT:
         return $str;
       case PhabricatorApplicationTransaction::TARGET_HTML:
         return phutil_tag('strong', array(), $str);
     }
   }
 
   final protected function renderSummary($text, $len = 128) {
     if ($len) {
       $text = phutil_utf8_shorten($text, $len);
     }
     switch ($this->getRenderingTarget()) {
       case PhabricatorApplicationTransaction::TARGET_HTML:
         $text = phutil_escape_html_newlines($text);
         break;
     }
     return $text;
   }
 
   public function getNotificationAggregations() {
     return array();
   }
 
   protected function newStoryView() {
     return id(new PHUIFeedStoryView())
       ->setChronologicalKey($this->getChronologicalKey())
       ->setEpoch($this->getEpoch())
       ->setViewed($this->getHasViewed());
   }
 
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
 
   public function getPHID() {
     return null;
   }
 
   /**
    * @task policy
    */
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
 
   /**
    * @task policy
    */
   public function getPolicy($capability) {
     // If this story's primary object is a policy-aware object, use its policy
     // to control story visiblity.
 
     $primary_phid = $this->getPrimaryObjectPHID();
     if (isset($this->objects[$primary_phid])) {
       $object = $this->objects[$primary_phid];
       if ($object instanceof PhabricatorPolicyInterface) {
         return $object->getPolicy($capability);
       }
     }
 
     // TODO: Remove this once all objects are policy-aware. For now, keep
     // respecting the `feed.public` setting.
     return PhabricatorEnv::getEnvConfig('feed.public')
       ? PhabricatorPolicies::POLICY_PUBLIC
       : PhabricatorPolicies::POLICY_USER;
   }
 
 
   /**
    * @task policy
    */
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/feed/story/PhabricatorFeedStoryAggregate.php b/src/applications/feed/story/PhabricatorFeedStoryAggregate.php
index 141e6911a..c37a39e53 100644
--- a/src/applications/feed/story/PhabricatorFeedStoryAggregate.php
+++ b/src/applications/feed/story/PhabricatorFeedStoryAggregate.php
@@ -1,74 +1,74 @@
 <?php
 
 abstract class PhabricatorFeedStoryAggregate extends PhabricatorFeedStory {
 
   private $aggregateStories = array();
 
   public function getHasViewed() {
     return head($this->getAggregateStories())->getHasViewed();
   }
 
   public function getPrimaryObjectPHID() {
     return head($this->getAggregateStories())->getPrimaryObjectPHID();
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = array();
     foreach ($this->getAggregateStories() as $story) {
       $phids[] = $story->getRequiredHandlePHIDs();
     }
     return array_mergev($phids);
   }
 
   public function getRequiredObjectPHIDs() {
     $phids = array();
     foreach ($this->getAggregateStories() as $story) {
       $phids[] = $story->getRequiredObjectPHIDs();
     }
     return array_mergev($phids);
   }
 
   protected function getAuthorPHIDs() {
     $authors = array();
     foreach ($this->getAggregateStories() as $story) {
       $authors[] = $story->getStoryData()->getAuthorPHID();
     }
     return array_unique(array_filter($authors));
   }
 
   protected function getDataValues($key, $default) {
     $result = array();
     foreach ($this->getAggregateStories() as $key => $story) {
       $result[$key] = $story->getStoryData()->getValue($key, $default);
     }
     return $result;
   }
 
   final public function setAggregateStories(array $aggregate_stories) {
     assert_instances_of($aggregate_stories, 'PhabricatorFeedStory');
     $this->aggregateStories = $aggregate_stories;
 
     $objects = array();
     $handles = array();
 
     foreach ($this->aggregateStories as $story) {
       $objects += $story->getObjects();
       $handles += $story->getHandles();
     }
 
     $this->setObjects($objects);
     $this->setHandles($handles);
 
     return $this;
   }
 
   final public function getAggregateStories() {
     return $this->aggregateStories;
   }
 
   final public function getNotificationAggregations() {
     throw new Exception(
-      "You can not get aggregations for an aggregate story.");
+      'You can not get aggregations for an aggregate story.');
   }
 
 }
diff --git a/src/applications/feed/story/PhabricatorFeedStoryCommit.php b/src/applications/feed/story/PhabricatorFeedStoryCommit.php
index d1a7f8593..25955ffde 100644
--- a/src/applications/feed/story/PhabricatorFeedStoryCommit.php
+++ b/src/applications/feed/story/PhabricatorFeedStoryCommit.php
@@ -1,108 +1,108 @@
 <?php
 
 final class PhabricatorFeedStoryCommit extends PhabricatorFeedStory {
 
   public function getPrimaryObjectPHID() {
     return $this->getValue('commitPHID');
   }
 
   public function getRequiredHandlePHIDs() {
     return array(
       $this->getValue('committerPHID'),
     );
   }
 
   public function renderView() {
     $data = $this->getStoryData();
 
     $author = null;
     if ($data->getValue('authorPHID')) {
       $author = $this->linkTo($data->getValue('authorPHID'));
     } else {
       $author = $data->getValue('authorName');
     }
 
     $committer = null;
     if ($data->getValue('committerPHID')) {
       $committer = $this->linkTo($data->getValue('committerPHID'));
     } else if ($data->getValue('committerName')) {
       $committer = $data->getValue('committerName');
     }
 
     $commit = $this->linkTo($data->getValue('commitPHID'));
 
     if (!$committer) {
       $committer = $author;
       $author = null;
     }
 
     if ($author) {
       $title = pht(
-        "%s committed %s (authored by %s)",
+        '%s committed %s (authored by %s)',
         $committer,
         $commit,
         $author);
     } else {
       $title = pht(
-        "%s committed %s",
+        '%s committed %s',
         $committer,
         $commit);
     }
 
     $view = $this->newStoryView();
     $view->setAppIcon('differential-dark');
 
     $view->setTitle($title);
 
     if ($data->getValue('authorPHID')) {
       $view->setImage($this->getHandle($data->getAuthorPHID())->getImageURI());
     }
 
     $content = $this->renderSummary($data->getValue('summary'));
     $view->appendChild($content);
 
     return $view;
   }
 
   public function renderText() {
     $author = null;
     if ($this->getAuthorPHID()) {
       $author = $this->getHandle($this->getAuthorPHID())->getLinkName();
     } else {
       $author = $this->getValue('authorName');
     }
 
     $committer = null;
     if ($this->getValue('committerPHID')) {
       $committer_handle = $this->getHandle($this->getValue('committerPHID'));
       $committer = $committer_handle->getLinkName();
     } else if ($this->getValue('committerName')) {
       $committer = $this->getValue('committerName');
     }
 
     $commit_handle = $this->getHandle($this->getPrimaryObjectPHID());
     $commit_uri = PhabricatorEnv::getURI($commit_handle->getURI());
     $commit_name = $commit_handle->getLinkName();
 
     if (!$committer) {
       $committer = $author;
       $author = null;
     }
 
     if ($author) {
       $text = pht(
         '%s committed %s (authored by %s).',
         $committer,
         $commit_name,
         $author);
     } else {
       $text = pht(
         '%s committed %s.',
         $committer,
         $commit_name);
     }
 
     return $text;
   }
 
 }
diff --git a/src/applications/files/PhabricatorImageTransformer.php b/src/applications/files/PhabricatorImageTransformer.php
index 74297ae5b..586583c2b 100644
--- a/src/applications/files/PhabricatorImageTransformer.php
+++ b/src/applications/files/PhabricatorImageTransformer.php
@@ -1,656 +1,656 @@
 <?php
 
 /**
  * @task enormous Detecting Enormous Images
  * @task save     Saving Image Data
  */
 final class PhabricatorImageTransformer {
 
   public function executeMemeTransform(
     PhabricatorFile $file,
     $upper_text,
     $lower_text) {
     $image = $this->applyMemeToFile($file, $upper_text, $lower_text);
     return PhabricatorFile::newFromFileData(
       $image,
       array(
         'name' => 'meme-'.$file->getName(),
         'ttl' => time() + 60 * 60 * 24,
       ));
   }
 
   public function executeThumbTransform(
     PhabricatorFile $file,
     $x,
     $y) {
 
     $image = $this->crudelyScaleTo($file, $x, $y);
 
     return PhabricatorFile::newFromFileData(
       $image,
       array(
         'name' => 'thumb-'.$file->getName(),
       ));
   }
 
   public function executeProfileTransform(
     PhabricatorFile $file,
     $x,
     $min_y,
     $max_y) {
 
     $image = $this->crudelyCropTo($file, $x, $min_y, $max_y);
 
     return PhabricatorFile::newFromFileData(
       $image,
       array(
         'name' => 'profile-'.$file->getName(),
       ));
   }
 
   public function executePreviewTransform(
     PhabricatorFile $file,
     $size) {
 
     $image = $this->generatePreview($file, $size);
 
     return PhabricatorFile::newFromFileData(
       $image,
       array(
         'name' => 'preview-'.$file->getName(),
       ));
   }
 
   public function executeConpherenceTransform(
     PhabricatorFile $file,
     $top,
     $left,
     $width,
     $height) {
 
     $image = $this->crasslyCropTo(
       $file,
       $top,
       $left,
       $width,
       $height);
 
     return PhabricatorFile::newFromFileData(
       $image,
       array(
         'name' => 'conpherence-'.$file->getName(),
       ));
   }
 
   private function crudelyCropTo(PhabricatorFile $file, $x, $min_y, $max_y) {
     $data = $file->loadFileData();
     $img = imagecreatefromstring($data);
     $sx = imagesx($img);
     $sy = imagesy($img);
 
     $scaled_y = ($x / $sx) * $sy;
     if ($scaled_y > $max_y) {
       // This image is very tall and thin.
       $scaled_y = $max_y;
     } else if ($scaled_y < $min_y) {
       // This image is very short and wide.
       $scaled_y = $min_y;
     }
 
     $cropped = $this->applyScaleWithImagemagick($file, $x, $scaled_y);
     if ($cropped != null) {
       return $cropped;
     }
 
     $img = $this->applyScaleTo(
       $file,
       $x,
       $scaled_y);
 
     return self::saveImageDataInAnyFormat($img, $file->getMimeType());
   }
 
   private function crasslyCropTo(PhabricatorFile $file, $top, $left, $w, $h) {
     $data = $file->loadFileData();
     $src = imagecreatefromstring($data);
     $dst = $this->getBlankDestinationFile($w, $h);
 
     $scale = self::getScaleForCrop($file, $w, $h);
     $orig_x = $left / $scale;
     $orig_y = $top / $scale;
     $orig_w = $w / $scale;
     $orig_h = $h / $scale;
 
     imagecopyresampled(
       $dst,
       $src,
       0, 0,
       $orig_x, $orig_y,
       $w, $h,
       $orig_w, $orig_h);
 
     return self::saveImageDataInAnyFormat($dst, $file->getMimeType());
   }
 
 
   /**
    * Very crudely scale an image up or down to an exact size.
    */
   private function crudelyScaleTo(PhabricatorFile $file, $dx, $dy) {
     $scaled = $this->applyScaleWithImagemagick($file, $dx, $dy);
 
     if ($scaled != null) {
       return $scaled;
     }
 
     $dst = $this->applyScaleTo($file, $dx, $dy);
     return self::saveImageDataInAnyFormat($dst, $file->getMimeType());
   }
 
   private function getBlankDestinationFile($dx, $dy) {
     $dst = imagecreatetruecolor($dx, $dy);
     imagesavealpha($dst, true);
     imagefill($dst, 0, 0, imagecolorallocatealpha($dst, 255, 255, 255, 127));
 
     return $dst;
   }
 
   private function applyScaleTo(PhabricatorFile $file, $dx, $dy) {
     $data = $file->loadFileData();
     $src = imagecreatefromstring($data);
 
     $x = imagesx($src);
     $y = imagesy($src);
 
     $scale = min(($dx / $x), ($dy / $y), 1);
 
     $sdx = $scale * $x;
     $sdy = $scale * $y;
 
     $dst = $this->getBlankDestinationFile($dx, $dy);
     imagesavealpha($dst, true);
     imagefill($dst, 0, 0, imagecolorallocatealpha($dst, 255, 255, 255, 127));
 
     imagecopyresampled(
       $dst,
       $src,
       ($dx - $sdx) / 2,  ($dy - $sdy) / 2,
       0, 0,
       $sdx, $sdy,
       $x, $y);
 
     return $dst;
 
   }
 
   public static function getPreviewDimensions(PhabricatorFile $file, $size) {
     $metadata = $file->getMetadata();
     $x = idx($metadata, PhabricatorFile::METADATA_IMAGE_WIDTH);
     $y = idx($metadata, PhabricatorFile::METADATA_IMAGE_HEIGHT);
 
     if (!$x || !$y) {
       $data = $file->loadFileData();
       $src = imagecreatefromstring($data);
 
       $x = imagesx($src);
       $y = imagesy($src);
     }
 
     $scale = min($size / $x, $size / $y, 1);
 
     $dx = max($size / 4, $scale * $x);
     $dy = max($size / 4, $scale * $y);
 
     $sdx = $scale * $x;
     $sdy = $scale * $y;
 
     return array(
       'x' => $x,
       'y' => $y,
       'dx' => $dx,
       'dy' => $dy,
       'sdx' => $sdx,
       'sdy' => $sdy
     );
   }
 
   public static function getScaleForCrop(
     PhabricatorFile $file,
     $des_width,
     $des_height) {
 
     $metadata = $file->getMetadata();
     $width = $metadata[PhabricatorFile::METADATA_IMAGE_WIDTH];
     $height = $metadata[PhabricatorFile::METADATA_IMAGE_HEIGHT];
 
     if ($height < $des_height) {
       $scale = $height / $des_height;
     } else if ($width < $des_width) {
       $scale = $width / $des_width;
     } else {
       $scale_x = $des_width / $width;
       $scale_y = $des_height / $height;
       $scale = max($scale_x, $scale_y);
     }
 
     return $scale;
   }
 
   private function generatePreview(PhabricatorFile $file, $size) {
     $data = $file->loadFileData();
     $src = imagecreatefromstring($data);
 
     $dimensions = self::getPreviewDimensions($file, $size);
     $x = $dimensions['x'];
     $y = $dimensions['y'];
     $dx = $dimensions['dx'];
     $dy = $dimensions['dy'];
     $sdx = $dimensions['sdx'];
     $sdy = $dimensions['sdy'];
 
     $dst = $this->getBlankDestinationFile($dx, $dy);
 
     imagecopyresampled(
       $dst,
       $src,
       ($dx - $sdx) / 2, ($dy - $sdy) / 2,
       0, 0,
       $sdx, $sdy,
       $x, $y);
 
     return self::saveImageDataInAnyFormat($dst, $file->getMimeType());
   }
 
   private function applyMemeToFile(
     PhabricatorFile $file,
     $upper_text,
     $lower_text) {
     $data = $file->loadFileData();
 
     $img_type = $file->getMimeType();
     $imagemagick = PhabricatorEnv::getEnvConfig('files.enable-imagemagick');
 
     if ($img_type != 'image/gif' || $imagemagick == false) {
       return $this->applyMemeTo(
         $data, $upper_text, $lower_text, $img_type);
     }
 
     $data = $file->loadFileData();
     $input = new TempFile();
     Filesystem::writeFile($input, $data);
 
     list($out) = execx('convert %s info:', $input);
     $split = phutil_split_lines($out);
     if (count($split) > 1) {
       return $this->applyMemeWithImagemagick(
         $input,
         $upper_text,
         $lower_text,
         count($split),
         $img_type);
     } else {
       return $this->applyMemeTo($data, $upper_text, $lower_text, $img_type);
     }
   }
 
   private function applyMemeTo(
     $data,
     $upper_text,
     $lower_text,
     $mime_type) {
     $img = imagecreatefromstring($data);
 
     // Some PNGs have color palettes, and allocating the dark border color
     // fails and gives us whatever's first in the color table. Copy the image
     // to a fresh truecolor canvas before working with it.
 
     $truecolor = imagecreatetruecolor(imagesx($img), imagesy($img));
     imagecopy($truecolor, $img, 0, 0, 0, 0, imagesx($img), imagesy($img));
     $img = $truecolor;
 
     $phabricator_root = dirname(phutil_get_library_root('phabricator'));
     $font_root = $phabricator_root.'/resources/font/';
     $font_path = $font_root.'tuffy.ttf';
     if (Filesystem::pathExists($font_root.'impact.ttf')) {
       $font_path = $font_root.'impact.ttf';
     }
     $text_color = imagecolorallocate($img, 255, 255, 255);
     $border_color = imagecolorallocatealpha($img, 0, 0, 0, 110);
     $border_width = 4;
     $font_max = 200;
     $font_min = 5;
     for ($i = $font_max; $i > $font_min; $i--) {
       $fit = $this->doesTextBoundingBoxFitInImage(
         $img,
         $upper_text,
         $i,
         $font_path);
       if ($fit['doesfit']) {
         $x = ($fit['imgwidth'] - $fit['txtwidth']) / 2;
         $y = $fit['txtheight'] + 10;
         $this->makeImageWithTextBorder($img,
           $i,
           $x,
           $y,
           $text_color,
           $border_color,
           $border_width,
           $font_path,
           $upper_text);
         break;
       }
     }
     for ($i = $font_max; $i > $font_min; $i--) {
       $fit = $this->doesTextBoundingBoxFitInImage($img,
         $lower_text, $i, $font_path);
       if ($fit['doesfit']) {
         $x = ($fit['imgwidth'] - $fit['txtwidth']) / 2;
         $y = $fit['imgheight'] - 10;
         $this->makeImageWithTextBorder(
           $img,
           $i,
           $x,
           $y,
           $text_color,
           $border_color,
           $border_width,
           $font_path,
           $lower_text);
         break;
       }
     }
     return self::saveImageDataInAnyFormat($img, $mime_type);
   }
 
   private function makeImageWithTextBorder($img, $font_size, $x, $y,
     $color, $stroke_color, $bw, $font, $text) {
     $angle = 0;
     $bw = abs($bw);
     for ($c1 = $x - $bw; $c1 <= $x + $bw; $c1++) {
       for ($c2 = $y - $bw; $c2 <= $y + $bw; $c2++) {
         if (!(($c1 == $x - $bw || $x + $bw) &&
           $c2 == $y - $bw || $c2 == $y + $bw)) {
           $bg = imagettftext($img, $font_size,
             $angle, $c1, $c2, $stroke_color, $font, $text);
           }
         }
       }
     imagettftext($img, $font_size, $angle,
             $x , $y, $color , $font, $text);
   }
 
   private function doesTextBoundingBoxFitInImage($img,
     $text, $font_size, $font_path) {
     // Default Angle = 0
     $angle = 0;
 
     $bbox = imagettfbbox($font_size, $angle, $font_path, $text);
     $text_height = abs($bbox[3] - $bbox[5]);
     $text_width = abs($bbox[0] - $bbox[2]);
     return array(
-      "doesfit" => ($text_height * 1.05 <= imagesy($img) / 2
+      'doesfit' => ($text_height * 1.05 <= imagesy($img) / 2
         && $text_width * 1.05 <= imagesx($img)),
-      "txtwidth" => $text_width,
-      "txtheight" => $text_height,
-      "imgwidth" => imagesx($img),
-      "imgheight" => imagesy($img),
+      'txtwidth' => $text_width,
+      'txtheight' => $text_height,
+      'imgwidth' => imagesx($img),
+      'imgheight' => imagesy($img),
     );
   }
 
   private function applyScaleWithImagemagick(PhabricatorFile $file, $dx, $dy) {
     $img_type = $file->getMimeType();
     $imagemagick = PhabricatorEnv::getEnvConfig('files.enable-imagemagick');
 
     if ($img_type != 'image/gif' || $imagemagick == false) {
       return null;
     }
 
     $data = $file->loadFileData();
     $src = imagecreatefromstring($data);
 
     $x = imagesx($src);
     $y = imagesy($src);
 
     if (self::isEnormousGIF($x, $y)) {
       return null;
     }
 
     $scale = min(($dx / $x), ($dy / $y), 1);
 
     $sdx = $scale * $x;
     $sdy = $scale * $y;
 
     $input = new TempFile();
     Filesystem::writeFile($input, $data);
 
     $resized = new TempFile();
 
     $future = new ExecFuture(
       'convert %s -coalesce -resize %sX%s%s %s',
       $input,
       $sdx,
       $sdy,
       '!',
       $resized);
 
     // Don't spend more than 10 seconds resizing; just fail if it takes longer
     // than that.
     $future->setTimeout(10)->resolvex();
 
     return Filesystem::readFile($resized);
   }
 
   private function applyMemeWithImagemagick(
     $input,
     $above,
     $below,
     $count,
     $img_type) {
 
     $output = new TempFile();
     $future = new ExecFuture(
       'convert %s -coalesce +adjoin %s_%s',
       $input,
       $input,
       '%09d');
     $future->setTimeout(10)->resolvex();
 
     $output_files = array();
     for ($ii = 0; $ii < $count; $ii++) {
       $frame_name = sprintf('%s_%09d', $input, $ii);
       $output_name = sprintf('%s_%09d', $output, $ii);
 
       $output_files[] = $output_name;
 
       $frame_data = Filesystem::readFile($frame_name);
       $memed_frame_data = $this->applyMemeTo(
         $frame_data,
         $above,
         $below,
         $img_type);
       Filesystem::writeFile($output_name, $memed_frame_data);
     }
 
     $future = new ExecFuture('convert -loop 0 %Ls %s', $output_files, $output);
     $future->setTimeout(10)->resolvex();
 
     return Filesystem::readFile($output);
   }
 
 /* -(  Detecting Enormous Files  )------------------------------------------- */
 
 
   /**
    * Determine if an image is enormous (too large to transform).
    *
    * Attackers can perform a denial of service attack by uploading highly
    * compressible images with enormous dimensions but a very small filesize.
    * Transforming them (e.g., into thumbnails) may consume huge quantities of
    * memory and CPU relative to the resources required to transmit the file.
    *
    * In general, we respond to these images by declining to transform them, and
    * using a default thumbnail instead.
    *
    * @param int Width of the image, in pixels.
    * @param int Height of the image, in pixels.
    * @return bool True if this image is enormous (too large to transform).
    * @task enormous
    */
   public static function isEnormousImage($x, $y) {
     // This is just a sanity check, but if we don't have valid dimensions we
     // shouldn't be trying to transform the file.
     if (($x <= 0) || ($y <= 0)) {
       return true;
     }
 
     return ($x * $y) > (4096 * 4096);
   }
 
 
   /**
    * Determine if a GIF is enormous (too large to transform).
    *
    * For discussion, see @{method:isEnormousImage}. We need to be more
    * careful about GIFs, because they can also have a large number of frames
    * despite having a very small filesize. We're more conservative about
    * calling GIFs enormous than about calling images in general enormous.
    *
    * @param int Width of the GIF, in pixels.
    * @param int Height of the GIF, in pixels.
    * @return bool True if this image is enormous (too large to transform).
    * @task enormous
    */
   public static function isEnormousGIF($x, $y) {
     if (self::isEnormousImage($x, $y)) {
       return true;
     }
 
     return ($x * $y) > (800 * 800);
   }
 
 
 /* -(  Saving Image Data  )-------------------------------------------------- */
 
 
   /**
    * Save an image resource to a string representation suitable for storage or
    * transmission as an image file.
    *
    * Optionally, you can specify a preferred MIME type like `"image/png"`.
    * Generally, you should specify the MIME type of the original file if you're
    * applying file transformations. The MIME type may not be honored if
    * Phabricator can not encode images in the given format (based on available
    * extensions), but can save images in another format.
    *
    * @param   resource  GD image resource.
    * @param   string?   Optionally, preferred mime type.
    * @return  string    Bytes of an image file.
    * @task save
    */
   public static function saveImageDataInAnyFormat($data, $preferred_mime = '') {
     $preferred = null;
     switch ($preferred_mime) {
       case 'image/gif':
         $preferred = self::saveImageDataAsGIF($data);
         break;
       case 'image/png':
         $preferred = self::saveImageDataAsPNG($data);
         break;
     }
 
     if ($preferred !== null) {
       return $preferred;
     }
 
     $data = self::saveImageDataAsJPG($data);
     if ($data !== null) {
       return $data;
     }
 
     $data = self::saveImageDataAsPNG($data);
     if ($data !== null) {
       return $data;
     }
 
     $data = self::saveImageDataAsGIF($data);
     if ($data !== null) {
       return $data;
     }
 
     throw new Exception(pht('Failed to save image data into any format.'));
   }
 
 
   /**
    * Save an image in PNG format, returning the file data as a string.
    *
    * @param resource      GD image resource.
    * @return string|null  PNG file as a string, or null on failure.
    * @task save
    */
   private static function saveImageDataAsPNG($image) {
     if (!function_exists('imagepng')) {
       return null;
     }
 
     ob_start();
     $result = imagepng($image, null, 9);
     $output = ob_get_clean();
 
     if (!$result) {
       return null;
     }
 
     return $output;
   }
 
 
   /**
    * Save an image in GIF format, returning the file data as a string.
    *
    * @param resource      GD image resource.
    * @return string|null  GIF file as a string, or null on failure.
    * @task save
    */
   private static function saveImageDataAsGIF($image) {
     if (!function_exists('imagegif')) {
       return null;
     }
 
     ob_start();
     $result = imagegif($image);
     $output = ob_get_clean();
 
     if (!$result) {
       return null;
     }
 
     return $output;
   }
 
 
   /**
    * Save an image in JPG format, returning the file data as a string.
    *
    * @param resource      GD image resource.
    * @return string|null  JPG file as a string, or null on failure.
    * @task save
    */
   private static function saveImageDataAsJPG($image) {
     if (!function_exists('imagejpeg')) {
       return null;
     }
 
     ob_start();
     $result = imagejpeg($image);
     $output = ob_get_clean();
 
     if (!$result) {
       return null;
     }
 
     return $output;
   }
 
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_download_Method.php b/src/applications/files/conduit/ConduitAPI_file_download_Method.php
index 66c7c700f..e28f21e6e 100644
--- a/src/applications/files/conduit/ConduitAPI_file_download_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_download_Method.php
@@ -1,43 +1,43 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_file_download_Method
   extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
-    return "Download a file from the server.";
+    return 'Download a file from the server.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'required phid',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty base64-bytes';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-PHID' => 'No such file exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $phid = $request->getValue('phid');
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(array($phid))
       ->executeOne();
     if (!$file) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     return base64_encode($file->loadFileData());
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_info_Method.php b/src/applications/files/conduit/ConduitAPI_file_info_Method.php
index 555ec2585..e31671212 100644
--- a/src/applications/files/conduit/ConduitAPI_file_info_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_info_Method.php
@@ -1,63 +1,63 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_file_info_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
-    return "Get information about a file.";
+    return 'Get information about a file.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'optional phid',
       'id'   => 'optional id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NOT-FOUND'     => 'No such file exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $phid = $request->getValue('phid');
     $id   = $request->getValue('id');
 
     $query = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser());
     if ($id) {
       $query->withIDs(array($id));
     } else {
       $query->withPHIDs(array($phid));
     }
 
     $file = $query->executeOne();
 
     if (!$file) {
       throw new ConduitException('ERR-NOT-FOUND');
     }
 
     $uri = $file->getBestURI();
 
     return array(
       'id'            => $file->getID(),
       'phid'          => $file->getPHID(),
       'objectName'    => 'F'.$file->getID(),
       'name'          => $file->getName(),
       'mimeType'      => $file->getMimeType(),
       'byteSize'      => $file->getByteSize(),
       'authorPHID'    => $file->getAuthorPHID(),
       'dateCreated'   => $file->getDateCreated(),
       'dateModified'  => $file->getDateModified(),
       'uri'           => PhabricatorEnv::getProductionURI($uri),
     );
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_upload_Method.php b/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
index 49e193f8b..f172b89d6 100644
--- a/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
@@ -1,43 +1,43 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_file_upload_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
-    return "Upload a file to the server.";
+    return 'Upload a file to the server.';
   }
 
   public function defineParamTypes() {
     return array(
       'data_base64' => 'required nonempty base64-bytes',
       'name' => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty guid';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $data = $request->getValue('data_base64');
     $name = $request->getValue('name');
     $data = base64_decode($data, $strict = true);
     $user = $request->getUser();
 
     $file = PhabricatorFile::newFromFileData(
       $data,
       array(
         'name' => $name,
         'authorPHID' => $user->getPHID(),
       ));
     return $file->getPHID();
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php b/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
index c43cb0867..dd724ce01 100644
--- a/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
@@ -1,45 +1,45 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_file_uploadhash_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
-    return "Upload a file to the server using content hash.";
+    return 'Upload a file to the server using content hash.';
   }
 
   public function defineParamTypes() {
     return array(
       'hash' => 'required nonempty string',
       'name' => 'required nonempty string',
     );
   }
 
   public function defineReturnType() {
     return 'phid or null';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $hash = $request->getValue('hash');
     $name = $request->getValue('name');
     $user = $request->getUser();
 
     $file = PhabricatorFile::newFileFromContentHash(
       $hash,
       array(
         'name' => $name,
         'authorPHID' => $user->getPHID(),
       ));
 
     if ($file) {
       return $file->getPHID();
     }
     return $file;
   }
 }
diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
index c942b9254..c57955caa 100644
--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
@@ -1,200 +1,200 @@
 <?php
 
 /**
  * @group file
  */
 final class PhabricatorFilesConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Files");
+    return pht('Files');
   }
 
   public function getDescription() {
-    return pht("Configure files and file storage.");
+    return pht('Configure files and file storage.');
   }
 
   public function getOptions() {
 
     $viewable_default = 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',
 
       'audio/x-wav'     => 'audio/x-wav',
       'application/ogg' => 'application/ogg',
       'audio/mpeg'      => 'audio/mpeg',
     );
 
     $image_default = 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,
     );
 
     $audio_default = array(
       'audio/x-wav'     => true,
       'application/ogg' => true,
       'audio/mpeg'      => true,
     );
 
     // largely lifted from http://en.wikipedia.org/wiki/Internet_media_type
     $icon_default = array(
       // audio file icon
       'audio/basic' => 'docs_audio',
       'audio/L24' => 'docs_audio',
       'audio/mp4' => 'docs_audio',
       'audio/mpeg' => 'docs_audio',
       'audio/ogg' => 'docs_audio',
       'audio/vorbis' => 'docs_audio',
       'audio/vnd.rn-realaudio' => 'docs_audio',
       'audio/vnd.wave' => 'docs_audio',
       'audio/webm' => 'docs_audio',
       // movie file icon
       'video/mpeg' => 'docs_movie',
       'video/mp4' => 'docs_movie',
       'video/ogg' => 'docs_movie',
       'video/quicktime' => 'docs_movie',
       'video/webm' => 'docs_movie',
       'video/x-matroska' => 'docs_movie',
       'video/x-ms-wmv' => 'docs_movie',
       'video/x-flv' => 'docs_movie',
       // pdf file icon
       'application/pdf' => 'docs_pdf',
       // zip file icon
       'application/zip' => 'docs_zip',
       // msword icon
       'application/msword' => 'docs_doc',
     ) + array_fill_keys(array_keys($image_default), 'docs_image');
 
     return array(
       $this->newOption('files.viewable-mime-types', 'wild', $viewable_default)
         ->setSummary(
           pht('Configure which MIME types are viewable in the browser.'))
         ->setDescription(
           pht(
             'Configure which uploaded file types may be viewed directly '.
             'in the browser. Other file types will be downloaded instead '.
             'of displayed. This is mainly a usability consideration, since '.
             'browsers tend to freak out when viewing enormous binary files.'.
             "\n\n".
             'The keys in this map are vieweable MIME types; the values are '.
             'the MIME types they are delivered as when they are viewed in '.
             'the browser.')),
       $this->newOption('files.image-mime-types', 'set', $image_default)
         ->setSummary(pht('Configure which MIME types are images.'))
         ->setDescription(
           pht(
             'List of MIME types which can be used as the `src` for an '.
             '`<img />` tag.')),
       $this->newOption('files.audio-mime-types', 'set', $audio_default)
         ->setSummary(pht('Configure which MIME types are audio.'))
         ->setDescription(
           pht(
             'List of MIME types which can be used to render an '.
             '`<audio />` tag.')),
       $this->newOption('files.icon-mime-types', 'wild', $icon_default)
         ->setSummary(pht('Configure which MIME types map to which icons.'))
         ->setDescription(
           pht(
             'Map of MIME type to icon name. MIME types which can not be '.
             'found default to icon `doc_files`.')),
       $this->newOption('storage.mysql-engine.max-size', 'int', 1000000)
         ->setSummary(
           pht(
             'Configure the largest file which will be put into the MySQL '.
             'storage engine.')),
       $this->newOption('storage.local-disk.path', 'string', null)
         ->setLocked(true)
         ->setSummary(pht('Local storage disk path.'))
         ->setDescription(
           pht(
             "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.")),
      $this->newOption('storage.s3.bucket', 'string', null)
         ->setSummary(pht('Amazon S3 bucket.'))
         ->setDescription(
           pht(
             "Set this to a valid Amazon S3 bucket to store files there. You ".
             "must also configure S3 access keys in the 'Amazon Web Services' ".
             "group.")),
      $this->newOption(
        'storage.engine-selector',
        'class',
        'PhabricatorDefaultFileStorageEngineSelector')
         ->setBaseClass('PhabricatorFileStorageEngineSelector')
         ->setSummary(pht('Storage engine selector.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
      $this->newOption('storage.upload-size-limit', 'string', null)
         ->setSummary(
           pht('Limit to users in interfaces which allow uploading.'))
         ->setDescription(
           pht(
             "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. \n\n".
             "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.\n\n".
             "Specify this limit in bytes, or using a 'K', 'M', or 'G' ".
             "suffix."))
-        ->addExample('10M', pht("Allow Uploads 10MB or Smaller")),
+        ->addExample('10M', pht('Allow Uploads 10MB or Smaller')),
      $this->newOption(
         'metamta.files.public-create-email',
         'string',
         null)
         ->setDescription(pht('Allow uploaded files via email.')),
      $this->newOption(
         'metamta.files.subject-prefix',
         'string',
         '[File]')
         ->setDescription(pht('Subject prefix for paste email.')),
      $this->newOption('files.enable-imagemagick', 'bool', false)
        ->setBoolOptions(
          array(
            pht('Enable'),
            pht('Disable')
          ))->setDescription(
              pht("This option will enable animated gif images".
                   "to be set as profile pictures. The 'convert' binary ".
                   "should be available to the webserver for this to work")),
 
     );
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index 6f6df0f65..6e6370aa7 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -1,270 +1,270 @@
 <?php
 
 final class PhabricatorFileInfoController extends PhabricatorFileController {
 
   private $phid;
 
   public function willProcessRequest(array $data) {
     $this->phid = $data['phid'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($user)
       ->withPHIDs(array($this->phid))
       ->executeOne();
 
     if (!$file) {
       return new Aphront404Response();
     }
 
     $phid = $file->getPHID();
     $xactions = id(new PhabricatorFileTransactionQuery())
       ->setViewer($user)
       ->withObjectPHIDs(array($phid))
       ->execute();
 
     $handle_phids = array_merge(
       array($file->getAuthorPHID()),
       $file->getObjectPHIDs());
 
     $this->loadHandles($handle_phids);
     $header = id(new PHUIHeaderView())
       ->setUser($user)
       ->setPolicyObject($file)
       ->setHeader($file->getName());
 
     $ttl = $file->getTTL();
     if ($ttl !== null) {
       $ttl_tag = id(new PHUITagView())
         ->setType(PHUITagView::TYPE_OBJECT)
-        ->setName(pht("Temporary"));
+        ->setName(pht('Temporary'));
       $header->addTag($ttl_tag);
     }
 
     $actions = $this->buildActionView($file);
     $timeline = $this->buildTransactionView($file, $xactions);
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setActionList($actions);
     $crumbs->addTextCrumb(
       'F'.$file->getID(),
       $this->getApplicationURI("/info/{$phid}/"));
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $this->buildPropertyViews($object_box, $file, $actions);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
         $timeline
       ),
       array(
         'title' => $file->getName(),
         'device'  => true,
         'pageObjects' => array($file->getPHID()),
       ));
   }
 
   private function buildTransactionView(
     PhabricatorFile $file,
     array $xactions) {
 
     $user = $this->getRequest()->getUser();
     $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())
       ->setUser($user)
       ->setObjectPHID($file->getPHID())
       ->setTransactions($xactions)
       ->setMarkupEngine($engine);
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     $add_comment_header = $is_serious
       ? pht('Add Comment')
       : pht('Question File Integrity');
 
     $draft = PhabricatorDraft::newFromUserAndKey($user, $file->getPHID());
 
     $add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
       ->setUser($user)
       ->setObjectPHID($file->getPHID())
       ->setDraft($draft)
       ->setHeaderText($add_comment_header)
       ->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
       ->setSubmitButtonName(pht('Add Comment'));
 
     return array(
       $timeline,
       $add_comment_form);
   }
 
   private function buildActionView(PhabricatorFile $file) {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $id = $file->getID();
 
     $view = id(new PhabricatorActionListView())
       ->setUser($user)
       ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($file);
 
     if ($file->isViewableInBrowser()) {
       $view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View File'))
           ->setIcon('fa-file-o')
           ->setHref($file->getViewURI()));
     } else {
       $view->addAction(
         id(new PhabricatorActionView())
           ->setUser($user)
           ->setRenderAsForm(true)
           ->setDownload(true)
           ->setName(pht('Download File'))
           ->setIcon('fa-download')
           ->setHref($file->getViewURI()));
     }
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Delete File'))
         ->setIcon('fa-times')
         ->setHref($this->getApplicationURI("/delete/{$id}/"))
         ->setWorkflow(true));
 
     return $view;
   }
 
   private function buildPropertyViews(
     PHUIObjectBoxView $box,
     PhabricatorFile $file,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $user = $request->getUser();
 
 
     $properties = id(new PHUIPropertyListView());
     $properties->setActionList($actions);
     $box->addPropertyList($properties, pht('Details'));
 
     if ($file->getAuthorPHID()) {
       $properties->addProperty(
         pht('Author'),
         $this->getHandle($file->getAuthorPHID())->renderLink());
     }
 
     $properties->addProperty(
       pht('Created'),
       phabricator_datetime($file->getDateCreated(), $user));
 
 
     $finfo = id(new PHUIPropertyListView());
     $box->addPropertyList($finfo, pht('File Info'));
 
     $finfo->addProperty(
       pht('Size'),
       phabricator_format_bytes($file->getByteSize()));
 
     $finfo->addProperty(
       pht('Mime Type'),
       $file->getMimeType());
 
     $width = $file->getImageWidth();
     if ($width) {
       $finfo->addProperty(
         pht('Width'),
         pht('%s px', new PhutilNumber($width)));
     }
 
     $height = $file->getImageHeight();
     if ($height) {
       $finfo->addProperty(
         pht('Height'),
         pht('%s px', new PhutilNumber($height)));
     }
 
 
     $storage_properties = new PHUIPropertyListView();
     $box->addPropertyList($storage_properties, pht('Storage'));
 
     $storage_properties->addProperty(
       pht('Engine'),
       $file->getStorageEngine());
 
     $storage_properties->addProperty(
       pht('Format'),
       $file->getStorageFormat());
 
     $storage_properties->addProperty(
       pht('Handle'),
       $file->getStorageHandle());
 
 
     $phids = $file->getObjectPHIDs();
     if ($phids) {
       $attached = new PHUIPropertyListView();
       $box->addPropertyList($attached, pht('Attached'));
 
       $attached->addProperty(
         pht('Attached To'),
         $this->renderHandlesForPHIDs($phids));
     }
 
 
     if ($file->isViewableImage()) {
       $image = phutil_tag(
         'img',
         array(
           'src' => $file->getViewURI(),
           'class' => 'phui-property-list-image',
         ));
 
       $linked_image = phutil_tag(
         'a',
         array(
           'href' => $file->getViewURI(),
         ),
         $image);
 
       $media = id(new PHUIPropertyListView())
         ->addImageContent($linked_image);
 
       $box->addPropertyList($media);
     } else if ($file->isAudio()) {
       $audio = phutil_tag(
         'audio',
         array(
           'controls' => 'controls',
           'class' => 'phui-property-list-audio',
         ),
         phutil_tag(
           'source',
           array(
             'src' => $file->getViewURI(),
             'type' => $file->getMimeType(),
           )));
       $media = id(new PHUIPropertyListView())
         ->addImageContent($audio);
 
       $box->addPropertyList($media);
     }
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileTransformController.php b/src/applications/files/controller/PhabricatorFileTransformController.php
index 4e2c7b08e..cdbb6a31c 100644
--- a/src/applications/files/controller/PhabricatorFileTransformController.php
+++ b/src/applications/files/controller/PhabricatorFileTransformController.php
@@ -1,159 +1,159 @@
 <?php
 
 final class PhabricatorFileTransformController
   extends PhabricatorFileController {
 
   private $transform;
   private $phid;
   private $key;
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function willProcessRequest(array $data) {
     $this->transform = $data['transform'];
     $this->phid      = $data['phid'];
     $this->key       = $data['key'];
   }
 
   public function processRequest() {
     $viewer = $this->getRequest()->getUser();
 
     // NOTE: This is a public/CDN endpoint, and permission to see files is
     // controlled by knowing the secret key, not by authentication.
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($this->phid))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     if (!$file->validateSecretKey($this->key)) {
       return new Aphront403Response();
     }
 
     $xform = id(new PhabricatorTransformedFile())
       ->loadOneWhere(
         'originalPHID = %s AND transform = %s',
         $this->phid,
         $this->transform);
 
     if ($xform) {
       return $this->buildTransformedFileResponse($xform);
     }
 
     $type = $file->getMimeType();
 
     if (!$file->isViewableInBrowser() || !$file->isTransformableImage()) {
       return $this->buildDefaultTransformation($file);
     }
 
     // We're essentially just building a cache here and don't need CSRF
     // protection.
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
 
     switch ($this->transform) {
       case 'thumb-profile':
         $xformed_file = $this->executeThumbTransform($file, 50, 50);
         break;
       case 'thumb-280x210':
         $xformed_file = $this->executeThumbTransform($file, 280, 210);
         break;
       case 'thumb-220x165':
         $xformed_file = $this->executeThumbTransform($file, 220, 165);
         break;
       case 'preview-140':
         $xformed_file = $this->executePreviewTransform($file, 140);
         break;
       case 'preview-220':
         $xformed_file = $this->executePreviewTransform($file, 220);
         break;
       case 'thumb-160x120':
         $xformed_file = $this->executeThumbTransform($file, 160, 120);
         break;
       case 'thumb-60x45':
         $xformed_file = $this->executeThumbTransform($file, 60, 45);
         break;
       default:
         return new Aphront400Response();
     }
 
     if (!$xformed_file) {
       return new Aphront400Response();
     }
 
     $xform = new PhabricatorTransformedFile();
     $xform->setOriginalPHID($this->phid);
     $xform->setTransform($this->transform);
     $xform->setTransformedPHID($xformed_file->getPHID());
     $xform->save();
 
     return $this->buildTransformedFileResponse($xform);
   }
 
   private function buildDefaultTransformation(PhabricatorFile $file) {
     static $regexps = array(
       '@application/zip@'     => 'zip',
       '@image/@'              => 'image',
       '@application/pdf@'     => 'pdf',
       '@.*@'                  => 'default',
     );
 
     $type = $file->getMimeType();
     $prefix = 'default';
     foreach ($regexps as $regexp => $implied_prefix) {
       if (preg_match($regexp, $type)) {
         $prefix = $implied_prefix;
         break;
       }
     }
 
     switch ($this->transform) {
       case 'thumb-160x120':
         $suffix = '160x120';
         break;
       case 'thumb-60x45':
         $suffix = '60x45';
         break;
       default:
-        throw new Exception("Unsupported transformation type!");
+        throw new Exception('Unsupported transformation type!');
     }
 
     $path = celerity_get_resource_uri(
       "/rsrc/image/icon/fatcow/thumbnails/{$prefix}{$suffix}.png");
 
     return id(new AphrontRedirectResponse())
       ->setURI($path);
   }
 
   private function buildTransformedFileResponse(
     PhabricatorTransformedFile $xform) {
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($xform->getTransformedPHID()))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     // TODO: We could just delegate to the file view controller instead,
     // which would save the client a roundtrip, but is slightly more complex.
     $uri = $file->getBestURI();
     return id(new AphrontRedirectResponse())->setURI($uri);
   }
 
   private function executePreviewTransform(PhabricatorFile $file, $size) {
     $xformer = new PhabricatorImageTransformer();
     return $xformer->executePreviewTransform($file, $size);
   }
 
   private function executeThumbTransform(PhabricatorFile $file, $x, $y) {
     $xformer = new PhabricatorImageTransformer();
     return $xformer->executeThumbTransform($file, $x, $y);
   }
 
 }
diff --git a/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
index 306772c97..a83261fa6 100644
--- a/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
+++ b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
@@ -1,54 +1,54 @@
 <?php
 
 /**
  * Default storage engine selector. See
  * @{class:PhabricatorFileStorageEngineSelector} and @{article:File Storage
  * Technical Documentation} for more information.
  *
  * @group filestorage
  */
 final class PhabricatorDefaultFileStorageEngineSelector
   extends PhabricatorFileStorageEngineSelector {
 
   /**
    * Select viable default storage engines according to configuration. We'll
    * select the MySQL and Local Disk storage engines if they are configured
    * to allow a given file.
    */
   public function selectStorageEngines($data, array $params) {
     $length = strlen($data);
 
     $mysql_key = 'storage.mysql-engine.max-size';
     $mysql_limit = PhabricatorEnv::getEnvConfig($mysql_key);
 
     $engines = array();
     if ($mysql_limit && $length <= $mysql_limit) {
       $engines[] = new PhabricatorMySQLFileStorageEngine();
     }
 
     $local_key = 'storage.local-disk.path';
     $local_path = PhabricatorEnv::getEnvConfig($local_key);
     if ($local_path) {
       $engines[] = new PhabricatorLocalDiskFileStorageEngine();
     }
 
     $s3_key = 'storage.s3.bucket';
     if (PhabricatorEnv::getEnvConfig($s3_key)) {
       $engines[] = new PhabricatorS3FileStorageEngine();
     }
 
     if ($mysql_limit && empty($engines)) {
       // If we return no engines, an exception will be thrown but it will be
       // a little vague ("No valid storage engines"). Since this is a default
       // case, throw a more specific exception.
       throw new Exception(
-        "This file exceeds the configured MySQL storage engine filesize ".
-        "limit, but no other storage engines are configured. Increase the ".
-        "MySQL storage engine limit or configure a storage engine suitable ".
-        "for larger files.");
+        'This file exceeds the configured MySQL storage engine filesize '.
+        'limit, but no other storage engines are configured. Increase the '.
+        'MySQL storage engine limit or configure a storage engine suitable '.
+        'for larger files.');
     }
 
     return $engines;
   }
 
 }
diff --git a/src/applications/files/exception/PhabricatorFileUploadException.php b/src/applications/files/exception/PhabricatorFileUploadException.php
index 6dcf34502..df7c06ff2 100644
--- a/src/applications/files/exception/PhabricatorFileUploadException.php
+++ b/src/applications/files/exception/PhabricatorFileUploadException.php
@@ -1,31 +1,31 @@
 <?php
 
 final class PhabricatorFileUploadException extends Exception {
 
   public function __construct($code) {
     $map = array(
       UPLOAD_ERR_INI_SIZE =>
         "Uploaded file is too large: file is larger than the ".
         "'upload_max_filesize' setting in php.ini.",
       UPLOAD_ERR_FORM_SIZE =>
-        "File is too large.",
+        'File is too large.',
       UPLOAD_ERR_PARTIAL =>
-        "File was only partially transferred, upload did not complete.",
+        'File was only partially transferred, upload did not complete.',
       UPLOAD_ERR_NO_FILE =>
-        "No file was uploaded.",
+        'No file was uploaded.',
       UPLOAD_ERR_NO_TMP_DIR =>
-        "Unable to write file: temporary directory does not exist.",
+        'Unable to write file: temporary directory does not exist.',
       UPLOAD_ERR_CANT_WRITE =>
-        "Unable to write file: failed to write to temporary directory.",
+        'Unable to write file: failed to write to temporary directory.',
       UPLOAD_ERR_EXTENSION =>
-        "Unable to upload: a PHP extension stopped the upload.",
+        'Unable to upload: a PHP extension stopped the upload.',
 
       -1000 =>
         "Uploaded file exceeds limit in Phabricator ".
         "'storage.upload-size-limit' configuration.",
     );
 
-    $message = idx($map, $code, "Upload failed: unknown error.");
+    $message = idx($map, $code, 'Upload failed: unknown error.');
     parent::__construct($message, $code);
   }
 }
diff --git a/src/applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php
index bdc04fee8..366eb5fbe 100644
--- a/src/applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php
@@ -1,30 +1,30 @@
 <?php
 
 final class PhabricatorFilesManagementEnginesWorkflow
   extends PhabricatorFilesManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('engines')
       ->setSynopsis('List available storage engines.')
       ->setArguments(array());
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $engines = PhabricatorFile::buildAllEngines();
     if (!$engines) {
-      throw new Exception("No storage engines are available.");
+      throw new Exception('No storage engines are available.');
     }
 
     foreach ($engines as $engine) {
       $console->writeOut(
         "%s\n",
         $engine->getEngineIdentifier());
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php
index 62946a007..85eca269b 100644
--- a/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php
@@ -1,106 +1,106 @@
 <?php
 
 final class PhabricatorFilesManagementMigrateWorkflow
   extends PhabricatorFilesManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('migrate')
       ->setSynopsis('Migrate files between storage engines.')
       ->setArguments(
         array(
           array(
             'name'      => 'engine',
             'param'     => 'storage_engine',
             'help'      => 'Migrate to the named storage engine.',
           ),
           array(
             'name'      => 'dry-run',
             'help'      => 'Show what would be migrated.',
           ),
           array(
             'name'      => 'all',
             'help'      => 'Migrate all files.',
           ),
           array(
             'name'      => 'names',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $engine_id = $args->getArg('engine');
     if (!$engine_id) {
       throw new PhutilArgumentUsageException(
-        "Specify an engine to migrate to with `--engine`. ".
-        "Use `files engines` to get a list of engines.");
+        'Specify an engine to migrate to with `--engine`. '.
+        'Use `files engines` to get a list of engines.');
     }
 
     $engine = PhabricatorFile::buildEngine($engine_id);
 
     $iterator = $this->buildIterator($args);
     if (!$iterator) {
       throw new PhutilArgumentUsageException(
-        "Either specify a list of files to migrate, or use `--all` ".
-        "to migrate all files.");
+        'Either specify a list of files to migrate, or use `--all` '.
+        'to migrate all files.');
     }
 
     $is_dry_run = $args->getArg('dry-run');
 
     $failed = array();
 
     foreach ($iterator as $file) {
       $fid = 'F'.$file->getID();
 
       if ($file->getStorageEngine() == $engine_id) {
         $console->writeOut(
           "%s: Already stored on '%s'\n",
           $fid,
           $engine_id);
         continue;
       }
 
       if ($is_dry_run) {
         $console->writeOut(
           "%s: Would migrate from '%s' to '%s' (dry run)\n",
           $fid,
           $file->getStorageEngine(),
           $engine_id);
         continue;
       }
 
       $console->writeOut(
         "%s: Migrating from '%s' to '%s'...",
         $fid,
         $file->getStorageEngine(),
         $engine_id);
 
       try {
         $file->migrateToEngine($engine);
         $console->writeOut("done.\n");
       } catch (Exception $ex) {
         $console->writeOut("failed!\n");
         $console->writeErr("%s\n", (string)$ex);
         $failed[] = $file;
       }
     }
 
     if ($failed) {
       $console->writeOut("**Failures!**\n");
       $ids = array();
       foreach ($failed as $file) {
         $ids[] = 'F'.$file->getID();
       }
       $console->writeOut("%s\n", implode(', ', $ids));
 
       return 1;
     } else {
       $console->writeOut("**Success!**\n");
       return 0;
     }
   }
 
 }
diff --git a/src/applications/files/management/PhabricatorFilesManagementPurgeWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementPurgeWorkflow.php
index d807f906b..89fab29b6 100644
--- a/src/applications/files/management/PhabricatorFilesManagementPurgeWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementPurgeWorkflow.php
@@ -1,69 +1,69 @@
 <?php
 
 final class PhabricatorFilesManagementPurgeWorkflow
   extends PhabricatorFilesManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('purge')
       ->setSynopsis('Delete files with missing data.')
       ->setArguments(
         array(
           array(
             'name'      => 'all',
             'help'      => 'Update all files.',
           ),
           array(
             'name'      => 'dry-run',
             'help'      => 'Show what would be updated.',
           ),
           array(
             'name'      => 'names',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $iterator = $this->buildIterator($args);
     if (!$iterator) {
       throw new PhutilArgumentUsageException(
-        "Either specify a list of files to purge, or use `--all` ".
-        "to purge all files.");
+        'Either specify a list of files to purge, or use `--all` '.
+        'to purge all files.');
     }
 
     $is_dry_run = $args->getArg('dry-run');
 
     foreach ($iterator as $file) {
       $fid = 'F'.$file->getID();
 
       try {
         $file->loadFileData();
         $okay = true;
       } catch (Exception $ex) {
         $okay = false;
       }
 
       if ($okay) {
         $console->writeOut(
           "%s: File data is OK, not purging.\n",
           $fid);
       } else {
         if ($is_dry_run) {
           $console->writeOut(
             "%s: Would purge (dry run).\n",
             $fid);
         } else {
           $console->writeOut(
             "%s: Purging.\n",
             $fid);
           $file->delete();
         }
       }
     }
 
     return 0;
   }
 }
diff --git a/src/applications/files/management/PhabricatorFilesManagementRebuildWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementRebuildWorkflow.php
index b937623db..912c21062 100644
--- a/src/applications/files/management/PhabricatorFilesManagementRebuildWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementRebuildWorkflow.php
@@ -1,149 +1,149 @@
 <?php
 
 final class PhabricatorFilesManagementRebuildWorkflow
   extends PhabricatorFilesManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('rebuild')
       ->setSynopsis('Rebuild metadata of old files.')
       ->setArguments(
         array(
           array(
             'name'      => 'all',
             'help'      => 'Update all files.',
           ),
           array(
             'name'      => 'dry-run',
             'help'      => 'Show what would be updated.',
           ),
           array(
             'name'      => 'rebuild-mime',
             'help'      => 'Rebuild MIME information.',
           ),
           array(
             'name'      => 'rebuild-dimensions',
             'help'      => 'Rebuild image dimension information.',
           ),
           array(
             'name'      => 'names',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $iterator = $this->buildIterator($args);
     if (!$iterator) {
       throw new PhutilArgumentUsageException(
-        "Either specify a list of files to update, or use `--all` ".
-        "to update all files.");
+        'Either specify a list of files to update, or use `--all` '.
+        'to update all files.');
     }
 
     $update = array(
       'mime'          => $args->getArg('rebuild-mime'),
       'dimensions'    => $args->getArg('rebuild-dimensions'),
     );
 
     // If the user didn't select anything, rebuild everything.
     if (!array_filter($update)) {
       foreach ($update as $key => $ignored) {
         $update[$key] = true;
       }
     }
 
     $is_dry_run = $args->getArg('dry-run');
 
     $failed = array();
 
     foreach ($iterator as $file) {
       $fid = 'F'.$file->getID();
 
       if ($update['mime']) {
         $tmp = new TempFile();
         Filesystem::writeFile($tmp, $file->loadFileData());
         $new_type = Filesystem::getMimeType($tmp);
 
         if ($new_type == $file->getMimeType()) {
           $console->writeOut(
             "%s: Mime type not changed (%s).\n",
             $fid,
             $new_type);
         } else {
           if ($is_dry_run) {
             $console->writeOut(
               "%s: Would update Mime type: '%s' -> '%s'.\n",
               $fid,
               $file->getMimeType(),
               $new_type);
           } else {
             $console->writeOut(
               "%s: Updating Mime type: '%s' -> '%s'.\n",
               $fid,
               $file->getMimeType(),
               $new_type);
             $file->setMimeType($new_type);
             $file->save();
           }
         }
       }
 
       if ($update['dimensions']) {
         if (!$file->isViewableImage()) {
           $console->writeOut(
             "%s: Not an image file.\n",
             $fid);
           continue;
         }
 
         $metadata = $file->getMetadata();
         $image_width = idx($metadata, PhabricatorFile::METADATA_IMAGE_WIDTH);
         $image_height = idx($metadata, PhabricatorFile::METADATA_IMAGE_HEIGHT);
         if ($image_width && $image_height) {
           $console->writeOut(
             "%s: Image dimensions already exist.\n",
             $fid);
           continue;
         }
 
         if ($is_dry_run) {
           $console->writeOut(
             "%s: Would update file dimensions (dry run)\n",
             $fid);
           continue;
         }
 
         $console->writeOut(
-          "%s: Updating metadata... ",
+          '%s: Updating metadata... ',
           $fid);
 
         try {
           $file->updateDimensions();
           $console->writeOut("done.\n");
         } catch (Exception $ex) {
           $console->writeOut("failed!\n");
           $console->writeErr("%s\n", (string)$ex);
           $failed[] = $file;
         }
       }
     }
 
     if ($failed) {
       $console->writeOut("**Failures!**\n");
       $ids = array();
       foreach ($failed as $file) {
         $ids[] = 'F'.$file->getID();
       }
       $console->writeOut("%s\n", implode(', ', $ids));
 
       return 1;
     } else {
       $console->writeOut("**Success!**\n");
       return 0;
     }
 
     return 0;
   }
 }
diff --git a/src/applications/files/management/PhabricatorFilesManagementWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementWorkflow.php
index a8cd9d602..43a8f6df1 100644
--- a/src/applications/files/management/PhabricatorFilesManagementWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementWorkflow.php
@@ -1,40 +1,40 @@
 <?php
 
 abstract class PhabricatorFilesManagementWorkflow
   extends PhabricatorManagementWorkflow {
 
   protected function buildIterator(PhutilArgumentParser $args) {
     $names = $args->getArg('names');
 
     if ($args->getArg('all')) {
       if ($names) {
         throw new PhutilArgumentUsageException(
-          "Specify either a list of files or `--all`, but not both.");
+          'Specify either a list of files or `--all`, but not both.');
       }
       return new LiskMigrationIterator(new PhabricatorFile());
     }
 
     if ($names) {
       $query = id(new PhabricatorObjectQuery())
         ->setViewer($this->getViewer())
         ->withNames($names)
         ->withTypes(array(PhabricatorFilePHIDTypeFile::TYPECONST));
 
       $query->execute();
       $files = $query->getNamedResults();
 
       foreach ($names as $name) {
         if (empty($files[$name])) {
           throw new PhutilArgumentUsageException(
             "No file '{$name}' exists!");
         }
       }
 
       return array_values($files);
     }
 
     return null;
   }
 
 
 }
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index dc6ad6d1a..8de85ee38 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -1,955 +1,955 @@
 <?php
 
 /**
  * @group file
  */
 final class PhabricatorFile extends PhabricatorFileDAO
   implements
     PhabricatorTokenReceiverInterface,
     PhabricatorSubscribableInterface,
     PhabricatorFlaggableInterface,
     PhabricatorPolicyInterface {
 
   const STORAGE_FORMAT_RAW  = 'raw';
 
   const METADATA_IMAGE_WIDTH  = 'width';
   const METADATA_IMAGE_HEIGHT = 'height';
 
   protected $name;
   protected $mimeType;
   protected $byteSize;
   protected $authorPHID;
   protected $secretKey;
   protected $contentHash;
   protected $metadata = array();
   protected $mailKey;
 
   protected $storageEngine;
   protected $storageFormat;
   protected $storageHandle;
 
   protected $ttl;
   protected $isExplicitUpload = 1;
   protected $viewPolicy = PhabricatorPolicies::POLICY_USER;
 
   private $objects = self::ATTACHABLE;
   private $objectPHIDs = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'metadata' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorFilePHIDTypeFile::TYPECONST);
   }
 
   public function save() {
     if (!$this->getSecretKey()) {
       $this->setSecretKey($this->generateSecretKey());
     }
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
   public static function readUploadedFileData($spec) {
     if (!$spec) {
-      throw new Exception("No file was uploaded!");
+      throw new Exception('No file was uploaded!');
     }
 
     $err = idx($spec, 'error');
     if ($err) {
       throw new PhabricatorFileUploadException($err);
     }
 
     $tmp_name = idx($spec, 'tmp_name');
     $is_valid = @is_uploaded_file($tmp_name);
     if (!$is_valid) {
-      throw new Exception("File is not an uploaded file.");
+      throw new Exception('File is not an uploaded file.');
     }
 
     $file_data = Filesystem::readFile($tmp_name);
     $file_size = idx($spec, 'size');
 
     if (strlen($file_data) != $file_size) {
-      throw new Exception("File size disagrees with uploaded size.");
+      throw new Exception('File size disagrees with uploaded size.');
     }
 
     self::validateFileSize(strlen($file_data));
 
     return $file_data;
   }
 
   public static function newFromPHPUpload($spec, array $params = array()) {
     $file_data = self::readUploadedFileData($spec);
 
     $file_name = nonempty(
       idx($params, 'name'),
       idx($spec,   'name'));
     $params = array(
       'name' => $file_name,
     ) + $params;
 
     return self::newFromFileData($file_data, $params);
   }
 
   public static function newFromXHRUpload($data, array $params = array()) {
     self::validateFileSize(strlen($data));
     return self::newFromFileData($data, $params);
   }
 
   private static function validateFileSize($size) {
     $limit = PhabricatorEnv::getEnvConfig('storage.upload-size-limit');
     if (!$limit) {
       return;
     }
 
     $limit = phabricator_parse_bytes($limit);
     if ($size > $limit) {
       throw new PhabricatorFileUploadException(-1000);
     }
   }
 
 
   /**
    * Given a block of data, try to load an existing file with the same content
    * if one exists. If it does not, build a new file.
    *
    * This method is generally used when we have some piece of semi-trusted data
    * like a diff or a file from a repository that we want to show to the user.
    * We can't just dump it out because it may be dangerous for any number of
    * reasons; instead, we need to serve it through the File abstraction so it
    * ends up on the CDN domain if one is configured and so on. However, if we
    * simply wrote a new file every time we'd potentially end up with a lot
    * of redundant data in file storage.
    *
    * To solve these problems, we use file storage as a cache and reuse the
    * same file again if we've previously written it.
    *
    * NOTE: This method unguards writes.
    *
    * @param string  Raw file data.
    * @param dict    Dictionary of file information.
    */
   public static function buildFromFileDataOrHash(
     $data,
     array $params = array()) {
 
     $file = id(new PhabricatorFile())->loadOneWhere(
       'name = %s AND contentHash = %s LIMIT 1',
       self::normalizeFileName(idx($params, 'name')),
       self::hashFileContent($data));
 
     if (!$file) {
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $file = PhabricatorFile::newFromFileData($data, $params);
       unset($unguarded);
     }
 
     return $file;
   }
 
   public static function newFileFromContentHash($hash, $params) {
 
     // Check to see if a file with same contentHash exist
     $file = id(new PhabricatorFile())->loadOneWhere(
       'contentHash = %s LIMIT 1', $hash);
 
     if ($file) {
       // copy storageEngine, storageHandle, storageFormat
       $copy_of_storage_engine = $file->getStorageEngine();
       $copy_of_storage_handle = $file->getStorageHandle();
       $copy_of_storage_format = $file->getStorageFormat();
       $copy_of_byteSize = $file->getByteSize();
       $copy_of_mimeType = $file->getMimeType();
 
       $file_name = idx($params, 'name');
       $file_name = self::normalizeFileName($file_name);
       $file_ttl = idx($params, 'ttl');
       $authorPHID = idx($params, 'authorPHID');
 
       $new_file = new PhabricatorFile();
 
       $new_file->setName($file_name);
       $new_file->setByteSize($copy_of_byteSize);
       $new_file->setAuthorPHID($authorPHID);
       $new_file->setTtl($file_ttl);
 
       if (idx($params, 'viewPolicy')) {
         $new_file->setViewPolicy($params['viewPolicy']);
       }
 
       $new_file->setContentHash($hash);
       $new_file->setStorageEngine($copy_of_storage_engine);
       $new_file->setStorageHandle($copy_of_storage_handle);
       $new_file->setStorageFormat($copy_of_storage_format);
       $new_file->setMimeType($copy_of_mimeType);
       $new_file->copyDimensions($file);
 
       $new_file->save();
 
       return $new_file;
     }
 
     return $file;
   }
 
   private static function buildFromFileData($data, array $params = array()) {
     $selector = PhabricatorEnv::newObjectFromConfig('storage.engine-selector');
 
     if (isset($params['storageEngines'])) {
       $engines = $params['storageEngines'];
     } else {
       $selector = PhabricatorEnv::newObjectFromConfig(
         'storage.engine-selector');
       $engines = $selector->selectStorageEngines($data, $params);
     }
 
     assert_instances_of($engines, 'PhabricatorFileStorageEngine');
     if (!$engines) {
-      throw new Exception("No valid storage engines are available!");
+      throw new Exception('No valid storage engines are available!');
     }
 
     $file = new PhabricatorFile();
 
     $data_handle = null;
     $engine_identifier = null;
     $exceptions = array();
     foreach ($engines as $engine) {
       $engine_class = get_class($engine);
       try {
         list($engine_identifier, $data_handle) = $file->writeToEngine(
           $engine,
           $data,
           $params);
 
         // We stored the file somewhere so stop trying to write it to other
         // places.
         break;
       } catch (PhabricatorFileStorageConfigurationException $ex) {
         // If an engine is outright misconfigured (or misimplemented), raise
         // that immediately since it probably needs attention.
         throw $ex;
       } catch (Exception $ex) {
         phlog($ex);
 
         // If an engine doesn't work, keep trying all the other valid engines
         // in case something else works.
         $exceptions[$engine_class] = $ex;
       }
     }
 
     if (!$data_handle) {
       throw new PhutilAggregateException(
-        "All storage engines failed to write file:",
+        'All storage engines failed to write file:',
         $exceptions);
     }
 
     $file_name = idx($params, 'name');
     $file_name = self::normalizeFileName($file_name);
     $file_ttl = idx($params, 'ttl');
 
     // If for whatever reason, authorPHID isn't passed as a param
     // (always the case with newFromFileDownload()), store a ''
     $authorPHID = idx($params, 'authorPHID');
 
     $file->setName($file_name);
     $file->setByteSize(strlen($data));
     $file->setAuthorPHID($authorPHID);
     $file->setTtl($file_ttl);
     $file->setContentHash(self::hashFileContent($data));
 
     if (idx($params, 'viewPolicy')) {
       $file->setViewPolicy($params['viewPolicy']);
     }
 
     $file->setStorageEngine($engine_identifier);
     $file->setStorageHandle($data_handle);
 
     // TODO: This is probably YAGNI, but allows for us to do encryption or
     // compression later if we want.
     $file->setStorageFormat(self::STORAGE_FORMAT_RAW);
     $file->setIsExplicitUpload(idx($params, 'isExplicitUpload') ? 1 : 0);
 
     if (isset($params['mime-type'])) {
       $file->setMimeType($params['mime-type']);
     } else {
       $tmp = new TempFile();
       Filesystem::writeFile($tmp, $data);
       $file->setMimeType(Filesystem::getMimeType($tmp));
     }
 
     try {
       $file->updateDimensions(false);
     } catch (Exception $ex) {
       // Do nothing
     }
 
     $file->save();
 
     return $file;
   }
 
   public static function newFromFileData($data, array $params = array()) {
     $hash = self::hashFileContent($data);
     $file = self::newFileFromContentHash($hash, $params);
 
     if ($file) {
       return $file;
     }
 
     return self::buildFromFileData($data, $params);
   }
 
   public function migrateToEngine(PhabricatorFileStorageEngine $engine) {
     if (!$this->getID() || !$this->getStorageHandle()) {
       throw new Exception(
         "You can not migrate a file which hasn't yet been saved.");
     }
 
     $data = $this->loadFileData();
     $params = array(
       'name' => $this->getName(),
     );
 
     list($new_identifier, $new_handle) = $this->writeToEngine(
       $engine,
       $data,
       $params);
 
     $old_engine = $this->instantiateStorageEngine();
     $old_handle = $this->getStorageHandle();
 
     $this->setStorageEngine($new_identifier);
     $this->setStorageHandle($new_handle);
     $this->save();
 
     $old_engine->deleteFile($old_handle);
 
     return $this;
   }
 
   private function writeToEngine(
     PhabricatorFileStorageEngine $engine,
     $data,
     array $params) {
 
     $engine_class = get_class($engine);
 
     $data_handle = $engine->writeFile($data, $params);
 
     if (!$data_handle || strlen($data_handle) > 255) {
       // This indicates an improperly implemented storage engine.
       throw new PhabricatorFileStorageConfigurationException(
         "Storage engine '{$engine_class}' executed writeFile() but did ".
         "not return a valid handle ('{$data_handle}') to the data: it ".
         "must be nonempty and no longer than 255 characters.");
     }
 
     $engine_identifier = $engine->getEngineIdentifier();
     if (!$engine_identifier || strlen($engine_identifier) > 32) {
       throw new PhabricatorFileStorageConfigurationException(
         "Storage engine '{$engine_class}' returned an improper engine ".
         "identifier '{$engine_identifier}': it must be nonempty ".
         "and no longer than 32 characters.");
     }
 
     return array($engine_identifier, $data_handle);
   }
 
 
   public static function newFromFileDownload($uri, array $params = array()) {
     // Make sure we're allowed to make a request first
     if (!PhabricatorEnv::getEnvConfig('security.allow-outbound-http')) {
-      throw new Exception("Outbound HTTP requests are disabled!");
+      throw new Exception('Outbound HTTP requests are disabled!');
     }
 
     $uri = new PhutilURI($uri);
 
     $protocol = $uri->getProtocol();
     switch ($protocol) {
       case 'http':
       case 'https':
         break;
       default:
         // Make sure we are not accessing any file:// URIs or similar.
         return null;
     }
 
     $timeout = 5;
 
     list($file_data) = id(new HTTPSFuture($uri))
         ->setTimeout($timeout)
         ->resolvex();
 
     $params = $params + array(
       'name' => basename($uri),
     );
 
     return self::newFromFileData($file_data, $params);
   }
 
   public static function normalizeFileName($file_name) {
     $pattern = "@[\\x00-\\x19#%&+!~'\$\"\/=\\\\?<> ]+@";
     $file_name = preg_replace($pattern, '_', $file_name);
     $file_name = preg_replace('@_+@', '_', $file_name);
     $file_name = trim($file_name, '_');
 
     $disallowed_filenames = array(
       '.'  => 'dot',
       '..' => 'dotdot',
       ''   => 'file',
     );
     $file_name = idx($disallowed_filenames, $file_name, $file_name);
 
     return $file_name;
   }
 
   public function delete() {
 
     // We want to delete all the rows which mark this file as the transformation
     // of some other file (since we're getting rid of it). We also delete all
     // the transformations of this file, so that a user who deletes an image
     // doesn't need to separately hunt down and delete a bunch of thumbnails and
     // resizes of it.
 
     $outbound_xforms = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms(
         array(
           array(
             'originalPHID' => $this->getPHID(),
             'transform'    => true,
           ),
         ))
       ->execute();
 
     foreach ($outbound_xforms as $outbound_xform) {
       $outbound_xform->delete();
     }
 
     $inbound_xforms = id(new PhabricatorTransformedFile())->loadAllWhere(
       'transformedPHID = %s',
       $this->getPHID());
 
     $this->openTransaction();
       foreach ($inbound_xforms as $inbound_xform) {
         $inbound_xform->delete();
       }
       $ret = parent::delete();
     $this->saveTransaction();
 
     // Check to see if other files are using storage
     $other_file = id(new PhabricatorFile())->loadAllWhere(
       'storageEngine = %s AND storageHandle = %s AND
       storageFormat = %s AND id != %d LIMIT 1',
       $this->getStorageEngine(),
       $this->getStorageHandle(),
       $this->getStorageFormat(),
       $this->getID());
 
     // If this is the only file using the storage, delete storage
     if (!$other_file) {
       $engine = $this->instantiateStorageEngine();
       try {
         $engine->deleteFile($this->getStorageHandle());
       } catch (Exception $ex) {
         // In the worst case, we're leaving some data stranded in a storage
         // engine, which is fine.
         phlog($ex);
       }
     }
 
     return $ret;
   }
 
   public static function hashFileContent($data) {
     return sha1($data);
   }
 
   public function loadFileData() {
 
     $engine = $this->instantiateStorageEngine();
     $data = $engine->readFile($this->getStorageHandle());
 
     switch ($this->getStorageFormat()) {
       case self::STORAGE_FORMAT_RAW:
         $data = $data;
         break;
       default:
-        throw new Exception("Unknown storage format.");
+        throw new Exception('Unknown storage format.');
     }
 
     return $data;
   }
 
   public function getViewURI() {
     if (!$this->getPHID()) {
       throw new Exception(
-        "You must save a file before you can generate a view URI.");
+        'You must save a file before you can generate a view URI.');
     }
 
     $name = phutil_escape_uri($this->getName());
 
     $path = '/file/data/'.$this->getSecretKey().'/'.$this->getPHID().'/'.$name;
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getInfoURI() {
     return '/file/info/'.$this->getPHID().'/';
   }
 
   public function getBestURI() {
     if ($this->isViewableInBrowser()) {
       return $this->getViewURI();
     } else {
       return $this->getInfoURI();
     }
   }
 
   public function getDownloadURI() {
     $uri = id(new PhutilURI($this->getViewURI()))
       ->setQueryParam('download', true);
     return (string) $uri;
   }
 
   public function getProfileThumbURI() {
     $path = '/file/xform/thumb-profile/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb60x45URI() {
     $path = '/file/xform/thumb-60x45/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb160x120URI() {
     $path = '/file/xform/thumb-160x120/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getPreview140URI() {
     $path = '/file/xform/preview-140/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getPreview220URI() {
     $path = '/file/xform/preview-220/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb220x165URI() {
     $path = '/file/xform/thumb-220x165/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb280x210URI() {
     $path = '/file/xform/thumb-280x210/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function isViewableInBrowser() {
     return ($this->getViewableMimeType() !== null);
   }
 
   public function isViewableImage() {
     if (!$this->isViewableInBrowser()) {
       return false;
     }
 
     $mime_map = PhabricatorEnv::getEnvConfig('files.image-mime-types');
     $mime_type = $this->getMimeType();
     return idx($mime_map, $mime_type);
   }
 
   public function isAudio() {
     if (!$this->isViewableInBrowser()) {
       return false;
     }
 
     $mime_map = PhabricatorEnv::getEnvConfig('files.audio-mime-types');
     $mime_type = $this->getMimeType();
     return idx($mime_map, $mime_type);
   }
 
   public function isTransformableImage() {
 
     // NOTE: The way the 'gd' extension works in PHP is that you can install it
     // with support for only some file types, so it might be able to handle
     // PNG but not JPEG. Try to generate thumbnails for whatever we can. Setup
     // warns you if you don't have complete support.
 
     $matches = null;
     $ok = preg_match(
       '@^image/(gif|png|jpe?g)@',
       $this->getViewableMimeType(),
       $matches);
     if (!$ok) {
       return false;
     }
 
     switch ($matches[1]) {
       case 'jpg';
       case 'jpeg':
         return function_exists('imagejpeg');
         break;
       case 'png':
         return function_exists('imagepng');
         break;
       case 'gif':
         return function_exists('imagegif');
         break;
       default:
         throw new Exception('Unknown type matched as image MIME type.');
     }
   }
 
   public static function getTransformableImageFormats() {
     $supported = array();
 
     if (function_exists('imagejpeg')) {
       $supported[] = 'jpg';
     }
 
     if (function_exists('imagepng')) {
       $supported[] = 'png';
     }
 
     if (function_exists('imagegif')) {
       $supported[] = 'gif';
     }
 
     return $supported;
   }
 
   protected function instantiateStorageEngine() {
     return self::buildEngine($this->getStorageEngine());
   }
 
   public static function buildEngine($engine_identifier) {
     $engines = self::buildAllEngines();
     foreach ($engines as $engine) {
       if ($engine->getEngineIdentifier() == $engine_identifier) {
         return $engine;
       }
     }
 
     throw new Exception(
       "Storage engine '{$engine_identifier}' could not be located!");
   }
 
   public static function buildAllEngines() {
     $engines = id(new PhutilSymbolLoader())
       ->setType('class')
       ->setConcreteOnly(true)
       ->setAncestorClass('PhabricatorFileStorageEngine')
       ->selectAndLoadSymbols();
 
     $results = array();
     foreach ($engines as $engine_class) {
       $results[] = newv($engine_class['name'], array());
     }
 
     return $results;
   }
 
   public function getViewableMimeType() {
     $mime_map = PhabricatorEnv::getEnvConfig('files.viewable-mime-types');
 
     $mime_type = $this->getMimeType();
     $mime_parts = explode(';', $mime_type);
     $mime_type = trim(reset($mime_parts));
 
     return idx($mime_map, $mime_type);
   }
 
   public function getDisplayIconForMimeType() {
     $mime_map = PhabricatorEnv::getEnvConfig('files.icon-mime-types');
     $mime_type = $this->getMimeType();
     return idx($mime_map, $mime_type, 'docs_file');
   }
 
   public function validateSecretKey($key) {
     return ($key == $this->getSecretKey());
   }
 
   public function generateSecretKey() {
     return Filesystem::readRandomCharacters(20);
   }
 
   public function updateDimensions($save = true) {
     if (!$this->isViewableImage()) {
       throw new Exception(
-        "This file is not a viewable image.");
+        'This file is not a viewable image.');
     }
 
-    if (!function_exists("imagecreatefromstring")) {
+    if (!function_exists('imagecreatefromstring')) {
       throw new Exception(
-        "Cannot retrieve image information.");
+        'Cannot retrieve image information.');
     }
 
     $data = $this->loadFileData();
 
     $img = imagecreatefromstring($data);
     if ($img === false) {
       throw new Exception(
-        "Error when decoding image.");
+        'Error when decoding image.');
     }
 
     $this->metadata[self::METADATA_IMAGE_WIDTH] = imagesx($img);
     $this->metadata[self::METADATA_IMAGE_HEIGHT] = imagesy($img);
 
     if ($save) {
       $this->save();
     }
 
     return $this;
   }
 
   public function copyDimensions(PhabricatorFile $file) {
     $metadata = $file->getMetadata();
     $width = idx($metadata, self::METADATA_IMAGE_WIDTH);
     if ($width) {
       $this->metadata[self::METADATA_IMAGE_WIDTH] = $width;
     }
     $height = idx($metadata, self::METADATA_IMAGE_HEIGHT);
     if ($height) {
       $this->metadata[self::METADATA_IMAGE_HEIGHT] = $height;
     }
 
     return $this;
   }
 
 
   /**
    * Load (or build) the {@class:PhabricatorFile} objects for builtin file
    * resources. The builtin mechanism allows files shipped with Phabricator
    * to be treated like normal files so that APIs do not need to special case
    * things like default images or deleted files.
    *
    * Builtins are located in `resources/builtin/` and identified by their
    * name.
    *
    * @param  PhabricatorUser                Viewing user.
    * @param  list<string>                   List of builtin file names.
    * @return dict<string, PhabricatorFile>  Dictionary of named builtins.
    */
   public static function loadBuiltins(PhabricatorUser $user, array $names) {
     $specs = array();
     foreach ($names as $name) {
       $specs[] = array(
         'originalPHID' => PhabricatorPHIDConstants::PHID_VOID,
         'transform'    => 'builtin:'.$name,
       );
     }
 
     // NOTE: Anyone is allowed to access builtin files.
 
     $files = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms($specs)
       ->execute();
 
     $files = mpull($files, null, 'getName');
 
     $root = dirname(phutil_get_library_root('phabricator'));
     $root = $root.'/resources/builtin/';
 
     $build = array();
     foreach ($names as $name) {
       if (isset($files[$name])) {
         continue;
       }
 
       // This is just a sanity check to prevent loading arbitrary files.
       if (basename($name) != $name) {
         throw new Exception("Invalid builtin name '{$name}'!");
       }
 
       $path = $root.$name;
 
       if (!Filesystem::pathExists($path)) {
         throw new Exception("Builtin '{$path}' does not exist!");
       }
 
       $data = Filesystem::readFile($path);
       $params = array(
         'name' => $name,
         'ttl'  => time() + (60 * 60 * 24 * 7),
       );
 
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         $file = PhabricatorFile::newFromFileData($data, $params);
         $xform = id(new PhabricatorTransformedFile())
           ->setOriginalPHID(PhabricatorPHIDConstants::PHID_VOID)
           ->setTransform('builtin:'.$name)
           ->setTransformedPHID($file->getPHID())
           ->save();
       unset($unguarded);
 
       $file->attachObjectPHIDs(array());
       $file->attachObjects(array());
 
       $files[$name] = $file;
     }
 
     return $files;
   }
 
 
   /**
    * Convenience wrapper for @{method:loadBuiltins}.
    *
    * @param PhabricatorUser   Viewing user.
    * @param string            Single builtin name to load.
    * @return PhabricatorFile  Corresponding builtin file.
    */
   public static function loadBuiltin(PhabricatorUser $user, $name) {
     return idx(self::loadBuiltins($user, array($name)), $name);
   }
 
   public function getObjects() {
     return $this->assertAttached($this->objects);
   }
 
   public function attachObjects(array $objects) {
     $this->objects = $objects;
     return $this;
   }
 
   public function getObjectPHIDs() {
     return $this->assertAttached($this->objectPHIDs);
   }
 
   public function attachObjectPHIDs(array $object_phids) {
     $this->objectPHIDs = $object_phids;
     return $this;
   }
 
   public function getImageHeight() {
     if (!$this->isViewableImage()) {
       return null;
     }
     return idx($this->metadata, self::METADATA_IMAGE_HEIGHT);
   }
 
   public function getImageWidth() {
     if (!$this->isViewableImage()) {
       return null;
     }
     return idx($this->metadata, self::METADATA_IMAGE_WIDTH);
   }
 
   /**
    * Write the policy edge between this file and some object.
    *
    * @param PhabricatorUser Acting user.
    * @param phid Object PHID to attach to.
    * @return this
    */
   public function attachToObject(PhabricatorUser $actor, $phid) {
     $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE;
 
     id(new PhabricatorEdgeEditor())
       ->setActor($actor)
       ->setSuppressEvents(true)
       ->addEdge($phid, $edge_type, $this->getPHID())
       ->save();
 
     return $this;
   }
 
 
 /* -(  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 PhabricatorPolicies::POLICY_NOONE;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     $viewer_phid = $viewer->getPHID();
     if ($viewer_phid) {
       if ($this->getAuthorPHID() == $viewer_phid) {
         return true;
       }
     }
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         // If you can see any object this file is attached to, you can see
         // the file.
         return (count($this->getObjects()) > 0);
     }
 
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     $out = array();
     $out[] = pht('The user who uploaded a file can always view and edit it.');
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         $out[] = pht(
           'Files attached to objects are visible to users who can view '.
           'those objects.');
         break;
     }
 
     return $out;
   }
 
 
 /* -(  PhabricatorSubscribableInterface Implementation  )-------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return ($this->authorPHID == $phid);
   }
 
   public function shouldShowSubscribersProperty() {
     return true;
   }
 
   public function shouldAllowSubscription($phid) {
     return true;
   }
 
 
 /* -(  PhabricatorTokenReceiverInterface  )---------------------------------- */
 
 
   public function getUsersToNotifyOfTokenGiven() {
     return array(
       $this->getAuthorPHID(),
     );
   }
 
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
index 396dea5f8..7dce64e32 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
@@ -1,59 +1,59 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_flag_delete_Method extends ConduitAPI_flag_Method {
 
   public function getMethodDescription() {
-    return "Clear a flag.";
+    return 'Clear a flag.';
   }
 
   public function defineParamTypes() {
     return array(
       'id'         => 'optional id',
       'objectPHID' => 'optional phid',
     );
   }
 
   public function defineReturnType() {
     return 'dict | null';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND'  => 'Bad flag ID.',
       'ERR_WRONG_USER' => 'You are not the creator of this flag.',
       'ERR_NEED_PARAM' => 'Must pass an id or an objectPHID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $id = $request->getValue('id');
     $object = $request->getValue('objectPHID');
     if ($id) {
       $flag = id(new PhabricatorFlag())->load($id);
       if (!$flag) {
         throw new ConduitException('ERR_NOT_FOUND');
       }
       if ($flag->getOwnerPHID() != $request->getUser()->getPHID()) {
         throw new ConduitException('ERR_WRONG_USER');
       }
-    } elseif ($object) {
+    } else if ($object) {
       $flag = id(new PhabricatorFlag())->loadOneWhere(
         'objectPHID = %s AND ownerPHID = %s',
         $object,
         $request->getUser()->getPHID());
       if (!$flag) {
         return null;
       }
     } else {
       throw new ConduitException('ERR_NEED_PARAM');
     }
     $this->attachHandleToFlag($flag, $request->getUser());
     $ret = $this->buildFlagInfoDictionary($flag);
     $flag->delete();
     return $ret;
   }
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
index cb4a98cb9..9f5ed860a 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
@@ -1,64 +1,64 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_flag_edit_Method extends ConduitAPI_flag_Method {
 
   public function getMethodDescription() {
-    return "Create or modify a flag.";
+    return 'Create or modify a flag.';
   }
 
   public function defineParamTypes() {
     return array(
       'objectPHID' => 'required phid',
       'color'      => 'optional int',
       'note'       => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'dict';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser()->getPHID();
     $phid = $request->getValue('objectPHID');
     $new = false;
 
     $flag = id(new PhabricatorFlag())->loadOneWhere(
       'objectPHID = %s AND ownerPHID = %s',
       $phid,
       $user);
     if ($flag) {
       $params = $request->getAllParameters();
       if (isset($params['color'])) {
         $flag->setColor($params['color']);
       }
       if (isset($params['note'])) {
         $flag->setNote($params['note']);
       }
     } else {
       $default_color = PhabricatorFlagColor::COLOR_BLUE;
       $flag = id(new PhabricatorFlag())
         ->setOwnerPHID($user)
         ->setType(phid_get_type($phid))
         ->setObjectPHID($phid)
         ->setReasonPHID($user)
         ->setColor($request->getValue('color', $default_color))
         ->setNote($request->getValue('note', ''));
       $new = true;
     }
     $this->attachHandleToFlag($flag, $request->getUser());
     $flag->save();
     $ret = $this->buildFlagInfoDictionary($flag);
     $ret['new'] = $new;
     return $ret;
   }
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
index 56655c4b6..c96806185 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
@@ -1,67 +1,67 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_flag_query_Method extends ConduitAPI_flag_Method {
 
   public function getMethodDescription() {
-    return "Query flag markers.";
+    return 'Query flag markers.';
   }
 
   public function defineParamTypes() {
     return array(
       'ownerPHIDs'    => 'optional list<phid>',
       'types'         => 'optional list<type>',
       'objectPHIDs'   => 'optional list<phid>',
 
       'offset'        => 'optional int',
       'limit'         => 'optional int (default = 100)',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $query = new PhabricatorFlagQuery();
     $query->setViewer($request->getUser());
 
     $owner_phids = $request->getValue('ownerPHIDs', array());
     if ($owner_phids) {
       $query->withOwnerPHIDs($owner_phids);
     }
 
     $object_phids = $request->getValue('objectPHIDs', array());
     if ($object_phids) {
       $query->withObjectPHIDs($object_phids);
     }
 
     $types = $request->getValue('types', array());
     if ($types) {
       $query->withTypes($types);
     }
 
     $query->needHandles(true);
 
     $query->setOffset($request->getValue('offset', 0));
     $query->setLimit($request->getValue('limit', 100));
 
     $flags = $query->execute();
 
     $results = array();
     foreach ($flags as $flag) {
       $results[] = $this->buildFlagInfoDictionary($flag);
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/flag/controller/PhabricatorFlagEditController.php b/src/applications/flag/controller/PhabricatorFlagEditController.php
index 3f65bb058..b6e2327cd 100644
--- a/src/applications/flag/controller/PhabricatorFlagEditController.php
+++ b/src/applications/flag/controller/PhabricatorFlagEditController.php
@@ -1,93 +1,93 @@
 <?php
 
 final class PhabricatorFlagEditController extends PhabricatorFlagController {
 
   private $phid;
 
   public function willProcessRequest(array $data) {
     $this->phid = $data['phid'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $phid = $this->phid;
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($phid))
       ->executeOne();
 
     if (!$handle->isComplete()) {
       return new Aphront404Response();
     }
 
     $flag = PhabricatorFlagQuery::loadUserFlag($user, $phid);
 
     if (!$flag) {
       $flag = new PhabricatorFlag();
       $flag->setOwnerPHID($user->getPHID());
       $flag->setType($handle->getType());
       $flag->setObjectPHID($handle->getPHID());
       $flag->setReasonPHID($user->getPHID());
     }
 
     if ($request->isDialogFormPost()) {
       $flag->setColor($request->getInt('color'));
       $flag->setNote($request->getStr('note'));
       $flag->save();
 
       return id(new AphrontReloadResponse())->setURI('/flag/');
     }
 
     $type_name = $handle->getTypeName();
 
     $dialog = new AphrontDialogView();
     $dialog->setUser($user);
 
-    $dialog->setTitle(pht("Flag %s", $type_name));
+    $dialog->setTitle(pht('Flag %s', $type_name));
 
     require_celerity_resource('phabricator-flag-css');
 
     $form = new PHUIFormLayoutView();
 
     $is_new = !$flag->getID();
 
     if ($is_new) {
       $form
         ->appendChild(hsprintf(
-          "<p>%s</p><br />",
+          '<p>%s</p><br />',
           pht('You can flag this %s if you want to remember to look '.
             'at it later.',
             $type_name)));
     }
 
     $radio = new AphrontFormRadioButtonControl();
     foreach (PhabricatorFlagColor::getColorNameMap() as $color => $text) {
       $class = 'phabricator-flag-radio phabricator-flag-color-'.$color;
       $radio->addButton($color, $text, '', $class);
     }
 
     $form
       ->appendChild(
         $radio
           ->setName('color')
           ->setLabel(pht('Flag Color'))
           ->setValue($flag->getColor()))
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
           ->setName('note')
           ->setLabel(pht('Note'))
           ->setValue($flag->getNote()));
 
     $dialog->appendChild($form);
 
     $dialog->addCancelButton($handle->getURI());
     $dialog->addSubmitButton(
-      $is_new ? pht("Create Flag") : pht('Save'));
+      $is_new ? pht('Create Flag') : pht('Save'));
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
index a45924023..ccc408e19 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -1,376 +1,376 @@
 <?php
 
 final class HarbormasterBuildViewController
   extends HarbormasterController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $this->id;
 
     $build = id(new HarbormasterBuildQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$build) {
       return new Aphront404Response();
     }
 
-    $title = pht("Build %d", $id);
+    $title = pht('Build %d', $id);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($build);
 
     if ($build->isRestarting()) {
       $header->setStatus('fa-exclamation-triangle', 'red', pht('Restarting'));
     } else if ($build->isStopping()) {
       $header->setStatus('fa-exclamation-triangle', 'red', pht('Stopping'));
     } else if ($build->isResuming()) {
       $header->setStatus('fa-exclamation-triangle', 'red', pht('Resuming'));
     }
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $actions = $this->buildActionList($build);
     $this->buildPropertyLists($box, $build, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
       $build->getBuildable()->getMonogram(),
       '/'.$build->getBuildable()->getMonogram());
     $crumbs->addTextCrumb($title);
 
     $build_targets = id(new HarbormasterBuildTargetQuery())
       ->setViewer($viewer)
       ->withBuildPHIDs(array($build->getPHID()))
       ->execute();
 
 
     if ($build_targets) {
       $messages = id(new HarbormasterBuildMessageQuery())
         ->setViewer($viewer)
         ->withBuildTargetPHIDs(mpull($build_targets, 'getPHID'))
         ->execute();
       $messages = mgroup($messages, 'getBuildTargetPHID');
     } else {
       $messages = array();
     }
 
     $targets = array();
     foreach ($build_targets as $build_target) {
       $header = id(new PHUIHeaderView())
         ->setHeader(pht(
           'Build Target %d (%s)',
           $build_target->getID(),
           $build_target->getImplementation()->getName()))
         ->setUser($viewer);
       $properties = new PHUIPropertyListView();
 
       $details = $build_target->getDetails();
       if ($details) {
         $properties->addSectionHeader(pht('Configuration Details'));
         foreach ($details as $key => $value) {
           $properties->addProperty($key, $value);
         }
       }
 
       $variables = $build_target->getVariables();
       if ($variables) {
         $properties->addSectionHeader(pht('Variables'));
         foreach ($variables as $key => $value) {
           $properties->addProperty($key, $value);
         }
       }
 
       $targets[] = id(new PHUIObjectBoxView())
         ->setHeader($header)
         ->addPropertyList($properties);
 
       $build_messages = idx($messages, $build_target->getPHID(), array());
       $targets[] = $this->buildMessages($build_messages);
 
       $targets[] = $this->buildArtifacts($build_target);
       $targets[] = $this->buildLog($build, $build_target);
     }
 
     $xactions = id(new HarbormasterBuildTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($build->getPHID()))
       ->execute();
     $timeline = id(new PhabricatorApplicationTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($build->getPHID())
       ->setTransactions($xactions);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
         $targets,
         $timeline,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function buildArtifacts(HarbormasterBuildTarget $build_target) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $artifacts = id(new HarbormasterBuildArtifactQuery())
       ->setViewer($viewer)
       ->withBuildTargetPHIDs(array($build_target->getPHID()))
       ->execute();
 
     if (count($artifacts) === 0) {
       return null;
     }
 
     $list = new PHUIObjectItemListView();
 
     foreach ($artifacts as $artifact) {
       $list->addItem($artifact->getObjectItemView($viewer));
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Build Artifacts'))
       ->setUser($viewer);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     return array($box, $list);
   }
 
   private function buildLog(
     HarbormasterBuild $build,
     HarbormasterBuildTarget $build_target) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $limit = $request->getInt('l', 25);
 
     $logs = id(new HarbormasterBuildLogQuery())
       ->setViewer($viewer)
       ->withBuildTargetPHIDs(array($build_target->getPHID()))
       ->execute();
 
     $log_boxes = array();
     foreach ($logs as $log) {
       $start = 1;
       $lines = preg_split("/\r\n|\r|\n/", $log->getLogText());
       if ($limit !== 0) {
         $start = count($lines) - $limit;
         if ($start >= 1) {
           $lines = array_slice($lines, -$limit, $limit);
         } else {
           $start = 1;
         }
       }
       $log_view = new ShellLogView();
       $log_view->setLines($lines);
       $log_view->setStart($start);
 
       $header = id(new PHUIHeaderView())
         ->setHeader(pht(
           'Build Log %d (%s - %s)',
           $log->getID(),
           $log->getLogSource(),
           $log->getLogType()))
         ->setSubheader($this->createLogHeader($build, $log))
         ->setUser($viewer);
 
       $log_boxes[] = id(new PHUIObjectBoxView())
         ->setHeader($header)
         ->setForm($log_view);
     }
 
     return $log_boxes;
   }
 
   private function createLogHeader($build, $log) {
     $request = $this->getRequest();
     $limit = $request->getInt('l', 25);
 
     $lines_25 = $this->getApplicationURI('/build/'.$build->getID().'/?l=25');
     $lines_50 = $this->getApplicationURI('/build/'.$build->getID().'/?l=50');
     $lines_100 =
       $this->getApplicationURI('/build/'.$build->getID().'/?l=100');
     $lines_0 = $this->getApplicationURI('/build/'.$build->getID().'/?l=0');
 
     $link_25 = phutil_tag('a', array('href' => $lines_25), pht('25'));
     $link_50 = phutil_tag('a', array('href' => $lines_50), pht('50'));
     $link_100 = phutil_tag('a', array('href' => $lines_100), pht('100'));
     $link_0 = phutil_tag('a', array('href' => $lines_0), pht('Unlimited'));
 
     if ($limit === 25) {
       $link_25 = phutil_tag('strong', array(), $link_25);
     } else if ($limit === 50) {
       $link_50 = phutil_tag('strong', array(), $link_50);
     } else if ($limit === 100) {
       $link_100 = phutil_tag('strong', array(), $link_100);
     } else if ($limit === 0) {
       $link_0 = phutil_tag('strong', array(), $link_0);
     }
 
     return phutil_tag(
       'span',
       array(),
       array(
         $link_25,
         ' - ',
         $link_50,
         ' - ',
         $link_100,
         ' - ',
         $link_0,
         ' Lines'));
   }
 
   private function buildActionList(HarbormasterBuild $build) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $id = $build->getID();
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($build)
       ->setObjectURI("/build/{$id}");
 
     $can_restart = $build->canRestartBuild();
     $can_stop = $build->canStopBuild();
     $can_resume = $build->canResumeBuild();
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Restart Build'))
         ->setIcon('fa-backward')
         ->setHref($this->getApplicationURI('/build/restart/'.$id.'/'))
         ->setDisabled(!$can_restart)
         ->setWorkflow(true));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Stop Build'))
         ->setIcon('fa-stop')
         ->setHref($this->getApplicationURI('/build/stop/'.$id.'/'))
         ->setDisabled(!$can_stop)
         ->setWorkflow(true));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Resume Build'))
         ->setIcon('fa-play')
         ->setHref($this->getApplicationURI('/build/resume/'.$id.'/'))
         ->setDisabled(!$can_resume)
         ->setWorkflow(true));
 
     return $list;
   }
 
   private function buildPropertyLists(
     PHUIObjectBoxView $box,
     HarbormasterBuild $build,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($build)
       ->setActionList($actions);
     $box->addPropertyList($properties);
 
     $properties->addProperty(
       pht('Status'),
       $this->getStatus($build));
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs(array(
         $build->getBuildablePHID(),
         $build->getBuildPlanPHID()))
       ->execute();
 
     $properties->addProperty(
       pht('Buildable'),
       $handles[$build->getBuildablePHID()]->renderLink());
 
     $properties->addProperty(
       pht('Build Plan'),
       $handles[$build->getBuildPlanPHID()]->renderLink());
 
   }
 
   private function getStatus(HarbormasterBuild $build) {
     if ($build->isStopping()) {
       return pht('Stopping');
     }
 
     return HarbormasterBuild::getBuildStatusName($build->getBuildStatus());
   }
 
   private function buildMessages(array $messages) {
     $viewer = $this->getRequest()->getUser();
 
     if ($messages) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($viewer)
         ->withPHIDs(mpull($messages, 'getAuthorPHID'))
         ->execute();
     } else {
       $handles = array();
     }
 
     $rows = array();
     foreach ($messages as $message) {
       $rows[] = array(
         $message->getID(),
         $handles[$message->getAuthorPHID()]->renderLink(),
         $message->getType(),
         $message->getIsConsumed() ? pht('Consumed') : null,
         phabricator_datetime($message->getDateCreated(), $viewer),
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setNoDataString(pht('No messages for this build target.'));
     $table->setHeaders(
       array(
         pht('ID'),
         pht('From'),
         pht('Type'),
         pht('Consumed'),
         pht('Received'),
       ));
     $table->setColumnClasses(
       array(
         '',
         '',
         'wide',
         '',
         'date',
       ));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Build Target Messages'))
       ->appendChild($table);
 
     return $box;
   }
 
 
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
index a65447a94..8e2cdff3c 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -1,313 +1,313 @@
 <?php
 
 final class HarbormasterBuildableViewController
   extends HarbormasterController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $this->id;
 
     $buildable = id(new HarbormasterBuildableQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->needBuildableHandles(true)
       ->needContainerHandles(true)
       ->executeOne();
     if (!$buildable) {
       return new Aphront404Response();
     }
 
     // Pull builds and build targets.
     $builds = id(new HarbormasterBuildQuery())
       ->setViewer($viewer)
       ->withBuildablePHIDs(array($buildable->getPHID()))
       ->needBuildTargets(true)
       ->execute();
 
     $buildable->attachBuilds($builds);
 
     $build_list = $this->buildBuildList($buildable);
 
-    $title = pht("Buildable %d", $id);
+    $title = pht('Buildable %d', $id);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($buildable);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $xactions = id(new HarbormasterBuildableTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($buildable->getPHID()))
       ->execute();
     $timeline = id(new PhabricatorApplicationTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($buildable->getPHID())
       ->setTransactions($xactions);
 
     $actions = $this->buildActionList($buildable);
     $this->buildPropertyLists($box, $buildable, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb("B{$id}");
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
         $build_list,
         $timeline,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function buildActionList(HarbormasterBuildable $buildable) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $id = $buildable->getID();
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($buildable)
       ->setObjectURI($buildable->getMonogram());
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $buildable,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $can_restart = false;
     $can_resume = false;
     $can_stop = false;
 
     foreach ($buildable->getBuilds() as $build) {
       if ($build->canRestartBuild()) {
         $can_restart = true;
       }
       if ($build->canResumeBuild()) {
         $can_resume = true;
       }
       if ($build->canStopBuild()) {
         $can_stop = true;
       }
     }
 
     $restart_uri = "buildable/{$id}/restart/";
     $stop_uri = "buildable/{$id}/stop/";
     $resume_uri = "buildable/{$id}/resume/";
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-backward')
         ->setName(pht('Restart All Builds'))
         ->setHref($this->getApplicationURI($restart_uri))
         ->setWorkflow(true)
         ->setDisabled(!$can_restart || !$can_edit));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-stop')
         ->setName(pht('Stop All Builds'))
         ->setHref($this->getApplicationURI($stop_uri))
         ->setWorkflow(true)
         ->setDisabled(!$can_stop || !$can_edit));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-play')
         ->setName(pht('Resume All Builds'))
         ->setHref($this->getApplicationURI($resume_uri))
         ->setWorkflow(true)
         ->setDisabled(!$can_resume || !$can_edit));
 
     return $list;
   }
 
   private function buildPropertyLists(
     PHUIObjectBoxView $box,
     HarbormasterBuildable $buildable,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($buildable)
       ->setActionList($actions);
     $box->addPropertyList($properties);
 
     $properties->addProperty(
       pht('Buildable'),
       $buildable->getBuildableHandle()->renderLink());
 
     if ($buildable->getContainerHandle() !== null) {
       $properties->addProperty(
         pht('Container'),
         $buildable->getContainerHandle()->renderLink());
     }
 
     $properties->addProperty(
       pht('Origin'),
       $buildable->getIsManualBuildable()
         ? pht('Manual Buildable')
         : pht('Automatic Buildable'));
 
   }
 
   private function buildBuildList(HarbormasterBuildable $buildable) {
     $viewer = $this->getRequest()->getUser();
 
     $build_list = id(new PHUIObjectItemListView())
       ->setUser($viewer);
     foreach ($buildable->getBuilds() as $build) {
       $view_uri = $this->getApplicationURI('/build/'.$build->getID().'/');
       $item = id(new PHUIObjectItemView())
         ->setObjectName(pht('Build %d', $build->getID()))
         ->setHeader($build->getName())
         ->setHref($view_uri);
 
       $status = $build->getBuildStatus();
       switch ($status) {
         case HarbormasterBuild::STATUS_INACTIVE:
           $item->setBarColor('grey');
           break;
         case HarbormasterBuild::STATUS_PENDING:
           $item->setBarColor('blue');
           break;
         case HarbormasterBuild::STATUS_BUILDING:
           $item->setBarColor('yellow');
           break;
         case HarbormasterBuild::STATUS_PASSED:
           $item->setBarColor('green');
           break;
         case HarbormasterBuild::STATUS_FAILED:
           $item->setBarColor('red');
           break;
         case HarbormasterBuild::STATUS_ERROR:
           $item->setBarColor('red');
           break;
         case HarbormasterBuild::STATUS_STOPPED:
           $item->setBarColor('black');
           break;
       }
 
       $item->addAttribute(HarbormasterBuild::getBuildStatusName($status));
 
       if ($build->isRestarting()) {
         $item->addIcon('fa-backward', pht('Restarting'));
       } else if ($build->isStopping()) {
         $item->addIcon('fa-stop', pht('Stopping'));
       } else if ($build->isResuming()) {
         $item->addIcon('fa-play', pht('Resuming'));
       }
 
       $build_id = $build->getID();
 
       $restart_uri = "build/restart/{$build_id}/buildable/";
       $resume_uri = "build/resume/{$build_id}/buildable/";
       $stop_uri = "build/stop/{$build_id}/buildable/";
 
       $item->addAction(
         id(new PHUIListItemView())
           ->setIcon('fa-backward')
           ->setName(pht('Restart'))
           ->setHref($this->getApplicationURI($restart_uri))
           ->setWorkflow(true)
           ->setDisabled(!$build->canRestartBuild()));
 
       if ($build->canResumeBuild()) {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-play')
             ->setName(pht('Resume'))
             ->setHref($this->getApplicationURI($resume_uri))
             ->setWorkflow(true));
       } else {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-stop')
             ->setName(pht('Stop'))
             ->setHref($this->getApplicationURI($stop_uri))
             ->setWorkflow(true)
             ->setDisabled(!$build->canStopBuild()));
       }
 
       $targets = $build->getBuildTargets();
 
       if ($targets) {
         $target_list = id(new PHUIStatusListView());
         foreach ($targets as $target) {
           switch ($target->getTargetStatus()) {
             case HarbormasterBuildTarget::STATUS_PENDING:
               $icon = PHUIStatusItemView::ICON_CLOCK;
               $color = 'green';
               $status_name = pht('Pending');
               break;
             case HarbormasterBuildTarget::STATUS_BUILDING:
               $icon = PHUIStatusItemView::ICON_RIGHT;
               $color = 'green';
               $status_name = pht('Building');
               break;
             case HarbormasterBuildTarget::STATUS_WAITING:
               $icon = PHUIStatusItemView::ICON_CLOCK;
               $color = 'orange';
               $status_name = pht('Waiting');
               break;
             case HarbormasterBuildTarget::STATUS_PASSED:
               $icon = PHUIStatusItemView::ICON_ACCEPT;
               $color = 'green';
               $status_name = pht('Passed');
               break;
             case HarbormasterBuildTarget::STATUS_FAILED:
               $icon = PHUIStatusItemView::ICON_REJECT;
               $color = 'red';
               $status_name = pht('Failed');
               break;
             default:
               $icon = PHUIStatusItemView::ICON_QUESTION;
               $color = 'bluegrey';
               $status_name = pht('Unknown');
               break;
           }
 
           try {
             $impl = $target->getImplementation();
             $name = $impl->getName();
           } catch (Exception $ex) {
             $name = $target->getClassName();
           }
 
           $target_list->addItem(
             id(new PHUIStatusItemView())
               ->setIcon($icon, $color, $status_name)
               ->setTarget(pht('Target %d', $target->getID()))
               ->setNote($name));
         }
 
         $target_box = id(new PHUIBoxView())
           ->addPadding(PHUI::PADDING_SMALL)
           ->appendChild($target_list);
 
         $item->appendChild($target_box);
       }
 
       $build_list->addItem($item);
     }
 
     return $build_list;
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
index 95495e342..0d2e6ba36 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
@@ -1,116 +1,116 @@
 <?php
 
 final class HarbormasterPlanEditController
   extends HarbormasterPlanController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
       HarbormasterCapabilityManagePlans::CAPABILITY);
 
     if ($this->id) {
       $plan = id(new HarbormasterBuildPlanQuery())
         ->setViewer($viewer)
         ->withIDs(array($this->id))
         ->executeOne();
       if (!$plan) {
         return new Aphront404Response();
       }
     } else {
       $plan = HarbormasterBuildPlan::initializeNewBuildPlan($viewer);
     }
 
     $e_name = true;
     $v_name = $plan->getName();
     $validation_exception = null;
     if ($request->isFormPost()) {
       $xactions = array();
 
       $v_name = $request->getStr('name');
       $e_name = null;
       $type_name = HarbormasterBuildPlanTransaction::TYPE_NAME;
 
       $xactions[] = id(new HarbormasterBuildPlanTransaction())
         ->setTransactionType($type_name)
         ->setNewValue($v_name);
 
       $editor = id(new HarbormasterBuildPlanEditor())
         ->setActor($viewer)
         ->setContentSourceFromRequest($request);
 
       try {
         $editor->applyTransactions($plan, $xactions);
         return id(new AphrontRedirectResponse())
           ->setURI($this->getApplicationURI('plan/'.$plan->getID().'/'));
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
 
         $e_name = $validation_exception->getShortMessage(
           HarbormasterBuildPlanTransaction::TYPE_NAME);
       }
 
     }
 
     $is_new = (!$plan->getID());
     if ($is_new) {
       $title = pht('New Build Plan');
       $cancel_uri = $this->getApplicationURI();
       $save_button = pht('Create Build Plan');
     } else {
       $id = $plan->getID();
 
       $title = pht('Edit Build Plan');
       $cancel_uri = $this->getApplicationURI('plan/'.$plan->getID().'/');
       $save_button = pht('Save Build Plan');
     }
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel('Plan Name')
           ->setName('name')
           ->setError($e_name)
           ->setValue($v_name));
 
     $form->appendChild(
       id(new AphrontFormSubmitControl())
         ->setValue($save_button)
         ->addCancelButton($cancel_uri));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setValidationException($validation_exception)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     if ($is_new) {
       $crumbs->addTextCrumb(pht('New Build Plan'));
     } else {
       $id = $plan->getID();
       $crumbs->addTextCrumb(
-        pht("Plan %d", $id),
+        pht('Plan %d', $id),
         $this->getApplicationURI("plan/{$id}/"));
       $crumbs->addTextCrumb(pht('Edit'));
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
index aa4f5d5a8..d8b46b521 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -1,389 +1,389 @@
 <?php
 
 final class HarbormasterPlanViewController
   extends HarbormasterPlanController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $this->id;
 
     $plan = id(new HarbormasterBuildPlanQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$plan) {
       return new Aphront404Response();
     }
 
     $xactions = id(new HarbormasterBuildPlanTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($plan->getPHID()))
       ->execute();
 
     $xaction_view = id(new PhabricatorApplicationTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($plan->getPHID())
       ->setTransactions($xactions)
       ->setShouldTerminate(true);
 
-    $title = pht("Plan %d", $id);
+    $title = pht('Plan %d', $id);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($plan);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $actions = $this->buildActionList($plan);
     $this->buildPropertyLists($box, $plan, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
-    $crumbs->addTextCrumb(pht("Plan %d", $id));
+    $crumbs->addTextCrumb(pht('Plan %d', $id));
 
     list($step_list, $has_any_conflicts) = $this->buildStepList($plan);
 
     if ($has_any_conflicts) {
       $box->setFormErrors(
         array(
           pht(
             'This build plan has conflicts in one or more build steps. '.
             'Examine the step list and resolve the listed errors.'),
         ));
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
         $step_list,
         $xaction_view,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function buildStepList(HarbormasterBuildPlan $plan) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $list_id = celerity_generate_unique_node_id();
 
     $steps = id(new HarbormasterBuildStepQuery())
       ->setViewer($viewer)
       ->withBuildPlanPHIDs(array($plan->getPHID()))
       ->execute();
 
     $can_edit = $this->hasApplicationCapability(
       HarbormasterCapabilityManagePlans::CAPABILITY);
 
     $i = 1;
     $step_list = id(new PHUIObjectItemListView())
       ->setUser($viewer)
       ->setNoDataString(
         pht('This build plan does not have any build steps yet.'))
       ->setID($list_id);
     Javelin::initBehavior(
       'harbormaster-reorder-steps',
       array(
         'listID' => $list_id,
         'orderURI' => '/harbormaster/plan/order/'.$plan->getID().'/',
       ));
 
     $has_any_conflicts = false;
     foreach ($steps as $step) {
       $implementation = null;
       try {
         $implementation = $step->getStepImplementation();
       } catch (Exception $ex) {
         // We can't initialize the implementation.  This might be because
         // it's been renamed or no longer exists.
         $item = id(new PHUIObjectItemView())
           ->setObjectName(pht('Step %d', $i++))
           ->setHeader(pht('Unknown Implementation'))
           ->setBarColor('red')
           ->addAttribute(pht(
             'This step has an invalid implementation (%s).',
             $step->getClassName()))
           ->addAction(
             id(new PHUIListItemView())
               ->setIcon('fa-times')
               ->addSigil('harbormaster-build-step-delete')
               ->setWorkflow(true)
               ->setRenderNameAsTooltip(true)
-              ->setName(pht("Delete"))
+              ->setName(pht('Delete'))
               ->setHref(
-                $this->getApplicationURI("step/delete/".$step->getID()."/")));
+                $this->getApplicationURI('step/delete/'.$step->getID().'/')));
         $step_list->addItem($item);
         continue;
       }
       $item = id(new PHUIObjectItemView())
-        ->setObjectName("Step ".$i++)
+        ->setObjectName('Step '.$i++)
         ->setHeader($implementation->getName());
 
       $item->addAttribute($implementation->getDescription());
 
       $step_id = $step->getID();
       $edit_uri = $this->getApplicationURI("step/edit/{$step_id}/");
       $delete_uri = $this->getApplicationURI("step/delete/{$step_id}/");
 
       if ($can_edit) {
         $item->setHref($edit_uri);
         $item->setGrippable(true);
         $item->addSigil('build-step');
         $item->setMetadata(
           array(
             'stepID' => $step->getID(),
           ));
       }
 
       $item
         ->setHref($edit_uri)
         ->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-times')
             ->addSigil('harbormaster-build-step-delete')
             ->setWorkflow(true)
             ->setDisabled(!$can_edit)
             ->setHref(
-              $this->getApplicationURI("step/delete/".$step->getID()."/")));
+              $this->getApplicationURI('step/delete/'.$step->getID().'/')));
 
       $inputs = $step->getStepImplementation()->getArtifactInputs();
       $outputs = $step->getStepImplementation()->getArtifactOutputs();
 
       $has_conflicts = false;
       if ($inputs || $outputs) {
         $available_artifacts =
           HarbormasterBuildStepImplementation::loadAvailableArtifacts(
             $plan,
             $step,
             null);
 
         list($inputs_ui, $has_conflicts) = $this->buildArtifactList(
             $inputs,
             'in',
             pht('Input Artifacts'),
             $available_artifacts);
 
         list($outputs_ui) = $this->buildArtifactList(
             $outputs,
             'out',
             pht('Output Artifacts'),
             array());
 
         $item->appendChild(
           phutil_tag(
             'div',
             array(
               'class' => 'harbormaster-artifact-io',
             ),
             array(
               $inputs_ui,
               $outputs_ui,
             )));
       }
 
       if ($has_conflicts) {
         $has_any_conflicts = true;
         $item->setBarColor('red');
       }
 
       $step_list->addItem($item);
     }
 
     return array($step_list, $has_any_conflicts);
   }
 
   private function buildActionList(HarbormasterBuildPlan $plan) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $id = $plan->getID();
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($plan)
       ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
 
     $can_edit = $this->hasApplicationCapability(
       HarbormasterCapabilityManagePlans::CAPABILITY);
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Plan'))
         ->setHref($this->getApplicationURI("plan/edit/{$id}/"))
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-pencil'));
 
     if ($plan->isDisabled()) {
       $list->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Enable Plan'))
           ->setHref($this->getApplicationURI("plan/disable/{$id}/"))
           ->setWorkflow(true)
           ->setDisabled(!$can_edit)
           ->setIcon('fa-check'));
     } else {
       $list->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Disable Plan'))
           ->setHref($this->getApplicationURI("plan/disable/{$id}/"))
           ->setWorkflow(true)
           ->setDisabled(!$can_edit)
           ->setIcon('fa-ban'));
     }
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Add Build Step'))
         ->setHref($this->getApplicationURI("step/add/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-plus'));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Run Plan Manually'))
         ->setHref($this->getApplicationURI("plan/run/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-play-circle'));
 
     return $list;
   }
 
   private function buildPropertyLists(
     PHUIObjectBoxView $box,
     HarbormasterBuildPlan $plan,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($plan)
       ->setActionList($actions);
     $box->addPropertyList($properties);
 
     $properties->addProperty(
       pht('Created'),
       phabricator_datetime($plan->getDateCreated(), $viewer));
 
   }
 
   private function buildArtifactList(
     array $artifacts,
     $kind,
     $name,
     array $available_artifacts) {
     $has_conflicts = false;
 
     if (!$artifacts) {
       return array(null, $has_conflicts);
     }
 
 
     $this->requireResource('harbormaster-css');
 
     $header = phutil_tag(
       'div',
       array(
         'class' => 'harbormaster-artifact-summary-header',
       ),
       $name);
 
     $is_input = ($kind == 'in');
 
     $list = new PHUIStatusListView();
     foreach ($artifacts as $artifact) {
       $error = null;
 
       $key = idx($artifact, 'key');
       if (!strlen($key)) {
         $bound = phutil_tag('em', array(), pht('(null)'));
         if ($is_input) {
           // This is an unbound input. For now, all inputs are always required.
           $icon = PHUIStatusItemView::ICON_WARNING;
           $color = 'red';
           $icon_label = pht('Required Input');
           $has_conflicts = true;
           $error = pht('This input is required, but not configured.');
         } else {
           // This is an unnamed output. Outputs do not necessarily need to be
           // named.
           $icon = PHUIStatusItemView::ICON_OPEN;
           $color = 'bluegrey';
           $icon_label = pht('Unused Output');
         }
       } else {
         $bound = phutil_tag('strong', array(), $key);
         if ($is_input) {
           if (isset($available_artifacts[$key])) {
             if ($available_artifacts[$key] == idx($artifact, 'type')) {
               $icon = PHUIStatusItemView::ICON_ACCEPT;
               $color = 'green';
               $icon_label = pht('Valid Input');
             } else {
               $icon = PHUIStatusItemView::ICON_WARNING;
               $color = 'red';
               $icon_label = pht('Bad Input Type');
               $has_conflicts = true;
               $error = pht(
                 'This input is bound to the wrong artifact type. It is bound '.
                 'to a "%s" artifact, but should be bound to a "%s" artifact.',
                 $available_artifacts[$key],
                 idx($artifact, 'type'));
             }
           } else {
             $icon = PHUIStatusItemView::ICON_QUESTION;
             $color = 'red';
             $icon_label = pht('Unknown Input');
             $has_conflicts = true;
             $error = pht(
               'This input is bound to an artifact ("%s") which does not exist '.
               'at this stage in the build process.',
               $key);
           }
         } else {
           $icon = PHUIStatusItemView::ICON_DOWN;
           $color = 'green';
           $icon_label = pht('Valid Output');
         }
       }
 
       if ($error) {
         $note = array(
           phutil_tag('strong', array(), pht('ERROR:')),
           ' ',
           $error);
       } else {
         $note = $bound;
       }
 
       $list->addItem(
         id(new PHUIStatusItemView())
           ->setIcon($icon, $color, $icon_label)
           ->setTarget($artifact['name'])
           ->setNote($note));
     }
 
     $ui = array(
       $header,
       $list,
     );
 
     return array($ui, $has_conflicts);
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php b/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php
index a11d565ba..0ccd8bd4a 100644
--- a/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php
+++ b/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php
@@ -1,52 +1,52 @@
 <?php
 
 final class HarbormasterStepDeleteController
   extends HarbormasterController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
       HarbormasterCapabilityManagePlans::CAPABILITY);
 
     $id = $this->id;
 
     $step = id(new HarbormasterBuildStepQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if ($step === null) {
-      throw new Exception("Build step not found!");
+      throw new Exception('Build step not found!');
     }
 
     $plan_id = $step->getBuildPlan()->getID();
     $done_uri = $this->getApplicationURI('plan/'.$plan_id.'/');
 
     if ($request->isDialogFormPost()) {
       $step->delete();
       return id(new AphrontRedirectResponse())->setURI($done_uri);
     }
 
     $dialog = new AphrontDialogView();
     $dialog->setTitle(pht('Really Delete Step?'))
             ->setUser($viewer)
             ->addSubmitButton(pht('Delete Build Step'))
             ->addCancelButton($done_uri);
     $dialog->appendChild(
       phutil_tag(
         'p',
         array(),
         pht(
           'Are you sure you want to delete this '.
           'step? This can\'t be undone!')));
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php
index a0d481b63..70e791adc 100644
--- a/src/applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php
@@ -1,100 +1,100 @@
 <?php
 
 final class HarbormasterCommandBuildStepImplementation
   extends HarbormasterBuildStepImplementation {
 
   public function getName() {
     return pht('Run Command');
   }
 
   public function getGenericDescription() {
     return pht('Run a command on Drydock host.');
   }
 
   public function getDescription() {
     return pht(
       'Run command %s on host %s.',
       $this->formatSettingForDescription('command'),
       $this->formatSettingForDescription('hostartifact'));
   }
 
   public function execute(
     HarbormasterBuild $build,
     HarbormasterBuildTarget $build_target) {
 
     $settings = $this->getSettings();
     $variables = $build_target->getVariables();
 
     $command = $this->mergeVariables(
       'vcsprintf',
       $settings['command'],
       $variables);
 
     $artifact = $build->loadArtifact($settings['hostartifact']);
 
     $lease = $artifact->loadDrydockLease();
 
     $interface = $lease->getInterface('command');
 
     $future = $interface->getExecFuture('%C', $command);
 
-    $log_stdout = $build->createLog($build_target, "remote", "stdout");
-    $log_stderr = $build->createLog($build_target, "remote", "stderr");
+    $log_stdout = $build->createLog($build_target, 'remote', 'stdout');
+    $log_stderr = $build->createLog($build_target, 'remote', 'stderr');
 
     $start_stdout = $log_stdout->start();
     $start_stderr = $log_stderr->start();
 
     // Read the next amount of available output every second.
     while (!$future->isReady()) {
       list($stdout, $stderr) = $future->read();
       $log_stdout->append($stdout);
       $log_stderr->append($stderr);
       $future->discardBuffers();
 
       // Wait one second before querying for more data.
       sleep(1);
     }
 
     // Get the return value so we can log that as well.
     list($err) = $future->resolve();
 
     // Retrieve the last few bits of information.
     list($stdout, $stderr) = $future->read();
     $log_stdout->append($stdout);
     $log_stderr->append($stderr);
     $future->discardBuffers();
 
     $log_stdout->finalize($start_stdout);
     $log_stderr->finalize($start_stderr);
 
     if ($err) {
       throw new Exception(pht('Command failed with error %d.', $err));
     }
   }
 
   public function getArtifactInputs() {
     return array(
       array(
         'name'  => pht('Run on Host'),
         'key'   => $this->getSetting('hostartifact'),
         'type'  => HarbormasterBuildArtifact::TYPE_HOST,
       ),
     );
   }
 
   public function getFieldSpecifications() {
     return array(
       'command' => array(
         'name' => pht('Command'),
         'type' => 'text',
         'required' => true,
       ),
       'hostartifact' => array(
         'name' => pht('Host'),
         'type' => 'text',
         'required' => true,
       ),
     );
   }
 
 }
diff --git a/src/applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php
index be007cad0..e008d5d50 100644
--- a/src/applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php
@@ -1,83 +1,83 @@
 <?php
 
 final class HarbormasterPublishFragmentBuildStepImplementation
   extends HarbormasterBuildStepImplementation {
 
   public function getName() {
     return pht('Publish Fragment');
   }
 
   public function getGenericDescription() {
     return pht('Publish a fragment based on a file artifact.');
   }
 
   public function getDescription() {
     return pht(
       'Publish file artifact %s as fragment %s.',
       $this->formatSettingForDescription('artifact'),
       $this->formatSettingForDescription('path'));
   }
 
   public function execute(
     HarbormasterBuild $build,
     HarbormasterBuildTarget $build_target) {
 
     $settings = $this->getSettings();
     $variables = $build_target->getVariables();
 
     $path = $this->mergeVariables(
       'vsprintf',
       $settings['path'],
       $variables);
 
     $artifact = $build->loadArtifact($settings['artifact']);
 
     $file = $artifact->loadPhabricatorFile();
 
     $fragment = id(new PhragmentFragmentQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPaths(array($path))
       ->executeOne();
 
     if ($fragment === null) {
       PhragmentFragment::createFromFile(
         PhabricatorUser::getOmnipotentUser(),
         $file,
         $path,
         PhabricatorPolicies::getMostOpenPolicy(),
         PhabricatorPolicies::POLICY_USER);
     } else {
-      if ($file->getMimeType() === "application/zip") {
+      if ($file->getMimeType() === 'application/zip') {
         $fragment->updateFromZIP(PhabricatorUser::getOmnipotentUser(), $file);
       } else {
         $fragment->updateFromFile(PhabricatorUser::getOmnipotentUser(), $file);
       }
     }
   }
 
   public function getArtifactInputs() {
     return array(
       array(
         'name' => pht('Publishes File'),
         'key' => $this->getSetting('artifact'),
         'type' => HarbormasterBuildArtifact::TYPE_FILE,
       ),
     );
   }
 
   public function getFieldSpecifications() {
     return array(
       'path' => array(
         'name' => pht('Path'),
         'type' => 'text',
         'required' => true,
       ),
       'artifact' => array(
         'name' => pht('File Artifact'),
         'type' => 'text',
         'required' => true,
       ),
     );
   }
 
 }
diff --git a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
index 1c5452506..39fa0754d 100644
--- a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
@@ -1,102 +1,102 @@
 <?php
 
 final class HarbormasterWaitForPreviousBuildStepImplementation
   extends HarbormasterBuildStepImplementation {
 
   public function getName() {
     return pht('Wait for Previous Commits to Build');
   }
 
   public function getGenericDescription() {
     return pht(
       'Wait for previous commits to finish building the current plan '.
       'before continuing.');
   }
 
   public function execute(
     HarbormasterBuild $build,
     HarbormasterBuildTarget $build_target) {
 
     // We can only wait when building against commits.
     $buildable = $build->getBuildable();
     $object = $buildable->getBuildableObject();
     if (!($object instanceof PhabricatorRepositoryCommit)) {
       return;
     }
 
     // Block until all previous builds of the same build plan have
     // finished.
     $plan = $build->getBuildPlan();
 
-    $log = $build->createLog($build_target, "waiting", "blockers");
+    $log = $build->createLog($build_target, 'waiting', 'blockers');
     $log_start = $log->start();
 
     $blockers = $this->getBlockers($object, $plan, $build);
     if ($blockers) {
-      $log->append("Blocked by: ".implode(",", $blockers)."\n");
+      $log->append("Blocked by: ".implode(',', $blockers)."\n");
     }
     $log->finalize($log_start);
 
     if ($blockers) {
       throw new PhabricatorWorkerYieldException(15);
     }
   }
 
   private function getBlockers(
     PhabricatorRepositoryCommit $commit,
     HarbormasterBuildPlan $plan,
     HarbormasterBuild $source) {
 
     $call = new ConduitCall(
       'diffusion.commitparentsquery',
       array(
         'commit'   => $commit->getCommitIdentifier(),
         'callsign' => $commit->getRepository()->getCallsign()
       ));
     $call->setUser(PhabricatorUser::getOmnipotentUser());
     $parents = $call->execute();
 
     $parents = id(new DiffusionCommitQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withRepository($commit->getRepository())
       ->withIdentifiers($parents)
       ->execute();
 
     $blockers = array();
 
     $build_objects = array();
     foreach ($parents as $parent) {
       if (!$parent->isImported()) {
         $blockers[] = pht('Commit %s', $parent->getCommitIdentifier());
       } else {
         $build_objects[] = $parent->getPHID();
       }
     }
 
     if ($build_objects) {
       $buildables = id(new HarbormasterBuildableQuery())
         ->setViewer(PhabricatorUser::getOmnipotentUser())
         ->withBuildablePHIDs($build_objects)
         ->withManualBuildables(false)
         ->execute();
       $buildable_phids = mpull($buildables, 'getPHID');
 
       if ($buildable_phids) {
         $builds = id(new HarbormasterBuildQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withBuildablePHIDs($buildable_phids)
           ->withBuildPlanPHIDs(array($plan->getPHID()))
           ->execute();
 
         foreach ($builds as $build) {
           if (!$build->isComplete()) {
             $blockers[] = pht('Build %d', $build->getID());
           }
         }
       }
     }
 
     return $blockers;
   }
 
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
index 2048b703a..bcb56b327 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -1,369 +1,369 @@
 <?php
 
 final class HarbormasterBuild extends HarbormasterDAO
   implements PhabricatorPolicyInterface {
 
   protected $buildablePHID;
   protected $buildPlanPHID;
   protected $buildStatus;
 
   private $buildable = self::ATTACHABLE;
   private $buildPlan = self::ATTACHABLE;
   private $buildTargets = self::ATTACHABLE;
   private $unprocessedCommands = self::ATTACHABLE;
 
   /**
    * Not currently being built.
    */
   const STATUS_INACTIVE = 'inactive';
 
   /**
    * Pending pick up by the Harbormaster daemon.
    */
   const STATUS_PENDING = 'pending';
 
   /**
    * Current building the buildable.
    */
   const STATUS_BUILDING = 'building';
 
   /**
    * The build has passed.
    */
   const STATUS_PASSED = 'passed';
 
   /**
    * The build has failed.
    */
   const STATUS_FAILED = 'failed';
 
   /**
    * The build encountered an unexpected error.
    */
   const STATUS_ERROR = 'error';
 
   /**
    * The build has been stopped.
    */
   const STATUS_STOPPED = 'stopped';
 
 
   /**
    * Get a human readable name for a build status constant.
    *
    * @param  const  Build status constant.
    * @return string Human-readable name.
    */
   public static function getBuildStatusName($status) {
     switch ($status) {
       case self::STATUS_INACTIVE:
         return pht('Inactive');
       case self::STATUS_PENDING:
         return pht('Pending');
       case self::STATUS_BUILDING:
         return pht('Building');
       case self::STATUS_PASSED:
         return pht('Passed');
       case self::STATUS_FAILED:
         return pht('Failed');
       case self::STATUS_ERROR:
         return pht('Unexpected Error');
       case self::STATUS_STOPPED:
         return pht('Stopped');
       default:
         return pht('Unknown');
     }
   }
 
   public static function initializeNewBuild(PhabricatorUser $actor) {
     return id(new HarbormasterBuild())
       ->setBuildStatus(self::STATUS_INACTIVE);
   }
 
   public function delete() {
     $this->openTransaction();
       $this->deleteUnprocessedCommands();
       $result = parent::delete();
     $this->saveTransaction();
 
     return $result;
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       HarbormasterPHIDTypeBuild::TYPECONST);
   }
 
   public function attachBuildable(HarbormasterBuildable $buildable) {
     $this->buildable = $buildable;
     return $this;
   }
 
   public function getBuildable() {
     return $this->assertAttached($this->buildable);
   }
 
   public function getName() {
     if ($this->getBuildPlan()) {
       return $this->getBuildPlan()->getName();
     }
     return pht('Build');
   }
 
   public function attachBuildPlan(
     HarbormasterBuildPlan $build_plan = null) {
     $this->buildPlan = $build_plan;
     return $this;
   }
 
   public function getBuildPlan() {
     return $this->assertAttached($this->buildPlan);
   }
 
   public function getBuildTargets() {
     return $this->assertAttached($this->buildTargets);
   }
 
   public function attachBuildTargets(array $targets) {
     $this->buildTargets = $targets;
     return $this;
   }
 
   public function isBuilding() {
     return $this->getBuildStatus() === self::STATUS_PENDING ||
       $this->getBuildStatus() === self::STATUS_BUILDING;
   }
 
   public function createLog(
     HarbormasterBuildTarget $build_target,
     $log_source,
     $log_type) {
 
     $log_source = phutil_utf8_shorten($log_source, 250);
 
     $log = HarbormasterBuildLog::initializeNewBuildLog($build_target)
       ->setLogSource($log_source)
       ->setLogType($log_type)
       ->save();
 
     return $log;
   }
 
   public function createArtifact(
     HarbormasterBuildTarget $build_target,
     $artifact_key,
     $artifact_type) {
 
     $artifact =
       HarbormasterBuildArtifact::initializeNewBuildArtifact($build_target);
     $artifact->setArtifactKey($this->getPHID(), $artifact_key);
     $artifact->setArtifactType($artifact_type);
     $artifact->save();
     return $artifact;
   }
 
   public function loadArtifact($name) {
     $artifact = id(new HarbormasterBuildArtifactQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withArtifactKeys(
         $this->getPHID(),
         array($name))
       ->executeOne();
     if ($artifact === null) {
-      throw new Exception("Artifact not found!");
+      throw new Exception('Artifact not found!');
     }
     return $artifact;
   }
 
   public function retrieveVariablesFromBuild() {
     $results = array(
       'buildable.diff' => null,
       'buildable.revision' => null,
       'buildable.commit' => null,
       'repository.callsign' => null,
       'repository.vcs' => null,
       'repository.uri' => null,
       'step.timestamp' => null,
       'build.id' => null,
     );
 
     $buildable = $this->getBuildable();
     $object = $buildable->getBuildableObject();
 
     $repo = null;
     if ($object instanceof DifferentialDiff) {
       $results['buildable.diff'] = $object->getID();
       $revision = $object->getRevision();
       $results['buildable.revision'] = $revision->getID();
       $repo = $revision->getRepository();
     } else if ($object instanceof PhabricatorRepositoryCommit) {
       $results['buildable.commit'] = $object->getCommitIdentifier();
       $repo = $object->getRepository();
     }
 
     if ($repo) {
       $results['repository.callsign'] = $repo->getCallsign();
       $results['repository.vcs'] = $repo->getVersionControlSystem();
       $results['repository.uri'] = $repo->getPublicCloneURI();
     }
 
     $results['step.timestamp'] = time();
     $results['build.id'] = $this->getID();
 
     return $results;
   }
 
   public static function getAvailableBuildVariables() {
     return array(
       'buildable.diff' =>
         pht('The differential diff ID, if applicable.'),
       'buildable.revision' =>
         pht('The differential revision ID, if applicable.'),
       'buildable.commit' => pht('The commit identifier, if applicable.'),
       'repository.callsign' =>
         pht('The callsign of the repository in Phabricator.'),
       'repository.vcs' =>
         pht('The version control system, either "svn", "hg" or "git".'),
       'repository.uri' =>
         pht('The URI to clone or checkout the repository from.'),
       'step.timestamp' => pht('The current UNIX timestamp.'),
       'build.id' => pht('The ID of the current build.'),
       'target.phid' => pht('The PHID of the current build target.'),
     );
   }
 
   public function isComplete() {
     switch ($this->getBuildStatus()) {
       case self::STATUS_PASSED:
       case self::STATUS_FAILED:
       case self::STATUS_ERROR:
       case self::STATUS_STOPPED:
         return true;
     }
 
     return false;
   }
 
   public function isStopped() {
     return ($this->getBuildStatus() == self::STATUS_STOPPED);
   }
 
 
 /* -(  Build Commands  )----------------------------------------------------- */
 
 
   private function getUnprocessedCommands() {
     return $this->assertAttached($this->unprocessedCommands);
   }
 
   public function attachUnprocessedCommands(array $commands) {
     $this->unprocessedCommands = $commands;
     return $this;
   }
 
   public function canRestartBuild() {
     return !$this->isRestarting();
   }
 
   public function canStopBuild() {
     return !$this->isComplete() &&
            !$this->isStopped() &&
            !$this->isStopping();
   }
 
   public function canResumeBuild() {
     return $this->isStopped() &&
            !$this->isResuming();
   }
 
   public function isStopping() {
     $is_stopping = false;
     foreach ($this->getUnprocessedCommands() as $command_object) {
       $command = $command_object->getCommand();
       switch ($command) {
         case HarbormasterBuildCommand::COMMAND_STOP:
           $is_stopping = true;
           break;
         case HarbormasterBuildCommand::COMMAND_RESUME:
         case HarbormasterBuildCommand::COMMAND_RESTART:
           $is_stopping = false;
           break;
       }
     }
 
     return $is_stopping;
   }
 
   public function isResuming() {
     $is_resuming = false;
     foreach ($this->getUnprocessedCommands() as $command_object) {
       $command = $command_object->getCommand();
       switch ($command) {
         case HarbormasterBuildCommand::COMMAND_RESTART:
         case HarbormasterBuildCommand::COMMAND_RESUME:
           $is_resuming = true;
           break;
         case HarbormasterBuildCommand::COMMAND_STOP:
           $is_resuming = false;
           break;
       }
     }
 
     return $is_resuming;
   }
 
   public function isRestarting() {
     $is_restarting = false;
     foreach ($this->getUnprocessedCommands() as $command_object) {
       $command = $command_object->getCommand();
       switch ($command) {
         case HarbormasterBuildCommand::COMMAND_RESTART:
           $is_restarting = true;
           break;
       }
     }
 
     return $is_restarting;
   }
 
   public function deleteUnprocessedCommands() {
     foreach ($this->getUnprocessedCommands() as $key => $command_object) {
       $command_object->delete();
       unset($this->unprocessedCommands[$key]);
     }
 
     return $this;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getBuildable()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getBuildable()->hasAutomaticCapability(
       $capability,
       $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht('A build inherits policies from its buildable.');
   }
 
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
index 4854e64b5..069e6f655 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
@@ -1,147 +1,147 @@
 <?php
 
 final class HarbormasterBuildArtifact extends HarbormasterDAO
   implements PhabricatorPolicyInterface {
 
   protected $buildTargetPHID;
   protected $artifactType;
   protected $artifactIndex;
   protected $artifactKey;
   protected $artifactData = array();
 
   private $buildTarget = self::ATTACHABLE;
 
   const TYPE_FILE = 'file';
   const TYPE_HOST = 'host';
 
   public static function initializeNewBuildArtifact(
     HarbormasterBuildTarget $build_target) {
     return id(new HarbormasterBuildArtifact())
       ->setBuildTargetPHID($build_target->getPHID());
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(
         'artifactData' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function attachBuildTarget(HarbormasterBuildTarget $build_target) {
     $this->buildTarget = $build_target;
     return $this;
   }
 
   public function getBuildTarget() {
     return $this->assertAttached($this->buildTarget);
   }
 
   public function setArtifactKey($build_phid, $key) {
     $this->artifactIndex =
       PhabricatorHash::digestForIndex($build_phid.$key);
     $this->artifactKey = $key;
     return $this;
   }
 
   public function getObjectItemView(PhabricatorUser $viewer) {
     $data = $this->getArtifactData();
     switch ($this->getArtifactType()) {
       case self::TYPE_FILE:
         $handle = id(new PhabricatorHandleQuery())
           ->setViewer($viewer)
           ->withPHIDs($data)
           ->executeOne();
 
         return id(new PHUIObjectItemView())
           ->setObjectName(pht('File'))
           ->setHeader($handle->getFullName())
           ->setHref($handle->getURI());
       case self::TYPE_HOST:
         $leases = id(new DrydockLeaseQuery())
           ->setViewer($viewer)
-          ->withIDs(array($data["drydock-lease"]))
+          ->withIDs(array($data['drydock-lease']))
           ->execute();
-        $lease = $leases[$data["drydock-lease"]];
+        $lease = $leases[$data['drydock-lease']];
 
         return id(new PHUIObjectItemView())
           ->setObjectName(pht('Drydock Lease'))
           ->setHeader($lease->getID())
           ->setHref('/drydock/lease/'.$lease->getID());
       default:
         return null;
     }
   }
 
   public function loadDrydockLease() {
     if ($this->getArtifactType() !== self::TYPE_HOST) {
       throw new Exception(
-        "`loadDrydockLease` may only be called on host artifacts.");
+        '`loadDrydockLease` may only be called on host artifacts.');
     }
 
     $data = $this->getArtifactData();
 
     // FIXME: Is there a better way of doing this?
     // TODO: Policy stuff, etc.
     $lease = id(new DrydockLease())->load(
       $data['drydock-lease']);
     if ($lease === null) {
-      throw new Exception("Associated Drydock lease not found!");
+      throw new Exception('Associated Drydock lease not found!');
     }
     $resource = id(new DrydockResource())->load(
       $lease->getResourceID());
     if ($resource === null) {
-      throw new Exception("Associated Drydock resource not found!");
+      throw new Exception('Associated Drydock resource not found!');
     }
     $lease->attachResource($resource);
 
     return $lease;
   }
 
   public function loadPhabricatorFile() {
     if ($this->getArtifactType() !== self::TYPE_FILE) {
       throw new Exception(
-        "`loadPhabricatorFile` may only be called on file artifacts.");
+        '`loadPhabricatorFile` may only be called on file artifacts.');
     }
 
     $data = $this->getArtifactData();
 
     // The data for TYPE_FILE is an array with a single PHID in it.
-    $phid = $data["filePHID"];
+    $phid = $data['filePHID'];
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($phid))
       ->executeOne();
     if ($file === null) {
-      throw new Exception("Associated file not found!");
+      throw new Exception('Associated file not found!');
     }
     return $file;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getBuildTarget()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getBuildTarget()->hasAutomaticCapability(
       $capability,
       $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'Users must be able to see a buildable to see its artifacts.');
   }
 
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index e998e82ab..f400895d1 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -1,193 +1,193 @@
 <?php
 
 final class HarbormasterBuildLog extends HarbormasterDAO
   implements PhabricatorPolicyInterface {
 
   protected $buildTargetPHID;
   protected $logSource;
   protected $logType;
   protected $duration;
   protected $live;
 
   private $buildTarget = self::ATTACHABLE;
 
   const CHUNK_BYTE_LIMIT = 102400;
 
   /**
    * The log is encoded as plain text.
    */
   const ENCODING_TEXT = 'text';
 
   public static function initializeNewBuildLog(
     HarbormasterBuildTarget $build_target) {
 
     return id(new HarbormasterBuildLog())
       ->setBuildTargetPHID($build_target->getPHID())
       ->setDuration(null)
       ->setLive(0);
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       HarbormasterPHIDTypeBuildLog::TYPECONST);
   }
 
   public function attachBuildTarget(HarbormasterBuildTarget $build_target) {
     $this->buildTarget = $build_target;
     return $this;
   }
 
   public function getBuildTarget() {
     return $this->assertAttached($this->buildTarget);
   }
 
   public function getName() {
     return pht('Build Log');
   }
 
   public function start() {
     if ($this->getLive()) {
-      throw new Exception("Live logging has already started for this log.");
+      throw new Exception('Live logging has already started for this log.');
     }
 
     $this->setLive(1);
     $this->save();
 
     return time();
   }
 
   public function append($content) {
     if (!$this->getLive()) {
-      throw new Exception("Start logging before appending data to the log.");
+      throw new Exception('Start logging before appending data to the log.');
     }
     if (strlen($content) === 0) {
       return;
     }
 
     // If the length of the content is greater than the chunk size limit,
     // then we can never fit the content in a single record.  We need to
     // split our content out and call append on it for as many parts as there
     // are to the content.
     if (strlen($content) > self::CHUNK_BYTE_LIMIT) {
       $current = $content;
       while (strlen($current) > self::CHUNK_BYTE_LIMIT) {
         $part = substr($current, 0, self::CHUNK_BYTE_LIMIT);
         $current = substr($current, self::CHUNK_BYTE_LIMIT);
         $this->append($part);
       }
       $this->append($current);
       return;
     }
 
     // Retrieve the size of last chunk from the DB for this log.  If the
     // chunk is over 500K, then we need to create a new log entry.
     $conn = $this->establishConnection('w');
     $result = queryfx_all(
       $conn,
       'SELECT id, size, encoding '.
       'FROM harbormaster_buildlogchunk '.
       'WHERE logID = %d '.
       'ORDER BY id DESC '.
       'LIMIT 1',
       $this->getID());
     if (count($result) === 0 ||
-      $result[0]["size"] + strlen($content) > self::CHUNK_BYTE_LIMIT ||
-      $result[0]["encoding"] !== self::ENCODING_TEXT) {
+      $result[0]['size'] + strlen($content) > self::CHUNK_BYTE_LIMIT ||
+      $result[0]['encoding'] !== self::ENCODING_TEXT) {
 
       // We must insert a new chunk because the data we are appending
       // won't fit into the existing one, or we don't have any existing
       // chunk data.
       queryfx(
         $conn,
         'INSERT INTO harbormaster_buildlogchunk '.
         '(logID, encoding, size, chunk) '.
         'VALUES '.
         '(%d, %s, %d, %s)',
         $this->getID(),
         self::ENCODING_TEXT,
         strlen($content),
         $content);
     } else {
       // We have a resulting record that we can append our content onto.
       queryfx(
         $conn,
         'UPDATE harbormaster_buildlogchunk '.
         'SET chunk = CONCAT(chunk, %s), size = LENGTH(CONCAT(chunk, %s))'.
         'WHERE id = %d',
         $content,
         $content,
-        $result[0]["id"]);
+        $result[0]['id']);
     }
   }
 
   public function finalize($start = 0) {
     if (!$this->getLive()) {
-      throw new Exception("Start logging before finalizing it.");
+      throw new Exception('Start logging before finalizing it.');
     }
 
     // TODO: Encode the log contents in a gzipped format.
     $this->reload();
     if ($start > 0) {
       $this->setDuration(time() - $start);
     }
     $this->setLive(0);
     $this->save();
   }
 
   public function getLogText() {
     // TODO: This won't cope very well if we're pulling like a 700MB
     // log file out of the DB.  We should probably implement some sort
     // of optional limit parameter so that when we're rendering out only
     // 25 lines in the UI, we don't wastefully read in the whole log.
 
     // We have to read our content out of the database and stitch all of
     // the log data back together.
     $conn = $this->establishConnection('r');
     $result = queryfx_all(
       $conn,
       'SELECT chunk '.
       'FROM harbormaster_buildlogchunk '.
       'WHERE logID = %d '.
       'ORDER BY id ASC',
       $this->getID());
 
-    $content = "";
+    $content = '';
     foreach ($result as $row) {
-      $content .= $row["chunk"];
+      $content .= $row['chunk'];
     }
     return $content;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getBuildTarget()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getBuildTarget()->hasAutomaticCapability(
       $capability,
       $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'Users must be able to see a build target to view it\'s build log.');
   }
 
 
 }
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index a246542b0..7cd571aa8 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -1,1374 +1,1374 @@
 <?php
 
 /**
  * @task customfield Custom Field Integration
  */
 abstract class HeraldAdapter {
 
   const FIELD_TITLE                  = 'title';
   const FIELD_BODY                   = 'body';
   const FIELD_AUTHOR                 = 'author';
   const FIELD_ASSIGNEE               = 'assignee';
   const FIELD_REVIEWER               = 'reviewer';
   const FIELD_REVIEWERS              = 'reviewers';
   const FIELD_COMMITTER              = 'committer';
   const FIELD_CC                     = 'cc';
   const FIELD_TAGS                   = 'tags';
   const FIELD_DIFF_FILE              = 'diff-file';
   const FIELD_DIFF_CONTENT           = 'diff-content';
   const FIELD_DIFF_ADDED_CONTENT     = 'diff-added-content';
   const FIELD_DIFF_REMOVED_CONTENT   = 'diff-removed-content';
   const FIELD_DIFF_ENORMOUS          = 'diff-enormous';
   const FIELD_REPOSITORY             = 'repository';
   const FIELD_REPOSITORY_PROJECTS    = 'repository-projects';
   const FIELD_RULE                   = 'rule';
   const FIELD_AFFECTED_PACKAGE       = 'affected-package';
   const FIELD_AFFECTED_PACKAGE_OWNER = 'affected-package-owner';
   const FIELD_CONTENT_SOURCE         = 'contentsource';
   const FIELD_ALWAYS                 = 'always';
   const FIELD_AUTHOR_PROJECTS        = 'authorprojects';
   const FIELD_PROJECTS               = 'projects';
   const FIELD_PUSHER                 = 'pusher';
   const FIELD_PUSHER_PROJECTS        = 'pusher-projects';
   const FIELD_DIFFERENTIAL_REVISION  = 'differential-revision';
   const FIELD_DIFFERENTIAL_REVIEWERS = 'differential-reviewers';
   const FIELD_DIFFERENTIAL_CCS       = 'differential-ccs';
   const FIELD_DIFFERENTIAL_ACCEPTED  = 'differential-accepted';
   const FIELD_IS_MERGE_COMMIT        = 'is-merge-commit';
   const FIELD_BRANCHES               = 'branches';
   const FIELD_AUTHOR_RAW             = 'author-raw';
   const FIELD_COMMITTER_RAW          = 'committer-raw';
   const FIELD_IS_NEW_OBJECT          = 'new-object';
   const FIELD_TASK_PRIORITY          = 'taskpriority';
   const FIELD_ARCANIST_PROJECT       = 'arcanist-project';
   const FIELD_PUSHER_IS_COMMITTER    = 'pusher-is-committer';
 
   const CONDITION_CONTAINS        = 'contains';
   const CONDITION_NOT_CONTAINS    = '!contains';
   const CONDITION_IS              = 'is';
   const CONDITION_IS_NOT          = '!is';
   const CONDITION_IS_ANY          = 'isany';
   const CONDITION_IS_NOT_ANY      = '!isany';
   const CONDITION_INCLUDE_ALL     = 'all';
   const CONDITION_INCLUDE_ANY     = 'any';
   const CONDITION_INCLUDE_NONE    = 'none';
   const CONDITION_IS_ME           = 'me';
   const CONDITION_IS_NOT_ME       = '!me';
   const CONDITION_REGEXP          = 'regexp';
   const CONDITION_RULE            = 'conditions';
   const CONDITION_NOT_RULE        = '!conditions';
   const CONDITION_EXISTS          = 'exists';
   const CONDITION_NOT_EXISTS      = '!exists';
   const CONDITION_UNCONDITIONALLY = 'unconditionally';
   const CONDITION_NEVER           = 'never';
   const CONDITION_REGEXP_PAIR     = 'regexp-pair';
   const CONDITION_HAS_BIT         = 'bit';
   const CONDITION_NOT_BIT         = '!bit';
   const CONDITION_IS_TRUE         = 'true';
   const CONDITION_IS_FALSE        = 'false';
 
   const ACTION_ADD_CC       = 'addcc';
   const ACTION_REMOVE_CC    = 'remcc';
   const ACTION_EMAIL        = 'email';
   const ACTION_NOTHING      = 'nothing';
   const ACTION_AUDIT        = 'audit';
   const ACTION_FLAG         = 'flag';
   const ACTION_ASSIGN_TASK  = 'assigntask';
   const ACTION_ADD_PROJECTS = 'addprojects';
   const ACTION_ADD_REVIEWERS = 'addreviewers';
   const ACTION_ADD_BLOCKING_REVIEWERS = 'addblockingreviewers';
   const ACTION_APPLY_BUILD_PLANS = 'applybuildplans';
   const ACTION_BLOCK = 'block';
 
   const VALUE_TEXT            = 'text';
   const VALUE_NONE            = 'none';
   const VALUE_EMAIL           = 'email';
   const VALUE_USER            = 'user';
   const VALUE_TAG             = 'tag';
   const VALUE_RULE            = 'rule';
   const VALUE_REPOSITORY      = 'repository';
   const VALUE_OWNERS_PACKAGE  = 'package';
   const VALUE_PROJECT         = 'project';
   const VALUE_FLAG_COLOR      = 'flagcolor';
   const VALUE_CONTENT_SOURCE  = 'contentsource';
   const VALUE_USER_OR_PROJECT = 'userorproject';
   const VALUE_BUILD_PLAN      = 'buildplan';
   const VALUE_TASK_PRIORITY   = 'taskpriority';
   const VALUE_ARCANIST_PROJECT = 'arcanistprojects';
 
   private $contentSource;
   private $isNewObject;
   private $customFields = false;
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source;
     return $this;
   }
   public function getContentSource() {
     return $this->contentSource;
   }
 
   public function getIsNewObject() {
     if (is_bool($this->isNewObject)) {
       return $this->isNewObject;
     }
 
     throw new Exception(pht('You must setIsNewObject to a boolean first!'));
   }
   public function setIsNewObject($new) {
     $this->isNewObject = (bool) $new;
     return $this;
   }
 
   abstract public function getPHID();
   abstract public function getHeraldName();
 
   public function getHeraldField($field_name) {
     switch ($field_name) {
       case self::FIELD_RULE:
         return null;
       case self::FIELD_CONTENT_SOURCE:
         return $this->getContentSource()->getSource();
       case self::FIELD_ALWAYS:
         return true;
       case self::FIELD_IS_NEW_OBJECT:
         return $this->getIsNewObject();
       default:
         if ($this->isHeraldCustomKey($field_name)) {
           return $this->getCustomFieldValue($field_name);
         }
 
         throw new Exception(
           "Unknown field '{$field_name}'!");
     }
   }
 
   abstract public function applyHeraldEffects(array $effects);
 
   public function isAvailableToUser(PhabricatorUser $viewer) {
     $applications = id(new PhabricatorApplicationQuery())
       ->setViewer($viewer)
       ->withInstalled(true)
       ->withClasses(array($this->getAdapterApplicationClass()))
       ->execute();
 
     return !empty($applications);
   }
 
 
   /**
    * NOTE: You generally should not override this; it exists to support legacy
    * adapters which had hard-coded content types.
    */
   public function getAdapterContentType() {
     return get_class($this);
   }
 
   abstract public function getAdapterContentName();
   abstract public function getAdapterContentDescription();
   abstract public function getAdapterApplicationClass();
   abstract public function getObject();
 
   public function supportsRuleType($rule_type) {
     return false;
   }
 
   public function canTriggerOnObject($object) {
     return false;
   }
 
   public function explainValidTriggerObjects() {
     return pht('This adapter can not trigger on objects.');
   }
 
   public function getTriggerObjectPHIDs() {
     return array($this->getPHID());
   }
 
   public function getAdapterSortKey() {
     return sprintf(
       '%08d%s',
       $this->getAdapterSortOrder(),
       $this->getAdapterContentName());
   }
 
   public function getAdapterSortOrder() {
     return 1000;
   }
 
 
 /* -(  Fields  )------------------------------------------------------------- */
 
 
   public function getFields() {
     $fields = array();
 
     $fields[] = self::FIELD_ALWAYS;
     $fields[] = self::FIELD_RULE;
 
     $custom_fields = $this->getCustomFields();
     if ($custom_fields) {
       foreach ($custom_fields->getFields() as $custom_field) {
         $key = $custom_field->getFieldKey();
         $fields[] = $this->getHeraldKeyFromCustomKey($key);
       }
     }
 
     return $fields;
   }
 
   public function getFieldNameMap() {
     return array(
       self::FIELD_TITLE => pht('Title'),
       self::FIELD_BODY => pht('Body'),
       self::FIELD_AUTHOR => pht('Author'),
       self::FIELD_ASSIGNEE => pht('Assignee'),
       self::FIELD_COMMITTER => pht('Committer'),
       self::FIELD_REVIEWER => pht('Reviewer'),
       self::FIELD_REVIEWERS => pht('Reviewers'),
       self::FIELD_CC => pht('CCs'),
       self::FIELD_TAGS => pht('Tags'),
       self::FIELD_DIFF_FILE => pht('Any changed filename'),
       self::FIELD_DIFF_CONTENT => pht('Any changed file content'),
       self::FIELD_DIFF_ADDED_CONTENT => pht('Any added file content'),
       self::FIELD_DIFF_REMOVED_CONTENT => pht('Any removed file content'),
       self::FIELD_DIFF_ENORMOUS => pht('Change is enormous'),
       self::FIELD_REPOSITORY => pht('Repository'),
       self::FIELD_REPOSITORY_PROJECTS => pht('Repository\'s projects'),
       self::FIELD_RULE => pht('Another Herald rule'),
       self::FIELD_AFFECTED_PACKAGE => pht('Any affected package'),
       self::FIELD_AFFECTED_PACKAGE_OWNER =>
         pht("Any affected package's owner"),
       self::FIELD_CONTENT_SOURCE => pht('Content Source'),
       self::FIELD_ALWAYS => pht('Always'),
       self::FIELD_AUTHOR_PROJECTS => pht("Author's projects"),
-      self::FIELD_PROJECTS => pht("Projects"),
+      self::FIELD_PROJECTS => pht('Projects'),
       self::FIELD_PUSHER => pht('Pusher'),
       self::FIELD_PUSHER_PROJECTS => pht("Pusher's projects"),
       self::FIELD_DIFFERENTIAL_REVISION => pht('Differential revision'),
       self::FIELD_DIFFERENTIAL_REVIEWERS => pht('Differential reviewers'),
       self::FIELD_DIFFERENTIAL_CCS => pht('Differential CCs'),
       self::FIELD_DIFFERENTIAL_ACCEPTED
         => pht('Accepted Differential revision'),
       self::FIELD_IS_MERGE_COMMIT => pht('Commit is a merge'),
       self::FIELD_BRANCHES => pht('Commit\'s branches'),
       self::FIELD_AUTHOR_RAW => pht('Raw author name'),
       self::FIELD_COMMITTER_RAW => pht('Raw committer name'),
       self::FIELD_IS_NEW_OBJECT => pht('Is newly created?'),
       self::FIELD_TASK_PRIORITY => pht('Task priority'),
       self::FIELD_ARCANIST_PROJECT => pht('Arcanist Project'),
       self::FIELD_PUSHER_IS_COMMITTER => pht('Pusher same as committer'),
     ) + $this->getCustomFieldNameMap();
   }
 
 
 /* -(  Conditions  )--------------------------------------------------------- */
 
 
   public function getConditionNameMap() {
     return array(
       self::CONDITION_CONTAINS        => pht('contains'),
       self::CONDITION_NOT_CONTAINS    => pht('does not contain'),
       self::CONDITION_IS              => pht('is'),
       self::CONDITION_IS_NOT          => pht('is not'),
       self::CONDITION_IS_ANY          => pht('is any of'),
       self::CONDITION_IS_TRUE         => pht('is true'),
       self::CONDITION_IS_FALSE        => pht('is false'),
       self::CONDITION_IS_NOT_ANY      => pht('is not any of'),
       self::CONDITION_INCLUDE_ALL     => pht('include all of'),
       self::CONDITION_INCLUDE_ANY     => pht('include any of'),
       self::CONDITION_INCLUDE_NONE    => pht('do not include'),
       self::CONDITION_IS_ME           => pht('is myself'),
       self::CONDITION_IS_NOT_ME       => pht('is not myself'),
       self::CONDITION_REGEXP          => pht('matches regexp'),
       self::CONDITION_RULE            => pht('matches:'),
       self::CONDITION_NOT_RULE        => pht('does not match:'),
       self::CONDITION_EXISTS          => pht('exists'),
       self::CONDITION_NOT_EXISTS      => pht('does not exist'),
       self::CONDITION_UNCONDITIONALLY => '',  // don't show anything!
       self::CONDITION_NEVER           => '',  // don't show anything!
       self::CONDITION_REGEXP_PAIR     => pht('matches regexp pair'),
       self::CONDITION_HAS_BIT         => pht('has bit'),
       self::CONDITION_NOT_BIT         => pht('lacks bit'),
     );
   }
 
   public function getConditionsForField($field) {
     switch ($field) {
       case self::FIELD_TITLE:
       case self::FIELD_BODY:
       case self::FIELD_COMMITTER_RAW:
       case self::FIELD_AUTHOR_RAW:
         return array(
           self::CONDITION_CONTAINS,
           self::CONDITION_NOT_CONTAINS,
           self::CONDITION_IS,
           self::CONDITION_IS_NOT,
           self::CONDITION_REGEXP,
         );
       case self::FIELD_REVIEWER:
       case self::FIELD_PUSHER:
       case self::FIELD_TASK_PRIORITY:
       case self::FIELD_ARCANIST_PROJECT:
         return array(
           self::CONDITION_IS_ANY,
           self::CONDITION_IS_NOT_ANY,
         );
       case self::FIELD_REPOSITORY:
       case self::FIELD_ASSIGNEE:
       case self::FIELD_AUTHOR:
       case self::FIELD_COMMITTER:
         return array(
           self::CONDITION_IS_ANY,
           self::CONDITION_IS_NOT_ANY,
           self::CONDITION_EXISTS,
           self::CONDITION_NOT_EXISTS,
         );
       case self::FIELD_TAGS:
       case self::FIELD_REVIEWERS:
       case self::FIELD_CC:
       case self::FIELD_AUTHOR_PROJECTS:
       case self::FIELD_PROJECTS:
       case self::FIELD_AFFECTED_PACKAGE:
       case self::FIELD_AFFECTED_PACKAGE_OWNER:
       case self::FIELD_PUSHER_PROJECTS:
       case self::FIELD_REPOSITORY_PROJECTS:
         return array(
           self::CONDITION_INCLUDE_ALL,
           self::CONDITION_INCLUDE_ANY,
           self::CONDITION_INCLUDE_NONE,
           self::CONDITION_EXISTS,
           self::CONDITION_NOT_EXISTS,
         );
       case self::FIELD_DIFF_FILE:
       case self::FIELD_BRANCHES:
         return array(
           self::CONDITION_CONTAINS,
           self::CONDITION_REGEXP,
         );
       case self::FIELD_DIFF_CONTENT:
       case self::FIELD_DIFF_ADDED_CONTENT:
       case self::FIELD_DIFF_REMOVED_CONTENT:
         return array(
           self::CONDITION_CONTAINS,
           self::CONDITION_REGEXP,
           self::CONDITION_REGEXP_PAIR,
         );
       case self::FIELD_RULE:
         return array(
           self::CONDITION_RULE,
           self::CONDITION_NOT_RULE,
         );
       case self::FIELD_CONTENT_SOURCE:
         return array(
           self::CONDITION_IS,
           self::CONDITION_IS_NOT,
         );
       case self::FIELD_ALWAYS:
         return array(
           self::CONDITION_UNCONDITIONALLY,
         );
       case self::FIELD_DIFFERENTIAL_REVIEWERS:
         return array(
           self::CONDITION_EXISTS,
           self::CONDITION_NOT_EXISTS,
           self::CONDITION_INCLUDE_ALL,
           self::CONDITION_INCLUDE_ANY,
           self::CONDITION_INCLUDE_NONE,
         );
       case self::FIELD_DIFFERENTIAL_CCS:
         return array(
           self::CONDITION_INCLUDE_ALL,
           self::CONDITION_INCLUDE_ANY,
           self::CONDITION_INCLUDE_NONE,
         );
       case self::FIELD_DIFFERENTIAL_REVISION:
       case self::FIELD_DIFFERENTIAL_ACCEPTED:
         return array(
           self::CONDITION_EXISTS,
           self::CONDITION_NOT_EXISTS,
         );
       case self::FIELD_IS_MERGE_COMMIT:
       case self::FIELD_DIFF_ENORMOUS:
       case self::FIELD_IS_NEW_OBJECT:
       case self::FIELD_PUSHER_IS_COMMITTER:
         return array(
           self::CONDITION_IS_TRUE,
           self::CONDITION_IS_FALSE,
         );
       default:
         if ($this->isHeraldCustomKey($field)) {
           return $this->getCustomFieldConditions($field);
         }
         throw new Exception(
           "This adapter does not define conditions for field '{$field}'!");
     }
   }
 
   public function doesConditionMatch(
     HeraldEngine $engine,
     HeraldRule $rule,
     HeraldCondition $condition,
     $field_value) {
 
     $condition_type = $condition->getFieldCondition();
     $condition_value = $condition->getValue();
 
     switch ($condition_type) {
       case self::CONDITION_CONTAINS:
         // "Contains" can take an array of strings, as in "Any changed
         // filename" for diffs.
         foreach ((array)$field_value as $value) {
           if (stripos($value, $condition_value) !== false) {
             return true;
           }
         }
         return false;
       case self::CONDITION_NOT_CONTAINS:
         return (stripos($field_value, $condition_value) === false);
       case self::CONDITION_IS:
         return ($field_value == $condition_value);
       case self::CONDITION_IS_NOT:
         return ($field_value != $condition_value);
       case self::CONDITION_IS_ME:
         return ($field_value == $rule->getAuthorPHID());
       case self::CONDITION_IS_NOT_ME:
         return ($field_value != $rule->getAuthorPHID());
       case self::CONDITION_IS_ANY:
         if (!is_array($condition_value)) {
           throw new HeraldInvalidConditionException(
-            "Expected condition value to be an array.");
+            'Expected condition value to be an array.');
         }
         $condition_value = array_fuse($condition_value);
         return isset($condition_value[$field_value]);
       case self::CONDITION_IS_NOT_ANY:
         if (!is_array($condition_value)) {
           throw new HeraldInvalidConditionException(
-            "Expected condition value to be an array.");
+            'Expected condition value to be an array.');
         }
         $condition_value = array_fuse($condition_value);
         return !isset($condition_value[$field_value]);
       case self::CONDITION_INCLUDE_ALL:
         if (!is_array($field_value)) {
           throw new HeraldInvalidConditionException(
-            "Object produced non-array value!");
+            'Object produced non-array value!');
         }
         if (!is_array($condition_value)) {
           throw new HeraldInvalidConditionException(
-            "Expected condition value to be an array.");
+            'Expected condition value to be an array.');
         }
 
         $have = array_select_keys(array_fuse($field_value), $condition_value);
         return (count($have) == count($condition_value));
       case self::CONDITION_INCLUDE_ANY:
         return (bool)array_select_keys(
           array_fuse($field_value),
           $condition_value);
       case self::CONDITION_INCLUDE_NONE:
         return !array_select_keys(
           array_fuse($field_value),
           $condition_value);
       case self::CONDITION_EXISTS:
       case self::CONDITION_IS_TRUE:
         return (bool)$field_value;
       case self::CONDITION_NOT_EXISTS:
       case self::CONDITION_IS_FALSE:
         return !$field_value;
       case self::CONDITION_UNCONDITIONALLY:
         return (bool)$field_value;
       case self::CONDITION_NEVER:
         return false;
       case self::CONDITION_REGEXP:
         foreach ((array)$field_value as $value) {
           // We add the 'S' flag because we use the regexp multiple times.
           // It shouldn't cause any troubles if the flag is already there
           // - /.*/S is evaluated same as /.*/SS.
           $result = @preg_match($condition_value . 'S', $value);
           if ($result === false) {
             throw new HeraldInvalidConditionException(
-              "Regular expression is not valid!");
+              'Regular expression is not valid!');
           }
           if ($result) {
             return true;
           }
         }
         return false;
       case self::CONDITION_REGEXP_PAIR:
         // Match a JSON-encoded pair of regular expressions against a
         // dictionary. The first regexp must match the dictionary key, and the
         // second regexp must match the dictionary value. If any key/value pair
         // in the dictionary matches both regexps, the condition is satisfied.
         $regexp_pair = json_decode($condition_value, true);
         if (!is_array($regexp_pair)) {
           throw new HeraldInvalidConditionException(
-            "Regular expression pair is not valid JSON!");
+            'Regular expression pair is not valid JSON!');
         }
         if (count($regexp_pair) != 2) {
           throw new HeraldInvalidConditionException(
-            "Regular expression pair is not a pair!");
+            'Regular expression pair is not a pair!');
         }
 
         $key_regexp   = array_shift($regexp_pair);
         $value_regexp = array_shift($regexp_pair);
 
         foreach ((array)$field_value as $key => $value) {
           $key_matches = @preg_match($key_regexp, $key);
           if ($key_matches === false) {
             throw new HeraldInvalidConditionException(
-              "First regular expression is invalid!");
+              'First regular expression is invalid!');
           }
           if ($key_matches) {
             $value_matches = @preg_match($value_regexp, $value);
             if ($value_matches === false) {
               throw new HeraldInvalidConditionException(
-                "Second regular expression is invalid!");
+                'Second regular expression is invalid!');
             }
             if ($value_matches) {
               return true;
             }
           }
         }
         return false;
       case self::CONDITION_RULE:
       case self::CONDITION_NOT_RULE:
         $rule = $engine->getRule($condition_value);
         if (!$rule) {
           throw new HeraldInvalidConditionException(
-            "Condition references a rule which does not exist!");
+            'Condition references a rule which does not exist!');
         }
 
         $is_not = ($condition_type == self::CONDITION_NOT_RULE);
         $result = $engine->doesRuleMatch($rule, $this);
         if ($is_not) {
           $result = !$result;
         }
         return $result;
       case self::CONDITION_HAS_BIT:
         return (($condition_value & $field_value) === (int) $condition_value);
       case self::CONDITION_NOT_BIT:
         return (($condition_value & $field_value) !== (int) $condition_value);
       default:
         throw new HeraldInvalidConditionException(
           "Unknown condition '{$condition_type}'.");
     }
   }
 
   public function willSaveCondition(HeraldCondition $condition) {
     $condition_type = $condition->getFieldCondition();
     $condition_value = $condition->getValue();
 
     switch ($condition_type) {
       case self::CONDITION_REGEXP:
         $ok = @preg_match($condition_value, '');
         if ($ok === false) {
           throw new HeraldInvalidConditionException(
             pht(
               'The regular expression "%s" is not valid. Regular expressions '.
               'must have enclosing characters (e.g. "@/path/to/file@", not '.
               '"/path/to/file") and be syntactically correct.',
               $condition_value));
         }
         break;
       case self::CONDITION_REGEXP_PAIR:
         $json = json_decode($condition_value, true);
         if (!is_array($json)) {
           throw new HeraldInvalidConditionException(
             pht(
               'The regular expression pair "%s" is not valid JSON. Enter a '.
               'valid JSON array with two elements.',
               $condition_value));
         }
 
         if (count($json) != 2) {
           throw new HeraldInvalidConditionException(
             pht(
               'The regular expression pair "%s" must have exactly two '.
               'elements.',
               $condition_value));
         }
 
         $key_regexp = array_shift($json);
         $val_regexp = array_shift($json);
 
         $key_ok = @preg_match($key_regexp, '');
         if ($key_ok === false) {
           throw new HeraldInvalidConditionException(
             pht(
               'The first regexp in the regexp pair, "%s", is not a valid '.
               'regexp.',
               $key_regexp));
         }
 
         $val_ok = @preg_match($val_regexp, '');
         if ($val_ok === false) {
           throw new HeraldInvalidConditionException(
             pht(
               'The second regexp in the regexp pair, "%s", is not a valid '.
               'regexp.',
               $val_regexp));
         }
         break;
       case self::CONDITION_CONTAINS:
       case self::CONDITION_NOT_CONTAINS:
       case self::CONDITION_IS:
       case self::CONDITION_IS_NOT:
       case self::CONDITION_IS_ANY:
       case self::CONDITION_IS_NOT_ANY:
       case self::CONDITION_INCLUDE_ALL:
       case self::CONDITION_INCLUDE_ANY:
       case self::CONDITION_INCLUDE_NONE:
       case self::CONDITION_IS_ME:
       case self::CONDITION_IS_NOT_ME:
       case self::CONDITION_RULE:
       case self::CONDITION_NOT_RULE:
       case self::CONDITION_EXISTS:
       case self::CONDITION_NOT_EXISTS:
       case self::CONDITION_UNCONDITIONALLY:
       case self::CONDITION_NEVER:
       case self::CONDITION_HAS_BIT:
       case self::CONDITION_NOT_BIT:
       case self::CONDITION_IS_TRUE:
       case self::CONDITION_IS_FALSE:
         // No explicit validation for these types, although there probably
         // should be in some cases.
         break;
       default:
         throw new HeraldInvalidConditionException(
           pht(
             'Unknown condition "%s"!',
             $condition_type));
     }
   }
 
 
 /* -(  Actions  )------------------------------------------------------------ */
 
   abstract public function getActions($rule_type);
 
   public function getActionNameMap($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
       case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
         return array(
           self::ACTION_NOTHING      => pht('Do nothing'),
           self::ACTION_ADD_CC       => pht('Add emails to CC'),
           self::ACTION_REMOVE_CC    => pht('Remove emails from CC'),
           self::ACTION_EMAIL        => pht('Send an email to'),
           self::ACTION_AUDIT        => pht('Trigger an Audit by'),
           self::ACTION_FLAG         => pht('Mark with flag'),
           self::ACTION_ASSIGN_TASK  => pht('Assign task to'),
           self::ACTION_ADD_PROJECTS => pht('Add projects'),
           self::ACTION_ADD_REVIEWERS => pht('Add reviewers'),
           self::ACTION_ADD_BLOCKING_REVIEWERS => pht('Add blocking reviewers'),
           self::ACTION_APPLY_BUILD_PLANS => pht('Run build plans'),
           self::ACTION_BLOCK => pht('Block change with message'),
         );
       case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
         return array(
           self::ACTION_NOTHING      => pht('Do nothing'),
           self::ACTION_ADD_CC       => pht('Add me to CC'),
           self::ACTION_REMOVE_CC    => pht('Remove me from CC'),
           self::ACTION_EMAIL        => pht('Send me an email'),
           self::ACTION_AUDIT        => pht('Trigger an Audit by me'),
           self::ACTION_FLAG         => pht('Mark with flag'),
           self::ACTION_ASSIGN_TASK  => pht('Assign task to me'),
           self::ACTION_ADD_PROJECTS => pht('Add projects'),
           self::ACTION_ADD_REVIEWERS => pht('Add me as a reviewer'),
           self::ACTION_ADD_BLOCKING_REVIEWERS =>
             pht('Add me as a blocking reviewer'),
         );
       default:
         throw new Exception("Unknown rule type '{$rule_type}'!");
     }
   }
 
   public function willSaveAction(
     HeraldRule $rule,
     HeraldAction $action) {
 
     $target = $action->getTarget();
     if (is_array($target)) {
       $target = array_keys($target);
     }
 
     $author_phid = $rule->getAuthorPHID();
 
     $rule_type = $rule->getRuleType();
     if ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) {
       switch ($action->getAction()) {
         case self::ACTION_EMAIL:
         case self::ACTION_ADD_CC:
         case self::ACTION_REMOVE_CC:
         case self::ACTION_AUDIT:
         case self::ACTION_ASSIGN_TASK:
         case self::ACTION_ADD_REVIEWERS:
         case self::ACTION_ADD_BLOCKING_REVIEWERS:
           // For personal rules, force these actions to target the rule owner.
           $target = array($author_phid);
           break;
         case self::ACTION_FLAG:
           // Make sure flag color is valid; set to blue if not.
           $color_map = PhabricatorFlagColor::getColorNameMap();
           if (empty($color_map[$target])) {
             $target = PhabricatorFlagColor::COLOR_BLUE;
           }
           break;
         case self::ACTION_BLOCK:
         case self::ACTION_NOTHING:
           break;
         default:
           throw new HeraldInvalidActionException(
             pht(
               'Unrecognized action type "%s"!',
               $action->getAction()));
       }
     }
 
     $action->setTarget($target);
   }
 
 
 
 /* -(  Values  )------------------------------------------------------------- */
 
 
   public function getValueTypeForFieldAndCondition($field, $condition) {
 
     if ($this->isHeraldCustomKey($field)) {
       $value_type = $this->getCustomFieldValueTypeForFieldAndCondition(
         $field,
         $condition);
       if ($value_type !== null) {
         return $value_type;
       }
     }
 
     switch ($condition) {
       case self::CONDITION_CONTAINS:
       case self::CONDITION_NOT_CONTAINS:
       case self::CONDITION_REGEXP:
       case self::CONDITION_REGEXP_PAIR:
         return self::VALUE_TEXT;
       case self::CONDITION_IS:
       case self::CONDITION_IS_NOT:
         switch ($field) {
           case self::FIELD_CONTENT_SOURCE:
             return self::VALUE_CONTENT_SOURCE;
           default:
             return self::VALUE_TEXT;
         }
         break;
       case self::CONDITION_IS_ANY:
       case self::CONDITION_IS_NOT_ANY:
         switch ($field) {
           case self::FIELD_REPOSITORY:
             return self::VALUE_REPOSITORY;
           case self::FIELD_TASK_PRIORITY:
             return self::VALUE_TASK_PRIORITY;
           case self::FIELD_ARCANIST_PROJECT:
             return self::VALUE_ARCANIST_PROJECT;
           default:
             return self::VALUE_USER;
         }
         break;
       case self::CONDITION_INCLUDE_ALL:
       case self::CONDITION_INCLUDE_ANY:
       case self::CONDITION_INCLUDE_NONE:
         switch ($field) {
           case self::FIELD_REPOSITORY:
             return self::VALUE_REPOSITORY;
           case self::FIELD_CC:
             return self::VALUE_EMAIL;
           case self::FIELD_TAGS:
             return self::VALUE_TAG;
           case self::FIELD_AFFECTED_PACKAGE:
             return self::VALUE_OWNERS_PACKAGE;
           case self::FIELD_AUTHOR_PROJECTS:
           case self::FIELD_PUSHER_PROJECTS:
           case self::FIELD_PROJECTS:
           case self::FIELD_REPOSITORY_PROJECTS:
             return self::VALUE_PROJECT;
           case self::FIELD_REVIEWERS:
             return self::VALUE_USER_OR_PROJECT;
           default:
             return self::VALUE_USER;
         }
         break;
       case self::CONDITION_IS_ME:
       case self::CONDITION_IS_NOT_ME:
       case self::CONDITION_EXISTS:
       case self::CONDITION_NOT_EXISTS:
       case self::CONDITION_UNCONDITIONALLY:
       case self::CONDITION_NEVER:
       case self::CONDITION_IS_TRUE:
       case self::CONDITION_IS_FALSE:
         return self::VALUE_NONE;
       case self::CONDITION_RULE:
       case self::CONDITION_NOT_RULE:
         return self::VALUE_RULE;
       default:
         throw new Exception("Unknown condition '{$condition}'.");
     }
   }
 
   public static function getValueTypeForAction($action, $rule_type) {
     $is_personal = ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
 
     if ($is_personal) {
       switch ($action) {
         case self::ACTION_ADD_CC:
         case self::ACTION_REMOVE_CC:
         case self::ACTION_EMAIL:
         case self::ACTION_NOTHING:
         case self::ACTION_AUDIT:
         case self::ACTION_ASSIGN_TASK:
         case self::ACTION_ADD_REVIEWERS:
         case self::ACTION_ADD_BLOCKING_REVIEWERS:
           return self::VALUE_NONE;
         case self::ACTION_FLAG:
           return self::VALUE_FLAG_COLOR;
         case self::ACTION_ADD_PROJECTS:
           return self::VALUE_PROJECT;
         default:
           throw new Exception("Unknown or invalid action '{$action}'.");
       }
     } else {
       switch ($action) {
         case self::ACTION_ADD_CC:
         case self::ACTION_REMOVE_CC:
         case self::ACTION_EMAIL:
           return self::VALUE_EMAIL;
         case self::ACTION_NOTHING:
           return self::VALUE_NONE;
         case self::ACTION_ADD_PROJECTS:
           return self::VALUE_PROJECT;
         case self::ACTION_FLAG:
           return self::VALUE_FLAG_COLOR;
         case self::ACTION_ASSIGN_TASK:
           return self::VALUE_USER;
         case self::ACTION_AUDIT:
         case self::ACTION_ADD_REVIEWERS:
         case self::ACTION_ADD_BLOCKING_REVIEWERS:
           return self::VALUE_USER_OR_PROJECT;
         case self::ACTION_APPLY_BUILD_PLANS:
           return self::VALUE_BUILD_PLAN;
         case self::ACTION_BLOCK:
           return self::VALUE_TEXT;
         default:
           throw new Exception("Unknown or invalid action '{$action}'.");
       }
     }
   }
 
 
 /* -(  Repetition  )--------------------------------------------------------- */
 
 
   public function getRepetitionOptions() {
     return array(
       HeraldRepetitionPolicyConfig::EVERY,
     );
   }
 
 
   public static function applyFlagEffect(HeraldEffect $effect, $phid) {
     $color = $effect->getTarget();
 
     // TODO: Silly that we need to load this again here.
     $rule = id(new HeraldRule())->load($effect->getRuleID());
     $user = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $rule->getAuthorPHID());
 
     $flag = PhabricatorFlagQuery::loadUserFlag($user, $phid);
     if ($flag) {
       return new HeraldApplyTranscript(
         $effect,
         false,
         pht('Object already flagged.'));
     }
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($phid))
       ->executeOne();
 
     $flag = new PhabricatorFlag();
     $flag->setOwnerPHID($user->getPHID());
     $flag->setType($handle->getType());
     $flag->setObjectPHID($handle->getPHID());
 
     // TOOD: Should really be transcript PHID, but it doesn't exist yet.
     $flag->setReasonPHID($user->getPHID());
 
     $flag->setColor($color);
     $flag->setNote(
       pht('Flagged by Herald Rule "%s".', $rule->getName()));
     $flag->save();
 
     return new HeraldApplyTranscript(
       $effect,
       true,
       pht('Added flag.'));
   }
 
   public static function getAllAdapters() {
     static $adapters;
     if (!$adapters) {
       $adapters = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
         ->loadObjects();
       $adapters = msort($adapters, 'getAdapterSortKey');
     }
     return $adapters;
   }
 
   public static function getAdapterForContentType($content_type) {
     $adapters = self::getAllAdapters();
 
     foreach ($adapters as $adapter) {
       if ($adapter->getAdapterContentType() == $content_type) {
         return $adapter;
       }
     }
 
     throw new Exception(
       pht(
         'No adapter exists for Herald content type "%s".',
         $content_type));
   }
 
   public static function getEnabledAdapterMap(PhabricatorUser $viewer) {
     $map = array();
 
     $adapters = HeraldAdapter::getAllAdapters();
     foreach ($adapters as $adapter) {
       if (!$adapter->isAvailableToUser($viewer)) {
         continue;
       }
       $type = $adapter->getAdapterContentType();
       $name = $adapter->getAdapterContentName();
       $map[$type] = $name;
     }
 
     return $map;
   }
 
   public function renderRuleAsText(HeraldRule $rule, array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
 
     require_celerity_resource('herald-css');
 
     $icon = id(new PHUIIconView())
       ->setIconFont('fa-chevron-circle-right lightgreytext')
       ->addClass('herald-list-icon');
 
     if ($rule->getMustMatchAll()) {
       $match_text = pht('When all of these conditions are met:');
     } else {
       $match_text = pht('When any of these conditions are met:');
     }
 
     $match_title = phutil_tag(
       'p',
       array(
         'class' => 'herald-list-description'
       ),
       $match_text);
 
     $match_list = array();
     foreach ($rule->getConditions() as $condition) {
       $match_list[] = phutil_tag(
         'div',
         array(
           'class' => 'herald-list-item'
         ),
         array(
           $icon,
           $this->renderConditionAsText($condition, $handles)));
     }
 
     $integer_code_for_every = HeraldRepetitionPolicyConfig::toInt(
       HeraldRepetitionPolicyConfig::EVERY);
 
     if ($rule->getRepetitionPolicy() == $integer_code_for_every) {
       $action_text =
         pht('Take these actions every time this rule matches:');
     } else {
       $action_text =
         pht('Take these actions the first time this rule matches:');
     }
 
     $action_title = phutil_tag(
       'p',
       array(
         'class' => 'herald-list-description'
       ),
       $action_text);
 
     $action_list = array();
     foreach ($rule->getActions() as $action) {
       $action_list[] = phutil_tag(
         'div',
         array(
           'class' => 'herald-list-item'
         ),
         array(
           $icon,
           $this->renderActionAsText($action, $handles)));    }
 
     return array(
       $match_title,
       $match_list,
       $action_title,
       $action_list);
   }
 
   private function renderConditionAsText(
     HeraldCondition $condition,
     array $handles) {
 
     $field_type = $condition->getFieldName();
 
     $default = $this->isHeraldCustomKey($field_type)
       ? pht('(Unknown Custom Field "%s")', $field_type)
       : pht('(Unknown Field "%s")', $field_type);
 
     $field_name = idx($this->getFieldNameMap(), $field_type, $default);
 
     $condition_type = $condition->getFieldCondition();
     $condition_name = idx($this->getConditionNameMap(), $condition_type);
 
     $value = $this->renderConditionValueAsText($condition, $handles);
 
     return hsprintf('    %s %s %s', $field_name, $condition_name, $value);
   }
 
   private function renderActionAsText(
     HeraldAction $action,
     array $handles) {
     $rule_global = HeraldRuleTypeConfig::RULE_TYPE_GLOBAL;
 
     $action_type = $action->getAction();
     $action_name = idx($this->getActionNameMap($rule_global), $action_type);
 
     $target = $this->renderActionTargetAsText($action, $handles);
 
     return hsprintf('    %s %s', $action_name, $target);
   }
 
   private function renderConditionValueAsText(
     HeraldCondition $condition,
     array $handles) {
 
     $value = $condition->getValue();
     if (!is_array($value)) {
       $value = array($value);
     }
     switch ($condition->getFieldName()) {
       case self::FIELD_TASK_PRIORITY:
         $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
         foreach ($value as $index => $val) {
           $name = idx($priority_map, $val);
           if ($name) {
             $value[$index] = $name;
           }
         }
         break;
       case HeraldPreCommitRefAdapter::FIELD_REF_CHANGE:
         $change_map =
           PhabricatorRepositoryPushLog::getHeraldChangeFlagConditionOptions();
         foreach ($value as $index => $val) {
           $name = idx($change_map, $val);
           if ($name) {
             $value[$index] = $name;
           }
         }
         break;
       default:
         foreach ($value as $index => $val) {
           $handle = idx($handles, $val);
           if ($handle) {
             $value[$index] = $handle->renderLink();
           }
         }
         break;
     }
     $value = phutil_implode_html(', ', $value);
     return $value;
   }
 
   private function renderActionTargetAsText(
     HeraldAction $action,
     array $handles) {
 
     $target = $action->getTarget();
     if (!is_array($target)) {
       $target = array($target);
     }
     foreach ($target as $index => $val) {
       switch ($action->getAction()) {
         case self::ACTION_FLAG:
           $target[$index] = PhabricatorFlagColor::getColorName($val);
           break;
         default:
           $handle = idx($handles, $val);
           if ($handle) {
             $target[$index] = $handle->renderLink();
           }
           break;
       }
     }
     $target = phutil_implode_html(', ', $target);
     return $target;
   }
 
   /**
    * Given a @{class:HeraldRule}, this function extracts all the phids that
    * we'll want to load as handles later.
    *
    * This function performs a somewhat hacky approach to figuring out what
    * is and is not a phid - try to get the phid type and if the type is
    * *not* unknown assume its a valid phid.
    *
    * Don't try this at home. Use more strongly typed data at home.
    *
    * Think of the children.
    */
   public static function getHandlePHIDs(HeraldRule $rule) {
     $phids = array($rule->getAuthorPHID());
     foreach ($rule->getConditions() as $condition) {
       $value = $condition->getValue();
       if (!is_array($value)) {
         $value = array($value);
       }
       foreach ($value as $val) {
         if (phid_get_type($val) !=
             PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
           $phids[] = $val;
         }
       }
     }
 
     foreach ($rule->getActions() as $action) {
       $target = $action->getTarget();
       if (!is_array($target)) {
         $target = array($target);
       }
       foreach ($target as $val) {
         if (phid_get_type($val) !=
             PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
           $phids[] = $val;
         }
       }
     }
 
     if ($rule->isObjectRule()) {
       $phids[] = $rule->getTriggerObjectPHID();
     }
 
     return $phids;
   }
 
 /* -(  Custom Field Integration  )------------------------------------------- */
 
 
   /**
    * Return an object which custom fields can be generated from while editing
    * rules. Adapters must return an object from this method to enable custom
    * field rules.
    *
    * Normally, you'll return an empty version of the adapted object, assuming
    * it implements @{interface:PhabricatorCustomFieldInterface}:
    *
    *   return new ApplicationObject();
    *
    * This is normally the only adapter method you need to override to enable
    * Herald rules to run against custom fields.
    *
    * @return null|PhabricatorCustomFieldInterface Template object.
    * @task customfield
    */
   protected function getCustomFieldTemplateObject() {
     return null;
   }
 
 
   /**
    * Returns the prefix used to namespace Herald fields which are based on
    * custom fields.
    *
    * @return string Key prefix.
    * @task customfield
    */
   private function getCustomKeyPrefix() {
     return 'herald.custom/';
   }
 
 
   /**
    * Determine if a field key is based on a custom field or a regular internal
    * field.
    *
    * @param string Field key.
    * @return bool True if the field key is based on a custom field.
    * @task customfield
    */
   private function isHeraldCustomKey($key) {
     $prefix = $this->getCustomKeyPrefix();
     return (strncmp($key, $prefix, strlen($prefix)) == 0);
   }
 
 
   /**
    * Convert a custom field key into a Herald field key.
    *
    * @param string Custom field key.
    * @return string Herald field key.
    * @task customfield
    */
   private function getHeraldKeyFromCustomKey($key) {
     return $this->getCustomKeyPrefix().$key;
   }
 
 
   /**
    * Get custom fields for this adapter, if appliable. This will either return
    * a field list or `null` if the adapted object does not implement custom
    * fields or the adapter does not support them.
    *
    * @return PhabricatorCustomFieldList|null List of fields, or `null`.
    * @task customfield
    */
   private function getCustomFields() {
     if ($this->customFields === false) {
       $this->customFields = null;
 
 
       $template_object = $this->getCustomFieldTemplateObject();
       if ($template_object) {
         $object = $this->getObject();
         if (!$object) {
           $object = $template_object;
         }
 
         $fields = PhabricatorCustomField::getObjectFields(
           $object,
           PhabricatorCustomField::ROLE_HERALD);
         $fields->setViewer(PhabricatorUser::getOmnipotentUser());
         $fields->readFieldsFromStorage($object);
 
         $this->customFields = $fields;
       }
     }
 
     return $this->customFields;
   }
 
 
   /**
    * Get a custom field by Herald field key, or `null` if it does not exist
    * or custom fields are not supported.
    *
    * @param string Herald field key.
    * @return PhabricatorCustomField|null Matching field, if it exists.
    * @task customfield
    */
   private function getCustomField($herald_field_key) {
     $fields = $this->getCustomFields();
     if (!$fields) {
       return null;
     }
 
     foreach ($fields->getFields() as $custom_field) {
       $key = $custom_field->getFieldKey();
       if ($this->getHeraldKeyFromCustomKey($key) == $herald_field_key) {
         return $custom_field;
       }
     }
 
     return null;
   }
 
 
   /**
    * Get the field map for custom fields.
    *
    * @return map<string, string> Map of Herald field keys to field names.
    * @task customfield
    */
   private function getCustomFieldNameMap() {
     $fields = $this->getCustomFields();
     if (!$fields) {
       return array();
     }
 
     $map = array();
     foreach ($fields->getFields() as $field) {
       $key = $field->getFieldKey();
       $name = $field->getHeraldFieldName();
       $map[$this->getHeraldKeyFromCustomKey($key)] = $name;
     }
 
     return $map;
   }
 
 
   /**
    * Get the value for a custom field.
    *
    * @param string Herald field key.
    * @return wild Custom field value.
    * @task customfield
    */
   private function getCustomFieldValue($field_key) {
     $field = $this->getCustomField($field_key);
     if (!$field) {
       return null;
     }
 
     return $field->getHeraldFieldValue();
   }
 
 
   /**
    * Get the Herald conditions for a custom field.
    *
    * @param string Herald field key.
    * @return list<const> List of Herald conditions.
    * @task customfield
    */
   private function getCustomFieldConditions($field_key) {
     $field = $this->getCustomField($field_key);
     if (!$field) {
       return array(
         self::CONDITION_NEVER,
       );
     }
 
     return $field->getHeraldFieldConditions();
   }
 
 
   /**
    * Get the Herald value type for a custom field and condition.
    *
    * @param string Herald field key.
    * @param const Herald condition constant.
    * @return const|null Herald value type constant, or null to use the default.
    * @task customfield
    */
   private function getCustomFieldValueTypeForFieldAndCondition(
     $field_key,
     $condition) {
 
     $field = $this->getCustomField($field_key);
     if (!$field) {
       return self::VALUE_NONE;
     }
 
     return $field->getHeraldFieldValueType($condition);
   }
 
 
 }
diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
index 3d1827882..c31a38f90 100644
--- a/src/applications/herald/adapter/HeraldCommitAdapter.php
+++ b/src/applications/herald/adapter/HeraldCommitAdapter.php
@@ -1,552 +1,552 @@
 <?php
 
 /**
  * @group herald
  */
 final class HeraldCommitAdapter extends HeraldAdapter {
 
   const FIELD_NEED_AUDIT_FOR_PACKAGE      = 'need-audit-for-package';
   const FIELD_REPOSITORY_AUTOCLOSE_BRANCH = 'repository-autoclose-branch';
 
   protected $diff;
   protected $revision;
 
   protected $repository;
   protected $commit;
   protected $commitData;
   private $commitDiff;
 
   protected $emailPHIDs = array();
   protected $addCCPHIDs = array();
   protected $auditMap = array();
   protected $buildPlans = array();
 
   protected $affectedPaths;
   protected $affectedRevision;
   protected $affectedPackages;
   protected $auditNeededPackages;
 
   public function getAdapterApplicationClass() {
     return 'PhabricatorApplicationDiffusion';
   }
 
   public function getObject() {
     return $this->commit;
   }
 
   public function getAdapterContentType() {
     return 'commit';
   }
 
   public function getAdapterContentName() {
     return pht('Commits');
   }
 
   public function getAdapterContentDescription() {
     return pht(
       "React to new commits appearing in tracked repositories.\n".
       "Commit rules can send email, flag commits, trigger audits, ".
       "and run build plans.");
   }
 
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
       case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
       case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
         return true;
       default:
         return false;
     }
   }
 
   public function canTriggerOnObject($object) {
     if ($object instanceof PhabricatorRepository) {
       return true;
     }
     if ($object instanceof PhabricatorProject) {
       return true;
     }
     return false;
   }
 
   public function getTriggerObjectPHIDs() {
     return array_merge(
       array(
         $this->repository->getPHID(),
         $this->getPHID(),
       ),
       $this->repository->getProjectPHIDs());
   }
 
   public function explainValidTriggerObjects() {
     return pht(
       'This rule can trigger for **repositories** and **projects**.');
   }
 
   public function getFieldNameMap() {
     return array(
       self::FIELD_NEED_AUDIT_FOR_PACKAGE =>
         pht('Affected packages that need audit'),
       self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH
         => pht('Commit is on closing branch'),
     ) + parent::getFieldNameMap();
   }
 
   public function getFields() {
     return array_merge(
       array(
         self::FIELD_BODY,
         self::FIELD_AUTHOR,
         self::FIELD_COMMITTER,
         self::FIELD_REVIEWER,
         self::FIELD_REPOSITORY,
         self::FIELD_REPOSITORY_PROJECTS,
         self::FIELD_DIFF_FILE,
         self::FIELD_DIFF_CONTENT,
         self::FIELD_DIFF_ADDED_CONTENT,
         self::FIELD_DIFF_REMOVED_CONTENT,
         self::FIELD_DIFF_ENORMOUS,
         self::FIELD_AFFECTED_PACKAGE,
         self::FIELD_AFFECTED_PACKAGE_OWNER,
         self::FIELD_NEED_AUDIT_FOR_PACKAGE,
         self::FIELD_DIFFERENTIAL_REVISION,
         self::FIELD_DIFFERENTIAL_ACCEPTED,
         self::FIELD_DIFFERENTIAL_REVIEWERS,
         self::FIELD_DIFFERENTIAL_CCS,
         self::FIELD_BRANCHES,
         self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH,
       ),
       parent::getFields());
   }
 
   public function getConditionsForField($field) {
     switch ($field) {
       case self::FIELD_NEED_AUDIT_FOR_PACKAGE:
         return array(
           self::CONDITION_INCLUDE_ANY,
           self::CONDITION_INCLUDE_NONE,
         );
       case self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH:
         return array(
           self::CONDITION_UNCONDITIONALLY,
         );
     }
     return parent::getConditionsForField($field);
   }
 
   public function getActions($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
       case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
         return array(
           self::ACTION_ADD_CC,
           self::ACTION_EMAIL,
           self::ACTION_AUDIT,
           self::ACTION_APPLY_BUILD_PLANS,
           self::ACTION_NOTHING
         );
       case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
         return array(
           self::ACTION_ADD_CC,
           self::ACTION_EMAIL,
           self::ACTION_FLAG,
           self::ACTION_AUDIT,
           self::ACTION_NOTHING,
         );
     }
   }
 
   public function getValueTypeForFieldAndCondition($field, $condition) {
     switch ($field) {
       case self::FIELD_DIFFERENTIAL_CCS:
         return self::VALUE_EMAIL;
       case self::FIELD_NEED_AUDIT_FOR_PACKAGE:
         return self::VALUE_OWNERS_PACKAGE;
     }
 
     return parent::getValueTypeForFieldAndCondition($field, $condition);
   }
 
   public static function newLegacyAdapter(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepositoryCommitData $commit_data) {
 
     $object = new HeraldCommitAdapter();
 
     $commit->attachRepository($repository);
 
     $object->repository = $repository;
     $object->commit = $commit;
     $object->commitData = $commit_data;
 
     return $object;
   }
 
   public function setCommit(PhabricatorRepositoryCommit $commit) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($viewer)
       ->withIDs(array($commit->getRepositoryID()))
       ->needProjectPHIDs(true)
       ->executeOne();
     if (!$repository) {
       throw new Exception(pht('Unable to load repository!'));
     }
 
     $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
       'commitID = %d',
       $commit->getID());
     if (!$data) {
       throw new Exception(pht('Unable to load commit data!'));
     }
 
     $this->commit = clone $commit;
     $this->commit->attachRepository($repository);
     $this->commit->attachCommitData($data);
 
     $this->repository = $repository;
     $this->commitData = $data;
 
     return $this;
   }
 
   public function getPHID() {
     return $this->commit->getPHID();
   }
 
   public function getEmailPHIDs() {
     return array_keys($this->emailPHIDs);
   }
 
   public function getAddCCMap() {
     return $this->addCCPHIDs;
   }
 
   public function getAuditMap() {
     return $this->auditMap;
   }
 
   public function getBuildPlans() {
     return $this->buildPlans;
   }
 
   public function getHeraldName() {
     return
       'r'.
       $this->repository->getCallsign().
       $this->commit->getCommitIdentifier();
   }
 
   public function loadAffectedPaths() {
     if ($this->affectedPaths === null) {
       $result = PhabricatorOwnerPathQuery::loadAffectedPaths(
         $this->repository,
         $this->commit,
         PhabricatorUser::getOmnipotentUser());
       $this->affectedPaths = $result;
     }
     return $this->affectedPaths;
   }
 
   public function loadAffectedPackages() {
     if ($this->affectedPackages === null) {
       $packages = PhabricatorOwnersPackage::loadAffectedPackages(
         $this->repository,
         $this->loadAffectedPaths());
       $this->affectedPackages = $packages;
     }
     return $this->affectedPackages;
   }
 
   public function loadAuditNeededPackage() {
     if ($this->auditNeededPackages === null) {
       $status_arr = array(
         PhabricatorAuditStatusConstants::AUDIT_REQUIRED,
         PhabricatorAuditStatusConstants::CONCERNED,
       );
       $requests = id(new PhabricatorRepositoryAuditRequest())
           ->loadAllWhere(
-        "commitPHID = %s AND auditStatus IN (%Ls)",
+        'commitPHID = %s AND auditStatus IN (%Ls)',
         $this->commit->getPHID(),
         $status_arr);
 
       $packages = mpull($requests, 'getAuditorPHID');
       $this->auditNeededPackages = $packages;
     }
     return $this->auditNeededPackages;
   }
 
   public function loadDifferentialRevision() {
     if ($this->affectedRevision === null) {
       $this->affectedRevision = false;
       $data = $this->commitData;
       $revision_id = $data->getCommitDetail('differential.revisionID');
       if ($revision_id) {
         // NOTE: The Herald rule owner might not actually have access to
         // the revision, and can control which revision a commit is
         // associated with by putting text in the commit message. However,
         // the rules they can write against revisions don't actually expose
         // anything interesting, so it seems reasonable to load unconditionally
         // here.
 
         $revision = id(new DifferentialRevisionQuery())
           ->withIDs(array($revision_id))
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->needRelationships(true)
           ->needReviewerStatus(true)
           ->executeOne();
         if ($revision) {
           $this->affectedRevision = $revision;
         }
       }
     }
     return $this->affectedRevision;
   }
 
   public static function getEnormousByteLimit() {
     return 1024 * 1024 * 1024; // 1GB
   }
 
   public static function getEnormousTimeLimit() {
     return 60 * 15; // 15 Minutes
   }
 
   private function loadCommitDiff() {
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => PhabricatorUser::getOmnipotentUser(),
         'repository' => $this->repository,
         'commit' => $this->commit->getCommitIdentifier(),
       ));
 
     $byte_limit = self::getEnormousByteLimit();
 
     $raw = DiffusionQuery::callConduitWithDiffusionRequest(
       PhabricatorUser::getOmnipotentUser(),
       $drequest,
       'diffusion.rawdiffquery',
       array(
         'commit' => $this->commit->getCommitIdentifier(),
         'timeout' => self::getEnormousTimeLimit(),
         'byteLimit' => $byte_limit,
         'linesOfContext' => 0,
       ));
 
     if (strlen($raw) >= $byte_limit) {
       throw new Exception(
         pht(
           'The raw text of this change is enormous (larger than %d bytes). '.
           'Herald can not process it.',
           $byte_limit));
     }
 
     $parser = new ArcanistDiffParser();
     $changes = $parser->parseDiff($raw);
 
     $diff = DifferentialDiff::newFromRawChanges($changes);
     return $diff;
   }
 
   private function getDiffContent($type) {
     if ($this->commitDiff === null) {
       try {
         $this->commitDiff = $this->loadCommitDiff();
       } catch (Exception $ex) {
         $this->commitDiff = $ex;
         phlog($ex);
       }
     }
 
     if ($this->commitDiff instanceof Exception) {
       $ex = $this->commitDiff;
       $ex_class = get_class($ex);
       $ex_message = pht('Failed to load changes: %s', $ex->getMessage());
 
       return array(
         '<'.$ex_class.'>' => $ex_message,
       );
     }
 
     $changes = $this->commitDiff->getChangesets();
 
     $result = array();
     foreach ($changes as $change) {
       $lines = array();
       foreach ($change->getHunks() as $hunk) {
         switch ($type) {
           case '-':
             $lines[] = $hunk->makeOldFile();
             break;
           case '+':
             $lines[] = $hunk->makeNewFile();
             break;
           case '*':
             $lines[] = $hunk->makeChanges();
             break;
           default:
             throw new Exception("Unknown content selection '{$type}'!");
         }
       }
       $result[$change->getFilename()] = implode("\n", $lines);
     }
 
     return $result;
   }
 
   public function getHeraldField($field) {
     $data = $this->commitData;
     switch ($field) {
       case self::FIELD_BODY:
         return $data->getCommitMessage();
       case self::FIELD_AUTHOR:
         return $data->getCommitDetail('authorPHID');
       case self::FIELD_COMMITTER:
         return $data->getCommitDetail('committerPHID');
       case self::FIELD_REVIEWER:
         return $data->getCommitDetail('reviewerPHID');
       case self::FIELD_DIFF_FILE:
         return $this->loadAffectedPaths();
       case self::FIELD_REPOSITORY:
         return $this->repository->getPHID();
       case self::FIELD_REPOSITORY_PROJECTS:
         return $this->repository->getProjectPHIDs();
       case self::FIELD_DIFF_CONTENT:
         return $this->getDiffContent('*');
       case self::FIELD_DIFF_ADDED_CONTENT:
         return $this->getDiffContent('+');
       case self::FIELD_DIFF_REMOVED_CONTENT:
         return $this->getDiffContent('-');
       case self::FIELD_DIFF_ENORMOUS:
         $this->getDiffContent('*');
         return ($this->commitDiff instanceof Exception);
       case self::FIELD_AFFECTED_PACKAGE:
         $packages = $this->loadAffectedPackages();
         return mpull($packages, 'getPHID');
       case self::FIELD_AFFECTED_PACKAGE_OWNER:
         $packages = $this->loadAffectedPackages();
         $owners = PhabricatorOwnersOwner::loadAllForPackages($packages);
         return mpull($owners, 'getUserPHID');
       case self::FIELD_NEED_AUDIT_FOR_PACKAGE:
         return $this->loadAuditNeededPackage();
       case self::FIELD_DIFFERENTIAL_REVISION:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return null;
         }
         return $revision->getID();
       case self::FIELD_DIFFERENTIAL_ACCEPTED:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return null;
         }
 
         switch ($revision->getStatus()) {
           case ArcanistDifferentialRevisionStatus::ACCEPTED:
           case ArcanistDifferentialRevisionStatus::CLOSED:
             return $revision->getPHID();
         }
 
         return null;
       case self::FIELD_DIFFERENTIAL_REVIEWERS:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return array();
         }
         return $revision->getReviewers();
       case self::FIELD_DIFFERENTIAL_CCS:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return array();
         }
         return $revision->getCCPHIDs();
       case self::FIELD_BRANCHES:
         $params = array(
           'callsign' => $this->repository->getCallsign(),
           'contains' => $this->commit->getCommitIdentifier(),
         );
 
         $result = id(new ConduitCall('diffusion.branchquery', $params))
           ->setUser(PhabricatorUser::getOmnipotentUser())
           ->execute();
 
         $refs = DiffusionRepositoryRef::loadAllFromDictionaries($result);
         return mpull($refs, 'getShortName');
       case self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH:
         return $this->repository->shouldAutocloseCommit(
           $this->commit,
           $this->commitData);
     }
 
     return parent::getHeraldField($field);
   }
 
   public function applyHeraldEffects(array $effects) {
     assert_instances_of($effects, 'HeraldEffect');
 
     $result = array();
     foreach ($effects as $effect) {
       $action = $effect->getAction();
       switch ($action) {
         case self::ACTION_NOTHING:
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Great success at doing nothing.'));
           break;
         case self::ACTION_EMAIL:
           foreach ($effect->getTarget() as $phid) {
             $this->emailPHIDs[$phid] = true;
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Added address to email targets.'));
           break;
         case self::ACTION_ADD_CC:
           foreach ($effect->getTarget() as $phid) {
             if (empty($this->addCCPHIDs[$phid])) {
               $this->addCCPHIDs[$phid] = array();
             }
             $this->addCCPHIDs[$phid][] = $effect->getRuleID();
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Added address to CC.'));
           break;
         case self::ACTION_AUDIT:
           foreach ($effect->getTarget() as $phid) {
             if (empty($this->auditMap[$phid])) {
               $this->auditMap[$phid] = array();
             }
             $this->auditMap[$phid][] = $effect->getRuleID();
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Triggered an audit.'));
           break;
         case self::ACTION_APPLY_BUILD_PLANS:
           foreach ($effect->getTarget() as $phid) {
             $this->buildPlans[] = $phid;
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Applied build plans.'));
           break;
         case self::ACTION_FLAG:
           $result[] = parent::applyFlagEffect(
             $effect,
             $this->commit->getPHID());
           break;
         default:
           throw new Exception("No rules to handle action '{$action}'.");
       }
     }
     return $result;
   }
 }
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index b770348ef..ecda679c8 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -1,657 +1,657 @@
 <?php
 
 final class HeraldRuleController extends HeraldController {
 
   private $id;
   private $filter;
 
   public function willProcessRequest(array $data) {
     $this->id = (int)idx($data, 'id');
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $content_type_map = HeraldAdapter::getEnabledAdapterMap($user);
     $rule_type_map = HeraldRuleTypeConfig::getRuleTypeMap();
 
     if ($this->id) {
       $id = $this->id;
       $rule = id(new HeraldRuleQuery())
         ->setViewer($user)
         ->withIDs(array($id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$rule) {
         return new Aphront404Response();
       }
       $cancel_uri = $this->getApplicationURI("rule/{$id}/");
     } else {
       $rule = new HeraldRule();
       $rule->setAuthorPHID($user->getPHID());
       $rule->setMustMatchAll(1);
 
       $content_type = $request->getStr('content_type');
       $rule->setContentType($content_type);
 
       $rule_type = $request->getStr('rule_type');
       if (!isset($rule_type_map[$rule_type])) {
         $rule_type = HeraldRuleTypeConfig::RULE_TYPE_PERSONAL;
       }
       $rule->setRuleType($rule_type);
 
       $adapter = HeraldAdapter::getAdapterForContentType(
         $rule->getContentType());
 
       if (!$adapter->supportsRuleType($rule->getRuleType())) {
         throw new Exception(
           pht(
             "This rule's content type does not support the selected rule ".
             "type."));
       }
 
       if ($rule->isObjectRule()) {
         $rule->setTriggerObjectPHID($request->getStr('targetPHID'));
         $object = id(new PhabricatorObjectQuery())
           ->setViewer($user)
           ->withPHIDs(array($rule->getTriggerObjectPHID()))
           ->requireCapabilities(
             array(
               PhabricatorPolicyCapability::CAN_VIEW,
               PhabricatorPolicyCapability::CAN_EDIT,
             ))
           ->executeOne();
         if (!$object) {
           throw new Exception(
             pht('No valid object provided for object rule!'));
         }
 
         if (!$adapter->canTriggerOnObject($object)) {
           throw new Exception(
             pht('Object is of wrong type for adapter!'));
         }
       }
 
       $cancel_uri = $this->getApplicationURI();
     }
 
     if ($rule->isGlobalRule()) {
       $this->requireApplicationCapability(
         HeraldCapabilityManageGlobalRules::CAPABILITY);
     }
 
     $adapter = HeraldAdapter::getAdapterForContentType($rule->getContentType());
 
     $local_version = id(new HeraldRule())->getConfigVersion();
     if ($rule->getConfigVersion() > $local_version) {
       throw new Exception(
         pht(
-          "This rule was created with a newer version of Herald. You can not ".
-          "view or edit it in this older version. Upgrade your Phabricator ".
-          "deployment."));
+          'This rule was created with a newer version of Herald. You can not '.
+          'view or edit it in this older version. Upgrade your Phabricator '.
+          'deployment.'));
     }
 
     // Upgrade rule version to our version, since we might add newly-defined
     // conditions, etc.
     $rule->setConfigVersion($local_version);
 
     $rule_conditions = $rule->loadConditions();
     $rule_actions = $rule->loadActions();
 
     $rule->attachConditions($rule_conditions);
     $rule->attachActions($rule_actions);
 
     $e_name = true;
     $errors = array();
     if ($request->isFormPost() && $request->getStr('save')) {
       list($e_name, $errors) = $this->saveRule($adapter, $rule, $request);
       if (!$errors) {
         $id = $rule->getID();
         $uri = $this->getApplicationURI("rule/{$id}/");
         return id(new AphrontRedirectResponse())->setURI($uri);
       }
     }
 
     $must_match_selector = $this->renderMustMatchSelector($rule);
     $repetition_selector = $this->renderRepetitionSelector($rule, $adapter);
 
     $handles = $this->loadHandlesForRule($rule);
 
     require_celerity_resource('herald-css');
 
     $content_type_name = $content_type_map[$rule->getContentType()];
     $rule_type_name = $rule_type_map[$rule->getRuleType()];
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->setID('herald-rule-edit-form')
       ->addHiddenInput('content_type', $rule->getContentType())
       ->addHiddenInput('rule_type', $rule->getRuleType())
       ->addHiddenInput('save', 1)
       ->appendChild(
         // Build this explicitly (instead of using addHiddenInput())
         // so we can add a sigil to it.
         javelin_tag(
           'input',
           array(
             'type'  => 'hidden',
             'name'  => 'rule',
             'sigil' => 'rule',
           )))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Rule Name'))
           ->setName('name')
           ->setError($e_name)
           ->setValue($rule->getName()));
 
     $trigger_object_control = false;
     if ($rule->isObjectRule()) {
       $trigger_object_control = id(new AphrontFormStaticControl())
         ->setValue(
           pht(
             'This rule triggers for %s.',
             $handles[$rule->getTriggerObjectPHID()]->renderLink()));
     }
 
 
     $form
       ->appendChild(
         id(new AphrontFormMarkupControl())
           ->setValue(pht(
-            "This %s rule triggers for %s.",
+            'This %s rule triggers for %s.',
             phutil_tag('strong', array(), $rule_type_name),
             phutil_tag('strong', array(), $content_type_name))))
       ->appendChild($trigger_object_control)
       ->appendChild(
         id(new AphrontFormInsetView())
           ->setTitle(pht('Conditions'))
           ->setRightButton(javelin_tag(
             'a',
             array(
               'href' => '#',
               'class' => 'button green',
               'sigil' => 'create-condition',
               'mustcapture' => true
             ),
             pht('New Condition')))
           ->setDescription(
             pht('When %s these conditions are met:', $must_match_selector))
           ->setContent(javelin_tag(
             'table',
             array(
               'sigil' => 'rule-conditions',
               'class' => 'herald-condition-table'
             ),
             '')))
       ->appendChild(
         id(new AphrontFormInsetView())
           ->setTitle(pht('Action'))
           ->setRightButton(javelin_tag(
             'a',
             array(
               'href' => '#',
               'class' => 'button green',
               'sigil' => 'create-action',
               'mustcapture' => true,
             ),
             pht('New Action')))
           ->setDescription(pht(
             'Take these actions %s this rule matches:',
             $repetition_selector))
           ->setContent(javelin_tag(
               'table',
               array(
                 'sigil' => 'rule-actions',
                 'class' => 'herald-action-table',
               ),
               '')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Rule'))
           ->addCancelButton($cancel_uri));
 
     $this->setupEditorBehavior($rule, $handles, $adapter);
 
     $title = $rule->getID()
         ? pht('Edit Herald Rule')
         : pht('Create Herald Rule');
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $crumbs = $this
       ->buildApplicationCrumbs()
       ->addTextCrumb($title);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => pht('Edit Rule'),
         'device' => true,
       ));
   }
 
   private function saveRule(HeraldAdapter $adapter, $rule, $request) {
     $rule->setName($request->getStr('name'));
     $match_all = ($request->getStr('must_match') == 'all');
     $rule->setMustMatchAll((int)$match_all);
 
     $repetition_policy_param = $request->getStr('repetition_policy');
     $rule->setRepetitionPolicy(
       HeraldRepetitionPolicyConfig::toInt($repetition_policy_param));
 
     $e_name = true;
     $errors = array();
 
     if (!strlen($rule->getName())) {
-      $e_name = pht("Required");
-      $errors[] = pht("Rule must have a name.");
+      $e_name = pht('Required');
+      $errors[] = pht('Rule must have a name.');
     }
 
     $data = json_decode($request->getStr('rule'), true);
     if (!is_array($data) ||
         !$data['conditions'] ||
         !$data['actions']) {
-      throw new Exception("Failed to decode rule data.");
+      throw new Exception('Failed to decode rule data.');
     }
 
     $conditions = array();
     foreach ($data['conditions'] as $condition) {
       if ($condition === null) {
         // We manage this as a sparse array on the client, so may receive
         // NULL if conditions have been removed.
         continue;
       }
 
       $obj = new HeraldCondition();
       $obj->setFieldName($condition[0]);
       $obj->setFieldCondition($condition[1]);
 
       if (is_array($condition[2])) {
         $obj->setValue(array_keys($condition[2]));
       } else {
         $obj->setValue($condition[2]);
       }
 
       try {
         $adapter->willSaveCondition($obj);
       } catch (HeraldInvalidConditionException $ex) {
         $errors[] = $ex->getMessage();
       }
 
       $conditions[] = $obj;
     }
 
     $actions = array();
     foreach ($data['actions'] as $action) {
       if ($action === null) {
         // Sparse on the client; removals can give us NULLs.
         continue;
       }
 
       if (!isset($action[1])) {
         // Legitimate for any action which doesn't need a target, like
         // "Do nothing".
         $action[1] = null;
       }
 
       $obj = new HeraldAction();
       $obj->setAction($action[0]);
       $obj->setTarget($action[1]);
 
       try {
         $adapter->willSaveAction($rule, $obj);
       } catch (HeraldInvalidActionException $ex) {
         $errors[] = $ex;
       }
 
       $actions[] = $obj;
     }
 
     $rule->attachConditions($conditions);
     $rule->attachActions($actions);
 
     if (!$errors) {
       try {
 
         $edit_action = $rule->getID() ? 'edit' : 'create';
 
         $rule->openTransaction();
           $rule->save();
           $rule->saveConditions($conditions);
           $rule->saveActions($actions);
           $rule->logEdit($request->getUser()->getPHID(), $edit_action);
         $rule->saveTransaction();
 
       } catch (AphrontQueryDuplicateKeyException $ex) {
-        $e_name = pht("Not Unique");
-        $errors[] = pht("Rule name is not unique. Choose a unique name.");
+        $e_name = pht('Not Unique');
+        $errors[] = pht('Rule name is not unique. Choose a unique name.');
       }
     }
 
     return array($e_name, $errors);
   }
 
   private function setupEditorBehavior(
     HeraldRule $rule,
     array $handles,
     HeraldAdapter $adapter) {
 
     $serial_conditions = array(
       array('default', 'default', ''),
     );
 
     if ($rule->getConditions()) {
       $serial_conditions = array();
       foreach ($rule->getConditions() as $condition) {
 
         $value = $condition->getValue();
         switch ($condition->getFieldName()) {
           case HeraldAdapter::FIELD_TASK_PRIORITY:
             $value_map = array();
             $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
             foreach ($value as $priority) {
               $value_map[$priority] = idx($priority_map, $priority);
             }
             $value = $value_map;
             break;
           default:
             if (is_array($value)) {
               $value_map = array();
               foreach ($value as $k => $fbid) {
                 $value_map[$fbid] = $handles[$fbid]->getName();
               }
               $value = $value_map;
             }
             break;
         }
         $serial_conditions[] = array(
           $condition->getFieldName(),
           $condition->getFieldCondition(),
           $value,
         );
       }
     }
 
     $serial_actions = array(
       array('default', ''),
     );
     if ($rule->getActions()) {
       $serial_actions = array();
       foreach ($rule->getActions() as $action) {
 
         switch ($action->getAction()) {
           case HeraldAdapter::ACTION_FLAG:
           case HeraldAdapter::ACTION_BLOCK:
             $current_value = $action->getTarget();
             break;
           default:
             $target_map = array();
             foreach ((array)$action->getTarget() as $fbid) {
               $target_map[$fbid] = $handles[$fbid]->getName();
             }
             $current_value = $target_map;
             break;
         }
 
         $serial_actions[] = array(
           $action->getAction(),
           $current_value,
         );
       }
     }
 
     $all_rules = $this->loadRulesThisRuleMayDependUpon($rule);
     $all_rules = mpull($all_rules, 'getName', 'getPHID');
     asort($all_rules);
 
     $all_fields = $adapter->getFieldNameMap();
     $all_conditions = $adapter->getConditionNameMap();
     $all_actions = $adapter->getActionNameMap($rule->getRuleType());
 
     $fields = $adapter->getFields();
     $field_map = array_select_keys($all_fields, $fields);
 
     // Populate any fields which exist in the rule but which we don't know the
     // names of, so that saving a rule without touching anything doesn't change
     // it.
     foreach ($rule->getConditions() as $condition) {
       if (empty($field_map[$condition->getFieldName()])) {
         $field_map[$condition->getFieldName()] = pht('<Unknown Field>');
       }
     }
 
     $actions = $adapter->getActions($rule->getRuleType());
     $action_map = array_select_keys($all_actions, $actions);
 
     $config_info = array();
     $config_info['fields'] = $field_map;
     $config_info['conditions'] = $all_conditions;
     $config_info['actions'] = $action_map;
 
     foreach ($config_info['fields'] as $field => $name) {
       $field_conditions = $adapter->getConditionsForField($field);
       $config_info['conditionMap'][$field] = $field_conditions;
     }
 
     foreach ($config_info['fields'] as $field => $fname) {
       foreach ($config_info['conditionMap'][$field] as $condition) {
         $value_type = $adapter->getValueTypeForFieldAndCondition(
           $field,
           $condition);
         $config_info['values'][$field][$condition] = $value_type;
       }
     }
 
     $config_info['rule_type'] = $rule->getRuleType();
 
     foreach ($config_info['actions'] as $action => $name) {
       $config_info['targets'][$action] = $adapter->getValueTypeForAction(
         $action,
        $rule->getRuleType());
     }
 
     $changeflag_options =
       PhabricatorRepositoryPushLog::getHeraldChangeFlagConditionOptions();
     Javelin::initBehavior(
       'herald-rule-editor',
       array(
         'root' => 'herald-rule-edit-form',
         'conditions' => (object)$serial_conditions,
         'actions' => (object)$serial_actions,
         'select' => array(
           HeraldAdapter::VALUE_CONTENT_SOURCE => array(
             'options' => PhabricatorContentSource::getSourceNameMap(),
             'default' => PhabricatorContentSource::SOURCE_WEB,
           ),
           HeraldAdapter::VALUE_FLAG_COLOR => array(
             'options' => PhabricatorFlagColor::getColorNameMap(),
             'default' => PhabricatorFlagColor::COLOR_BLUE,
           ),
           HeraldPreCommitRefAdapter::VALUE_REF_TYPE => array(
             'options' => array(
               PhabricatorRepositoryPushLog::REFTYPE_BRANCH
                 => pht('branch (git/hg)'),
               PhabricatorRepositoryPushLog::REFTYPE_TAG
                 => pht('tag (git)'),
               PhabricatorRepositoryPushLog::REFTYPE_BOOKMARK
                 => pht('bookmark (hg)'),
             ),
             'default' => PhabricatorRepositoryPushLog::REFTYPE_BRANCH,
           ),
           HeraldPreCommitRefAdapter::VALUE_REF_CHANGE => array(
             'options' => $changeflag_options,
             'default' => PhabricatorRepositoryPushLog::CHANGEFLAG_ADD,
           ),
         ),
         'template' => $this->buildTokenizerTemplates($handles) + array(
           'rules' => $all_rules,
         ),
         'author' => array($rule->getAuthorPHID() =>
                           $handles[$rule->getAuthorPHID()]->getName()),
         'info' => $config_info,
       ));
   }
 
   private function loadHandlesForRule($rule) {
     $phids = array();
 
     foreach ($rule->getActions() as $action) {
       if (!is_array($action->getTarget())) {
         continue;
       }
       foreach ($action->getTarget() as $target) {
         $target = (array)$target;
         foreach ($target as $phid) {
           $phids[] = $phid;
         }
       }
     }
 
     foreach ($rule->getConditions() as $condition) {
       $value = $condition->getValue();
       if (is_array($value)) {
         foreach ($value as $phid) {
           $phids[] = $phid;
         }
       }
     }
 
     $phids[] = $rule->getAuthorPHID();
 
     if ($rule->isObjectRule()) {
       $phids[] = $rule->getTriggerObjectPHID();
     }
 
     return $this->loadViewerHandles($phids);
   }
 
 
   /**
    * Render the selector for the "When (all of | any of) these conditions are
    * met:" element.
    */
   private function renderMustMatchSelector($rule) {
     return AphrontFormSelectControl::renderSelectTag(
       $rule->getMustMatchAll() ? 'all' : 'any',
       array(
         'all' => pht('all of'),
         'any' => pht('any of'),
       ),
       array(
         'name' => 'must_match',
       ));
   }
 
 
   /**
    * Render the selector for "Take these actions (every time | only the first
    * time) this rule matches..." element.
    */
   private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
     $repetition_policy = HeraldRepetitionPolicyConfig::toString(
       $rule->getRepetitionPolicy());
 
     $repetition_options = $adapter->getRepetitionOptions();
     $repetition_names = HeraldRepetitionPolicyConfig::getMap();
     $repetition_map = array_select_keys($repetition_names, $repetition_options);
 
     if (count($repetition_map) < 2) {
       return head($repetition_names);
     } else {
       return AphrontFormSelectControl::renderSelectTag(
         $repetition_policy,
         $repetition_map,
         array(
           'name' => 'repetition_policy',
         ));
     }
   }
 
 
   protected function buildTokenizerTemplates(array $handles) {
     $template = new AphrontTokenizerTemplateView();
     $template = $template->render();
 
     return array(
       'source' => array(
         'email'         => '/typeahead/common/mailable/',
         'user'          => '/typeahead/common/accounts/',
         'repository'    => '/typeahead/common/repositories/',
         'package'       => '/typeahead/common/packages/',
         'project'       => '/typeahead/common/projects/',
         'userorproject' => '/typeahead/common/accountsorprojects/',
         'buildplan'     => '/typeahead/common/buildplans/',
         'taskpriority'  => '/typeahead/common/taskpriority/',
         'arcanistprojects' => '/typeahead/common/arcanistprojects/',
       ),
       'username' => $this->getRequest()->getUser()->getUserName(),
       'icons' => mpull($handles, 'getTypeIcon', 'getPHID'),
       'markup' => $template,
     );
   }
 
 
   /**
    * Load rules for the "Another Herald rule..." condition dropdown, which
    * allows one rule to depend upon the success or failure of another rule.
    */
   private function loadRulesThisRuleMayDependUpon(HeraldRule $rule) {
     $viewer = $this->getRequest()->getUser();
 
     // Any rule can depend on a global rule.
     $all_rules = id(new HeraldRuleQuery())
       ->setViewer($viewer)
       ->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_GLOBAL))
       ->withContentTypes(array($rule->getContentType()))
       ->execute();
 
     if ($rule->isObjectRule()) {
       // Object rules may depend on other rules for the same object.
       $all_rules += id(new HeraldRuleQuery())
         ->setViewer($viewer)
         ->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_OBJECT))
         ->withContentTypes(array($rule->getContentType()))
         ->withTriggerObjectPHIDs(array($rule->getTriggerObjectPHID()))
         ->execute();
     }
 
     if ($rule->isPersonalRule()) {
       // Personal rules may depend upon your other personal rules.
       $all_rules += id(new HeraldRuleQuery())
         ->setViewer($viewer)
         ->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_PERSONAL))
         ->withContentTypes(array($rule->getContentType()))
         ->withAuthorPHIDs(array($rule->getAuthorPHID()))
         ->execute();
     }
 
     // mark disabled rules as disabled since they are not useful as such;
     // don't filter though to keep edit cases sane / expected
     foreach ($all_rules as $current_rule) {
       if ($current_rule->getIsDisabled()) {
         $current_rule->makeEphemeral();
         $current_rule->setName($rule->getName(). ' '.pht('(Disabled)'));
       }
     }
 
     // A rule can not depend upon itself.
     unset($all_rules[$rule->getID()]);
 
     return $all_rules;
   }
 
 
 }
diff --git a/src/applications/herald/controller/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php
index 58eae13c0..6ffa1d92d 100644
--- a/src/applications/herald/controller/HeraldTestConsoleController.php
+++ b/src/applications/herald/controller/HeraldTestConsoleController.php
@@ -1,115 +1,115 @@
 <?php
 
 final class HeraldTestConsoleController extends HeraldController {
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $request = $this->getRequest();
 
     $object_name = trim($request->getStr('object_name'));
 
     $e_name = true;
     $errors = array();
     if ($request->isFormPost()) {
       if (!$object_name) {
         $e_name = pht('Required');
         $errors[] = pht('An object name is required.');
       }
 
       if (!$errors) {
         $object = id(new PhabricatorObjectQuery())
           ->setViewer($user)
           ->withNames(array($object_name))
           ->executeOne();
 
         if (!$object) {
           $e_name = pht('Invalid');
           $errors[] = pht('No object exists with that name.');
         }
 
         if (!$errors) {
 
           // TODO: Let the adapters claim objects instead.
 
           if ($object instanceof DifferentialRevision) {
             $adapter = HeraldDifferentialRevisionAdapter::newLegacyAdapter(
               $object,
               $object->loadActiveDiff());
           } else if ($object instanceof PhabricatorRepositoryCommit) {
             $adapter = id(new HeraldCommitAdapter())
               ->setCommit($object);
           } else if ($object instanceof ManiphestTask) {
             $adapter = id(new HeraldManiphestTaskAdapter())
               ->setTask($object);
           } else if ($object instanceof PholioMock) {
             $adapter = id(new HeraldPholioMockAdapter())
               ->setMock($object);
           } else {
-            throw new Exception("Can not build adapter for object!");
+            throw new Exception('Can not build adapter for object!');
           }
 
           $rules = id(new HeraldRuleQuery())
             ->setViewer($user)
             ->withContentTypes(array($adapter->getAdapterContentType()))
             ->withDisabled(false)
             ->needConditionsAndActions(true)
             ->needAppliedToPHIDs(array($object->getPHID()))
             ->needValidateAuthors(true)
             ->execute();
 
           $engine = id(new HeraldEngine())
             ->setDryRun(true);
 
           $effects = $engine->applyRules($rules, $adapter);
           $engine->applyEffects($effects, $adapter, $rules);
 
           $xscript = $engine->getTranscript();
 
           return id(new AphrontRedirectResponse())
             ->setURI('/herald/transcript/'.$xscript->getID().'/');
         }
       }
     }
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendRemarkupInstructions(
         pht(
         'Enter an object to test rules for, like a Diffusion commit (e.g., '.
         '`rX123`) or a Differential revision (e.g., `D123`). You will be '.
         'shown the results of a dry run on the object.'))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Object Name'))
           ->setName('object_name')
           ->setError($e_name)
           ->setValue($object_name))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Test Rules')));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Herald Test Console'))
       ->setFormErrors($errors)
       ->setForm($form);
 
     $nav = $this->buildSideNavView();
     $nav->selectFilter('test');
     $nav->appendChild($box);
 
     $crumbs = id($this->buildApplicationCrumbs())
       ->addTextCrumb(pht('Test Console'));
     $nav->setCrumbs($crumbs);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => pht('Test Console'),
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php
index 8a44face9..381d766f3 100644
--- a/src/applications/herald/controller/HeraldTranscriptController.php
+++ b/src/applications/herald/controller/HeraldTranscriptController.php
@@ -1,551 +1,551 @@
 <?php
 
 final class HeraldTranscriptController extends HeraldController {
 
   const FILTER_AFFECTED = 'affected';
   const FILTER_OWNED    = 'owned';
   const FILTER_ALL      = 'all';
 
   private $id;
   private $filter;
   private $handles;
   private $adapter;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
     $map = $this->getFilterMap();
     $this->filter = idx($data, 'filter');
     if (empty($map[$this->filter])) {
       $this->filter = self::FILTER_ALL;
     }
   }
 
   private function getAdapter() {
     return $this->adapter;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $xscript = id(new HeraldTranscriptQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$xscript) {
       return new Aphront404Response();
     }
 
     require_celerity_resource('herald-test-css');
 
     $nav = $this->buildSideNav();
 
     $object_xscript = $xscript->getObjectTranscript();
     if (!$object_xscript) {
       $notice = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
         ->setTitle(pht('Old Transcript'))
         ->appendChild(phutil_tag(
           'p',
           array(),
           pht('Details of this transcript have been garbage collected.')));
       $nav->appendChild($notice);
     } else {
       $map = HeraldAdapter::getEnabledAdapterMap($viewer);
       $object_type = $object_xscript->getType();
       if (empty($map[$object_type])) {
         // TODO: We should filter these out in the Query, but we have to load
         // the objectTranscript right now, which is potentially enormous. We
         // should denormalize the object type, or move the data into a separate
         // table, and then filter this earlier (and thus raise a better error).
         // For now, just block access so we don't violate policies.
         throw new Exception(
-          pht("This transcript has an invalid or inaccessible adapter."));
+          pht('This transcript has an invalid or inaccessible adapter.'));
       }
 
       $this->adapter = HeraldAdapter::getAdapterForContentType($object_type);
 
       $filter = $this->getFilterPHIDs();
       $this->filterTranscript($xscript, $filter);
       $phids = array_merge($filter, $this->getTranscriptPHIDs($xscript));
       $phids = array_unique($phids);
       $phids = array_filter($phids);
 
       $handles = $this->loadViewerHandles($phids);
       $this->handles = $handles;
 
       if ($xscript->getDryRun()) {
         $notice = new AphrontErrorView();
         $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
         $notice->setTitle(pht('Dry Run'));
         $notice->appendChild(pht('This was a dry run to test Herald '.
           'rules, no actions were executed.'));
         $nav->appendChild($notice);
       }
 
       $warning_panel = $this->buildWarningPanel($xscript);
       $nav->appendChild($warning_panel);
 
       $apply_xscript_panel = $this->buildApplyTranscriptPanel(
         $xscript);
       $nav->appendChild($apply_xscript_panel);
 
       $action_xscript_panel = $this->buildActionTranscriptPanel(
         $xscript);
       $nav->appendChild($action_xscript_panel);
 
       $object_xscript_panel = $this->buildObjectTranscriptPanel(
         $xscript);
       $nav->appendChild($object_xscript_panel);
     }
 
     $crumbs = id($this->buildApplicationCrumbs())
       ->addTextCrumb(
         pht('Transcripts'),
         $this->getApplicationURI('/transcript/'))
       ->addTextCrumb($xscript->getID());
     $nav->setCrumbs($crumbs);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => pht('Transcript'),
         'device' => true,
       ));
   }
 
   protected function renderConditionTestValue($condition, $handles) {
     switch ($condition->getFieldName()) {
       case HeraldAdapter::FIELD_RULE:
         $value = array($condition->getTestValue());
         break;
       default:
         $value = $condition->getTestValue();
         break;
     }
 
     if (!is_scalar($value) && $value !== null) {
       foreach ($value as $key => $phid) {
         $handle = idx($handles, $phid);
         if ($handle) {
           $value[$key] = $handle->getName();
         } else {
           // This shouldn't ever really happen as we are supposed to have
           // grabbed handles for everything, but be super liberal in what
           // we accept here since we expect all sorts of weird issues as we
           // version the system.
           $value[$key] = 'Unknown Object #'.$phid;
         }
       }
       sort($value);
       $value = implode(', ', $value);
     }
 
     return phutil_tag('span', array('class' => 'condition-test-value'), $value);
   }
 
   private function buildSideNav() {
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI('/herald/transcript/'.$this->id.'/'));
 
     $items = array();
     $filters = $this->getFilterMap();
     foreach ($filters as $key => $name) {
       $nav->addFilter($key, $name);
     }
     $nav->selectFilter($this->filter, null);
 
     return $nav;
   }
 
   protected function getFilterMap() {
     return array(
       self::FILTER_ALL      => pht('All Rules'),
       self::FILTER_OWNED    => pht('Rules I Own'),
       self::FILTER_AFFECTED => pht('Rules that Affected Me'),
     );
   }
 
 
   protected function getFilterPHIDs() {
     return array($this->getRequest()->getUser()->getPHID());
   }
 
   protected function getTranscriptPHIDs($xscript) {
     $phids = array();
 
     $object_xscript = $xscript->getObjectTranscript();
     if (!$object_xscript) {
       return array();
     }
 
     $phids[] = $object_xscript->getPHID();
 
     foreach ($xscript->getApplyTranscripts() as $apply_xscript) {
       // TODO: This is total hacks. Add another amazing layer of abstraction.
       $target = (array)$apply_xscript->getTarget();
       foreach ($target as $phid) {
         if ($phid) {
           $phids[] = $phid;
         }
       }
     }
 
     foreach ($xscript->getRuleTranscripts() as $rule_xscript) {
       $phids[] = $rule_xscript->getRuleOwner();
     }
 
     $condition_xscripts = $xscript->getConditionTranscripts();
     if ($condition_xscripts) {
       $condition_xscripts = call_user_func_array(
         'array_merge',
         $condition_xscripts);
     }
     foreach ($condition_xscripts as $condition_xscript) {
       switch ($condition_xscript->getFieldName()) {
         case HeraldAdapter::FIELD_RULE:
           $phids[] = $condition_xscript->getTestValue();
           break;
         default:
           $value = $condition_xscript->getTestValue();
           // TODO: Also total hacks.
           if (is_array($value)) {
             foreach ($value as $phid) {
               if ($phid) { // TODO: Probably need to make sure this
                 // "looks like" a PHID or decrease the level of hacks here;
                 // this used to be an is_numeric() check in Facebook land.
                 $phids[] = $phid;
               }
             }
           }
           break;
       }
     }
 
     return $phids;
   }
 
   protected function filterTranscript($xscript, $filter_phids) {
     $filter_owned = ($this->filter == self::FILTER_OWNED);
     $filter_affected = ($this->filter == self::FILTER_AFFECTED);
 
     if (!$filter_owned && !$filter_affected) {
       // No filtering to be done.
       return;
     }
 
     if (!$xscript->getObjectTranscript()) {
       return;
     }
 
     $user_phid = $this->getRequest()->getUser()->getPHID();
 
     $keep_apply_xscripts = array();
     $keep_rule_xscripts  = array();
 
     $filter_phids = array_fill_keys($filter_phids, true);
 
     $rule_xscripts = $xscript->getRuleTranscripts();
     foreach ($xscript->getApplyTranscripts() as $id => $apply_xscript) {
       $rule_id = $apply_xscript->getRuleID();
       if ($filter_owned) {
         if (empty($rule_xscripts[$rule_id])) {
           // No associated rule so you can't own this effect.
           continue;
         }
         if ($rule_xscripts[$rule_id]->getRuleOwner() != $user_phid) {
           continue;
         }
       } else if ($filter_affected) {
         $targets = (array)$apply_xscript->getTarget();
         if (!array_select_keys($filter_phids, $targets)) {
           continue;
         }
       }
       $keep_apply_xscripts[$id] = true;
       if ($rule_id) {
         $keep_rule_xscripts[$rule_id] = true;
       }
     }
 
     foreach ($rule_xscripts as $rule_id => $rule_xscript) {
       if ($filter_owned && $rule_xscript->getRuleOwner() == $user_phid) {
         $keep_rule_xscripts[$rule_id] = true;
       }
     }
 
     $xscript->setRuleTranscripts(
       array_intersect_key(
         $xscript->getRuleTranscripts(),
         $keep_rule_xscripts));
 
     $xscript->setApplyTranscripts(
       array_intersect_key(
         $xscript->getApplyTranscripts(),
         $keep_apply_xscripts));
 
     $xscript->setConditionTranscripts(
       array_intersect_key(
         $xscript->getConditionTranscripts(),
         $keep_rule_xscripts));
   }
 
   private function buildWarningPanel(HeraldTranscript $xscript) {
     $request = $this->getRequest();
     $panel = null;
     if ($xscript->getObjectTranscript()) {
       $handles = $this->handles;
       $object_xscript = $xscript->getObjectTranscript();
       $handle = $handles[$object_xscript->getPHID()];
       if ($handle->getType() ==
           PhabricatorRepositoryPHIDTypeCommit::TYPECONST) {
         $commit = id(new DiffusionCommitQuery())
           ->setViewer($request->getUser())
           ->withPHIDs(array($handle->getPHID()))
           ->executeOne();
         if ($commit) {
           $repository = $commit->getRepository();
           if ($repository->isImporting()) {
             $title = pht(
               'The %s repository is still importing.',
               $repository->getMonogram());
             $body = pht(
               'Herald rules will not trigger until import completes.');
           } else if (!$repository->isTracked()) {
             $title = pht(
               'The %s repository is not tracked.',
               $repository->getMonogram());
             $body = pht(
               'Herald rules will not trigger until tracking is enabled.');
           } else {
             return $panel;
           }
           $panel = id(new AphrontErrorView())
             ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
             ->setTitle($title)
             ->appendChild($body);
         }
       }
     }
     return $panel;
   }
 
   private function buildApplyTranscriptPanel(HeraldTranscript $xscript) {
     $handles = $this->handles;
     $adapter = $this->getAdapter();
 
     $rule_type_global = HeraldRuleTypeConfig::RULE_TYPE_GLOBAL;
     $action_names = $adapter->getActionNameMap($rule_type_global);
 
     $list = new PHUIObjectItemListView();
     $list->setStates(true);
     $list->setNoDataString(pht('No actions were taken.'));
     foreach ($xscript->getApplyTranscripts() as $apply_xscript) {
 
       $target = $apply_xscript->getTarget();
       switch ($apply_xscript->getAction()) {
         case HeraldAdapter::ACTION_NOTHING:
           $target = null;
           break;
         case HeraldAdapter::ACTION_FLAG:
           $target = PhabricatorFlagColor::getColorName($target);
           break;
         case HeraldAdapter::ACTION_BLOCK:
           // Target is a text string.
           $target = $target;
           break;
         default:
           if ($target) {
             foreach ($target as $k => $phid) {
               if (isset($handles[$phid])) {
                 $target[$k] = $handles[$phid]->getName();
               }
             }
-            $target = implode(", ", $target);
+            $target = implode(', ', $target);
           } else {
             $target = '<empty>';
           }
           break;
       }
 
       $item = new PHUIObjectItemView();
 
       if ($apply_xscript->getApplied()) {
         $item->setState(PHUIObjectItemView::STATE_SUCCESS);
       } else {
         $item->setState(PHUIObjectItemView::STATE_FAIL);
       }
 
       $rule = idx($action_names, $apply_xscript->getAction(), pht('Unknown'));
 
       $item->setHeader(pht('%s: %s', $rule, $target));
       $item->addAttribute($apply_xscript->getReason());
       $item->addAttribute(
         pht('Outcome: %s', $apply_xscript->getAppliedReason()));
 
       $list->addItem($item);
     }
 
     $box = new PHUIObjectBoxView();
     $box->setHeaderText(pht('Actions Taken'));
     $box->appendChild($list);
 
     return $box;
   }
 
   private function buildActionTranscriptPanel(HeraldTranscript $xscript) {
     $action_xscript = mgroup($xscript->getApplyTranscripts(), 'getRuleID');
 
     $adapter = $this->getAdapter();
 
 
     $field_names = $adapter->getFieldNameMap();
     $condition_names = $adapter->getConditionNameMap();
 
     $handles = $this->handles;
 
     $rule_markup = array();
     foreach ($xscript->getRuleTranscripts() as $rule_id => $rule) {
       $cond_markup = array();
       foreach ($xscript->getConditionTranscriptsForRule($rule_id) as $cond) {
         if ($cond->getNote()) {
           $note = phutil_tag_div('herald-condition-note', $cond->getNote());
         } else {
           $note = null;
         }
 
         if ($cond->getResult()) {
           $result = phutil_tag(
             'span',
             array('class' => 'herald-outcome condition-pass'),
             "\xE2\x9C\x93");
         } else {
           $result = phutil_tag(
             'span',
             array('class' => 'herald-outcome condition-fail'),
             "\xE2\x9C\x98");
         }
 
         $cond_markup[] = phutil_tag(
           'li',
           array(),
           pht(
             '%s Condition: %s %s %s%s',
             $result,
             idx($field_names, $cond->getFieldName(), pht('Unknown')),
             idx($condition_names, $cond->getCondition(), pht('Unknown')),
             $this->renderConditionTestValue($cond, $handles),
             $note));
       }
 
       if ($rule->getResult()) {
         $result = phutil_tag(
           'span',
           array('class' => 'herald-outcome rule-pass'),
           pht('PASS'));
         $class = 'herald-rule-pass';
       } else {
         $result = phutil_tag(
           'span',
           array('class' => 'herald-outcome rule-fail'),
           pht('FAIL'));
         $class = 'herald-rule-fail';
       }
 
       $cond_markup[] = phutil_tag(
         'li',
         array(),
         array($result, $rule->getReason()));
       $user_phid = $this->getRequest()->getUser()->getPHID();
 
       $name = $rule->getRuleName();
 
       $rule_markup[] =
         phutil_tag(
           'li',
           array(
             'class' => $class,
           ),
           phutil_tag_div('rule-name', array(
             phutil_tag('strong', array(), $name),
             ' ',
             phutil_tag('ul', array(), $cond_markup),
           )));
     }
 
     $box = null;
     if ($rule_markup) {
       $box = new PHUIObjectBoxView();
       $box->setHeaderText(pht('Rule Details'));
       $box->appendChild(phutil_tag(
         'ul',
         array('class' => 'herald-explain-list'),
         $rule_markup));
     }
     return $box;
   }
 
   private function buildObjectTranscriptPanel(HeraldTranscript $xscript) {
 
     $adapter = $this->getAdapter();
     $field_names = $adapter->getFieldNameMap();
 
     $object_xscript = $xscript->getObjectTranscript();
 
     $data = array();
     if ($object_xscript) {
       $phid = $object_xscript->getPHID();
       $handles = $this->handles;
 
       $data += array(
         pht('Object Name') => $object_xscript->getName(),
         pht('Object Type') => $object_xscript->getType(),
         pht('Object PHID') => $phid,
         pht('Object Link') => $handles[$phid]->renderLink(),
       );
     }
 
     $data += $xscript->getMetadataMap();
 
     if ($object_xscript) {
       foreach ($object_xscript->getFields() as $field => $value) {
         $field = idx($field_names, $field, '['.$field.'?]');
         $data['Field: '.$field] = $value;
       }
     }
 
     $rows = array();
     foreach ($data as $name => $value) {
       if (!($value instanceof PhutilSafeHTML)) {
         if (!is_scalar($value) && !is_null($value)) {
           $value = implode("\n", $value);
         }
 
         if (strlen($value) > 256) {
           $value = phutil_tag(
             'textarea',
             array(
               'class' => 'herald-field-value-transcript',
             ),
             $value);
         }
       }
 
       $rows[] = array($name, $value);
     }
 
     $property_list = new PHUIPropertyListView();
     $property_list->setStacked(true);
     foreach ($rows as $row) {
       $property_list->addProperty($row[0], $row[1]);
     }
 
     $box = new PHUIObjectBoxView();
     $box->setHeaderText(pht('Object Transcript'));
     $box->appendChild($property_list);
 
     return $box;
   }
 
 
 }
diff --git a/src/applications/herald/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php
index 5e62a8e19..d4fedf1e9 100644
--- a/src/applications/herald/engine/HeraldEngine.php
+++ b/src/applications/herald/engine/HeraldEngine.php
@@ -1,438 +1,438 @@
 <?php
 
 final class HeraldEngine {
 
   protected $rules = array();
   protected $results = array();
   protected $stack = array();
   protected $activeRule = null;
 
   protected $fieldCache = array();
   protected $object = null;
   private $dryRun;
 
   public function setDryRun($dry_run) {
     $this->dryRun = $dry_run;
     return $this;
   }
 
   public function getDryRun() {
     return $this->dryRun;
   }
 
   public function getRule($phid) {
     return idx($this->rules, $phid);
   }
 
   public function loadRulesForAdapter(HeraldAdapter $adapter) {
     return id(new HeraldRuleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withDisabled(false)
       ->withContentTypes(array($adapter->getAdapterContentType()))
       ->needConditionsAndActions(true)
       ->needAppliedToPHIDs(array($adapter->getPHID()))
       ->needValidateAuthors(true)
       ->execute();
   }
 
   public static function loadAndApplyRules(HeraldAdapter $adapter) {
     $engine = new HeraldEngine();
 
     $rules = $engine->loadRulesForAdapter($adapter);
     $effects = $engine->applyRules($rules, $adapter);
     $engine->applyEffects($effects, $adapter, $rules);
 
     return $engine->getTranscript();
   }
 
   public function applyRules(array $rules, HeraldAdapter $object) {
     assert_instances_of($rules, 'HeraldRule');
     $t_start = microtime(true);
 
     $rules = mpull($rules, null, 'getPHID');
 
     $this->transcript = new HeraldTranscript();
     $this->transcript->setObjectPHID((string)$object->getPHID());
     $this->fieldCache = array();
     $this->results = array();
     $this->rules   = $rules;
     $this->object  = $object;
 
     $effects = array();
     foreach ($rules as $phid => $rule) {
       $this->stack = array();
 
       $policy_first = HeraldRepetitionPolicyConfig::FIRST;
       $policy_first_int = HeraldRepetitionPolicyConfig::toInt($policy_first);
       $is_first_only = ($rule->getRepetitionPolicy() == $policy_first_int);
 
       try {
         if (!$this->getDryRun() &&
             $is_first_only &&
             $rule->getRuleApplied($object->getPHID())) {
           // This is not a dry run, and this rule is only supposed to be
           // applied a single time, and it's already been applied...
           // That means automatic failure.
           $xscript = id(new HeraldRuleTranscript())
             ->setRuleID($rule->getID())
             ->setResult(false)
             ->setRuleName($rule->getName())
             ->setRuleOwner($rule->getAuthorPHID())
             ->setReason(
-              "This rule is only supposed to be repeated a single time, ".
-              "and it has already been applied.");
+              'This rule is only supposed to be repeated a single time, '.
+              'and it has already been applied.');
           $this->transcript->addRuleTranscript($xscript);
           $rule_matches = false;
         } else {
           $rule_matches = $this->doesRuleMatch($rule, $object);
         }
       } catch (HeraldRecursiveConditionsException $ex) {
         $names = array();
         foreach ($this->stack as $rule_id => $ignored) {
           $names[] = '"'.$rules[$rule_id]->getName().'"';
         }
         $names = implode(', ', $names);
         foreach ($this->stack as $rule_id => $ignored) {
           $xscript = new HeraldRuleTranscript();
           $xscript->setRuleID($rule_id);
           $xscript->setResult(false);
           $xscript->setReason(
             "Rules {$names} are recursively dependent upon one another! ".
             "Don't do this! You have formed an unresolvable cycle in the ".
             "dependency graph!");
           $xscript->setRuleName($rules[$rule_id]->getName());
           $xscript->setRuleOwner($rules[$rule_id]->getAuthorPHID());
           $this->transcript->addRuleTranscript($xscript);
         }
         $rule_matches = false;
       }
       $this->results[$phid] = $rule_matches;
 
       if ($rule_matches) {
         foreach ($this->getRuleEffects($rule, $object) as $effect) {
           $effects[] = $effect;
         }
       }
     }
 
     $object_transcript = new HeraldObjectTranscript();
     $object_transcript->setPHID($object->getPHID());
     $object_transcript->setName($object->getHeraldName());
     $object_transcript->setType($object->getAdapterContentType());
     $object_transcript->setFields($this->fieldCache);
 
     $this->transcript->setObjectTranscript($object_transcript);
 
     $t_end = microtime(true);
 
     $this->transcript->setDuration($t_end - $t_start);
 
     return $effects;
   }
 
   public function applyEffects(
     array $effects,
     HeraldAdapter $adapter,
     array $rules) {
     assert_instances_of($effects, 'HeraldEffect');
     assert_instances_of($rules, 'HeraldRule');
 
     $this->transcript->setDryRun((int)$this->getDryRun());
 
     if ($this->getDryRun()) {
       $xscripts = array();
       foreach ($effects as $effect) {
         $xscripts[] = new HeraldApplyTranscript(
           $effect,
           false,
           pht('This was a dry run, so no actions were actually taken.'));
       }
     } else {
       $xscripts = $adapter->applyHeraldEffects($effects);
     }
 
     assert_instances_of($xscripts, 'HeraldApplyTranscript');
     foreach ($xscripts as $apply_xscript) {
       $this->transcript->addApplyTranscript($apply_xscript);
     }
 
     // For dry runs, don't mark the rule as having applied to the object.
     if ($this->getDryRun()) {
       return;
     }
 
     $rules = mpull($rules, null, 'getID');
     $applied_ids = array();
     $first_policy = HeraldRepetitionPolicyConfig::toInt(
       HeraldRepetitionPolicyConfig::FIRST);
 
     // Mark all the rules that have had their effects applied as having been
     // executed for the current object.
     $rule_ids = mpull($xscripts, 'getRuleID');
 
     foreach ($rule_ids as $rule_id) {
       if (!$rule_id) {
         // Some apply transcripts are purely informational and not associated
         // with a rule, e.g. carryover emails from earlier revisions.
         continue;
       }
 
       $rule = idx($rules, $rule_id);
       if (!$rule) {
         continue;
       }
 
       if ($rule->getRepetitionPolicy() == $first_policy) {
         $applied_ids[] = $rule_id;
       }
     }
 
     if ($applied_ids) {
       $conn_w = id(new HeraldRule())->establishConnection('w');
       $sql = array();
       foreach ($applied_ids as $id) {
         $sql[] = qsprintf(
           $conn_w,
           '(%s, %d)',
           $adapter->getPHID(),
           $id);
       }
       queryfx(
         $conn_w,
         'INSERT IGNORE INTO %T (phid, ruleID) VALUES %Q',
         HeraldRule::TABLE_RULE_APPLIED,
         implode(', ', $sql));
     }
   }
 
   public function getTranscript() {
     $this->transcript->save();
     return $this->transcript;
   }
 
   public function doesRuleMatch(
     HeraldRule $rule,
     HeraldAdapter $object) {
 
     $phid = $rule->getPHID();
 
     if (isset($this->results[$phid])) {
       // If we've already evaluated this rule because another rule depends
       // on it, we don't need to reevaluate it.
       return $this->results[$phid];
     }
 
     if (isset($this->stack[$phid])) {
       // We've recursed, fail all of the rules on the stack. This happens when
       // there's a dependency cycle with "Rule conditions match for rule ..."
       // conditions.
       foreach ($this->stack as $rule_phid => $ignored) {
         $this->results[$rule_phid] = false;
       }
       throw new HeraldRecursiveConditionsException();
     }
 
     $this->stack[$phid] = true;
 
     $all = $rule->getMustMatchAll();
 
     $conditions = $rule->getConditions();
 
     $result = null;
 
     $local_version = id(new HeraldRule())->getConfigVersion();
     if ($rule->getConfigVersion() > $local_version) {
       $reason = pht(
-        "Rule could not be processed, it was created with a newer version ".
-        "of Herald.");
+        'Rule could not be processed, it was created with a newer version '.
+        'of Herald.');
       $result = false;
     } else if (!$conditions) {
       $reason = pht(
-        "Rule failed automatically because it has no conditions.");
+        'Rule failed automatically because it has no conditions.');
       $result = false;
     } else if (!$rule->hasValidAuthor()) {
       $reason = pht(
-        "Rule failed automatically because its owner is invalid ".
-        "or disabled.");
+        'Rule failed automatically because its owner is invalid '.
+        'or disabled.');
       $result = false;
     } else if (!$this->canAuthorViewObject($rule, $object)) {
       $reason = pht(
-        "Rule failed automatically because it is a personal rule and its ".
-        "owner can not see the object.");
+        'Rule failed automatically because it is a personal rule and its '.
+        'owner can not see the object.');
       $result = false;
     } else if (!$this->canRuleApplyToObject($rule, $object)) {
       $reason = pht(
-        "Rule failed automatically because it is an object rule which is ".
-        "not relevant for this object.");
+        'Rule failed automatically because it is an object rule which is '.
+        'not relevant for this object.');
       $result = false;
     } else {
       foreach ($conditions as $condition) {
         $match = $this->doesConditionMatch($rule, $condition, $object);
 
         if (!$all && $match) {
-          $reason = "Any condition matched.";
+          $reason = 'Any condition matched.';
           $result = true;
           break;
         }
 
         if ($all && !$match) {
-          $reason = "Not all conditions matched.";
+          $reason = 'Not all conditions matched.';
           $result = false;
           break;
         }
       }
 
       if ($result === null) {
         if ($all) {
-          $reason = "All conditions matched.";
+          $reason = 'All conditions matched.';
           $result = true;
         } else {
-          $reason = "No conditions matched.";
+          $reason = 'No conditions matched.';
           $result = false;
         }
       }
     }
 
     $rule_transcript = new HeraldRuleTranscript();
     $rule_transcript->setRuleID($rule->getID());
     $rule_transcript->setResult($result);
     $rule_transcript->setReason($reason);
     $rule_transcript->setRuleName($rule->getName());
     $rule_transcript->setRuleOwner($rule->getAuthorPHID());
 
     $this->transcript->addRuleTranscript($rule_transcript);
 
     return $result;
   }
 
   protected function doesConditionMatch(
     HeraldRule $rule,
     HeraldCondition $condition,
     HeraldAdapter $object) {
 
     $object_value = $this->getConditionObjectValue($condition, $object);
     $test_value   = $condition->getValue();
 
     $cond = $condition->getFieldCondition();
 
     $transcript = new HeraldConditionTranscript();
     $transcript->setRuleID($rule->getID());
     $transcript->setConditionID($condition->getID());
     $transcript->setFieldName($condition->getFieldName());
     $transcript->setCondition($cond);
     $transcript->setTestValue($test_value);
 
     try {
       $result = $object->doesConditionMatch(
         $this,
         $rule,
         $condition,
         $object_value);
     } catch (HeraldInvalidConditionException $ex) {
       $result = false;
       $transcript->setNote($ex->getMessage());
     }
 
     $transcript->setResult($result);
 
     $this->transcript->addConditionTranscript($transcript);
 
     return $result;
   }
 
   protected function getConditionObjectValue(
     HeraldCondition $condition,
     HeraldAdapter $object) {
 
     $field = $condition->getFieldName();
 
     return $this->getObjectFieldValue($field);
   }
 
   public function getObjectFieldValue($field) {
     if (isset($this->fieldCache[$field])) {
       return $this->fieldCache[$field];
     }
 
     $result = $this->object->getHeraldField($field);
 
     $this->fieldCache[$field] = $result;
     return $result;
   }
 
   protected function getRuleEffects(
     HeraldRule $rule,
     HeraldAdapter $object) {
 
     $effects = array();
     foreach ($rule->getActions() as $action) {
       $effect = new HeraldEffect();
       $effect->setObjectPHID($object->getPHID());
       $effect->setAction($action->getAction());
       $effect->setTarget($action->getTarget());
 
       $effect->setRuleID($rule->getID());
       $effect->setRulePHID($rule->getPHID());
 
       $name = $rule->getName();
       $id   = $rule->getID();
       $effect->setReason(
         pht(
           'Conditions were met for %s',
           "H{$id} {$name}"));
 
       $effects[] = $effect;
     }
     return $effects;
   }
 
   private function canAuthorViewObject(
     HeraldRule $rule,
     HeraldAdapter $adapter) {
 
     // Authorship is irrelevant for global rules and object rules.
     if ($rule->isGlobalRule() || $rule->isObjectRule()) {
       return true;
     }
 
     // The author must be able to create rules for the adapter's content type.
     // In particular, this means that the application must be installed and
     // accessible to the user. For example, if a user writes a Differential
     // rule and then loses access to Differential, this disables the rule.
     $enabled = HeraldAdapter::getEnabledAdapterMap($rule->getAuthor());
     if (empty($enabled[$adapter->getAdapterContentType()])) {
       return false;
     }
 
     // Finally, the author must be able to see the object itself. You can't
     // write a personal rule that CC's you on revisions you wouldn't otherwise
     // be able to see, for example.
     $object = $adapter->getObject();
     return PhabricatorPolicyFilter::hasCapability(
       $rule->getAuthor(),
       $object,
       PhabricatorPolicyCapability::CAN_VIEW);
   }
 
   private function canRuleApplyToObject(
     HeraldRule $rule,
     HeraldAdapter $adapter) {
 
     // Rules which are not object rules can apply to anything.
     if (!$rule->isObjectRule()) {
       return true;
     }
 
     $trigger_phid = $rule->getTriggerObjectPHID();
     $object_phids = $adapter->getTriggerObjectPHIDs();
 
     if ($object_phids) {
       if (in_array($trigger_phid, $object_phids)) {
         return true;
       }
     }
 
     return false;
   }
 
 }
diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
index 28b0899b0..cdd4c5be7 100644
--- a/src/applications/herald/storage/HeraldRule.php
+++ b/src/applications/herald/storage/HeraldRule.php
@@ -1,265 +1,265 @@
 <?php
 
 final class HeraldRule extends HeraldDAO
   implements
     PhabricatorFlaggableInterface,
     PhabricatorPolicyInterface,
     PhabricatorDestructableInterface {
 
   const TABLE_RULE_APPLIED = 'herald_ruleapplied';
 
   protected $name;
   protected $authorPHID;
 
   protected $contentType;
   protected $mustMatchAll;
   protected $repetitionPolicy;
   protected $ruleType;
   protected $isDisabled = 0;
   protected $triggerObjectPHID;
 
   protected $configVersion = 36;
 
   // phids for which this rule has been applied
   private $ruleApplied = self::ATTACHABLE;
   private $validAuthor = self::ATTACHABLE;
   private $author = self::ATTACHABLE;
   private $conditions;
   private $actions;
   private $triggerObject = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(HeraldPHIDTypeRule::TYPECONST);
   }
 
   public function getRuleApplied($phid) {
     return $this->assertAttachedKey($this->ruleApplied, $phid);
   }
 
   public function setRuleApplied($phid, $applied) {
     if ($this->ruleApplied === self::ATTACHABLE) {
       $this->ruleApplied = array();
     }
     $this->ruleApplied[$phid] = $applied;
     return $this;
   }
 
   public function loadConditions() {
     if (!$this->getID()) {
       return array();
     }
     return id(new HeraldCondition())->loadAllWhere(
       'ruleID = %d',
       $this->getID());
   }
 
   public function attachConditions(array $conditions) {
     assert_instances_of($conditions, 'HeraldCondition');
     $this->conditions = $conditions;
     return $this;
   }
 
   public function getConditions() {
     // TODO: validate conditions have been attached.
     return $this->conditions;
   }
 
   public function loadActions() {
     if (!$this->getID()) {
       return array();
     }
     return id(new HeraldAction())->loadAllWhere(
       'ruleID = %d',
       $this->getID());
   }
 
   public function attachActions(array $actions) {
     // TODO: validate actions have been attached.
     assert_instances_of($actions, 'HeraldAction');
     $this->actions = $actions;
     return $this;
   }
 
   public function getActions() {
     return $this->actions;
   }
 
   public function loadEdits() {
     if (!$this->getID()) {
       return array();
     }
     $edits = id(new HeraldRuleEdit())->loadAllWhere(
       'ruleID = %d ORDER BY dateCreated DESC',
       $this->getID());
 
     return $edits;
   }
 
   public function logEdit($editor_phid, $action) {
     id(new HeraldRuleEdit())
       ->setRuleID($this->getID())
       ->setRuleName($this->getName())
       ->setEditorPHID($editor_phid)
       ->setAction($action)
       ->save();
   }
 
   public function saveConditions(array $conditions) {
     assert_instances_of($conditions, 'HeraldCondition');
     return $this->saveChildren(
       id(new HeraldCondition())->getTableName(),
       $conditions);
   }
 
   public function saveActions(array $actions) {
     assert_instances_of($actions, 'HeraldAction');
     return $this->saveChildren(
       id(new HeraldAction())->getTableName(),
       $actions);
   }
 
   protected function saveChildren($table_name, array $children) {
     assert_instances_of($children, 'HeraldDAO');
 
     if (!$this->getID()) {
-      throw new Exception("Save rule before saving children.");
+      throw new Exception('Save rule before saving children.');
     }
 
     foreach ($children as $child) {
       $child->setRuleID($this->getID());
     }
 
     $this->openTransaction();
       queryfx(
         $this->establishConnection('w'),
         'DELETE FROM %T WHERE ruleID = %d',
         $table_name,
         $this->getID());
       foreach ($children as $child) {
         $child->save();
       }
     $this->saveTransaction();
   }
 
   public function delete() {
     $this->openTransaction();
       queryfx(
         $this->establishConnection('w'),
         'DELETE FROM %T WHERE ruleID = %d',
         id(new HeraldCondition())->getTableName(),
         $this->getID());
       queryfx(
         $this->establishConnection('w'),
         'DELETE FROM %T WHERE ruleID = %d',
         id(new HeraldAction())->getTableName(),
         $this->getID());
       $result = parent::delete();
     $this->saveTransaction();
 
     return $result;
   }
 
   public function hasValidAuthor() {
     return $this->assertAttached($this->validAuthor);
   }
 
   public function attachValidAuthor($valid) {
     $this->validAuthor = $valid;
     return $this;
   }
 
   public function getAuthor() {
     return $this->assertAttached($this->author);
   }
 
   public function attachAuthor(PhabricatorUser $user) {
     $this->author = $user;
     return $this;
   }
 
   public function isGlobalRule() {
     return ($this->getRuleType() === HeraldRuleTypeConfig::RULE_TYPE_GLOBAL);
   }
 
   public function isPersonalRule() {
     return ($this->getRuleType() === HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
   }
 
   public function isObjectRule() {
     return ($this->getRuleType() == HeraldRuleTypeConfig::RULE_TYPE_OBJECT);
   }
 
   public function attachTriggerObject($trigger_object) {
     $this->triggerObject = $trigger_object;
     return $this;
   }
 
   public function getTriggerObject() {
     return $this->assertAttached($this->triggerObject);
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     if ($this->isGlobalRule()) {
       switch ($capability) {
         case PhabricatorPolicyCapability::CAN_VIEW:
           return PhabricatorPolicies::POLICY_USER;
         case PhabricatorPolicyCapability::CAN_EDIT:
           $app = 'PhabricatorApplicationHerald';
           $herald = PhabricatorApplication::getByClass($app);
           $global = HeraldCapabilityManageGlobalRules::CAPABILITY;
           return $herald->getPolicy($global);
       }
     } else if ($this->isObjectRule()) {
       return $this->getTriggerObject()->getPolicy($capability);
     } else {
       return PhabricatorPolicies::POLICY_NOONE;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     if ($this->isPersonalRule()) {
       return ($viewer->getPHID() == $this->getAuthorPHID());
     } else {
       return false;
     }
   }
 
   public function describeAutomaticCapability($capability) {
     if ($this->isPersonalRule()) {
       return pht("A personal rule's owner can always view and edit it.");
     } else if ($this->isObjectRule()) {
-      return pht("Object rules inherit the policies of their objects.");
+      return pht('Object rules inherit the policies of their objects.');
     }
 
     return null;
   }
 
 
 /* -(  PhabricatorDestructableInterface  )----------------------------------- */
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
     $this->delete();
     $this->saveTransaction();
   }
 
 }
diff --git a/src/applications/legalpad/mail/LegalpadReplyHandler.php b/src/applications/legalpad/mail/LegalpadReplyHandler.php
index 11c78da40..7491dcb86 100644
--- a/src/applications/legalpad/mail/LegalpadReplyHandler.php
+++ b/src/applications/legalpad/mail/LegalpadReplyHandler.php
@@ -1,89 +1,89 @@
 <?php
 
 /**
  * @group legalpad
  */
 final class LegalpadReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof LegalpadDocument)) {
-      throw new Exception("Mail receiver is not a LegalpadDocument!");
+      throw new Exception('Mail receiver is not a LegalpadDocument!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'L');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('L');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht('Reply to comment or !unsubscribe.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $actor = $this->getActor();
     $document = $this->getMailReceiver();
 
     $body_data = $mail->parseBody();
     $body = $body_data['body'];
     $body = $this->enhanceBodyWithAttachments($body, $mail->getAttachments());
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
 
     $xactions = array();
     $command = $body_data['command'];
 
     switch ($command) {
       case 'unsubscribe':
         $xaction = id(new LegalpadTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
           ->setNewValue(array('-' => array($actor->getPHID())));
         $xactions[] = $xaction;
         break;
     }
 
     $xactions[] = id(new LegalpadTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new LegalpadTransactionComment())
         ->setDocumentID($document->getID())
         ->setLineNumber(0)
         ->setLineLength(0)
         ->setContent($body));
 
     $editor = id(new LegalpadDocumentEditor())
       ->setActor($actor)
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setIsPreview(false);
 
     try {
       $xactions = $editor->applyTransactions($document, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       // just do nothing, though unclear why you're sending a blank email
       return true;
     }
 
     $head_xaction = head($xactions);
     return $head_xaction->getID();
   }
 
 }
diff --git a/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php b/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
index 6470f6c26..45eca56c7 100644
--- a/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
+++ b/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
@@ -1,28 +1,28 @@
 <?php
 
 abstract class PhabricatorTestDataGenerator {
 
   public function generate() {
     return;
   }
 
   public function loadOneRandom($classname) {
     try {
       return newv($classname, array())
-        ->loadOneWhere("1 = 1 ORDER BY RAND() LIMIT 1");
+        ->loadOneWhere('1 = 1 ORDER BY RAND() LIMIT 1');
     } catch (PhutilMissingSymbolException $ex) {
       throw new PhutilMissingSymbolException(
-        "Unable to load symbol ".$classname.": this class does not exit.");
+        'Unable to load symbol '.$classname.': this class does not exit.');
     }
   }
 
 
   public function loadPhabrictorUserPHID() {
-    return $this->loadOneRandom("PhabricatorUser")->getPHID();
+    return $this->loadOneRandom('PhabricatorUser')->getPHID();
   }
 
   public function loadPhabrictorUser() {
-    return $this->loadOneRandom("PhabricatorUser");
+    return $this->loadOneRandom('PhabricatorUser');
   }
 
 }
diff --git a/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php b/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php
index 1544a0a05..b79e50df6 100644
--- a/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php
+++ b/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php
@@ -1,79 +1,79 @@
 <?php
 
 final class PhabricatorLipsumGenerateWorkflow
   extends PhabricatorLipsumManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('generate')
       ->setExamples('**generate**')
       ->setSynopsis('Generate some lipsum.')
       ->setArguments(
         array(
           array(
             'name'      => 'args',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $supported_types = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorTestDataGenerator')
       ->loadObjects();
     echo "These are the types of data you can generate:\n";
     foreach (array_keys($supported_types) as $typetmp) {
       echo "\t".$typetmp."\n";
     }
     echo "\n";
-    $prompt = "Are you sure you want to generate lots of test data?";
+    $prompt = 'Are you sure you want to generate lots of test data?';
     if (!phutil_console_confirm($prompt, $default_no = true)) {
       return;
     }
     $argv = $args->getArg('args');
     if (count($argv) == 0 ||
-      (count($argv) == 1 && $argv[0] == "all")) {
+      (count($argv) == 1 && $argv[0] == 'all')) {
       $this->infinitelyGenerate($supported_types);
     } else {
       $new_supported_types = array();
       for ($i = 0; $i < count($argv);$i++) {
         $arg = $argv[$i];
         if (array_key_exists($arg, $supported_types)) {
            $new_supported_types[$arg] = $supported_types[$arg];
         } else {
           echo "The type ".$arg." is not supported by the lipsum generator.\n";
         }
       }
       $this->infinitelyGenerate($new_supported_types);
     }
     echo "None of the input types were supported.\n";
     echo "The supported types are:\n";
     echo implode("\n", array_keys($supported_types));
   }
 
   protected function infinitelyGenerate(array $supported_types) {
     if (count($supported_types) == 0) {
       echo "None of the input types were supported.\n";
       return;
     }
-    echo "GENERATING: ";
-    echo strtoupper(implode(" , ", array_keys($supported_types)));
+    echo 'GENERATING: ';
+    echo strtoupper(implode(' , ', array_keys($supported_types)));
     echo "\n";
     while (true) {
       $type = $supported_types[array_rand($supported_types)];
       $admin = $this->getViewer();
 
       $taskgen = newv($type, array());
       $object = $taskgen->generate();
       $handle = id(new PhabricatorHandleQuery())
         ->setViewer($admin)
         ->withPHIDs(array($object->getPHID()))
         ->executeOne();
       echo "Generated ".$handle->getTypeName().": ".
         $handle->getFullName()."\n";
 
       usleep(200000);
     }
   }
 
 }
diff --git a/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
index 87146d5c6..b5f76ddc8 100644
--- a/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
+++ b/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
@@ -1,81 +1,81 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_macro_query_Method extends ConduitAPI_macro_Method {
 
   public function getMethodDescription() {
-    return "Retrieve image macro information.";
+    return 'Retrieve image macro information.';
   }
 
   public function defineParamTypes() {
     return array(
       'authorPHIDs' => 'optional list<phid>',
       'phids'       => 'optional list<phid>',
       'ids'         => 'optional list<id>',
       'names'       => 'optional list<string>',
       'nameLike'    => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = new PhabricatorMacroQuery();
     $query->setViewer($request->getUser());
 
     $author_phids = $request->getValue('authorPHIDs');
     $phids = $request->getValue('phids');
     $ids = $request->getValue('ids');
     $name_like = $request->getValue('nameLike');
     $names = $request->getValue('names');
 
     if ($author_phids) {
       $query->withAuthorPHIDs($author_phids);
     }
 
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     if ($ids) {
       $query->withIDs($ids);
     }
 
     if ($name_like) {
       $query->withNameLike($name_like);
     }
 
     if ($names) {
       $query->withNames($names);
     }
 
     $macros = $query->execute();
 
     if (!$macros) {
       return array();
     }
 
     $results = array();
     foreach ($macros as $macro) {
       $file = $macro->getFile();
       $results[$macro->getName()] = array(
         'uri' => $file->getBestURI(),
         'phid' => $macro->getPHID(),
         'authorPHID' => $file->getAuthorPHID(),
         'dateCreated'   => $file->getDateCreated(),
       );
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/macro/config/PhabricatorMacroConfigOptions.php b/src/applications/macro/config/PhabricatorMacroConfigOptions.php
index 087da3fbe..427405e84 100644
--- a/src/applications/macro/config/PhabricatorMacroConfigOptions.php
+++ b/src/applications/macro/config/PhabricatorMacroConfigOptions.php
@@ -1,24 +1,24 @@
 <?php
 
 final class PhabricatorMacroConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Macro");
+    return pht('Macro');
   }
 
   public function getDescription() {
-    return pht("Configure Macro.");
+    return pht('Configure Macro.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('metamta.macro.reply-handler-domain', 'string', null)
         ->setDescription(pht(
           'As {{metamta.maniphest.reply-handler-domain}}, but affects Macro.')),
       $this->newOption('metamta.macro.subject-prefix', 'string', '[Macro]')
         ->setDescription(pht('Subject prefix for Macro email.'))
     );
   }
 
 }
diff --git a/src/applications/macro/controller/PhabricatorMacroMemeController.php b/src/applications/macro/controller/PhabricatorMacroMemeController.php
index b0a79e3a4..91e02fe84 100644
--- a/src/applications/macro/controller/PhabricatorMacroMemeController.php
+++ b/src/applications/macro/controller/PhabricatorMacroMemeController.php
@@ -1,62 +1,62 @@
 <?php
 
 final class PhabricatorMacroMemeController
   extends PhabricatorMacroController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $macro_name = $request->getStr('macro');
     $upper_text = $request->getStr('uppertext');
     $lower_text = $request->getStr('lowertext');
     $user = $request->getUser();
 
     $uri = PhabricatorMacroMemeController::generateMacro($user, $macro_name,
       $upper_text, $lower_text);
     if ($uri === false) {
       return new Aphront404Response();
     }
     return id(new AphrontRedirectResponse())->setURI($uri);
   }
 
   public static function generateMacro($user, $macro_name, $upper_text,
       $lower_text) {
     $macro = id(new PhabricatorMacroQuery())
       ->setViewer($user)
       ->withNames(array($macro_name))
       ->executeOne();
     if (!$macro) {
       return false;
     }
     $file = $macro->getFile();
 
     $upper_text = strtoupper($upper_text);
     $lower_text = strtoupper($lower_text);
-    $mixed_text = md5($upper_text).":".md5($lower_text);
-    $hash = "meme".hash("sha256", $mixed_text);
+    $mixed_text = md5($upper_text).':'.md5($lower_text);
+    $hash = 'meme'.hash('sha256', $mixed_text);
     $xform = id(new PhabricatorTransformedFile())
       ->loadOneWhere('originalphid=%s and transform=%s',
         $file->getPHID(), $hash);
 
     if ($xform) {
       $memefile = id(new PhabricatorFileQuery())
         ->setViewer($user)
         ->withPHIDs(array($xform->getTransformedPHID()))
         ->executeOne();
       if ($memefile) {
         return $memefile->getBestURI();
       }
     }
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     $transformers = (new PhabricatorImageTransformer());
     $newfile = $transformers
       ->executeMemeTransform($file, $upper_text, $lower_text);
     $xfile = new PhabricatorTransformedFile();
     $xfile->setOriginalPHID($file->getPHID());
     $xfile->setTransformedPHID($newfile->getPHID());
     $xfile->setTransform($hash);
     $xfile->save();
 
     return $newfile->getBestURI();
   }
 }
diff --git a/src/applications/macro/mail/PhabricatorMacroReplyHandler.php b/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
index b44cbb057..b447895d7 100644
--- a/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
+++ b/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
@@ -1,40 +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!");
+      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 pht("Reply to comment.");
+      return pht('Reply to comment.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     // TODO: Implement this.
     return null;
   }
 
 }
diff --git a/src/applications/macro/query/PhabricatorMacroSearchEngine.php b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
index 1e95cb683..0480db492 100644
--- a/src/applications/macro/query/PhabricatorMacroSearchEngine.php
+++ b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
@@ -1,221 +1,221 @@
 <?php
 
 final class PhabricatorMacroSearchEngine
   extends PhabricatorApplicationSearchEngine {
 
   public function getApplicationClassName() {
     return 'PhabricatorApplicationMacro';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
     $saved = new PhabricatorSavedQuery();
     $saved->setParameter(
       'authorPHIDs',
       $this->readUsersFromRequest($request, 'authors'));
 
     $saved->setParameter('status', $request->getStr('status'));
     $saved->setParameter('names', $request->getStrList('names'));
     $saved->setParameter('nameLike', $request->getStr('nameLike'));
     $saved->setParameter('createdStart', $request->getStr('createdStart'));
     $saved->setParameter('createdEnd', $request->getStr('createdEnd'));
     $saved->setParameter('flagColor', $request->getStr('flagColor', '-1'));
 
     return $saved;
   }
 
   public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
     $query = id(new PhabricatorMacroQuery())
       ->withIDs($saved->getParameter('ids', array()))
       ->withPHIDs($saved->getParameter('phids', array()))
       ->withAuthorPHIDs($saved->getParameter('authorPHIDs', array()));
 
     $status = $saved->getParameter('status');
     $options = PhabricatorMacroQuery::getStatusOptions();
     if (empty($options[$status])) {
       $status = head_key($options);
     }
     $query->withStatus($status);
 
     $names = $saved->getParameter('names', array());
     if ($names) {
       $query->withNames($names);
     }
 
     $like = $saved->getParameter('nameLike');
     if (strlen($like)) {
       $query->withNameLike($like);
     }
 
     $start = $this->parseDateTime($saved->getParameter('createdStart'));
     $end = $this->parseDateTime($saved->getParameter('createdEnd'));
 
     if ($start) {
       $query->withDateCreatedAfter($start);
     }
 
     if ($end) {
       $query->withDateCreatedBefore($end);
     }
 
     $color = $saved->getParameter('flagColor');
     if (strlen($color)) {
       $query->withFlagColor($color);
     }
 
     return $query;
   }
 
   public function buildSearchForm(
     AphrontFormView $form,
     PhabricatorSavedQuery $saved_query) {
 
     $phids = $saved_query->getParameter('authorPHIDs', array());
     $author_handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->requireViewer())
       ->withPHIDs($phids)
       ->execute();
 
     $status = $saved_query->getParameter('status');
     $names = implode(', ', $saved_query->getParameter('names', array()));
     $like = $saved_query->getParameter('nameLike');
-    $color = $saved_query->getParameter('flagColor', "-1");
+    $color = $saved_query->getParameter('flagColor', '-1');
 
     $form
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setName('status')
           ->setLabel(pht('Status'))
           ->setOptions(PhabricatorMacroQuery::getStatusOptions())
           ->setValue($status))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setDatasource('/typeahead/common/users/')
           ->setName('authors')
           ->setLabel(pht('Authors'))
           ->setValue($author_handles))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setName('nameLike')
           ->setLabel(pht('Name Contains'))
           ->setValue($like))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setName('names')
           ->setLabel(pht('Exact Names'))
           ->setValue($names))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setName('flagColor')
           ->setLabel(pht('Marked with Flag'))
           ->setOptions(PhabricatorMacroQuery::getFlagColorsOptions())
           ->setValue($color));
 
     $this->buildDateRange(
       $form,
       $saved_query,
       'createdStart',
       pht('Created After'),
       'createdEnd',
       pht('Created Before'));
   }
 
   protected function getURI($path) {
     return '/macro/'.$path;
   }
 
   public function getBuiltinQueryNames() {
     $names = array(
       'active'  => pht('Active'),
       'all'     => pht('All'),
     );
 
     if ($this->requireViewer()->isLoggedIn()) {
       $names['authored'] = pht('Authored');
     }
 
     return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
 
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
     switch ($query_key) {
       case 'active':
         return $query;
       case 'all':
         return $query->setParameter(
           'status',
           PhabricatorMacroQuery::STATUS_ANY);
       case 'authored':
         return $query->setParameter(
           'authorPHIDs',
           array($this->requireViewer()->getPHID()));
     }
 
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
   protected function getRequiredHandlePHIDsForResultList(
     array $macros,
     PhabricatorSavedQuery $query) {
     return mpull($macros, 'getAuthorPHID');
   }
 
   protected function renderResultList(
     array $macros,
     PhabricatorSavedQuery $query,
     array $handles) {
 
     assert_instances_of($macros, 'PhabricatorFileImageMacro');
     $viewer = $this->requireViewer();
 
     $pinboard = new PHUIPinboardView();
     foreach ($macros as $macro) {
       $file = $macro->getFile();
 
       $item = new PHUIPinboardItemView();
       if ($file) {
         $item->setImageURI($file->getThumb280x210URI());
         $item->setImageSize(280, 210);
       }
 
       if ($macro->getDateCreated()) {
         $datetime = phabricator_date($macro->getDateCreated(), $viewer);
         $item->appendChild(
           phutil_tag(
             'div',
             array(),
             pht('Created on %s', $datetime)));
       } else {
         // Very old macros don't have a creation date. Rendering something
         // keeps all the pins at the same height and avoids flow issues.
         $item->appendChild(
           phutil_tag(
             'div',
             array(),
             pht('Created in ages long past')));
       }
 
       if ($macro->getAuthorPHID()) {
         $author_handle = $handles[$macro->getAuthorPHID()];
         $item->appendChild(
           pht('Created by %s', $author_handle->renderLink()));
       }
 
       $item->setURI($this->getApplicationURI('/view/'.$macro->getID().'/'));
 
       $name = $macro->getName();
       if ($macro->getIsDisabled()) {
         $name = pht('%s (Disabled)', $name);
       }
       $item->setHeader($name);
 
       $pinboard->addItem($item);
     }
 
     return $pinboard;
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
index f306861fb..677130132 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
@@ -1,35 +1,35 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_maniphest_createtask_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
-    return "Create a new Maniphest task.";
+    return 'Create a new Maniphest task.';
   }
 
   public function defineParamTypes() {
     return $this->getTaskFields($is_new = true);
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.'
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $task = ManiphestTask::initializeNewTask($request->getUser());
 
     $this->applyRequest($task, $request, $is_new = true);
 
     return $this->buildTaskInfoDictionary($task);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
index 76e2588ae..d5ccc8acc 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
  * @group conduit
  *
  * @concrete-extensible
  */
 final class ConduitAPI_maniphest_find_Method
   extends ConduitAPI_maniphest_query_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Renamed to 'maniphest.query'.";
   }
 
   public function getMethodDescription() {
-    return "Deprecated alias of maniphest.query";
+    return 'Deprecated alias of maniphest.query';
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
index dc25cd05c..61f9c85dc 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
@@ -1,77 +1,77 @@
 <?php
 
 /**
  * @group maniphest
  */
 final class ConduitAPI_maniphest_gettasktransactions_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
-    return "Retrieve Maniphest Task Transactions.";
+    return 'Retrieve Maniphest Task Transactions.';
   }
 
   public function defineParamTypes() {
     return array(
       'ids' => 'required list<int>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict<string, wild>>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
     $task_ids = $request->getValue('ids');
 
     if (!$task_ids) {
       return $results;
     }
 
     $tasks = id(new ManiphestTaskQuery())
       ->setViewer($request->getUser())
       ->withIDs($task_ids)
       ->execute();
     $tasks = mpull($tasks, null, 'getPHID');
 
     $transactions = array();
     if ($tasks) {
       $transactions = id(new ManiphestTransactionQuery())
         ->setViewer($request->getUser())
         ->withObjectPHIDs(mpull($tasks, 'getPHID'))
         ->needComments(true)
         ->execute();
     }
 
     foreach ($transactions as $transaction) {
       $task_phid = $transaction->getObjectPHID();
       if (empty($tasks[$task_phid])) {
         continue;
       }
 
       $task_id = $tasks[$task_phid]->getID();
 
       $comments = null;
       if ($transaction->hasComment()) {
         $comments = $transaction->getComment()->getContent();
       }
 
       $results[$task_id][] = array(
         'taskID'  => $task_id,
         'transactionType'  => $transaction->getTransactionType(),
         'oldValue'  => $transaction->getOldValue(),
         'newValue'  => $transaction->getNewValue(),
         'comments'      => $comments,
         'authorPHID'  => $transaction->getAuthorPHID(),
         'dateCreated' => $transaction->getDateCreated(),
       );
     }
 
     return $results;
   }
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
index a6c14f48f..da6d4c1f1 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
@@ -1,44 +1,44 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_maniphest_info_Method
   extends ConduitAPI_maniphest_Method {
 
 
   public function getMethodDescription() {
-    return "Retrieve information about a Maniphest task, given its id.";
+    return 'Retrieve information about a Maniphest task, given its id.';
   }
 
   public function defineParamTypes() {
     return array(
       'task_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_TASK' => 'No such maniphest task exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $task_id = $request->getValue('task_id');
 
     $task = id(new ManiphestTaskQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($task_id))
       ->executeOne();
     if (!$task) {
       throw new ConduitException('ERR_BAD_TASK');
     }
 
     return $this->buildTaskInfoDictionary($task);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
index 6ad94356b..5a551e3b3 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
@@ -1,129 +1,129 @@
 <?php
 
 /**
  * @group conduit
  *
  * TODO: Remove maniphest.find, then make this final.
  *
  * @concrete-extensible
  */
 class ConduitAPI_maniphest_query_Method
   extends ConduitAPI_maniphest_Method {
 
 
   public function getMethodDescription() {
-    return "Execute complex searches for Maniphest tasks.";
+    return 'Execute complex searches for Maniphest tasks.';
   }
 
   public function defineParamTypes() {
 
     $statuses = array(
       ManiphestTaskQuery::STATUS_ANY,
       ManiphestTaskQuery::STATUS_OPEN,
       ManiphestTaskQuery::STATUS_CLOSED,
       ManiphestTaskQuery::STATUS_RESOLVED,
       ManiphestTaskQuery::STATUS_WONTFIX,
       ManiphestTaskQuery::STATUS_INVALID,
       ManiphestTaskQuery::STATUS_SPITE,
       ManiphestTaskQuery::STATUS_DUPLICATE,
     );
     $status_const = $this->formatStringConstants($statuses);
 
     $orders = array(
       ManiphestTaskQuery::ORDER_PRIORITY,
       ManiphestTaskQuery::ORDER_CREATED,
       ManiphestTaskQuery::ORDER_MODIFIED,
     );
     $order_const = $this->formatStringConstants($orders);
 
     return array(
       'ids'               => 'optional list<uint>',
       'phids'             => 'optional list<phid>',
       'ownerPHIDs'        => 'optional list<phid>',
       'authorPHIDs'       => 'optional list<phid>',
       'projectPHIDs'      => 'optional list<phid>',
       'ccPHIDs'           => 'optional list<phid>',
       'fullText'          => 'optional string',
 
       'status'            => 'optional '.$status_const,
       'order'             => 'optional '.$order_const,
 
       'limit'             => 'optional int',
       'offset'            => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = new ManiphestTaskQuery();
 
     $query->setViewer($request->getUser());
 
     $task_ids = $request->getValue('ids');
     if ($task_ids) {
       $query->withIDs($task_ids);
     }
 
     $task_phids = $request->getValue('phids');
     if ($task_phids) {
       $query->withPHIDs($task_phids);
     }
 
     $owners = $request->getValue('ownerPHIDs');
     if ($owners) {
       $query->withOwners($owners);
     }
 
     $authors = $request->getValue('authorPHIDs');
     if ($authors) {
       $query->withAuthors($authors);
     }
 
     $projects = $request->getValue('projectPHIDs');
     if ($projects) {
       $query->withAllProjects($projects);
     }
 
     $ccs = $request->getValue('ccPHIDs');
     if ($ccs) {
       $query->withSubscribers($ccs);
     }
 
     $full_text = $request->getValue('fullText');
     if ($full_text) {
       $query->withFullTextSearch($full_text);
     }
 
     $status = $request->getValue('status');
     if ($status) {
       $query->withStatus($status);
     }
 
     $order = $request->getValue('order');
     if ($order) {
       $query->setOrderBy($order);
     }
 
     $limit = $request->getValue('limit');
     if ($limit) {
       $query->setLimit($limit);
     }
 
     $offset = $request->getValue('offset');
     if ($offset) {
       $query->setOffset($offset);
     }
 
     $results = $query->execute();
     return $this->buildTaskInfoDictionaries($results);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php
index ab6963b6b..a752bf957 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php
@@ -1,35 +1,35 @@
 <?php
 
 final class ConduitAPI_maniphest_querystatuses_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
-    return "Retrieve information about possible Maniphest Task status values.";
+    return 'Retrieve information about possible Maniphest Task status values.';
   }
 
   public function defineParamTypes() {
     return array();
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $results = array(
       'defaultStatus' => ManiphestTaskStatus::getDefaultStatus(),
       'defaultClosedStatus' => ManiphestTaskStatus::getDefaultClosedStatus(),
       'duplicateStatus' => ManiphestTaskStatus::getDuplicateStatus(),
       'openStatuses' => ManiphestTaskStatus::getOpenStatusConstants(),
       'closedStatuses' => ManiphestTaskStatus::getClosedStatusConstants(),
       'allStatuses' => array_keys(ManiphestTaskStatus::getTaskStatusMap()),
       'statusMap' => ManiphestTaskStatus::getTaskStatusMap()
     );
     return $results;
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
index ffe43cbd2..99969d108 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
@@ -1,66 +1,66 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_maniphest_update_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
-    return "Update an existing Maniphest task.";
+    return 'Update an existing Maniphest task.';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-TASK'          => 'No such maniphest task exists.',
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
       'ERR-NO-EFFECT'         => 'Update has no effect.',
     );
   }
 
   public function defineParamTypes() {
     return $this->getTaskFields($is_new = false);
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $id = $request->getValue('id');
     $phid = $request->getValue('phid');
 
     if (($id && $phid) || (!$id && !$phid)) {
       throw new Exception("Specify exactly one of 'id' and 'phid'.");
     }
 
     if ($id) {
       $task = id(new ManiphestTaskQuery())
         ->setViewer($request->getUser())
         ->withIDs(array($id))
         ->executeOne();
     } else {
       $task = id(new ManiphestTaskQuery())
         ->setViewer($request->getUser())
         ->withPHIDs(array($phid))
         ->executeOne();
     }
 
     $params = $request->getAllParameters();
     unset($params['id']);
     unset($params['phid']);
 
     if (call_user_func_array('coalesce', $params) === null) {
       throw new ConduitException('ERR-NO-EFFECT');
     }
 
     if (!$task) {
       throw new ConduitException('ERR-BAD-TASK');
     }
 
     $this->applyRequest($task, $request, $is_new = false);
 
     return $this->buildTaskInfoDictionary($task);
   }
 
 }
diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
index 6b03cae03..67d05dae2 100644
--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
@@ -1,351 +1,351 @@
 <?php
 
 final class PhabricatorManiphestConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Maniphest");
+    return pht('Maniphest');
   }
 
   public function getDescription() {
-    return pht("Configure Maniphest.");
+    return pht('Configure Maniphest.');
   }
 
   public function getOptions() {
 
     $priority_defaults = array(
       100 => array(
         'name'  => pht('Unbreak Now!'),
         'short' => pht('Unbreak!'),
         'color' => 'indigo',
       ),
       90 => array(
         'name' => pht('Needs Triage'),
         'short' => pht('Triage'),
         'color' => 'violet',
       ),
       80 => array(
         'name' => pht('High'),
         'short' => pht('High'),
         'color' => 'red',
       ),
       50 => array(
         'name' => pht('Normal'),
         'short' => pht('Normal'),
         'color' => 'orange',
       ),
       25 => array(
         'name' => pht('Low'),
         'short' => pht('Low'),
         'color' => 'yellow',
       ),
       0 => array(
         'name' => pht('Wishlist'),
         'short' => pht('Wish'),
         'color' => 'sky',
       ),
     );
 
     $status_type = 'custom:ManiphestStatusConfigOptionType';
     $status_defaults = array(
       'open' => array(
         'name' => pht('Open'),
         'special' => ManiphestTaskStatus::SPECIAL_DEFAULT,
       ),
       'resolved' => array(
         'name' => pht('Resolved'),
         'name.full' => pht('Closed, Resolved'),
         'closed' => true,
         'special' => ManiphestTaskStatus::SPECIAL_CLOSED,
         'prefixes' => array(
           'closed',
           'closes',
           'close',
           'fix',
           'fixes',
           'fixed',
           'resolve',
           'resolves',
           'resolved',
         ),
         'suffixes' => array(
           'as resolved',
           'as fixed',
         ),
       ),
       'wontfix' => array(
         'name' => pht('Wontfix'),
         'name.full' => pht('Closed, Wontfix'),
         'closed' => true,
         'prefixes' => array(
           'wontfix',
           'wontfixes',
           'wontfixed',
         ),
         'suffixes' => array(
           'as wontfix',
         ),
       ),
       'invalid' => array(
         'name' => pht('Invalid'),
         'name.full' => pht('Closed, Invalid'),
         'closed' => true,
         'prefixes' => array(
           'invalidate',
           'invalidates',
           'invalidated',
         ),
         'suffixes' => array(
           'as invalid',
         ),
       ),
       'duplicate' => array(
         'name' => pht('Duplicate'),
         'name.full' => pht('Closed, Duplicate'),
         'transaction.icon' => 'fa-times',
         'special' => ManiphestTaskStatus::SPECIAL_DUPLICATE,
         'closed' => true,
       ),
       'spite' => array(
         'name' => pht('Spite'),
         'name.full' => pht('Closed, Spite'),
         'name.action' => pht('Spited'),
         'transaction.icon' => 'fa-thumbs-o-down',
         'silly' => true,
         'closed' => true,
         'prefixes' => array(
           'spite',
           'spites',
           'spited',
         ),
         'suffixes' => array(
           'out of spite',
           'as spite',
         ),
       ),
     );
 
     $status_description = $this->deformat(pht(<<<EOTEXT
 Allows you to edit, add, or remove the task statuses available in Maniphest,
 like "Open", "Resolved" and "Invalid". The configuration should contain a map
 of status constants to status specifications (see defaults below for examples).
 
 The constant for each status should be 1-12 characters long and  contain only
 lowercase letters and digits. Valid examples are "open", "closed", and
 "invalid". Users will not normally see these values.
 
 The keys you can provide in a specification are:
 
   - `name` //Required string.// Name of the status, like "Invalid".
   - `name.full` //Optional string.// Longer name, like "Closed, Invalid". This
     appears on the task detail view in the header.
   - `name.action` //Optional string.// Action name for email subjects, like
     "Marked Invalid".
   - `closed` //Optional bool.// Statuses are either "open" or "closed".
     Specifying `true` here will mark the status as closed (like "Resolved" or
     "Invalid"). By default, statuses are open.
   - `special` //Optional string.// Mark this status as special. The special
     statuses are:
     - `default` This is the default status for newly created tasks. You must
       designate one status as default, and it must be an open status.
     - `closed` This is the default status for closed tasks (for example, tasks
       closed via the "!close" action in email or via the quick close button in
       Maniphest). You must designate one status as the default closed status,
       and it must be a closed status.
     - `duplicate` This is the status used when tasks are merged into one
       another as duplicates. You must designate one status for duplicates,
       and it must be a closed status.
   - `transaction.icon` //Optional string.// Allows you to choose a different
     icon to use for this status when showing status changes in the transaction
     log. Please see UIExamples, Icons and Images for a list.
   - `transaction.color` //Optional string.// Allows you to choose a different
     color to use for this status when showing status changes in the transaction
     log.
   - `silly` //Optional bool.// Marks this status as silly, and thus wholly
     inappropriate for use by serious businesses.
   - `prefixes` //Optional list<string>.// Allows you to specify a list of
     text prefixes which will trigger a task transition into this status
     when mentioned in a commit message. For example, providing "closes" here
     will allow users to move tasks to this status by writing `Closes T123` in
     commit messages.
   - `suffixes` //Optional list<string>.// Allows you to specify a list of
     text suffixes which will trigger a task transition into this status
     when mentioned in a commit message, after a valid prefix. For example,
     providing "as invalid" here will allow users to move tasks
     to this status by writing `Closes T123 as invalid`, even if another status
     is selected by the "Closes" prefix.
 
 Examining the default configuration and examples below will probably be helpful
 in understanding these options.
 
 EOTEXT
 ));
 
     $status_example = array(
       'open' => array(
         'name' => 'Open',
         'special' => 'default',
       ),
       'closed' => array(
         'name' => 'Closed',
         'special' => 'closed',
         'closed' => true,
       ),
       'duplicate' => array(
         'name' => 'Duplicate',
         'special' => 'duplicate',
         'closed' => true,
       ),
     );
 
     $json = new PhutilJSON();
     $status_example = $json->encodeFormatted($status_example);
 
     // This is intentionally blank for now, until we can move more Maniphest
     // logic to custom fields.
     $default_fields = array();
 
     foreach ($default_fields as $key => $enabled) {
       $default_fields[$key] = array(
         'disabled' => !$enabled,
       );
     }
 
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     return array(
       $this->newOption('maniphest.custom-field-definitions', 'wild', array())
-        ->setSummary(pht("Custom Maniphest fields."))
+        ->setSummary(pht('Custom Maniphest fields.'))
         ->setDescription(
           pht(
             'Array of custom fields for Maniphest tasks. For details on '.
             'adding custom fields to Maniphest, see "Configuring Custom '.
             'Fields" in the documentation.'))
         ->addExample(
           '{"mycompany:estimated-hours": {"name": "Estimated Hours", '.
           '"type": "int", "caption": "Estimated number of hours this will '.
           'take."}}',
           pht('Valid Setting')),
       $this->newOption('maniphest.fields', $custom_field_type, $default_fields)
         ->setCustomData(id(new ManiphestTask())->getCustomFieldBaseClass())
-        ->setDescription(pht("Select and reorder task fields.")),
+        ->setDescription(pht('Select and reorder task fields.')),
       $this->newOption('maniphest.priorities', 'wild', $priority_defaults)
-        ->setSummary(pht("Configure Maniphest priority names."))
+        ->setSummary(pht('Configure Maniphest priority names.'))
         ->setDescription(
           pht(
             'Allows you to edit or override the default priorities available '.
             'in Maniphest, like "High", "Normal" and "Low". The configuration '.
             'should contain a map of priority constants to priority '.
             'specifications (see defaults below for examples).'.
             "\n\n".
             'The keys you can define for a priority are:'.
             "\n\n".
             '  - `name` Name of the priority.'."\n".
             '  - `short` Alternate shorter name, used in UIs where there is '.
             '    not much space available.'."\n".
             '  - `color` A color for this priority, like "red" or "blue".'.
             "\n\n".
             'You can choose which priority is the default for newly created '.
             'tasks with `maniphest.default-priority`.')),
       $this->newOption('maniphest.statuses', $status_type, $status_defaults)
         ->setSummary(pht('Configure Maniphest task statuses.'))
         ->setDescription($status_description)
         ->addExample($status_example, pht('Minimal Valid Config')),
       $this->newOption('maniphest.default-priority', 'int', 90)
-        ->setSummary(pht("Default task priority for create flows."))
+        ->setSummary(pht('Default task priority for create flows.'))
         ->setDescription(
           pht(
             "What should the default task priority be in create flows? See ".
             "the constants in @{class:ManiphestTaskPriority} for valid ".
             "values. Defaults to 'needs triage'.")),
       $this->newOption(
         'metamta.maniphest.reply-handler-domain',
         'string',
         null)
         ->setSummary(pht('Enable replying to tasks via email.'))
         ->setDescription(
           pht(
             '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".')),
       $this->newOption(
         'metamta.maniphest.reply-handler',
         'class',
         'ManiphestReplyHandler')
         ->setBaseClass('PhabricatorMailReplyHandler')
         ->setDescription(pht('Override reply handler class.')),
       $this->newOption(
         'metamta.maniphest.subject-prefix',
         'string',
         '[Maniphest]')
         ->setDescription(pht('Subject prefix for Maniphest mail.')),
       $this->newOption(
         'metamta.maniphest.public-create-email',
         'string',
         null)
         ->setSummary(pht('Allow filing bugs via email.'))
         ->setDescription(
           pht(
             '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.')),
       $this->newOption(
         'metamta.maniphest.default-public-author',
         'string',
         null)
         ->setSummary(pht('Username anonymous bugs are filed under.'))
         ->setDescription(
           pht(
             '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.')),
       $this->newOption(
         'maniphest.priorities.unbreak-now',
         'int',
         100)
         ->setSummary(pht('Priority used to populate "Unbreak Now" on home.'))
         ->setDescription(
           pht(
             'Temporary setting. If set, this priority is used to populate the '.
             '"Unbreak Now" panel on the home page. You should adjust this if '.
             'you adjust priorities using `maniphest.priorities`.')),
       $this->newOption(
         'maniphest.priorities.needs-triage',
         'int',
         90)
         ->setSummary(pht('Priority used to populate "Needs Triage" on home.'))
         ->setDescription(
           pht(
             'Temporary setting. If set, this priority is used to populate the '.
             '"Needs Triage" panel on the home page. You should adjust this if '.
             'you adjust priorities using `maniphest.priorities`.')),
 
     );
   }
 
 }
diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php
index 1872efc97..f30b5cb93 100644
--- a/src/applications/maniphest/controller/ManiphestExportController.php
+++ b/src/applications/maniphest/controller/ManiphestExportController.php
@@ -1,140 +1,140 @@
 <?php
 
 /**
  * @group maniphest
  */
 final class ManiphestExportController extends ManiphestController {
 
   private $key;
 
   public function willProcessRequest(array $data) {
     $this->key = $data['key'];
     return $this;
   }
 
   /**
    * @phutil-external-symbol class PHPExcel
    * @phutil-external-symbol class PHPExcel_IOFactory
    * @phutil-external-symbol class PHPExcel_Style_NumberFormat
    * @phutil-external-symbol class PHPExcel_Cell_DataType
    */
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $ok = @include_once 'PHPExcel.php';
     if (!$ok) {
       $dialog = new AphrontDialogView();
       $dialog->setUser($user);
 
       $inst1 = pht(
         'This system does not have PHPExcel installed. This software '.
         'component is required to export tasks to Excel. Have your system '.
         'administrator install it from:');
 
       $inst2 = pht(
         'Your PHP "include_path" needs to be updated to include the '.
         'PHPExcel Classes directory.');
 
       $dialog->setTitle(pht('Excel Export Not Configured'));
       $dialog->appendChild(hsprintf(
         '<p>%s</p>'.
         '<br />'.
         '<p>'.
           '<a href="http://www.phpexcel.net/">http://www.phpexcel.net/</a>'.
         '</p>'.
         '<br />'.
         '<p>%s</p>',
         $inst1,
         $inst2));
 
       $dialog->addCancelButton('/maniphest/');
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     // TODO: PHPExcel has a dependency on the PHP zip extension. We should test
     // for that here, since it fatals if we don't have the ZipArchive class.
 
     $saved = id(new PhabricatorSavedQueryQuery())
       ->setViewer($user)
       ->withQueryKeys(array($this->key))
       ->executeOne();
     if (!$saved) {
       $engine = id(new ManiphestTaskSearchEngine())
         ->setViewer($user);
       if ($engine->isBuiltinQuery($this->key)) {
         $saved = $engine->buildSavedQueryFromBuiltin($this->key);
       }
       if (!$saved) {
         return new Aphront404Response();
       }
     }
 
     $formats = ManiphestExcelFormat::loadAllFormats();
     $export_formats = array();
     foreach ($formats as $format_class => $format_object) {
       $export_formats[$format_class] = $format_object->getName();
     }
 
     if (!$request->isDialogFormPost()) {
       $dialog = new AphrontDialogView();
       $dialog->setUser($user);
 
       $dialog->setTitle(pht('Export Tasks to Excel'));
       $dialog->appendChild(phutil_tag('p', array(), pht(
         'Do you want to export the query results to Excel?')));
 
       $form = id(new PHUIFormLayoutView())
         ->appendChild(
           id(new AphrontFormSelectControl())
             ->setLabel(pht('Format:'))
-            ->setName("excel-format")
+            ->setName('excel-format')
             ->setOptions($export_formats));
 
       $dialog->appendChild($form);
 
       $dialog->addCancelButton('/maniphest/');
       $dialog->addSubmitButton(pht('Export to Excel'));
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
-    $format = idx($formats, $request->getStr("excel-format"));
+    $format = idx($formats, $request->getStr('excel-format'));
     if ($format === null) {
       throw new Exception('Excel format object not found.');
     }
 
     $saved->makeEphemeral();
     $saved->setParameter('limit', PHP_INT_MAX);
 
     $engine = id(new ManiphestTaskSearchEngine())
       ->setViewer($user);
 
     $query = $engine->buildQueryFromSavedQuery($saved);
     $query->setViewer($user);
     $tasks = $query->execute();
 
     $all_projects = array_mergev(mpull($tasks, 'getProjectPHIDs'));
     $all_assigned = mpull($tasks, 'getOwnerPHID');
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array_merge($all_projects, $all_assigned))
       ->execute();
 
     $workbook = new PHPExcel();
     $format->buildWorkbook($workbook, $tasks, $handles, $user);
     $writer = PHPExcel_IOFactory::createWriter($workbook, 'Excel2007');
 
     ob_start();
     $writer->save('php://output');
     $data = ob_get_clean();
 
     $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 
     return id(new AphrontFileResponse())
       ->setMimeType($mime)
       ->setDownload($format->getFileName().'.xlsx')
       ->setContent($data);
   }
 
 }
diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index e7ba433fb..1b04a1ad3 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -1,765 +1,765 @@
 <?php
 
 final class ManiphestReportController extends ManiphestController {
 
   private $view;
 
   public function willProcessRequest(array $data) {
     $this->view = idx($data, 'view');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($request->isFormPost()) {
       $uri = $request->getRequestURI();
 
       $project = head($request->getArr('set_project'));
       $project = nonempty($project, null);
       $uri = $uri->alter('project', $project);
 
       $window = $request->getStr('set_window');
       $uri = $uri->alter('window', $window);
 
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI('/maniphest/report/'));
     $nav->addLabel(pht('Open Tasks'));
     $nav->addFilter('user', pht('By User'));
     $nav->addFilter('project', pht('By Project'));
     $nav->addLabel(pht('Burnup'));
     $nav->addFilter('burn', pht('Burnup Rate'));
 
     $this->view = $nav->selectFilter($this->view, 'user');
 
     require_celerity_resource('maniphest-report-css');
 
     switch ($this->view) {
       case 'burn':
         $core = $this->renderBurn();
         break;
       case 'user':
       case 'project':
         $core = $this->renderOpenTasks();
         break;
       default:
         return new Aphront404Response();
     }
 
     $nav->appendChild($core);
     $nav->setCrumbs(
       $this->buildApplicationCrumbs()
         ->addTextCrumb(pht('Reports')));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => pht('Maniphest Reports'),
       ));
   }
 
   public function renderBurn() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $handle = null;
 
     $project_phid = $request->getStr('project');
     if ($project_phid) {
       $phids = array($project_phid);
       $handles = $this->loadViewerHandles($phids);
       $handle = $handles[$project_phid];
     }
 
     $table = new ManiphestTransaction();
     $conn = $table->establishConnection('r');
 
     $joins = '';
     if ($project_phid) {
       $joins = qsprintf(
         $conn,
         'JOIN %T t ON x.objectPHID = t.phid
           JOIN %T p ON p.taskPHID = t.phid AND p.projectPHID = %s',
         id(new ManiphestTask())->getTableName(),
         id(new ManiphestTaskProject())->getTableName(),
         $project_phid);
     }
 
     $data = queryfx_all(
       $conn,
       'SELECT x.oldValue, x.newValue, x.dateCreated FROM %T x %Q
         WHERE transactionType = %s
         ORDER BY x.dateCreated ASC',
       $table->getTableName(),
       $joins,
       ManiphestTransaction::TYPE_STATUS);
 
     $stats = array();
     $day_buckets = array();
 
     $open_tasks = array();
 
     foreach ($data as $key => $row) {
 
       // NOTE: Hack to avoid json_decode().
       $oldv = trim($row['oldValue'], '"');
       $newv = trim($row['newValue'], '"');
 
       if ($oldv == 'null') {
         $old_is_open = false;
       } else {
         $old_is_open = ManiphestTaskStatus::isOpenStatus($oldv);
       }
 
       $new_is_open = ManiphestTaskStatus::isOpenStatus($newv);
 
       $is_open  = ($new_is_open && !$old_is_open);
       $is_close = ($old_is_open && !$new_is_open);
 
       $data[$key]['_is_open'] = $is_open;
       $data[$key]['_is_close'] = $is_close;
 
       if (!$is_open && !$is_close) {
         // This is either some kind of bogus event, or a resolution change
         // (e.g., resolved -> invalid). Just skip it.
         continue;
       }
 
       $day_bucket = phabricator_format_local_time(
         $row['dateCreated'],
         $user,
         'Yz');
       $day_buckets[$day_bucket] = $row['dateCreated'];
       if (empty($stats[$day_bucket])) {
         $stats[$day_bucket] = array(
           'open'  => 0,
           'close' => 0,
         );
       }
       $stats[$day_bucket][$is_close ? 'close' : 'open']++;
     }
 
     $template = array(
       'open'  => 0,
       'close' => 0,
     );
 
     $rows = array();
     $rowc = array();
     $last_month = null;
     $last_month_epoch = null;
     $last_week = null;
     $last_week_epoch = null;
     $week = null;
     $month = null;
 
     $last = last_key($stats) - 1;
     $period = $template;
 
     foreach ($stats as $bucket => $info) {
       $epoch = $day_buckets[$bucket];
 
       $week_bucket = phabricator_format_local_time(
         $epoch,
         $user,
         'YW');
       if ($week_bucket != $last_week) {
         if ($week) {
           $rows[] = $this->formatBurnRow(
             'Week of '.phabricator_date($last_week_epoch, $user),
             $week);
           $rowc[] = 'week';
         }
         $week = $template;
         $last_week = $week_bucket;
         $last_week_epoch = $epoch;
       }
 
       $month_bucket = phabricator_format_local_time(
         $epoch,
         $user,
         'Ym');
       if ($month_bucket != $last_month) {
         if ($month) {
           $rows[] = $this->formatBurnRow(
             phabricator_format_local_time($last_month_epoch, $user, 'F, Y'),
             $month);
           $rowc[] = 'month';
         }
         $month = $template;
         $last_month = $month_bucket;
         $last_month_epoch = $epoch;
       }
 
       $rows[] = $this->formatBurnRow(phabricator_date($epoch, $user), $info);
       $rowc[] = null;
       $week['open'] += $info['open'];
       $week['close'] += $info['close'];
       $month['open'] += $info['open'];
       $month['close'] += $info['close'];
       $period['open'] += $info['open'];
       $period['close'] += $info['close'];
     }
 
     if ($week) {
       $rows[] = $this->formatBurnRow(
         pht('Week To Date'),
         $week);
       $rowc[] = 'week';
     }
 
     if ($month) {
       $rows[] = $this->formatBurnRow(
         pht('Month To Date'),
         $month);
       $rowc[] = 'month';
     }
 
     $rows[] = $this->formatBurnRow(
       pht('All Time'),
       $period);
     $rowc[] = 'aggregate';
 
     $rows = array_reverse($rows);
     $rowc = array_reverse($rowc);
 
     $table = new AphrontTableView($rows);
     $table->setRowClasses($rowc);
     $table->setHeaders(
       array(
         pht('Period'),
         pht('Opened'),
         pht('Closed'),
         pht('Change'),
       ));
     $table->setColumnClasses(
       array(
         'right wide',
         'n',
         'n',
         'n',
       ));
 
     if ($handle) {
       $inst = pht(
-        "NOTE: This table reflects tasks currently in ".
-        "the project. If a task was opened in the past but added to ".
-        "the project recently, it is counted on the day it was ".
-        "opened, not the day it was categorized. If a task was part ".
-        "of this project in the past but no longer is, it is not ".
-        "counted at all.");
-      $header = pht("Task Burn Rate for Project %s", $handle->renderLink());
+        'NOTE: This table reflects tasks currently in '.
+        'the project. If a task was opened in the past but added to '.
+        'the project recently, it is counted on the day it was '.
+        'opened, not the day it was categorized. If a task was part '.
+        'of this project in the past but no longer is, it is not '.
+        'counted at all.');
+      $header = pht('Task Burn Rate for Project %s', $handle->renderLink());
       $caption = phutil_tag('p', array(), $inst);
     } else {
-      $header = pht("Task Burn Rate for All Tasks");
+      $header = pht('Task Burn Rate for All Tasks');
       $caption = null;
     }
 
     if ($caption) {
       $caption = id(new AphrontErrorView())
         ->appendChild($caption)
         ->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
     }
 
     $panel = new PHUIObjectBoxView();
     $panel->setHeaderText($header);
     if ($caption) {
       $panel->setErrorView($caption);
     }
     $panel->appendChild($table);
 
     $tokens = array();
     if ($handle) {
       $tokens = array($handle);
     }
 
     $filter = $this->renderReportFilters($tokens, $has_window = false);
 
     $id = celerity_generate_unique_node_id();
     $chart = phutil_tag(
       'div',
       array(
         'id' => $id,
         'style' => 'border: 1px solid #BFCFDA; '.
                    'background-color: #fff; '.
                    'margin: 8px 16px; '.
                    'height: 400px; ',
       ),
       '');
 
     list($burn_x, $burn_y) = $this->buildSeries($data);
 
     require_celerity_resource('raphael-core');
     require_celerity_resource('raphael-g');
     require_celerity_resource('raphael-g-line');
 
     Javelin::initBehavior('line-chart', array(
       'hardpoint' => $id,
       'x' => array(
         $burn_x,
       ),
       'y' => array(
         $burn_y,
       ),
       'xformat' => 'epoch',
       'yformat' => 'int',
     ));
 
     return array($filter, $chart, $panel);
   }
 
   private function renderReportFilters(array $tokens, $has_window) {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setDatasource('/typeahead/common/searchproject/')
           ->setLabel(pht('Project'))
           ->setLimit(1)
           ->setName('set_project')
           ->setValue($tokens));
 
     if ($has_window) {
       list($window_str, $ignored, $window_error) = $this->getWindow();
       $form
         ->appendChild(
           id(new AphrontFormTextControl())
             ->setLabel(pht('Recently Means'))
             ->setName('set_window')
             ->setCaption(
               pht('Configure the cutoff for the "Recently Closed" column.'))
             ->setValue($window_str)
             ->setError($window_error));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Filter By Project')));
 
     $filter = new AphrontListFilterView();
     $filter->appendChild($form);
 
     return $filter;
   }
 
   private function buildSeries(array $data) {
     $out = array();
 
     $counter = 0;
     foreach ($data as $row) {
       $t = (int)$row['dateCreated'];
       if ($row['_is_close']) {
         --$counter;
         $out[$t] = $counter;
       } else if ($row['_is_open']) {
         ++$counter;
         $out[$t] = $counter;
       }
     }
 
     return array(array_keys($out), array_values($out));
   }
 
   private function formatBurnRow($label, $info) {
     $delta = $info['open'] - $info['close'];
     $fmt = number_format($delta);
     if ($delta > 0) {
       $fmt = '+'.$fmt;
       $fmt = phutil_tag('span', array('class' => 'red'), $fmt);
     } else {
       $fmt = phutil_tag('span', array('class' => 'green'), $fmt);
     }
 
     return array(
       $label,
       number_format($info['open']),
       number_format($info['close']),
       $fmt);
   }
 
   public function renderOpenTasks() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
 
     $query = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withStatuses(ManiphestTaskStatus::getOpenStatusConstants());
 
     $project_phid = $request->getStr('project');
     $project_handle = null;
     if ($project_phid) {
       $phids = array($project_phid);
       $handles = $this->loadViewerHandles($phids);
       $project_handle = $handles[$project_phid];
 
       $query->withAnyProjects($phids);
     }
 
     $tasks = $query->execute();
 
     $recently_closed = $this->loadRecentlyClosedTasks();
 
     $date = phabricator_date(time(), $user);
 
     switch ($this->view) {
       case 'user':
         $result = mgroup($tasks, 'getOwnerPHID');
         $leftover = idx($result, '', array());
         unset($result['']);
 
         $result_closed = mgroup($recently_closed, 'getOwnerPHID');
         $leftover_closed = idx($result_closed, '', array());
         unset($result_closed['']);
 
         $base_link = '/maniphest/?assigned=';
         $leftover_name = phutil_tag('em', array(), pht('(Up For Grabs)'));
         $col_header = pht('User');
         $header = pht('Open Tasks by User and Priority (%s)', $date);
         break;
       case 'project':
         $result = array();
         $leftover = array();
         foreach ($tasks as $task) {
           $phids = $task->getProjectPHIDs();
           if ($phids) {
             foreach ($phids as $project_phid) {
               $result[$project_phid][] = $task;
             }
           } else {
             $leftover[] = $task;
           }
         }
 
         $result_closed = array();
         $leftover_closed = array();
         foreach ($recently_closed as $task) {
           $phids = $task->getProjectPHIDs();
           if ($phids) {
             foreach ($phids as $project_phid) {
               $result_closed[$project_phid][] = $task;
             }
           } else {
             $leftover_closed[] = $task;
           }
         }
 
         $base_link = '/maniphest/?allProjects=';
         $leftover_name = phutil_tag('em', array(), pht('(No Project)'));
         $col_header = pht('Project');
         $header = pht('Open Tasks by Project and Priority (%s)', $date);
         break;
     }
 
     $phids = array_keys($result);
     $handles = $this->loadViewerHandles($phids);
     $handles = msort($handles, 'getName');
 
     $order = $request->getStr('order', 'name');
     list($order, $reverse) = AphrontTableView::parseSort($order);
 
     require_celerity_resource('aphront-tooltip-css');
     Javelin::initBehavior('phabricator-tooltips', array());
 
     $rows = array();
     $pri_total = array();
     foreach (array_merge($handles, array(null)) as $handle) {
       if ($handle) {
         if (($project_handle) &&
             ($project_handle->getPHID() == $handle->getPHID())) {
           // If filtering by, e.g., "bugs", don't show a "bugs" group.
           continue;
         }
 
         $tasks = idx($result, $handle->getPHID(), array());
         $name = phutil_tag(
           'a',
           array(
             'href' => $base_link.$handle->getPHID(),
           ),
           $handle->getName());
         $closed = idx($result_closed, $handle->getPHID(), array());
       } else {
         $tasks = $leftover;
         $name  = $leftover_name;
         $closed = $leftover_closed;
       }
 
       $taskv = $tasks;
       $tasks = mgroup($tasks, 'getPriority');
 
       $row = array();
       $row[] = $name;
       $total = 0;
       foreach (ManiphestTaskPriority::getTaskPriorityMap() as $pri => $label) {
         $n = count(idx($tasks, $pri, array()));
         if ($n == 0) {
           $row[] = '-';
         } else {
           $row[] = number_format($n);
         }
         $total += $n;
       }
       $row[] = number_format($total);
 
       list($link, $oldest_all) = $this->renderOldest($taskv);
       $row[] = $link;
 
       $normal_or_better = array();
       foreach ($taskv as $id => $task) {
         // TODO: This is sort of a hard-code for the default "normal" status.
         // When reports are more powerful, this should be made more general.
         if ($task->getPriority() < 50) {
           continue;
         }
         $normal_or_better[$id] = $task;
       }
 
       list($link, $oldest_pri) = $this->renderOldest($normal_or_better);
       $row[] = $link;
 
       if ($closed) {
         $task_ids = implode(',', mpull($closed, 'getID'));
         $row[] = phutil_tag(
           'a',
           array(
             'href' => '/maniphest/?ids='.$task_ids,
             'target' => '_blank',
           ),
           number_format(count($closed)));
       } else {
         $row[] = '-';
       }
 
       switch ($order) {
         case 'total':
           $row['sort'] = $total;
           break;
         case 'oldest-all':
           $row['sort'] = $oldest_all;
           break;
         case 'oldest-pri':
           $row['sort'] = $oldest_pri;
           break;
         case 'closed':
           $row['sort'] = count($closed);
           break;
         case 'name':
         default:
           $row['sort'] = $handle ? $handle->getName() : '~';
           break;
       }
 
       $rows[] = $row;
     }
 
     $rows = isort($rows, 'sort');
     foreach ($rows as $k => $row) {
       unset($rows[$k]['sort']);
     }
     if ($reverse) {
       $rows = array_reverse($rows);
     }
 
     $cname = array($col_header);
     $cclass = array('pri right wide');
     $pri_map = ManiphestTaskPriority::getShortNameMap();
     foreach ($pri_map as $pri => $label) {
       $cname[] = $label;
       $cclass[] = 'n';
     }
     $cname[] = 'Total';
     $cclass[] = 'n';
     $cname[] = javelin_tag(
       'span',
       array(
         'sigil' => 'has-tooltip',
         'meta'  => array(
           'tip' => pht('Oldest open task.'),
           'size' => 200,
         ),
       ),
       pht('Oldest (All)'));
     $cclass[] = 'n';
     $cname[] = javelin_tag(
       'span',
       array(
         'sigil' => 'has-tooltip',
         'meta'  => array(
           'tip' => pht('Oldest open task, excluding those with Low or '.
                    'Wishlist priority.'),
           'size' => 200,
         ),
       ),
       pht('Oldest (Pri)'));
     $cclass[] = 'n';
 
     list($ignored, $window_epoch) = $this->getWindow();
     $edate = phabricator_datetime($window_epoch, $user);
     $cname[] = javelin_tag(
       'span',
       array(
         'sigil' => 'has-tooltip',
         'meta'  => array(
           'tip'  => pht('Closed after %s', $edate),
           'size' => 260
         ),
       ),
       pht('Recently Closed'));
     $cclass[] = 'n';
 
     $table = new AphrontTableView($rows);
     $table->setHeaders($cname);
     $table->setColumnClasses($cclass);
     $table->makeSortable(
       $request->getRequestURI(),
       'order',
       $order,
       $reverse,
       array(
         'name',
         null,
         null,
         null,
         null,
         null,
         null,
         'total',
         'oldest-all',
         'oldest-pri',
         'closed',
       ));
 
     $panel = new PHUIObjectBoxView();
     $panel->setHeaderText($header);
     $panel->appendChild($table);
 
     $tokens = array();
     if ($project_handle) {
       $tokens = array($project_handle);
     }
     $filter = $this->renderReportFilters($tokens, $has_window = true);
 
     return array($filter, $panel);
   }
 
 
   /**
    * Load all the tasks that have been recently closed.
    */
   private function loadRecentlyClosedTasks() {
     list($ignored, $window_epoch) = $this->getWindow();
 
     $table = new ManiphestTask();
     $xtable = new ManiphestTransaction();
     $conn_r = $table->establishConnection('r');
 
     // TODO: Gross. This table is not meant to be queried like this. Build
     // real stats tables.
 
     $open_status_list = array();
     foreach (ManiphestTaskStatus::getOpenStatusConstants() as $constant) {
       $open_status_list[] = json_encode((string)$constant);
     }
 
     $tasks = queryfx_all(
       $conn_r,
       'SELECT t.* FROM %T t JOIN %T x ON x.objectPHID = t.phid
         WHERE t.status NOT IN (%Ls)
         AND x.oldValue IN (null, %Ls)
         AND x.newValue NOT IN (%Ls)
         AND t.dateModified >= %d
         AND x.dateCreated >= %d',
       $table->getTableName(),
       $xtable->getTableName(),
       ManiphestTaskStatus::getOpenStatusConstants(),
       $open_status_list,
       $open_status_list,
       $window_epoch,
       $window_epoch);
 
     return id(new ManiphestTask())->loadAllFromArray($tasks);
   }
 
   /**
    * Parse the "Recently Means" filter into:
    *
    *    - A string representation, like "12 AM 7 days ago" (default);
    *    - a locale-aware epoch representation; and
    *    - a possible error.
    */
   private function getWindow() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $window_str = $this->getRequest()->getStr('window', '12 AM 7 days ago');
 
     $error = null;
     $window_epoch = null;
 
     // Do locale-aware parsing so that the user's timezone is assumed for
     // time windows like "3 PM", rather than assuming the server timezone.
 
     $window_epoch = PhabricatorTime::parseLocalTime($window_str, $user);
     if (!$window_epoch) {
       $error = 'Invalid';
       $window_epoch = time() - (60 * 60 * 24 * 7);
     }
 
     // If the time ends up in the future, convert it to the corresponding time
     // and equal distance in the past. This is so users can type "6 days" (which
     // means "6 days from now") and get the behavior of "6 days ago", rather
     // than no results (because the window epoch is in the future). This might
     // be a little confusing because it casues "tomorrow" to mean "yesterday"
     // and "2022" (or whatever) to mean "ten years ago", but these inputs are
     // nonsense anyway.
 
     if ($window_epoch > time()) {
       $window_epoch = time() - ($window_epoch - time());
     }
 
     return array($window_str, $window_epoch, $error);
   }
 
   private function renderOldest(array $tasks) {
     assert_instances_of($tasks, 'ManiphestTask');
     $oldest = null;
     foreach ($tasks as $id => $task) {
       if (($oldest === null) ||
           ($task->getDateCreated() < $tasks[$oldest]->getDateCreated())) {
         $oldest = $id;
       }
     }
 
     if ($oldest === null) {
       return array('-', 0);
     }
 
     $oldest = $tasks[$oldest];
 
     $raw_age = (time() - $oldest->getDateCreated());
     $age = number_format($raw_age / (24 * 60 * 60)).' d';
 
     $link = javelin_tag(
       'a',
       array(
         'href'  => '/T'.$oldest->getID(),
         'sigil' => 'has-tooltip',
         'meta'  => array(
           'tip' => 'T'.$oldest->getID().': '.$oldest->getTitle(),
         ),
         'target' => '_blank',
       ),
       $age);
 
     return array($link, $raw_age);
   }
 
 }
diff --git a/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php b/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
index 7d0d5a8ec..e4211dc9c 100644
--- a/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
+++ b/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
@@ -1,110 +1,110 @@
 <?php
 
 final class PhabricatorManiphestTaskTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   public function generate() {
     $authorPHID = $this->loadPhabrictorUserPHID();
     $author = id(new PhabricatorUser())
           ->loadOneWhere('phid = %s', $authorPHID);
     $task = ManiphestTask::initializeNewTask($author)
       ->setSubPriority($this->generateTaskSubPriority())
       ->setTitle($this->generateTitle());
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_UNKNOWN,
       array());
 
     $template = new ManiphestTransaction();
     // Accumulate Transactions
     $changes = array();
     $changes[ManiphestTransaction::TYPE_TITLE] =
       $this->generateTitle();
     $changes[ManiphestTransaction::TYPE_DESCRIPTION] =
       $this->generateDescription();
     $changes[ManiphestTransaction::TYPE_OWNER] =
       $this->loadOwnerPHID();
     $changes[ManiphestTransaction::TYPE_STATUS] =
       $this->generateTaskStatus();
     $changes[ManiphestTransaction::TYPE_PRIORITY] =
       $this->generateTaskPriority();
     $changes[ManiphestTransaction::TYPE_CCS] =
       $this->getCCPHIDs();
     $changes[ManiphestTransaction::TYPE_PROJECTS] =
       $this->getProjectPHIDs();
     $transactions = array();
     foreach ($changes as $type => $value) {
       $transaction = clone $template;
       $transaction->setTransactionType($type);
       $transaction->setNewValue($value);
       $transactions[] = $transaction;
     }
 
     // Apply Transactions
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($author)
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true)
       ->applyTransactions($task, $transactions);
     return $task;
   }
 
   public function getCCPHIDs() {
     $ccs = array();
     for ($i = 0; $i < rand(1, 4);$i++) {
       $ccs[] = $this->loadPhabrictorUserPHID();
     }
     return $ccs;
   }
 
   public function getProjectPHIDs() {
     $projects = array();
     for ($i = 0; $i < rand(1, 4);$i++) {
-      $project = $this->loadOneRandom("PhabricatorProject");
+      $project = $this->loadOneRandom('PhabricatorProject');
       if ($project) {
         $projects[] = $project->getPHID();
       }
     }
     return $projects;
   }
 
   public function loadOwnerPHID() {
     if (rand(0, 3) == 0) {
       return null;
     } else {
       return $this->loadPhabrictorUserPHID();
     }
   }
 
   public function generateTitle() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generate();
   }
 
   public function generateDescription() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generateSeveral(rand(30, 40));
   }
 
   public function generateTaskPriority() {
     return array_rand(ManiphestTaskPriority::getTaskPriorityMap());
   }
 
   public function generateTaskSubPriority() {
     return rand(2 << 16, 2 << 32);
   }
 
   public function generateTaskStatus() {
     $statuses = array_keys(ManiphestTaskStatus::getTaskStatusMap());
     // Make sure 4/5th of all generated Tasks are open
     $random = rand(0, 4);
     if ($random != 0) {
       return ManiphestTaskStatus::getDefaultStatus();
     } else {
       return array_rand($statuses);
     }
   }
 
 
 }
diff --git a/src/applications/maniphest/mail/ManiphestReplyHandler.php b/src/applications/maniphest/mail/ManiphestReplyHandler.php
index 3ab24595d..8408dd0ce 100644
--- a/src/applications/maniphest/mail/ManiphestReplyHandler.php
+++ b/src/applications/maniphest/mail/ManiphestReplyHandler.php
@@ -1,190 +1,190 @@
 <?php
 
 /**
  * @group maniphest
  */
 final class ManiphestReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof ManiphestTask)) {
-      throw new Exception("Mail receiver is not a ManiphestTask!");
+      throw new Exception('Mail receiver is not a ManiphestTask!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'T');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('T');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.maniphest.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht(
-        "Reply to comment or attach files, or !close, !claim, ".
-        "!unsubscribe or !assign <username>.");
+        'Reply to comment or attach files, or !close, !claim, '.
+        '!unsubscribe or !assign <username>.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
 
     // NOTE: We'll drop in here on both the "reply to a task" and "create a
     // new task" workflows! Make sure you test both if you make changes!
 
     $task = $this->getMailReceiver();
 
     $is_new_task = !$task->getID();
 
     $user = $this->getActor();
 
     $body_data = $mail->parseBody();
     $body = $body_data['body'];
     $body = $this->enhanceBodyWithAttachments($body, $mail->getAttachments());
 
     $xactions = array();
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $template = new ManiphestTransaction();
 
     $is_unsub = false;
     if ($is_new_task) {
       // If this is a new task, create a "User created this task." transaction
       // and then set the title and description.
       $xaction = clone $template;
       $xaction->setTransactionType(ManiphestTransaction::TYPE_STATUS);
       $xaction->setNewValue(ManiphestTaskStatus::getDefaultStatus());
       $xactions[] = $xaction;
 
       $task->setAuthorPHID($user->getPHID());
       $task->setTitle(nonempty($mail->getSubject(), 'Untitled Task'));
       $task->setDescription($body);
       $task->setPriority(ManiphestTaskPriority::getDefaultPriority());
 
     } else {
 
       $command = $body_data['command'];
       $command_value = $body_data['command_value'];
 
       $ttype = PhabricatorTransactions::TYPE_COMMENT;
       $new_value = null;
       switch ($command) {
         case 'close':
           $ttype = ManiphestTransaction::TYPE_STATUS;
           $new_value = ManiphestTaskStatus::getDefaultClosedStatus();
           break;
         case 'claim':
           $ttype = ManiphestTransaction::TYPE_OWNER;
           $new_value = $user->getPHID();
           break;
         case 'assign':
           $ttype = ManiphestTransaction::TYPE_OWNER;
           if ($command_value) {
             $assign_users = id(new PhabricatorPeopleQuery())
               ->setViewer($user)
               ->withUsernames(array($command_value))
               ->execute();
             if ($assign_users) {
               $assign_user = head($assign_users);
               $new_value = $assign_user->getPHID();
             }
           }
           // assign to the user by default
           if (!$new_value) {
             $new_value = $user->getPHID();
           }
           break;
         case 'unsubscribe':
           $is_unsub = true;
           $ttype = ManiphestTransaction::TYPE_CCS;
           $ccs = $task->getCCPHIDs();
           foreach ($ccs as $k => $phid) {
             if ($phid == $user->getPHID()) {
               unset($ccs[$k]);
             }
           }
           $new_value = array_values($ccs);
           break;
       }
 
       if ($ttype != PhabricatorTransactions::TYPE_COMMENT) {
         $xaction = clone $template;
         $xaction->setTransactionType($ttype);
         $xaction->setNewValue($new_value);
         $xactions[] = $xaction;
       }
 
       if (strlen($body)) {
         $xaction = clone $template;
         $xaction->setTransactionType(PhabricatorTransactions::TYPE_COMMENT);
         $xaction->attachComment(
           id(new ManiphestTransactionComment())
             ->setContent($body));
         $xactions[] = $xaction;
       }
 
     }
 
     $ccs = $mail->loadCCPHIDs();
     $old_ccs = $task->getCCPHIDs();
     $new_ccs = array_merge($old_ccs, $ccs);
     if (!$is_unsub) {
       $new_ccs[] = $user->getPHID();
     }
     $new_ccs = array_unique($new_ccs);
 
     if (array_diff($new_ccs, $old_ccs)) {
       $cc_xaction = clone $template;
       $cc_xaction->setTransactionType(ManiphestTransaction::TYPE_CCS);
       $cc_xaction->setNewValue($new_ccs);
       $xactions[] = $cc_xaction;
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
       array(
         'task'          => $task,
         'mail'          => $mail,
         'new'           => $is_new_task,
         'transactions'  => $xactions,
       ));
     $event->setUser($user);
     PhutilEventEngine::dispatchEvent($event);
 
     $task = $event->getValue('task');
     $xactions = $event->getValue('transactions');
 
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($user)
       ->setParentMessageID($mail->getMessageID())
       ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true)
       ->setContentSource($content_source)
       ->applyTransactions($task, $xactions);
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
       array(
         'task'          => $task,
         'new'           => $is_new_task,
         'transactions'  => $xactions,
       ));
     $event->setUser($user);
     PhutilEventEngine::dispatchEvent($event);
 
   }
 
 }
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
index 44c8acd2f..e9e30b31f 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
@@ -1,157 +1,157 @@
 <?php
 
 /**
  * Mail adapter that uses SendGrid's web API to deliver email.
  */
 final class PhabricatorMailImplementationSendGridAdapter
   extends PhabricatorMailImplementationAdapter {
 
   private $params = array();
 
   public function setFrom($email, $name = '') {
     $this->params['from'] = $email;
     $this->params['from-name'] = $name;
     return $this;
   }
 
   public function addReplyTo($email, $name = '') {
     if (empty($this->params['reply-to'])) {
       $this->params['reply-to'] = array();
     }
     $this->params['reply-to'][] = array(
       'email' => $email,
       'name'  => $name,
     );
     return $this;
   }
 
   public function addTos(array $emails) {
     foreach ($emails as $email) {
       $this->params['tos'][] = $email;
     }
     return $this;
   }
 
   public function addCCs(array $emails) {
     foreach ($emails as $email) {
       $this->params['ccs'][] = $email;
     }
     return $this;
   }
 
   public function addAttachment($data, $filename, $mimetype) {
     if (empty($this->params['files'])) {
       $this->params['files'] = array();
     }
     $this->params['files'][$filename] = $data;
   }
 
   public function addHeader($header_name, $header_value) {
     $this->params['headers'][] = array($header_name, $header_value);
     return $this;
   }
 
   public function setBody($body) {
     $this->params['body'] = $body;
     return $this;
   }
 
   public function setSubject($subject) {
     $this->params['subject'] = $subject;
     return $this;
   }
 
   public function setIsHTML($is_html) {
     $this->params['is-html'] = $is_html;
     return $this;
   }
 
   public function supportsMessageIDHeader() {
     return false;
   }
 
   public function send() {
 
     $user = PhabricatorEnv::getEnvConfig('sendgrid.api-user');
     $key  = PhabricatorEnv::getEnvConfig('sendgrid.api-key');
 
     if (!$user || !$key) {
       throw new Exception(
         "Configure 'sendgrid.api-user' and 'sendgrid.api-key' to use ".
         "SendGrid for mail delivery.");
     }
 
     $params = array();
 
     $ii = 0;
     foreach (idx($this->params, 'tos', array()) as $to) {
       $params['to['.($ii++).']'] = $to;
     }
 
     $params['subject'] = idx($this->params, 'subject');
     if (idx($this->params, 'is-html')) {
       $params['html'] = idx($this->params, 'body');
     } else {
       $params['text'] = idx($this->params, 'body');
     }
 
     $params['from'] = idx($this->params, 'from');
     if (idx($this->params, 'from-name')) {
       $params['fromname'] = $this->params['from-name'];
     }
 
     if (idx($this->params, 'reply-to')) {
       $replyto = $this->params['reply-to'];
 
       // Pick off the email part, no support for the name part in this API.
       $params['replyto'] = $replyto[0]['email'];
     }
 
     foreach (idx($this->params, 'files', array()) as $name => $data) {
       $params['files['.$name.']'] = $data;
     }
 
     $headers = idx($this->params, 'headers', array());
 
     // See SendGrid Support Ticket #29390; there's no explicit REST API support
     // for CC right now but it works if you add a generic "Cc" header.
     //
     // SendGrid said this is supported:
     //   "You can use CC as you are trying to do there [by adding a generic
     //    header]. It is supported despite our limited documentation to this
     //    effect, I am glad you were able to figure it out regardless. ..."
     if (idx($this->params, 'ccs')) {
       $headers[] = array('Cc', implode(', ', $this->params['ccs']));
     }
 
     if ($headers) {
       // Convert to dictionary.
       $headers = ipull($headers, 1, 0);
       $headers = json_encode($headers);
       $params['headers'] = $headers;
     }
 
     $params['api_user'] = $user;
     $params['api_key'] = $key;
 
     $future = new HTTPSFuture(
       'https://sendgrid.com/api/mail.send.json',
       $params);
     $future->setMethod('POST');
 
     list($body) = $future->resolvex();
 
     $response = json_decode($body, true);
     if (!is_array($response)) {
       throw new Exception("Failed to JSON decode response: {$body}");
     }
 
     if ($response['message'] !== 'success') {
-      $errors = implode(";", $response['errors']);
+      $errors = implode(';', $response['errors']);
       throw new Exception("Request failed with errors: {$errors}.");
     }
 
     return true;
   }
 
 }
diff --git a/src/applications/metamta/contentsource/PhabricatorContentSourceView.php b/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
index 6a37e3c82..e1a7b8fda 100644
--- a/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
+++ b/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
@@ -1,32 +1,32 @@
 <?php
 
 final class PhabricatorContentSourceView extends AphrontView {
 
   private $contentSource;
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source;
     return $this;
   }
 
   public function render() {
     require_celerity_resource('phabricator-content-source-view-css');
 
     $map = PhabricatorContentSource::getSourceNameMap();
 
     $source = $this->contentSource->getSource();
     $type = idx($map, $source, null);
 
     if (!$type) {
       return null;
     }
 
     return phutil_tag(
       'span',
       array(
-        'class' => "phabricator-content-source-view",
+        'class' => 'phabricator-content-source-view',
       ),
       "Via {$type}");
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php
index e10351342..d6a762b75 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php
@@ -1,64 +1,64 @@
 <?php
 
 final class PhabricatorMailManagementListInboundWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('list-inbound')
       ->setSynopsis('List inbound messages received by Phabricator.')
       ->setExamples(
-        "**list-inbound**")
+        '**list-inbound**')
       ->setArguments(
         array(
           array(
             'name'    => 'limit',
             'param'   => 'N',
             'default' => 100,
             'help'    => 'Show a specific number of messages (default 100).',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $mails = id(new PhabricatorMetaMTAReceivedMail())->loadAllWhere(
       '1 = 1 ORDER BY id DESC LIMIT %d',
       $args->getArg('limit'));
 
     if (!$mails) {
-      $console->writeErr("%s\n", pht("No received mail."));
+      $console->writeErr("%s\n", pht('No received mail.'));
       return 0;
     }
 
     $phids = array_merge(
       mpull($mails, 'getRelatedPHID'),
       mpull($mails, 'getAuthorPHID'));
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs($phids)
       ->execute();
 
     foreach (array_reverse($mails) as $mail) {
       $console->writeOut(
         "%s\n",
         sprintf(
-          "% 8d  %-16s  %-20s  %s",
+          '% 8d  %-16s  %-20s  %s',
           $mail->getID(),
           $mail->getAuthorPHID()
             ? $handles[$mail->getAuthorPHID()]->getName()
             : '-',
           $mail->getRelatedPHID()
             ? $handles[$mail->getRelatedPHID()]->getName()
             : '-',
           $mail->getSubject()
             ? $mail->getSubject()
             : pht('(No subject.)')));
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
index 6d84d1566..14907c0f7 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
@@ -1,49 +1,49 @@
 <?php
 
 final class PhabricatorMailManagementListOutboundWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('list-outbound')
       ->setSynopsis('List outbound messages sent by Phabricator.')
       ->setExamples(
-        "**list-outbound**")
+        '**list-outbound**')
       ->setArguments(
         array(
           array(
             'name'    => 'limit',
             'param'   => 'N',
             'default' => 100,
             'help'    => 'Show a specific number of messages (default 100).',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $mails = id(new PhabricatorMetaMTAMail())->loadAllWhere(
       '1 = 1 ORDER BY id DESC LIMIT %d',
       $args->getArg('limit'));
 
     if (!$mails) {
-      $console->writeErr("%s\n", pht("No sent mail."));
+      $console->writeErr("%s\n", pht('No sent mail.'));
       return 0;
     }
 
     foreach (array_reverse($mails) as $mail) {
       $console->writeOut(
         "%s\n",
         sprintf(
-          "% 8d  %-8s  %s",
+          '% 8d  %-8s  %s',
           $mail->getID(),
           PhabricatorMetaMTAMail::getReadableStatus($mail->getStatus()),
           $mail->getSubject()));
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
index 22eb00e41..ebaf76817 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
@@ -1,143 +1,143 @@
 <?php
 
 final class PhabricatorMailManagementReceiveTestWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('receive-test')
       ->setSynopsis(
         pht(
           'Simulate receiving mail. This is primarily useful if you are '.
           'developing new mail receivers.'))
       ->setExamples(
-        "**receive-test** --as alincoln --to D123 < body.txt")
+        '**receive-test** --as alincoln --to D123 < body.txt')
       ->setArguments(
         array(
           array(
             'name'    => 'as',
             'param'   => 'user',
             'help'    => 'Act as the specified user.',
           ),
           array(
             'name'    => 'from',
             'param'   => 'email',
             'help'    => 'Simulate mail delivery "From:" the given user.',
           ),
           array(
             'name'    => 'to',
             'param'   => 'object',
             'help'    => 'Simulate mail delivery "To:" the given object.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $as = $args->getArg('as');
     if (!$as) {
       throw new PhutilArgumentUsageException(
         pht("Use '--as' to specify the acting user."));
     }
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($this->getViewer())
       ->withUsernames(array($as))
       ->executeOne();
     if (!$user) {
       throw new PhutilArgumentUsageException(
         pht("No such user '%s' exists.", $as));
     }
 
     $to = $args->getArg('to');
     if (!$to) {
       throw new PhutilArgumentUsageException(
         "Use '--to' to specify the receiving object or email address.");
     }
 
     $from = $args->getArg('from');
     if (!$from) {
       $from = $user->loadPrimaryEmail()->getAddress();
     }
 
     $console->writeErr("%s\n", pht('Reading message body from stdin...'));
     $body = file_get_contents('php://stdin');
 
     $received = new PhabricatorMetaMTAReceivedMail();
     $header_content = array(
       'Message-ID' => Filesystem::readRandomCharacters(12),
       'From'       => $from,
     );
 
     if (preg_match('/.+@.+/', $to)) {
       $header_content['to'] = $to;
     } else {
       // We allow the user to use an object name instead of a real address
       // as a convenience. To build the mail, we build a similar message and
       // look for a receiver which will accept it.
       $pseudohash = PhabricatorObjectMailReceiver::computeMailHash('x', 'y');
       $pseudomail = id(new PhabricatorMetaMTAReceivedMail())
         ->setHeaders(
           array(
             'to' => $to.'+1+'.$pseudohash,
           ));
 
       $receivers = id(new PhutilSymbolLoader())
         ->setAncestorClass('PhabricatorMailReceiver')
         ->loadObjects();
 
       $receiver = null;
       foreach ($receivers as $possible_receiver) {
         if (!$possible_receiver->isEnabled()) {
           continue;
         }
         if (!$possible_receiver->canAcceptMail($pseudomail)) {
           continue;
         }
         $receiver = $possible_receiver;
         break;
       }
 
       if (!$receiver) {
         throw new Exception(
           pht("No configured mail receiver can accept mail to '%s'.", $to));
       }
 
       if (!($receiver instanceof PhabricatorObjectMailReceiver)) {
         $class = get_class($receiver);
         throw new Exception(
           "Receiver '%s' accepts mail to '%s', but is not a ".
           "subclass of PhabricatorObjectMailReceiver.",
           $class,
           $to);
       }
 
       $object = $receiver->loadMailReceiverObject($to, $user);
       if (!$object) {
         throw new Exception(pht("No such object '%s'!", $to));
       }
 
       $hash = PhabricatorObjectMailReceiver::computeMailHash(
         $object->getMailKey(),
         $user->getPHID());
 
       $header_content['to'] = $to.'+'.$user->getID().'+'.$hash.'@test.com';
     }
 
     $received->setHeaders($header_content);
     $received->setBodies(
       array(
         'text' => $body,
       ));
 
     $received->save();
     $received->processReceivedMail();
 
     $console->writeErr(
       "%s\n\n    phabricator/ $ ./bin/mail show-inbound --id %d\n\n",
-      pht("Mail received! You can view details by running this command:"),
+      pht('Mail received! You can view details by running this command:'),
       $received->getID());
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementResendWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementResendWorkflow.php
index c58699717..952ec44f3 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementResendWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementResendWorkflow.php
@@ -1,60 +1,60 @@
 <?php
 
 final class PhabricatorMailManagementResendWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('resend')
       ->setSynopsis('Send mail again.')
       ->setExamples(
-        "**resend** --id 1 --id 2")
+        '**resend** --id 1 --id 2')
       ->setArguments(
         array(
           array(
             'name'    => 'id',
             'param'   => 'id',
             'help'    => 'Send mail with a given ID again.',
             'repeat'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $ids = $args->getArg('id');
     if (!$ids) {
       throw new PhutilArgumentUsageException(
         "Use the '--id' flag to specify one or more messages to resend.");
     }
 
     $messages = id(new PhabricatorMetaMTAMail())->loadAllWhere(
       'id IN (%Ld)',
       $ids);
 
     if ($ids) {
       $ids = array_fuse($ids);
       $missing = array_diff_key($ids, $messages);
       if ($missing) {
         throw new PhutilArgumentUsageException(
-          "Some specified messages do not exist: ".
+          'Some specified messages do not exist: '.
           implode(', ', array_keys($missing)));
       }
     }
 
     foreach ($messages as $message) {
       $message->setStatus(PhabricatorMetaMTAMail::STATUS_QUEUE);
       $message->save();
 
       $mailer_task = PhabricatorWorker::scheduleTask(
         'PhabricatorMetaMTAWorker',
         $message->getID());
 
       $console->writeOut(
         "Queued message #%d for resend.\n",
         $message->getID());
     }
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
index 4af5d5a79..763e0d764 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
@@ -1,146 +1,146 @@
 <?php
 
 final class PhabricatorMailManagementSendTestWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('send-test')
       ->setSynopsis(
         pht(
           'Simulate sending mail. This may be useful to test your mail '.
           'configuration, or while developing new mail adapters.'))
       ->setExamples(
-        "**send-test** --to alincoln --subject hi < body.txt")
+        '**send-test** --to alincoln --subject hi < body.txt')
       ->setArguments(
         array(
           array(
             'name'    => 'from',
             'param'   => 'user',
             'help'    => 'Send mail from the specified user.',
           ),
           array(
             'name'    => 'to',
             'param'   => 'user',
             'help'    => 'Send mail "To:" the specified users.',
             'repeat'  => true,
           ),
           array(
             'name'    => 'cc',
             'param'   => 'user',
             'help'    => 'Send mail which "Cc:"s the specified users.',
             'repeat'  => true,
           ),
           array(
             'name'    => 'subject',
             'param'   => 'text',
             'help'    => 'Use the provided subject.',
           ),
           array(
             'name'    => 'tag',
             'param'   => 'text',
             'help'    => 'Add the given mail tags.',
             'repeat'  => true,
           ),
           array(
             'name'    => 'attach',
             'param'   => 'file',
             'help'    => 'Attach a file.',
             'repeat'  => true,
           ),
           array(
             'name'    => 'html',
             'help'    => 'Send as HTML mail.',
           ),
           array(
             'name'    => 'bulk',
             'help'    => 'Send with bulk headers.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $from = $args->getArg('from');
     if ($from) {
       $user = id(new PhabricatorPeopleQuery())
         ->setViewer($viewer)
         ->withUsernames(array($from))
         ->executeOne();
       if (!$user) {
         throw new PhutilArgumentUsageException(
           pht("No such user '%s' exists.", $from));
       }
       $from = $user;
     }
 
     $tos = $args->getArg('to');
     $ccs = $args->getArg('cc');
 
     $names = array_merge($tos, $ccs);
     $users = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withUsernames($names)
       ->execute();
     $users = mpull($users, null, 'getUsername');
 
     foreach ($tos as $key => $username) {
       if (empty($users[$username])) {
         throw new PhutilArgumentUsageException(
           pht("No such user '%s' exists.", $username));
       }
       $tos[$key] = $users[$username]->getPHID();
     }
 
     foreach ($ccs as $key => $username) {
       if (empty($users[$username])) {
         throw new PhutilArgumentUsageException(
           pht("No such user '%s' exists.", $username));
       }
       $ccs[$key] = $users[$username]->getPHID();
     }
 
     $subject = $args->getArg('subject');
     $tags = $args->getArg('tag');
     $attach = $args->getArg('attach');
     $is_html = $args->getArg('html');
     $is_bulk = $args->getArg('bulk');
 
     $console->writeErr("%s\n", pht('Reading message body from stdin...'));
     $body = file_get_contents('php://stdin');
 
 
     $mail = id(new PhabricatorMetaMTAMail())
       ->addTos($tos)
       ->addCCs($ccs)
       ->setSubject($subject)
       ->setBody($body)
       ->setOverrideNoSelfMailPreference(true)
       ->setIsHTML($is_html)
       ->setIsBulk($is_bulk)
       ->setMailTags($tags);
 
     if ($from) {
       $mail->setFrom($from->getPHID());
     }
 
     foreach ($attach as $attachment) {
       $data = Filesystem::readFile($attachment);
       $name = basename($attachment);
       $mime = Filesystem::getMimeType($attachment);
       $file = new PhabricatorMetaMTAAttachment($data, $name, $mime);
       $mail->addAttachment($file);
     }
 
     PhabricatorWorker::setRunAllTasksInProcess(true);
     $mail->save();
 
     $console->writeErr(
       "%s\n\n    phabricator/ $ ./bin/mail show-outbound --id %d\n\n",
-      pht("Mail sent! You can view details by running this command:"),
+      pht('Mail sent! You can view details by running this command:'),
       $mail->getID());
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php
index 138436a66..7131187fa 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php
@@ -1,106 +1,106 @@
 <?php
 
 final class PhabricatorMailManagementShowInboundWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('show-inbound')
       ->setSynopsis('Show diagnostic details about inbound mail.')
       ->setExamples(
-        "**show-inbound** --id 1 --id 2")
+        '**show-inbound** --id 1 --id 2')
       ->setArguments(
         array(
           array(
             'name'    => 'id',
             'param'   => 'id',
             'help'    => 'Show details about inbound mail with given ID.',
             'repeat'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $ids = $args->getArg('id');
     if (!$ids) {
       throw new PhutilArgumentUsageException(
         "Use the '--id' flag to specify one or more messages to show.");
     }
 
     $messages = id(new PhabricatorMetaMTAReceivedMail())->loadAllWhere(
       'id IN (%Ld)',
       $ids);
 
     if ($ids) {
       $ids = array_fuse($ids);
       $missing = array_diff_key($ids, $messages);
       if ($missing) {
         throw new PhutilArgumentUsageException(
-          "Some specified messages do not exist: ".
+          'Some specified messages do not exist: '.
           implode(', ', array_keys($missing)));
       }
     }
 
     $last_key = last_key($messages);
     foreach ($messages as $message_key => $message) {
       $info = array();
 
       $info[] = pht('PROPERTIES');
       $info[] = pht('ID: %d', $message->getID());
       $info[] = pht('Status: %s', $message->getStatus());
       $info[] = pht('Related PHID: %s', $message->getRelatedPHID());
       $info[] = pht('Author PHID: %s', $message->getAuthorPHID());
       $info[] = pht('Message ID Hash: %s', $message->getMessageIDHash());
 
       if ($message->getMessage()) {
         $info[] = null;
         $info[] = pht('MESSAGE');
         $info[] = $message->getMessage();
       }
 
       $info[] = null;
       $info[] = pht('HEADERS');
       foreach ($message->getHeaders() as $key => $value) {
         if (is_array($value)) {
           $value = implode("\n", $value);
         }
         $info[] = pht('%s: %s', $key, $value);
       }
 
       $bodies = $message->getBodies();
 
       $last_body = last_key($bodies);
 
       $info[] = null;
       $info[] = pht('BODIES');
       foreach ($bodies as $key => $value) {
         $info[] = pht('Body "%s"', $key);
         $info[] = $value;
         if ($key != $last_body) {
           $info[] = null;
         }
       }
 
       $attachments = $message->getAttachments();
 
       $info[] = null;
       $info[] = pht('ATTACHMENTS');
       if (!$attachments) {
         $info[] = pht('No attachments.');
       } else {
         foreach ($attachments as $attachment) {
           $info[] = pht('File PHID: %s', $attachment);
         }
       }
 
       $console->writeOut("%s\n", implode("\n", $info));
 
       if ($message_key != $last_key) {
         $console->writeOut("\n%s\n\n", str_repeat('-', 80));
       }
     }
   }
 
 }
diff --git a/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
index 31989fa26..e2854a4a2 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
@@ -1,124 +1,124 @@
 <?php
 
 final class PhabricatorMailManagementShowOutboundWorkflow
   extends PhabricatorMailManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('show-outbound')
       ->setSynopsis('Show diagnostic details about outbound mail.')
       ->setExamples(
-        "**show-outbound** --id 1 --id 2")
+        '**show-outbound** --id 1 --id 2')
       ->setArguments(
         array(
           array(
             'name'    => 'id',
             'param'   => 'id',
             'help'    => 'Show details about outbound mail with given ID.',
             'repeat'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $ids = $args->getArg('id');
     if (!$ids) {
       throw new PhutilArgumentUsageException(
         "Use the '--id' flag to specify one or more messages to show.");
     }
 
     $messages = id(new PhabricatorMetaMTAMail())->loadAllWhere(
       'id IN (%Ld)',
       $ids);
 
     if ($ids) {
       $ids = array_fuse($ids);
       $missing = array_diff_key($ids, $messages);
       if ($missing) {
         throw new PhutilArgumentUsageException(
-          "Some specified messages do not exist: ".
+          'Some specified messages do not exist: '.
           implode(', ', array_keys($missing)));
       }
     }
 
     $last_key = last_key($messages);
     foreach ($messages as $message_key => $message) {
       $info = array();
 
       $info[] = pht('PROPERTIES');
       $info[] = pht('ID: %d', $message->getID());
       $info[] = pht('Status: %s', $message->getStatus());
       $info[] = pht('Related PHID: %s', $message->getRelatedPHID());
       $info[] = pht('Message: %s', $message->getMessage());
 
       $info[] = null;
       $info[] = pht('PARAMETERS');
       $parameters = $message->getParameters();
       foreach ($parameters as $key => $value) {
         if ($key == 'body') {
           continue;
         }
 
         if ($key == 'headers') {
           continue;
         }
 
         if ($key == 'attachments') {
           continue;
         }
 
         if (!is_scalar($value)) {
           $value = json_encode($value);
         }
 
         $info[] = pht('%s: %s', $key, $value);
       }
 
       $info[] = null;
       $info[] = pht('HEADERS');
       foreach (idx($parameters, 'headers', array()) as $header) {
         list($name, $value) = $header;
         $info[] = "{$name}: {$value}";
       }
 
       $attachments = idx($parameters, 'attachments');
       if ($attachments) {
         $info[] = null;
         $info[] = pht('ATTACHMENTS');
         foreach ($attachments as $attachment) {
           $info[] = idx($attachment, 'filename', pht('Unnamed File'));
         }
       }
 
       $actors = $message->loadAllActors();
       $actors = array_select_keys(
         $actors,
         array_merge($message->getToPHIDs(), $message->getCcPHIDs()));
       $info[] = null;
       $info[] = pht('RECIPIENTS');
       foreach ($actors as $actor) {
         if ($actor->isDeliverable()) {
           $info[] = '  '.coalesce($actor->getName(), $actor->getPHID());
         } else {
           $info[] = '! '.coalesce($actor->getName(), $actor->getPHID());
           foreach ($actor->getUndeliverableReasons() as $reason) {
             $info[] = '    - '.$reason;
           }
         }
       }
 
       $info[] = null;
       $info[] = pht('BODY');
       $info[] = $message->getBody();
 
       $console->writeOut('%s', implode("\n", $info));
 
       if ($message_key != $last_key) {
         $console->writeOut("\n%s\n\n", str_repeat('-', 80));
       }
     }
   }
 
 }
diff --git a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
index fd30ce634..08414f2e9 100644
--- a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
+++ b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
@@ -1,183 +1,183 @@
 <?php
 
 final class PhabricatorMetaMTAEmailBodyParserTestCase
   extends PhabricatorTestCase {
 
   public function testQuotedTextStripping() {
     $bodies = $this->getEmailBodies();
     foreach ($bodies as $body) {
       $parser = new PhabricatorMetaMTAEmailBodyParser();
       $stripped = $parser->stripTextBody($body);
-      $this->assertEqual("OKAY", $stripped);
+      $this->assertEqual('OKAY', $stripped);
     }
   }
 
   public function testEmailBodyCommandParsing() {
     $bodies = $this->getEmailBodiesWithFullCommands();
     foreach ($bodies as $body) {
       $parser = new PhabricatorMetaMTAEmailBodyParser();
       $body_data = $parser->parseBody($body);
       $this->assertEqual('OKAY', $body_data['body']);
       $this->assertEqual('whatevs', $body_data['command']);
       $this->assertEqual('dude', $body_data['command_value']);
     }
     $bodies = $this->getEmailBodiesWithPartialCommands();
     foreach ($bodies as $body) {
       $parser = new PhabricatorMetaMTAEmailBodyParser();
       $body_data = $parser->parseBody($body);
       $this->assertEqual('OKAY', $body_data['body']);
       $this->assertEqual('whatevs', $body_data['command']);
       $this->assertEqual(null, $body_data['command_value']);
     }
   }
 
   public function testFalsePositiveForOnWrote() {
     $body = <<<EOEMAIL
 On which horse shall you ride?
 
 On Sep 23, alincoln wrote:
 
 > Hey bro do you want to go ride horses tomorrow?
 EOEMAIL;
 
     $parser = new PhabricatorMetaMTAEmailBodyParser();
     $stripped = $parser->stripTextBody($body);
-    $this->assertEqual("On which horse shall you ride?", $stripped);
+    $this->assertEqual('On which horse shall you ride?', $stripped);
   }
 
   private function getEmailBodiesWithFullCommands() {
     $bodies = $this->getEmailBodies();
     $with_commands = array();
     foreach ($bodies as $body) {
       $with_commands[] = "!whatevs dude\n" . $body;
     }
     return $with_commands;
   }
 
   private function getEmailBodiesWithPartialCommands() {
     $bodies = $this->getEmailBodies();
     $with_commands = array();
     foreach ($bodies as $body) {
       $with_commands[] = "!whatevs\n" . $body;
     }
     return $with_commands;
   }
 
 
   private function getEmailBodies() {
     $trailing_space = ' ';
 
     return array(
 <<<EOEMAIL
 OKAY
 
 On May 30, 2011, at 8:36 PM, Someone wrote:
 
 > ...
 
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 On Fri, May 27, 2011 at 9:39 AM, Someone <
 somebody@somewhere.com> wrote:
 
 > ...
 
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 On Fri, May 27, 2011 at 9:39 AM, Someone
 <somebody@somewhere.com> wrote:
 
 > ...
 
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 -----Oprindelig Meddelelse-----
 
 > ...
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 -----Original Message-----
 
 > ...
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 -----oprindelig meddelelse-----
 
 > ...
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 -----original message-----
 
 > ...
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 Sent from my HTC smartphone on the Now Network from Sprint!
 
 -Reply message ----- From: "somebody (someone)" <
 somebody@somewhere.com>
 To: <somebody@somewhere.com>
 Subject: Some Text Date: Mon, Apr 2, 2012 1:42 pm
 > ...
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 --{$trailing_space}
 Abraham Lincoln
 Supreme Galactic Emperor
 EOEMAIL
 ,
 <<<EOEMAIL
 OKAY
 
 Sent from my iPhone
 EOEMAIL
 ,
 <<<EOMAIL
 OKAY
 
 ________________________________________
 From: Abraham Lincoln <alincoln@logcab.in>
 Subject: Core World Tariffs
 EOMAIL
 ,
 <<<EOMAIL
 OKAY
 
 > On 17 Oct 2013, at 17:47, "Someone" <somebody@somewhere> wrote:
 > ...
 EOMAIL
 ,
 <<<EOMAIL
 OKAY
 
 > -----Original Message-----
 >
 > ...
 EOMAIL
     );
   }
 
 }
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 6e1b5132d..ded773c79 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -1,889 +1,889 @@
 <?php
 
 /**
  * @task recipients   Managing Recipients
  */
 final class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
 
   const STATUS_QUEUE = 'queued';
   const STATUS_SENT  = 'sent';
   const STATUS_FAIL  = 'fail';
   const STATUS_VOID  = 'void';
 
   const RETRY_DELAY   = 5;
 
   protected $parameters;
   protected $status;
   protected $message;
   protected $relatedPHID;
 
   private $excludePHIDs = array();
   private $overrideNoSelfMail = false;
   private $recipientExpansionMap;
 
   public function __construct() {
 
     $this->status     = self::STATUS_QUEUE;
     $this->parameters = array();
 
     parent::__construct();
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(
         'parameters'  => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   protected function setParam($param, $value) {
     $this->parameters[$param] = $value;
     return $this;
   }
 
   protected function getParam($param, $default = null) {
     return idx($this->parameters, $param, $default);
   }
 
   /**
    * Set tags (@{class:MetaMTANotificationType} constants) which identify the
    * content of this mail in a general way. These tags are used to allow users
    * to opt out of receiving certain types of mail, like updates when a task's
    * projects change.
    *
    * @param list<const> List of @{class:MetaMTANotificationType} constants.
    * @return this
    */
   public function setMailTags(array $tags) {
     $this->setParam('mailtags', array_unique($tags));
     return $this;
   }
 
   public function getMailTags() {
     return $this->getParam('mailtags', array());
   }
 
   /**
    * In Gmail, conversations will be broken if you reply to a thread and the
    * server sends back a response without referencing your Message-ID, even if
    * it references a Message-ID earlier in the thread. To avoid this, use the
    * parent email's message ID explicitly if it's available. This overwrites the
    * "In-Reply-To" and "References" headers we would otherwise generate. This
    * needs to be set whenever an action is triggered by an email message. See
    * T251 for more details.
    *
    * @param   string The "Message-ID" of the email which precedes this one.
    * @return  this
    */
   public function setParentMessageID($id) {
     $this->setParam('parent-message-id', $id);
     return $this;
   }
 
   public function getParentMessageID() {
     return $this->getParam('parent-message-id');
   }
 
   public function getSubject() {
     return $this->getParam('subject');
   }
 
   public function addTos(array $phids) {
     $phids = array_unique($phids);
     $this->setParam('to', $phids);
     return $this;
   }
 
   public function addRawTos(array $raw_email) {
     $this->setParam('raw-to', $raw_email);
     return $this;
   }
 
   public function addCCs(array $phids) {
     $phids = array_unique($phids);
     $this->setParam('cc', $phids);
     return $this;
   }
 
   public function setExcludeMailRecipientPHIDs($exclude) {
     $this->excludePHIDs = $exclude;
     return $this;
   }
   private function getExcludeMailRecipientPHIDs() {
     return $this->excludePHIDs;
   }
 
   public function getOverrideNoSelfMailPreference() {
     return $this->overrideNoSelfMail;
   }
 
   public function setOverrideNoSelfMailPreference($override) {
     $this->overrideNoSelfMail = $override;
     return $this;
   }
 
   public function getTranslation(array $objects) {
     $default_translation = PhabricatorEnv::getEnvConfig('translation.provider');
     $return = null;
     $recipients = array_merge(
       idx($this->parameters, 'to', array()),
       idx($this->parameters, 'cc', array()));
     foreach (array_select_keys($objects, $recipients) as $object) {
       $translation = null;
       if ($object instanceof PhabricatorUser) {
         $translation = $object->getTranslation();
       }
       if (!$translation) {
         $translation = $default_translation;
       }
       if ($return && $translation != $return) {
         return $default_translation;
       }
       $return = $translation;
     }
 
     if (!$return) {
       $return = $default_translation;
     }
 
     return $return;
   }
 
   public function addPHIDHeaders($name, array $phids) {
     foreach ($phids as $phid) {
       $this->addHeader($name, '<'.$phid.'>');
     }
     return $this;
   }
 
   public function addHeader($name, $value) {
     $this->parameters['headers'][] = array($name, $value);
     return $this;
   }
 
   public function addAttachment(PhabricatorMetaMTAAttachment $attachment) {
     $this->parameters['attachments'][] = $attachment->toDictionary();
     return $this;
   }
 
   public function getAttachments() {
     $dicts = $this->getParam('attachments');
 
     $result = array();
     foreach ($dicts as $dict) {
       $result[] = PhabricatorMetaMTAAttachment::newFromDictionary($dict);
     }
     return $result;
   }
 
   public function setAttachments(array $attachments) {
     assert_instances_of($attachments, 'PhabricatorMetaMTAAttachment');
     $this->setParam('attachments', mpull($attachments, 'toDictionary'));
     return $this;
   }
 
   public function setFrom($from) {
     $this->setParam('from', $from);
     return $this;
   }
 
   public function setReplyTo($reply_to) {
     $this->setParam('reply-to', $reply_to);
     return $this;
   }
 
   public function setSubject($subject) {
     $this->setParam('subject', $subject);
     return $this;
   }
 
   public function setSubjectPrefix($prefix) {
     $this->setParam('subject-prefix', $prefix);
     return $this;
   }
 
   public function setVarySubjectPrefix($prefix) {
     $this->setParam('vary-subject-prefix', $prefix);
     return $this;
   }
 
   public function setBody($body) {
     $this->setParam('body', $body);
     return $this;
   }
 
   public function getBody() {
     return $this->getParam('body');
   }
 
   public function setIsHTML($html) {
     $this->setParam('is-html', $html);
     return $this;
   }
 
   public function setIsErrorEmail($is_error) {
     $this->setParam('is-error', $is_error);
     return $this;
   }
 
   public function getIsErrorEmail() {
     return $this->getParam('is-error', false);
   }
 
   public function getToPHIDs() {
     return $this->getParam('to', array());
   }
 
   public function getRawToAddresses() {
     return $this->getParam('raw-to', array());
   }
 
   public function getCcPHIDs() {
     return $this->getParam('cc', array());
   }
 
   /**
    * Flag that this is an auto-generated bulk message and should have bulk
    * headers added to it if appropriate. Broadly, this means some flavor of
    * "Precedence: bulk" or similar, but is implementation and configuration
    * dependent.
    *
    * @param bool  True if the mail is automated bulk mail.
    * @return this
    */
   public function setIsBulk($is_bulk) {
     $this->setParam('is-bulk', $is_bulk);
     return $this;
   }
 
   /**
    * Use this method to set an ID used for message threading. MetaMTA will
    * set appropriate headers (Message-ID, In-Reply-To, References and
    * Thread-Index) based on the capabilities of the underlying mailer.
    *
    * @param string  Unique identifier, appropriate for use in a Message-ID,
    *                In-Reply-To or References headers.
    * @param bool    If true, indicates this is the first message in the thread.
    * @return this
    */
   public function setThreadID($thread_id, $is_first_message = false) {
     $this->setParam('thread-id', $thread_id);
     $this->setParam('is-first-message', $is_first_message);
     return $this;
   }
 
   /**
    * Save a newly created mail to the database. The mail will eventually be
    * delivered by the MetaMTA daemon.
    *
    * @return this
    */
   public function saveAndSend() {
     return $this->save();
   }
 
   public function save() {
     if ($this->getID()) {
       return parent::save();
     }
 
     // NOTE: When mail is sent from CLI scripts that run tasks in-process, we
     // may re-enter this method from within scheduleTask(). The implementation
     // is intended to avoid anything awkward if we end up reentering this
     // method.
 
     $this->openTransaction();
       // Save to generate a task ID.
       $result = parent::save();
 
       // Queue a task to send this mail.
       $mailer_task = PhabricatorWorker::scheduleTask(
         'PhabricatorMetaMTAWorker',
         $this->getID());
 
     $this->saveTransaction();
 
     return $result;
   }
 
   public function buildDefaultMailer() {
     return PhabricatorEnv::newObjectFromConfig('metamta.mail-adapter');
   }
 
 
   /**
    * Attempt to deliver an email immediately, in this process.
    *
    * @param bool  Try to deliver this email even if it has already been
    *              delivered or is in backoff after a failed delivery attempt.
    * @param PhabricatorMailImplementationAdapter Use a specific mail adapter,
    *              instead of the default.
    *
    * @return void
    */
   public function sendNow(
     $force_send = false,
     PhabricatorMailImplementationAdapter $mailer = null) {
 
     if ($mailer === null) {
       $mailer = $this->buildDefaultMailer();
     }
 
     if (!$force_send) {
       if ($this->getStatus() != self::STATUS_QUEUE) {
-        throw new Exception("Trying to send an already-sent mail!");
+        throw new Exception('Trying to send an already-sent mail!');
       }
     }
 
     try {
       $params = $this->parameters;
 
       $actors = $this->loadAllActors();
       $deliverable_actors = $this->filterDeliverableActors($actors);
 
       $default_from = PhabricatorEnv::getEnvConfig('metamta.default-address');
       if (empty($params['from'])) {
         $mailer->setFrom($default_from);
       }
 
       $is_first = idx($params, 'is-first-message');
       unset($params['is-first-message']);
 
       $is_threaded = (bool)idx($params, 'thread-id');
 
       $reply_to_name = idx($params, 'reply-to-name', '');
       unset($params['reply-to-name']);
 
       $add_cc = array();
       $add_to = array();
 
       foreach ($params as $key => $value) {
         switch ($key) {
           case 'from':
             $from = $value;
             $actor_email = null;
             $actor_name = null;
             $actor = idx($actors, $from);
             if ($actor) {
               $actor_email = $actor->getEmailAddress();
               $actor_name = $actor->getName();
             }
             $can_send_as_user = $actor_email &&
               PhabricatorEnv::getEnvConfig('metamta.can-send-as-user');
 
             if ($can_send_as_user) {
               $mailer->setFrom($actor_email, $actor_name);
             } else {
               $from_email = coalesce($actor_email, $default_from);
               $from_name = coalesce($actor_name, pht('Phabricator'));
 
               if (empty($params['reply-to'])) {
                 $params['reply-to'] = $from_email;
                 $params['reply-to-name'] = $from_name;
               }
 
               $mailer->setFrom($default_from, $from_name);
             }
             break;
           case 'reply-to':
             $mailer->addReplyTo($value, $reply_to_name);
             break;
           case 'to':
             $to_phids = $this->expandRecipients($value);
             $to_actors = array_select_keys($deliverable_actors, $to_phids);
             $add_to = array_merge(
               $add_to,
               mpull($to_actors, 'getEmailAddress'));
             break;
           case 'raw-to':
             $add_to = array_merge($add_to, $value);
             break;
           case 'cc':
             $cc_phids = $this->expandRecipients($value);
             $cc_actors = array_select_keys($deliverable_actors, $cc_phids);
             $add_cc = array_merge(
               $add_cc,
               mpull($cc_actors, 'getEmailAddress'));
             break;
           case 'headers':
             foreach ($value as $pair) {
               list($header_key, $header_value) = $pair;
 
               // NOTE: If we have \n in a header, SES rejects the email.
-              $header_value = str_replace("\n", " ", $header_value);
+              $header_value = str_replace("\n", ' ', $header_value);
 
               $mailer->addHeader($header_key, $header_value);
             }
             break;
           case 'attachments':
             $value = $this->getAttachments();
             foreach ($value as $attachment) {
               $mailer->addAttachment(
                 $attachment->getData(),
                 $attachment->getFilename(),
                 $attachment->getMimeType());
             }
             break;
           case 'body':
             $max = PhabricatorEnv::getEnvConfig('metamta.email-body-limit');
             if (strlen($value) > $max) {
               $value = phutil_utf8_shorten($value, $max);
               $value .= "\n";
               $value .= pht('(This email was truncated at %d bytes.)', $max);
             }
             $mailer->setBody($value);
             break;
           case 'subject':
             // Only try to use preferences if everything is multiplexed, so we
             // get consistent behavior.
             $use_prefs = self::shouldMultiplexAllMail();
 
             $prefs = null;
             if ($use_prefs) {
 
               // If multiplexing is enabled, some recipients will be in "Cc"
               // rather than "To". We'll move them to "To" later (or supply a
               // dummy "To") but need to look for the recipient in either the
               // "To" or "Cc" fields here.
               $target_phid = head(idx($params, 'to', array()));
               if (!$target_phid) {
                 $target_phid = head(idx($params, 'cc', array()));
               }
 
               if ($target_phid) {
                 $user = id(new PhabricatorUser())->loadOneWhere(
                   'phid = %s',
                   $target_phid);
                 if ($user) {
                   $prefs = $user->loadPreferences();
                 }
               }
             }
 
             $subject = array();
 
             if ($is_threaded) {
               $add_re = PhabricatorEnv::getEnvConfig('metamta.re-prefix');
 
               if ($prefs) {
                 $add_re = $prefs->getPreference(
                   PhabricatorUserPreferences::PREFERENCE_RE_PREFIX,
                   $add_re);
               }
 
               if ($add_re) {
                 $subject[] = 'Re:';
               }
             }
 
             $subject[] = trim(idx($params, 'subject-prefix'));
 
             $vary_prefix = idx($params, 'vary-subject-prefix');
             if ($vary_prefix != '') {
               $use_subject = PhabricatorEnv::getEnvConfig(
                 'metamta.vary-subjects');
 
               if ($prefs) {
                 $use_subject = $prefs->getPreference(
                   PhabricatorUserPreferences::PREFERENCE_VARY_SUBJECT,
                   $use_subject);
               }
 
               if ($use_subject) {
                 $subject[] = $vary_prefix;
               }
             }
 
             $subject[] = $value;
 
             $mailer->setSubject(implode(' ', array_filter($subject)));
             break;
           case 'is-html':
             if ($value) {
               $mailer->setIsHTML(true);
             }
             break;
           case 'is-bulk':
             if ($value) {
               if (PhabricatorEnv::getEnvConfig('metamta.precedence-bulk')) {
                 $mailer->addHeader('Precedence', 'bulk');
               }
             }
             break;
           case 'thread-id':
 
             // NOTE: Gmail freaks out about In-Reply-To and References which
             // aren't in the form "<string@domain.tld>"; this is also required
             // by RFC 2822, although some clients are more liberal in what they
             // accept.
             $domain = PhabricatorEnv::getEnvConfig('metamta.domain');
             $value = '<'.$value.'@'.$domain.'>';
 
             if ($is_first && $mailer->supportsMessageIDHeader()) {
               $mailer->addHeader('Message-ID',  $value);
             } else {
               $in_reply_to = $value;
               $references = array($value);
               $parent_id = $this->getParentMessageID();
               if ($parent_id) {
                 $in_reply_to = $parent_id;
                 // By RFC 2822, the most immediate parent should appear last
                 // in the "References" header, so this order is intentional.
                 $references[] = $parent_id;
               }
               $references = implode(' ', $references);
               $mailer->addHeader('In-Reply-To', $in_reply_to);
               $mailer->addHeader('References',  $references);
             }
             $thread_index = $this->generateThreadIndex($value, $is_first);
             $mailer->addHeader('Thread-Index', $thread_index);
             break;
           case 'mailtags':
             // Handled below.
             break;
           case 'subject-prefix':
           case 'vary-subject-prefix':
             // Handled above.
             break;
           default:
             // Just discard.
         }
       }
 
       if (!$add_to && !$add_cc) {
         $this->setStatus(self::STATUS_VOID);
         $this->setMessage(
-          "Message has no valid recipients: all To/Cc are disabled, invalid, ".
-          "or configured not to receive this mail.");
+          'Message has no valid recipients: all To/Cc are disabled, invalid, '.
+          'or configured not to receive this mail.');
         return $this->save();
       }
 
       if ($this->getIsErrorEmail()) {
         $all_recipients = array_merge($add_to, $add_cc);
         if ($this->shouldRateLimitMail($all_recipients)) {
           $this->setStatus(self::STATUS_VOID);
           $this->setMessage(
             pht(
               'This is an error email, but one or more recipients have '.
               'exceeded the error email rate limit. Declining to deliver '.
               'message.'));
           return $this->save();
         }
       }
 
       $mailer->addHeader('X-Phabricator-Sent-This-Message', 'Yes');
       $mailer->addHeader('X-Mail-Transport-Agent', 'MetaMTA');
 
       // Some clients respect this to suppress OOF and other auto-responses.
       $mailer->addHeader('X-Auto-Response-Suppress', 'All');
 
       // If the message has mailtags, filter out any recipients who don't want
       // to receive this type of mail.
       $mailtags = $this->getParam('mailtags');
       if ($mailtags) {
         $tag_header = array();
         foreach ($mailtags as $mailtag) {
           $tag_header[] = '<'.$mailtag.'>';
         }
         $tag_header = implode(', ', $tag_header);
         $mailer->addHeader('X-Phabricator-Mail-Tags', $tag_header);
       }
 
       // Some mailers require a valid "To:" in order to deliver mail. If we
       // don't have any "To:", try to fill it in with a placeholder "To:".
       // If that also fails, move the "Cc:" line to "To:".
       if (!$add_to) {
         $placeholder_key = 'metamta.placeholder-to-recipient';
         $placeholder = PhabricatorEnv::getEnvConfig($placeholder_key);
         if ($placeholder !== null) {
           $add_to = array($placeholder);
         } else {
           $add_to = $add_cc;
           $add_cc = array();
         }
       }
 
       $add_to = array_unique($add_to);
       $add_cc = array_unique($add_cc);
 
       $mailer->addTos($add_to);
       if ($add_cc) {
         $mailer->addCCs($add_cc);
       }
     } catch (Exception $ex) {
       $this
         ->setStatus(self::STATUS_FAIL)
         ->setMessage($ex->getMessage())
         ->save();
 
       throw $ex;
     }
 
     try {
       $ok = $mailer->send();
       if (!$ok) {
         // TODO: At some point, we should clean this up and make all mailers
         // throw.
         throw new Exception(
           pht('Mail adapter encountered an unexpected, unspecified failure.'));
       }
 
       $this->setStatus(self::STATUS_SENT);
       $this->save();
 
       return $this;
     } catch (PhabricatorMetaMTAPermanentFailureException $ex) {
       $this
         ->setStatus(self::STATUS_FAIL)
         ->setMessage($ex->getMessage())
         ->save();
 
       throw $ex;
     } catch (Exception $ex) {
       $this
         ->setMessage($ex->getMessage()."\n".$ex->getTraceAsString())
         ->save();
 
       throw $ex;
     }
   }
 
   public static function getReadableStatus($status_code) {
     static $readable = array(
-      self::STATUS_QUEUE => "Queued for Delivery",
-      self::STATUS_FAIL  => "Delivery Failed",
-      self::STATUS_SENT  => "Sent",
-      self::STATUS_VOID  => "Void",
+      self::STATUS_QUEUE => 'Queued for Delivery',
+      self::STATUS_FAIL  => 'Delivery Failed',
+      self::STATUS_SENT  => 'Sent',
+      self::STATUS_VOID  => 'Void',
     );
     $status_code = coalesce($status_code, '?');
     return idx($readable, $status_code, $status_code);
   }
 
   private function generateThreadIndex($seed, $is_first_mail) {
     // When threading, Outlook ignores the 'References' and 'In-Reply-To'
     // headers that most clients use. Instead, it uses a custom 'Thread-Index'
     // header. The format of this header is something like this (from
     // camel-exchange-folder.c in Evolution Exchange):
 
     /* A new post to a folder gets a 27-byte-long thread index. (The value
      * is apparently unique but meaningless.) Each reply to a post gets a
      * 32-byte-long thread index whose first 27 bytes are the same as the
      * parent's thread index. Each reply to any of those gets a
      * 37-byte-long thread index, etc. The Thread-Index header contains a
      * base64 representation of this value.
      */
 
     // The specific implementation uses a 27-byte header for the first email
     // a recipient receives, and a random 5-byte suffix (32 bytes total)
     // thereafter. This means that all the replies are (incorrectly) siblings,
     // but it would be very difficult to keep track of the entire tree and this
     // gets us reasonable client behavior.
 
     $base = substr(md5($seed), 0, 27);
     if (!$is_first_mail) {
       // Not totally sure, but it seems like outlook orders replies by
       // thread-index rather than timestamp, so to get these to show up in the
       // right order we use the time as the last 4 bytes.
       $base .= ' '.pack('N', time());
     }
 
     return base64_encode($base);
   }
 
   public static function shouldMultiplexAllMail() {
     return PhabricatorEnv::getEnvConfig('metamta.one-mail-per-recipient');
   }
 
 
 /* -(  Managing Recipients  )------------------------------------------------ */
 
 
   /**
    * Get all of the recipients for this mail, after preference filters are
    * applied. This list has all objects to whom delivery will be attempted.
    *
    * @return  list<phid>  A list of all recipients to whom delivery will be
    *                      attempted.
    * @task recipients
    */
   public function buildRecipientList() {
     $actors = $this->loadActors(
       array_merge(
         $this->getToPHIDs(),
         $this->getCcPHIDs()));
     $actors = $this->filterDeliverableActors($actors);
     return mpull($actors, 'getPHID');
   }
 
   public function loadAllActors() {
     $actor_phids = array_merge(
       array($this->getParam('from')),
       $this->getToPHIDs(),
       $this->getCcPHIDs());
 
     $this->loadRecipientExpansions($actor_phids);
     $actor_phids = $this->expandRecipients($actor_phids);
 
     return $this->loadActors($actor_phids);
   }
 
   private function loadRecipientExpansions(array $phids) {
     $expansions = id(new PhabricatorMetaMTAMemberQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs($phids)
       ->execute();
 
     $this->recipientExpansionMap = $expansions;
 
     return $this;
   }
 
   /**
    * Expand a list of recipient PHIDs (possibly including aggregate recipients
    * like projects) into a deaggregated list of individual recipient PHIDs.
    * For example, this will expand project PHIDs into a list of the project's
    * members.
    *
    * @param list<phid>  List of recipient PHIDs, possibly including aggregate
    *                    recipients.
    * @return list<phid> Deaggregated list of mailable recipients.
    */
   private function expandRecipients(array $phids) {
     if ($this->recipientExpansionMap === null) {
       throw new Exception(
         pht(
           'Call loadRecipientExpansions() before expandRecipients()!'));
     }
 
     $results = array();
     foreach ($phids as $phid) {
       if (!isset($this->recipientExpansionMap[$phid])) {
         $results[$phid] = $phid;
       } else {
         foreach ($this->recipientExpansionMap[$phid] as $recipient_phid) {
           $results[$recipient_phid] = $recipient_phid;
         }
       }
     }
 
     return array_keys($results);
   }
 
   private function filterDeliverableActors(array $actors) {
     assert_instances_of($actors, 'PhabricatorMetaMTAActor');
     $deliverable_actors = array();
     foreach ($actors as $phid => $actor) {
       if ($actor->isDeliverable()) {
         $deliverable_actors[$phid] = $actor;
       }
     }
     return $deliverable_actors;
   }
 
   private function loadActors(array $actor_phids) {
     $actor_phids = array_filter($actor_phids);
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $actors = id(new PhabricatorMetaMTAActorQuery())
       ->setViewer($viewer)
       ->withPHIDs($actor_phids)
       ->execute();
 
     if (!$actors) {
       return array();
     }
 
     // Exclude explicit recipients.
     foreach ($this->getExcludeMailRecipientPHIDs() as $phid) {
       $actor = idx($actors, $phid);
       if (!$actor) {
         continue;
       }
       $actor->setUndeliverable(
         pht(
           'This message is a response to another email message, and this '.
           'recipient received the original email message, so we are not '.
           'sending them this substantially similar message (for example, '.
           'the sender used "Reply All" instead of "Reply" in response to '.
           'mail from Phabricator).'));
     }
 
     // Exclude the actor if their preferences are set.
     $from_phid = $this->getParam('from');
     $from_actor = idx($actors, $from_phid);
     if ($from_actor) {
       $from_user = id(new PhabricatorPeopleQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($from_phid))
         ->execute();
       $from_user = head($from_user);
       if ($from_user && !$this->getOverrideNoSelfMailPreference()) {
         $pref_key = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;
         $exclude_self = $from_user
           ->loadPreferences()
           ->getPreference($pref_key);
         if ($exclude_self) {
           $from_actor->setUndeliverable(
             pht(
               'This recipient is the user whose actions caused delivery of '.
               'this message, but they have set preferences so they do not '.
               'receive mail about their own actions (Settings > Email '.
               'Preferences > Self Actions).'));
         }
       }
     }
 
 
     // Exclude all recipients who have set preferences to not receive this type
     // of email (for example, a user who says they don't want emails about task
     // CC changes).
     $tags = $this->getParam('mailtags');
     if ($tags) {
       $all_prefs = id(new PhabricatorUserPreferences())->loadAllWhere(
         'userPHID in (%Ls)',
         $actor_phids);
       $all_prefs = mpull($all_prefs, null, 'getUserPHID');
 
       foreach ($all_prefs as $phid => $prefs) {
         $user_mailtags = $prefs->getPreference(
           PhabricatorUserPreferences::PREFERENCE_MAILTAGS,
           array());
 
         // The user must have elected to receive mail for at least one
         // of the mailtags.
         $send = false;
         foreach ($tags as $tag) {
           if (idx($user_mailtags, $tag, true)) {
             $send = true;
             break;
           }
         }
 
         if (!$send) {
           $actors[$phid]->setUndeliverable(
             pht(
               'This mail has tags which control which users receive it, and '.
               'this recipient has not elected to receive mail with any of '.
               'the tags on this message (Settings > Email Preferences).'));
         }
       }
     }
 
     return $actors;
   }
 
   private function shouldRateLimitMail(array $all_recipients) {
     try {
       PhabricatorSystemActionEngine::willTakeAction(
         $all_recipients,
         new PhabricatorMetaMTAErrorMailAction(),
         1);
       return false;
     } catch (PhabricatorSystemActionRateLimitException $ex) {
       return true;
     }
   }
 
 
 }
diff --git a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
index 6337c4764..d3575097d 100644
--- a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
+++ b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
@@ -1,187 +1,187 @@
 <?php
 
 final class PhabricatorMetaMTAMailTestCase extends PhabricatorTestCase {
 
   protected function getPhabricatorTestCaseConfiguration() {
     return array(
       self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
     );
   }
 
   public function testMailSendFailures() {
     $user = $this->generateNewTestUser();
     $phid = $user->getPHID();
 
 
     // Normally, the send should succeed.
     $mail = new PhabricatorMetaMTAMail();
     $mail->addTos(array($phid));
 
     $mailer = new PhabricatorMailImplementationTestAdapter();
     $mail->sendNow($force = true, $mailer);
     $this->assertEqual(
       PhabricatorMetaMTAMail::STATUS_SENT,
       $mail->getStatus());
 
 
     // When the mailer fails temporarily, the mail should remain queued.
     $mail = new PhabricatorMetaMTAMail();
     $mail->addTos(array($phid));
 
     $mailer = new PhabricatorMailImplementationTestAdapter();
     $mailer->setFailTemporarily(true);
     try {
       $mail->sendNow($force = true, $mailer);
     } catch (Exception $ex) {
       // Ignore.
     }
     $this->assertEqual(
       PhabricatorMetaMTAMail::STATUS_QUEUE,
       $mail->getStatus());
 
 
     // When the mailer fails permanently, the mail should be failed.
     $mail = new PhabricatorMetaMTAMail();
     $mail->addTos(array($phid));
 
     $mailer = new PhabricatorMailImplementationTestAdapter();
     $mailer->setFailPermanently(true);
     try {
       $mail->sendNow($force = true, $mailer);
     } catch (Exception $ex) {
       // Ignore.
     }
     $this->assertEqual(
       PhabricatorMetaMTAMail::STATUS_FAIL,
       $mail->getStatus());
   }
 
   public function testRecipients() {
     $user = $this->generateNewTestUser();
     $phid = $user->getPHID();
 
     $prefs = $user->loadPreferences();
 
     $mailer = new PhabricatorMailImplementationTestAdapter();
 
     $mail = new PhabricatorMetaMTAMail();
     $mail->addTos(array($phid));
 
     $this->assertTrue(
       in_array($phid, $mail->buildRecipientList()),
       '"To" is a recipient.');
 
 
     // Test that the "No Self Mail" preference works correctly.
     $mail->setFrom($phid);
 
     $this->assertTrue(
       in_array($phid, $mail->buildRecipientList()),
       '"From" does not exclude recipients by default.');
 
     $prefs->setPreference(
       PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL,
       true);
     $prefs->save();
 
     $this->assertFalse(
       in_array($phid, $mail->buildRecipientList()),
       '"From" excludes recipients with no-self-mail set.');
 
     $prefs->unsetPreference(
       PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL);
     $prefs->save();
 
     $this->assertTrue(
       in_array($phid, $mail->buildRecipientList()),
       '"From" does not exclude recipients by default.');
 
 
     // Test that explicit exclusion works correctly.
     $mail->setExcludeMailRecipientPHIDs(array($phid));
 
     $this->assertFalse(
       in_array($phid, $mail->buildRecipientList()),
       'Explicit exclude excludes recipients.');
 
     $mail->setExcludeMailRecipientPHIDs(array());
 
 
     // Test that mail tag preferences exclude recipients.
     $prefs->setPreference(
       PhabricatorUserPreferences::PREFERENCE_MAILTAGS,
       array(
         'test-tag' => false,
       ));
     $prefs->save();
 
     $mail->setMailTags(array('test-tag'));
 
     $this->assertFalse(
       in_array($phid, $mail->buildRecipientList()),
       'Tag preference excludes recipients.');
 
     $prefs->unsetPreference(PhabricatorUserPreferences::PREFERENCE_MAILTAGS);
     $prefs->save();
 
     $this->assertTrue(
       in_array($phid, $mail->buildRecipientList()),
       'Recipients restored after tag preference removed.');
   }
 
   public function testThreadIDHeaders() {
     $this->runThreadIDHeadersWithConfiguration(true, true);
     $this->runThreadIDHeadersWithConfiguration(true, false);
     $this->runThreadIDHeadersWithConfiguration(false, true);
     $this->runThreadIDHeadersWithConfiguration(false, false);
   }
 
   private function runThreadIDHeadersWithConfiguration(
     $supports_message_id,
     $is_first_mail) {
 
     $mailer = new PhabricatorMailImplementationTestAdapter(
       array(
         'supportsMessageIDHeader' => $supports_message_id,
       ));
 
     $thread_id = '<somethread-12345@somedomain.tld>';
 
     $mail = new PhabricatorMetaMTAMail();
     $mail->setThreadID($thread_id, $is_first_mail);
     $mail->sendNow($force = true, $mailer);
 
     $guts = $mailer->getGuts();
     $dict = ipull($guts['headers'], 1, 0);
 
     if ($is_first_mail && $supports_message_id) {
       $expect_message_id = true;
       $expect_in_reply_to = false;
       $expect_references = false;
     } else {
       $expect_message_id = false;
       $expect_in_reply_to = true;
       $expect_references = true;
     }
 
-    $case = "<message-id = ".($supports_message_id ? 'Y' : 'N').", ".
-            "first = ".($is_first_mail ? 'Y' : 'N').">";
+    $case = '<message-id = '.($supports_message_id ? 'Y' : 'N').', '.
+            'first = '.($is_first_mail ? 'Y' : 'N').'>';
 
     $this->assertTrue(
       isset($dict['Thread-Index']),
       "Expect Thread-Index header for case {$case}.");
     $this->assertEqual(
       $expect_message_id,
       isset($dict['Message-ID']),
       "Expectation about existence of Message-ID header for case {$case}.");
     $this->assertEqual(
       $expect_in_reply_to,
       isset($dict['In-Reply-To']),
       "Expectation about existence of In-Reply-To header for case {$case}.");
     $this->assertEqual(
       $expect_references,
       isset($dict['References']),
       "Expectation about existence of References header for case {$case}.");
   }
 
 }
diff --git a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
index 1d5b1e047..f7579fc89 100644
--- a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
+++ b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
@@ -1,78 +1,78 @@
 <?php
 
 /**
  * @group metamta
  */
 final class PhabricatorMetaMTAMailBodyTestCase extends PhabricatorTestCase {
 
 
   public function testBodyRender() {
     $expect = <<<EOTEXT
 salmon
 
 HEADER
   bass
   trout
 
 WHY DID I GET THIS EMAIL?
   http://test.com/xscript/
 
 REPLY HANDLER ACTIONS
   pike
 
 EOTEXT;
 
     $this->assertEmail($expect, true, true);
   }
 
 
   public function testBodyRenderNoHerald() {
     $expect = <<<EOTEXT
 salmon
 
 HEADER
   bass
   trout
 
 REPLY HANDLER ACTIONS
   pike
 
 EOTEXT;
 
     $this->assertEmail($expect, false, true);
   }
 
 
   public function testBodyRenderNoReply() {
     $expect = <<<EOTEXT
 salmon
 
 HEADER
   bass
   trout
 
 WHY DID I GET THIS EMAIL?
   http://test.com/xscript/
 
 EOTEXT;
 
     $this->assertEmail($expect, true, false);
   }
 
   private function assertEmail($expect, $herald_hints, $reply_hints) {
     $env = PhabricatorEnv::beginScopedEnv();
     $env->overrideEnvConfig('phabricator.production-uri', 'http://test.com/');
     $env->overrideEnvConfig('metamta.herald.show-hints', $herald_hints);
     $env->overrideEnvConfig('metamta.reply.show-hints', $reply_hints);
 
     $body = new PhabricatorMetaMTAMailBody();
-    $body->addRawSection("salmon");
-    $body->addTextSection("HEADER", "bass\ntrout\n");
-    $body->addHeraldSection("/xscript/");
-    $body->addReplySection("pike");
+    $body->addRawSection('salmon');
+    $body->addTextSection('HEADER', "bass\ntrout\n");
+    $body->addHeraldSection('/xscript/');
+    $body->addReplySection('pike');
 
     $this->assertEqual($expect, $body->render());
   }
 
 
 }
diff --git a/src/applications/notification/PhabricatorNotificationQuery.php b/src/applications/notification/PhabricatorNotificationQuery.php
index 3fa20923d..c056d6f6f 100644
--- a/src/applications/notification/PhabricatorNotificationQuery.php
+++ b/src/applications/notification/PhabricatorNotificationQuery.php
@@ -1,119 +1,119 @@
 <?php
 
 /**
  * @task config Configuring the Query
  * @task exec   Query Execution
  */
 final class PhabricatorNotificationQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $userPHID;
   private $keys;
   private $unread;
 
 
 /* -(  Configuring the Query  )---------------------------------------------- */
 
 
   public function setUserPHID($user_phid) {
     $this->userPHID = $user_phid;
     return $this;
   }
 
   public function withKeys(array $keys) {
     $this->keys = $keys;
     return $this;
   }
 
 
   /**
    * Filter results by read/unread status. Note that `true` means to return
    * only unread notifications, while `false` means to return only //read//
    * notifications. The default is `null`, which returns both.
    *
    * @param mixed True or false to filter results by read status. Null to remove
    *              the filter.
    * @return this
    * @task config
    */
   public function withUnread($unread) {
     $this->unread = $unread;
     return $this;
   }
 
 
 /* -(  Query Execution  )---------------------------------------------------- */
 
 
   protected function loadPage() {
     if (!$this->userPHID) {
-      throw new Exception("Call setUser() before executing the query");
+      throw new Exception('Call setUser() before executing the query');
     }
 
     $story_table = new PhabricatorFeedStoryData();
     $notification_table = new PhabricatorFeedStoryNotification();
 
     $conn = $story_table->establishConnection('r');
 
     $data = queryfx_all(
       $conn,
-      "SELECT story.*, notif.hasViewed FROM %T notif
+      'SELECT story.*, notif.hasViewed FROM %T notif
          JOIN %T story ON notif.chronologicalKey = story.chronologicalKey
          %Q
          ORDER BY notif.chronologicalKey DESC
-         %Q",
+         %Q',
       $notification_table->getTableName(),
       $story_table->getTableName(),
       $this->buildWhereClause($conn),
       $this->buildLimitClause($conn));
 
     $viewed_map = ipull($data, 'hasViewed', 'chronologicalKey');
 
     $stories = PhabricatorFeedStory::loadAllFromRows(
       $data,
       $this->getViewer());
 
     foreach ($stories as $key => $story) {
       $story->setHasViewed($viewed_map[$key]);
     }
 
     return $stories;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     if ($this->userPHID) {
       $where[] = qsprintf(
         $conn_r,
         'notif.userPHID = %s',
         $this->userPHID);
     }
 
     if ($this->unread !== null) {
       $where[] = qsprintf(
         $conn_r,
         'notif.hasViewed = %d',
         (int)!$this->unread);
     }
 
     if ($this->keys) {
       $where[] = qsprintf(
         $conn_r,
         'notif.chronologicalKey IN (%Ls)',
         $this->keys);
     }
 
     return $this->formatWhereClause($where);
   }
 
   protected function getPagingValue($item) {
     return $item->getChronologicalKey();
   }
 
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationNotifications';
   }
 
 }
diff --git a/src/applications/notification/controller/PhabricatorNotificationClearController.php b/src/applications/notification/controller/PhabricatorNotificationClearController.php
index 06a99d9f7..7bf598a81 100644
--- a/src/applications/notification/controller/PhabricatorNotificationClearController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationClearController.php
@@ -1,45 +1,45 @@
 <?php
 
 final class PhabricatorNotificationClearController
   extends PhabricatorNotificationController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($request->isDialogFormPost()) {
       $table = new PhabricatorFeedStoryNotification();
 
       queryfx(
         $table->establishConnection('w'),
         'UPDATE %T SET hasViewed = 1 WHERE
           userPHID = %s AND hasViewed = 0',
         $table->getTableName(),
         $user->getPHID());
 
       return id(new AphrontReloadResponse())
         ->setURI('/notification/');
     }
 
     $dialog = new AphrontDialogView();
     $dialog->setUser($user);
     $dialog->setTitle('Really mark all notifications as read?');
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
     if ($is_serious) {
       $dialog->appendChild(
         pht(
-          "All unread notifications will be marked as read. You can not ".
-          "undo this action."));
+          'All unread notifications will be marked as read. You can not '.
+          'undo this action.'));
     } else {
       $dialog->appendChild(
         pht(
           "You can't ignore your problems forever, you know."));
     }
 
     $dialog->addCancelButton('/notification/');
     $dialog->addSubmitButton(pht('Mark All Read'));
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 }
diff --git a/src/applications/notification/controller/PhabricatorNotificationStatusController.php b/src/applications/notification/controller/PhabricatorNotificationStatusController.php
index 92954e2c8..18fb1845b 100644
--- a/src/applications/notification/controller/PhabricatorNotificationStatusController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationStatusController.php
@@ -1,82 +1,82 @@
 <?php
 
 final class PhabricatorNotificationStatusController
   extends PhabricatorNotificationController {
 
   public function processRequest() {
     try {
       $status = PhabricatorNotificationClient::getServerStatus();
       $status = $this->renderServerStatus($status);
     } catch (Exception $ex) {
       $status = new AphrontErrorView();
-      $status->setTitle("Notification Server Issue");
+      $status->setTitle('Notification Server Issue');
       $status->appendChild(hsprintf(
         'Unable to determine server status. This probably means the server '.
         'is not in great shape. The specific issue encountered was:'.
         '<br />'.
         '<br />'.
         '<strong>%s</strong> %s',
         get_class($ex),
         phutil_escape_html_newlines($ex->getMessage())));
     }
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Status'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $status,
       ),
       array(
         'title' => pht('Notification Server Status'),
       ));
   }
 
   private function renderServerStatus(array $status) {
 
     $rows = array();
     foreach ($status as $key => $value) {
       switch ($key) {
         case 'uptime':
           $value /= 1000;
           $value = phabricator_format_relative_time_detailed($value);
           break;
         case 'log':
           break;
         default:
           $value = number_format($value);
           break;
       }
 
       $rows[] = array($key, $value);
     }
 
     $table = new AphrontTableView($rows);
     $table->setColumnClasses(
       array(
         'header',
         'wide',
       ));
 
     $test_icon = id(new PHUIIconView())
       ->setIconFont('fa-exclamation-triangle');
 
     $test_button = id(new PHUIButtonView())
         ->setTag('a')
         ->setWorkflow(true)
         ->setText(pht('Send Test Notification'))
-        ->setHref($this->getApplicationURI("test/"))
+        ->setHref($this->getApplicationURI('test/'))
         ->setIcon($test_icon);
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Notification Server Status'))
       ->addActionLink($test_button);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($table);
 
     return $box;
   }
 }
diff --git a/src/applications/notification/storage/PhabricatorFeedStoryNotification.php b/src/applications/notification/storage/PhabricatorFeedStoryNotification.php
index 182e08e2a..47846418c 100644
--- a/src/applications/notification/storage/PhabricatorFeedStoryNotification.php
+++ b/src/applications/notification/storage/PhabricatorFeedStoryNotification.php
@@ -1,54 +1,54 @@
 <?php
 
 final class PhabricatorFeedStoryNotification extends PhabricatorFeedDAO {
 
   protected $userPHID;
   protected $primaryObjectPHID;
   protected $chronologicalKey;
   protected $hasViewed;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_IDS          => self::IDS_MANUAL,
       self::CONFIG_TIMESTAMPS   => false,
     ) + parent::getConfiguration();
   }
 
   static public function updateObjectNotificationViews(
     PhabricatorUser $user,
     $object_phid) {
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
 
     $notification_table = new PhabricatorFeedStoryNotification();
     $conn = $notification_table->establishConnection('w');
 
     queryfx(
       $conn,
-      "UPDATE %T
+      'UPDATE %T
        SET hasViewed = 1
        WHERE userPHID = %s
          AND primaryObjectPHID = %s
-         AND hasViewed = 0",
+         AND hasViewed = 0',
       $notification_table->getTableName(),
       $user->getPHID(),
       $object_phid);
 
     unset($unguarded);
   }
 
   public function countUnread(PhabricatorUser $user) {
     $conn = $this->establishConnection('r');
 
     $data = queryfx_one(
       $conn,
       'SELECT COUNT(*) as count
        FROM %T
        WHERE userPHID = %s AND hasViewed = 0',
       $this->getTableName(),
       $user->getPHID());
 
     return $data['count'];
   }
 
 }
diff --git a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
index 2554c0310..27333211e 100644
--- a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
+++ b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
@@ -1,27 +1,27 @@
 <?php
 
 final class PhabricatorOwnersConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Owners");
+    return pht('Owners');
   }
 
   public function getDescription() {
-    return pht("Configure Owners.");
+    return pht('Configure Owners.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'metamta.package.reply-handler',
         'class',
         'OwnersPackageReplyHandler')
         ->setBaseClass('PhabricatorMailReplyHandler')
         ->setDescription(pht('Reply handler for owners mail.')),
       $this->newOption('metamta.package.subject-prefix', 'string', '[Package]')
         ->setDescription(pht('Subject prefix for Owners email.'))
     );
   }
 
 }
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
index 957df24e3..ad4466a43 100644
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -1,237 +1,237 @@
 <?php
 
 final class PhabricatorOwnersDetailController
   extends PhabricatorOwnersController {
 
   private $id;
   private $package;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $package = id(new PhabricatorOwnersPackage())->load($this->id);
     if (!$package) {
       return new Aphront404Response();
     }
     $this->package = $package;
 
     $paths = $package->loadPaths();
     $owners = $package->loadOwners();
 
     $repository_phids = array();
     foreach ($paths as $path) {
       $repository_phids[$path->getRepositoryPHID()] = true;
     }
 
     if ($repository_phids) {
       $repositories = id(new PhabricatorRepositoryQuery())
         ->setViewer($user)
         ->withPHIDs(array_keys($repository_phids))
         ->execute();
       $repositories = mpull($repositories, null, 'getPHID');
     } else {
       $repositories = array();
     }
 
     $phids = array();
     foreach ($owners as $owner) {
       $phids[$owner->getUserPHID()] = true;
     }
     $phids = array_keys($phids);
 
     $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
 
     $rows[] = array(pht('Name'), $package->getName());
     $rows[] = array(pht('Description'), $package->getDescription());
 
     $primary_owner = null;
     $primary_phid = $package->getPrimaryOwnerPHID();
     if ($primary_phid && isset($handles[$primary_phid])) {
       $primary_owner = phutil_tag(
         'strong',
         array(),
         $handles[$primary_phid]->renderLink());
     }
     $rows[] = array(pht('Primary Owner'), $primary_owner);
 
     $owner_links = array();
     foreach ($owners as $owner) {
       $owner_links[] = $handles[$owner->getUserPHID()]->renderLink();
     }
     $owner_links = phutil_implode_html(phutil_tag('br'), $owner_links);
     $rows[] = array(pht('Owners'), $owner_links);
 
     $rows[] = array(
       pht('Auditing'),
       $package->getAuditingEnabled() ?
         pht('Enabled') :
         pht('Disabled'),
     );
 
     $path_links = array();
     foreach ($paths as $path) {
       $repo = idx($repositories, $path->getRepositoryPHID());
       if (!$repo) {
         continue;
       }
       $href = DiffusionRequest::generateDiffusionURI(
         array(
           'callsign' => $repo->getCallsign(),
           'branch'   => $repo->getDefaultBranch(),
           'path'     => $path->getPath(),
           'action'   => 'browse'
         ));
       $repo_name = phutil_tag('strong', array(), $repo->getName());
       $path_link = phutil_tag(
         'a',
         array(
           'href' => (string) $href,
         ),
         $path->getPath());
       $path_links[] = hsprintf(
         '%s %s %s',
         ($path->getExcluded() ? "\xE2\x80\x93" : '+'),
         $repo_name,
         $path_link);
     }
     $path_links = phutil_implode_html(phutil_tag('br'), $path_links);
     $rows[] = array(pht('Paths'), $path_links);
 
     $table = new AphrontTableView($rows);
     $table->setColumnClasses(
       array(
         'header',
         'wide',
       ));
 
     $panel = new AphrontPanelView();
     $panel->setNoBackground();
     $panel->setHeader(
       pht('Package Details for "%s"', $package->getName()));
     $panel->addButton(
       javelin_tag(
         'a',
         array(
           'href' => '/owners/delete/'.$package->getID().'/',
           'class' => 'button grey',
           'sigil' => 'workflow',
         ),
         pht('Delete Package')));
     $panel->addButton(
       phutil_tag(
         'a',
         array(
           'href' => '/owners/edit/'.$package->getID().'/',
           'class' => 'button',
         ),
         pht('Edit Package')));
     $panel->appendChild($table);
 
     $key = 'package/'.$package->getID();
     $this->setSideNavFilter($key);
 
     $commit_views = array();
 
     $commit_uri = id(new PhutilURI('/audit/view/packagecommits/'))
       ->setQueryParams(
         array(
           'phid'    => $package->getPHID(),
         ));
 
     $attention_commits = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser())
       ->withAuditorPHIDs(array($package->getPHID()))
       ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_CONCERN)
       ->needCommitData(true)
       ->setLimit(10)
       ->execute();
     if ($attention_commits) {
       $view = id(new PhabricatorAuditListView())
         ->setUser($user)
         ->setCommits($attention_commits);
 
       $commit_views[] = array(
         'view'    => $view,
         'header'  => pht('Commits in this Package that Need Attention'),
         'button'  => phutil_tag(
           'a',
           array(
             'href'  => $commit_uri->alter('status', 'open'),
             'class' => 'button grey',
           ),
           pht('View All Problem Commits')),
       );
     }
 
     $all_commits = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser())
       ->withAuditorPHIDs(array($package->getPHID()))
       ->needCommitData(true)
       ->setLimit(100)
       ->execute();
 
     $view = id(new PhabricatorAuditListView())
       ->setUser($user)
       ->setCommits($all_commits)
       ->setNoDataString(pht('No commits in this package.'));
 
     $commit_views[] = array(
       'view'    => $view,
       'header'  => pht('Recent Commits in Package'),
       'button'  => phutil_tag(
         'a',
         array(
           'href'  => $commit_uri,
           'class' => 'button grey',
         ),
         pht('View All Package Commits')),
     );
 
     $phids = array();
     foreach ($commit_views as $commit_view) {
       $phids[] = $commit_view['view']->getRequiredHandlePHIDs();
     }
     $phids = array_mergev($phids);
     $handles = $this->loadViewerHandles($phids);
 
     $commit_panels = array();
     foreach ($commit_views as $commit_view) {
       $commit_panel = new AphrontPanelView();
       $commit_panel->setNoBackground();
       $commit_panel->setHeader($commit_view['header']);
       if (isset($commit_view['button'])) {
         $commit_panel->addButton($commit_view['button']);
       }
       $commit_view['view']->setHandles($handles);
       $commit_panel->appendChild($commit_view['view']);
 
       $commit_panels[] = $commit_panel;
     }
 
     $nav = $this->buildSideNavView();
     $nav->appendChild($panel);
     $nav->appendChild($commit_panels);
 
     return $this->buildApplicationPage(
       array(
         $nav,
       ),
       array(
-        'title' => pht("Package %s", $package->getName()),
+        'title' => pht('Package %s', $package->getName()),
         'device' => true,
       ));
   }
 
   protected function getExtraPackageViews(AphrontSideNavFilterView $view) {
     $package = $this->package;
     $view->addFilter('package/'.$package->getID(), pht('Details'));
   }
 
 }
diff --git a/src/applications/owners/mail/OwnersPackageReplyHandler.php b/src/applications/owners/mail/OwnersPackageReplyHandler.php
index e530ee41e..5f2c7c5f1 100644
--- a/src/applications/owners/mail/OwnersPackageReplyHandler.php
+++ b/src/applications/owners/mail/OwnersPackageReplyHandler.php
@@ -1,30 +1,30 @@
 <?php
 
 final class OwnersPackageReplyHandler extends PhabricatorMailReplyHandler {
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PhabricatorOwnersPackage)) {
-      throw new Exception("Receiver is not a PhabricatorOwnersPackage!");
+      throw new Exception('Receiver is not a PhabricatorOwnersPackage!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return null;
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return null;
   }
 
   public function getReplyHandlerDomain() {
     return null;
   }
 
   public function getReplyHandlerInstructions() {
     return null;
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     return;
   }
 }
diff --git a/src/applications/owners/mail/PackageDeleteMail.php b/src/applications/owners/mail/PackageDeleteMail.php
index c7ced65b3..8d992b3fb 100644
--- a/src/applications/owners/mail/PackageDeleteMail.php
+++ b/src/applications/owners/mail/PackageDeleteMail.php
@@ -1,13 +1,13 @@
 <?php
 
 final class PackageDeleteMail extends PackageMail {
 
   protected function getVerb() {
-    return "Deleted";
+    return 'Deleted';
   }
 
   protected function isNewThread() {
     return false;
   }
 
 }
diff --git a/src/applications/passphrase/keys/PassphraseAbstractKey.php b/src/applications/passphrase/keys/PassphraseAbstractKey.php
index cf532d3fa..da56de15a 100644
--- a/src/applications/passphrase/keys/PassphraseAbstractKey.php
+++ b/src/applications/passphrase/keys/PassphraseAbstractKey.php
@@ -1,74 +1,74 @@
 <?php
 
 abstract class PassphraseAbstractKey extends Phobject {
 
   private $credential;
 
   protected function requireCredential() {
     if (!$this->credential) {
-      throw new Exception(pht("Credential is required!"));
+      throw new Exception(pht('Credential is required!'));
     }
     return $this->credential;
   }
 
   private function loadCredential(
     $phid,
     PhabricatorUser $viewer) {
 
     $credential = id(new PassphraseCredentialQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($phid))
       ->needSecrets(true)
       ->executeOne();
 
     if (!$credential) {
       throw new Exception(pht('Failed to load credential "%s"!', $phid));
     }
 
     return $credential;
   }
 
   private function validateCredential(
     PassphraseCredential $credential,
     $provides_type) {
 
     $type = $credential->getCredentialTypeImplementation();
 
     if (!$type) {
       throw new Exception(
         pht(
           'Credential "%s" is of unknown type "%s"!',
           'K'.$credential->getID(),
           $credential->getCredentialType()));
     }
 
     if ($type->getProvidesType() !== $provides_type) {
       throw new Exception(
         pht(
           'Credential "%s" must provide "%s", but provides "%s"!',
           'K'.$credential->getID(),
           $provides_type,
           $type->getProvidesType()));
     }
   }
 
   protected function loadAndValidateFromPHID(
     $phid,
     PhabricatorUser $viewer,
     $type) {
 
     $credential = $this->loadCredential($phid, $viewer);
 
     $this->validateCredential($credential, $type);
 
     $this->credential = $credential;
 
     return $this;
   }
 
   public function getUsernameEnvelope() {
     $credential = $this->requireCredential();
     return new PhutilOpaqueEnvelope($credential->getUsername());
   }
 
 }
diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
index 980e57233..4e1493d45 100644
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -1,160 +1,160 @@
 <?php
 
 final class PassphraseCredentialControl extends AphrontFormControl {
 
   private $options = array();
   private $credentialType;
   private $defaultUsername;
   private $allowNull;
 
   public function setAllowNull($allow_null) {
     $this->allowNull = $allow_null;
     return $this;
   }
 
   public function setDefaultUsername($default_username) {
     $this->defaultUsername = $default_username;
     return $this;
   }
 
   public function setCredentialType($credential_type) {
     $this->credentialType = $credential_type;
     return $this;
   }
 
   public function getCredentialType() {
     return $this->credentialType;
   }
 
   public function setOptions(array $options) {
     assert_instances_of($options, 'PassphraseCredential');
     $this->options = $options;
     return $this;
   }
 
   protected function getCustomControlClass() {
     return 'passphrase-credential-control';
   }
 
   protected function renderInput() {
 
     $options_map = array();
     foreach ($this->options as $option) {
       $options_map[$option->getPHID()] = pht(
-        "%s %s",
+        '%s %s',
         'K'.$option->getID(),
         $option->getName());
     }
 
     $disabled = $this->getDisabled();
     if ($this->allowNull) {
       $options_map = array('' => pht('(No Credentials)')) + $options_map;
     } else {
       if (!$options_map) {
         $options_map[''] = pht('(No Existing Credentials)');
         $disabled = true;
       }
     }
 
     Javelin::initBehavior('passphrase-credential-control');
 
     $options = AphrontFormSelectControl::renderSelectTag(
       $this->getValue(),
       $options_map,
       array(
         'id' => $this->getControlID(),
         'name' => $this->getName(),
         'disabled' => $disabled ? 'disabled' : null,
         'sigil' => 'passphrase-credential-select',
       ));
 
     if ($this->credentialType) {
       $button = javelin_tag(
         'a',
         array(
           'href' => '#',
           'class' => 'button grey',
           'sigil' => 'passphrase-credential-add',
           'mustcapture' => true,
         ),
         pht('Add Credential'));
     } else {
       $button = null;
     }
 
     return javelin_tag(
       'div',
       array(
         'sigil' => 'passphrase-credential-control',
         'meta' => array(
           'type' => $this->getCredentialType(),
           'username' => $this->defaultUsername,
           'allowNull' => $this->allowNull,
         ),
       ),
       array(
         $options,
         $button,
       ));
   }
 
   /**
    * Verify that a given actor has permission to use all of the credentials
    * in a list of credential transactions.
    *
    * In general, the rule here is:
    *
    *   - If you're editing an object and it uses a credential you can't use,
    *     that's fine as long as you don't change the credential.
    *   - If you do change the credential, the new credential must be one you
    *     can use.
    *
    * @param PhabricatorUser The acting user.
    * @param list<PhabricatorApplicationTransaction> List of credential altering
    *        transactions.
    * @return bool True if the transactions are valid.
    */
   public static function validateTransactions(
     PhabricatorUser $actor,
     array $xactions) {
 
     $new_phids = array();
     foreach ($xactions as $xaction) {
       $new = $xaction->getNewValue();
       if (!$new) {
         // Removing a credential, so this is OK.
         continue;
       }
 
       $old = $xaction->getOldValue();
       if ($old == $new) {
         // This is a no-op transaction, so this is also OK.
         continue;
       }
 
       // Otherwise, we need to check this credential.
       $new_phids[] = $new;
     }
 
     if (!$new_phids) {
       // No new credentials being set, so this is fine.
       return true;
     }
 
     $usable_credentials = id(new PassphraseCredentialQuery())
       ->setViewer($actor)
       ->withPHIDs($new_phids)
       ->execute();
     $usable_credentials = mpull($usable_credentials, null, 'getPHID');
 
     foreach ($new_phids as $phid) {
       if (empty($usable_credentials[$phid])) {
         return false;
       }
     }
 
     return true;
   }
 
 
 }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
index 2e5956f05..7e3797019 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
@@ -1,49 +1,49 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_paste_info_Method extends ConduitAPI_paste_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'paste.query'.";
   }
 
   public function getMethodDescription() {
-    return "Retrieve an array of information about a paste.";
+    return 'Retrieve an array of information about a paste.';
   }
 
   public function defineParamTypes() {
     return array(
       'paste_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_PASTE' => 'No such paste exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $paste_id = $request->getValue('paste_id');
     $paste = id(new PhabricatorPasteQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($paste_id))
       ->needRawContent(true)
       ->executeOne();
     if (!$paste) {
       throw new ConduitException('ERR_BAD_PASTE');
     }
     return $this->buildPasteInfoDictionary($paste);
   }
 
 }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
index 7f5ad4ff8..c839d562d 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
@@ -1,66 +1,66 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_paste_query_Method extends ConduitAPI_paste_Method {
 
   public function getMethodDescription() {
-    return "Query Pastes.";
+    return 'Query Pastes.';
   }
 
   public function defineParamTypes() {
     return array(
       'ids'           => 'optional list<int>',
       'phids'         => 'optional list<phid>',
       'authorPHIDs'   => 'optional list<phid>',
       'after'         => 'optional int',
       'limit'         => 'optional int, default = 100',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = id(new PhabricatorPasteQuery())
       ->setViewer($request->getUser())
       ->needRawContent(true);
 
     if ($request->getValue('ids')) {
       $query->withIDs($request->getValue('ids'));
     }
 
     if ($request->getValue('phids')) {
       $query->withPHIDs($request->getValue('phids'));
     }
 
     if ($request->getValue('authorPHIDs')) {
       $query->withAuthorPHIDs($request->getValue('authorPHIDs'));
     }
 
     if ($request->getValue('after')) {
       $query->setAfterID($request->getValue('after'));
     }
 
     $limit = $request->getValue('limit', 100);
     if ($limit) {
       $query->setLimit($limit);
     }
 
     $pastes = $query->execute();
 
     $results = array();
     foreach ($pastes as $paste) {
       $results[$paste->getPHID()] = $this->buildPasteInfoDictionary($paste);
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
index 1caf410ad..2e7061e27 100644
--- a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
+++ b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
@@ -1,92 +1,92 @@
 <?php
 
 final class PhabricatorPasteTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   // Better Support for this in the future
   public $supportedLanguages = array(
-    "Java" => "java",
-    "PHP" => "php");
+    'Java' => 'java',
+    'PHP' => 'php');
 
   public function generate() {
     $authorphid = $this->loadPhabrictorUserPHID();
     $language = $this->generateLanguage();
     $content = $this->generateContent($language);
     $title = $this->generateTitle($language);
     $paste_file = PhabricatorFile::newFromFileData(
       $content,
       array(
         'name' => $title,
         'mime-type' => 'text/plain; charset=utf-8',
         'authorPHID' => $authorphid,
         ));
     $policy = $this->generatePolicy();
     $filephid = $paste_file->getPHID();
     $parentphid = $this->loadPhabrictorPastePHID();
     $paste = id(new PhabricatorPaste())
       ->setParentPHID($parentphid)
       ->setAuthorPHID($authorphid)
       ->setTitle($title)
       ->setLanguage($language)
       ->setViewPolicy($policy)
       ->setFilePHID($filephid)
       ->save();
     return $paste;
   }
 
   private function loadPhabrictorPastePHID() {
     $random = rand(0, 1);
     if ($random == 1) {
-      $paste = id($this->loadOneRandom("PhabricatorPaste"));
+      $paste = id($this->loadOneRandom('PhabricatorPaste'));
       if ($paste) {
         return $paste->getPHID();
       }
     }
     return null;
   }
 
   public function generateTitle($language = null) {
     $taskgen = new PhutilLipsumContextFreeGrammar();
     // Remove Punctuation
     $title = preg_replace('/[^a-zA-Z 0-9]+/', '', $taskgen->generate());
     // Capitalize First Letters
     $title = ucwords($title);
     // Remove Spaces
     $title = preg_replace('/\s+/', '', $title);
     if ($language == null ||
       !in_array($language, array_keys($this->supportedLanguages))) {
-        return $title.".txt";
+        return $title.'.txt';
     } else {
-      return $title.".".$this->supportedLanguages[$language];
+      return $title.'.'.$this->supportedLanguages[$language];
     }
   }
 
   public function generateLanguage() {
     $supplemented_lang = $this->supportedLanguages;
-    $supplemented_lang["lipsum"] = "txt";
+    $supplemented_lang['lipsum'] = 'txt';
     return array_rand($supplemented_lang);
   }
 
   public function generateContent($language = null) {
       if ($language == null ||
         !in_array($language, array_keys($this->supportedLanguages))) {
         return id(new PhutilLipsumContextFreeGrammar())
             ->generateSeveral(rand(30, 40));
       } else {
-        $cfg_class = "Phutil".$language."CodeSnippetContextFreeGrammar";
+        $cfg_class = 'Phutil'.$language.'CodeSnippetContextFreeGrammar';
         return newv($cfg_class, array())->generate();
       }
   }
 
   public function generatePolicy() {
     // Make sure 4/5th of all generated Pastes are viewable to all
     switch (rand(0, 4)) {
       case 0:
         return PhabricatorPolicies::POLICY_PUBLIC;
       case 1:
         return PhabricatorPolicies::POLICY_NOONE;
       default:
         return PhabricatorPolicies::POLICY_USER;
     }
   }
 }
diff --git a/src/applications/paste/view/PasteEmbedView.php b/src/applications/paste/view/PasteEmbedView.php
index fa3295e2c..7c429a279 100644
--- a/src/applications/paste/view/PasteEmbedView.php
+++ b/src/applications/paste/view/PasteEmbedView.php
@@ -1,70 +1,70 @@
 <?php
 
 final class PasteEmbedView extends AphrontView {
 
   private $paste;
   private $handle;
   private $highlights = array();
   private $lines = 30;
 
   public function setPaste(PhabricatorPaste $paste) {
     $this->paste = $paste;
     return $this;
   }
 
   public function setHandle(PhabricatorObjectHandle $handle) {
     $this->handle = $handle;
     return $this;
   }
 
   public function setHighlights(array $highlights) {
     $this->highlights = $highlights;
     return $this;
   }
 
   public function setLines($lines) {
     $this->lines = $lines;
   }
 
   public function render() {
     if (!$this->paste) {
-      throw new Exception("Call setPaste() before render()!");
+      throw new Exception('Call setPaste() before render()!');
     }
 
     $lines = phutil_split_lines($this->paste->getContent());
     require_celerity_resource('paste-css');
 
     $link = phutil_tag(
       'a',
       array(
         'href' => '/P'.$this->paste->getID()
       ),
       $this->handle->getFullName());
 
     $head = phutil_tag(
       'div',
       array(
         'class' => 'paste-embed-head'
       ),
       $link);
 
     $body_attributes = array('class' => 'paste-embed-body');
     if ($this->lines != null) {
       $body_attributes['style'] = 'max-height: '.$this->lines * (1.15).'em;';
     }
 
     $body = phutil_tag(
       'div',
       $body_attributes,
       id(new PhabricatorSourceCodeView())
       ->setLines($lines)
       ->setHighlights($this->highlights)
       ->disableHighlightOnClick());
 
     return phutil_tag(
       'div',
       array('class' => 'paste-embed'),
       array($head, $body));
 
   }
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php b/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
index 75b394b2a..123ccea09 100644
--- a/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
@@ -1,63 +1,63 @@
 <?php
 
 final class ConduitAPI_user_addstatus_Method
   extends ConduitAPI_user_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodDescription() {
-    return pht("Add status information to the logged-in user.");
+    return pht('Add status information to the logged-in user.');
   }
 
   public function getMethodStatusDescription() {
     return pht(
       'Statuses are becoming full-fledged events as part of the '.
       'Calendar application.');
   }
 
   public function defineParamTypes() {
     $status_const = $this->formatStringConstants(array('away', 'sporadic'));
 
     return array(
       'fromEpoch'   => 'required int',
       'toEpoch'     => 'required int',
       'status'      => 'required '.$status_const,
       'description' => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-EPOCH' => "'toEpoch' must be bigger than 'fromEpoch'.",
       'ERR-OVERLAP'   =>
         'There must be no status in any part of the specified epoch.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user_phid   = $request->getUser()->getPHID();
     $from        = $request->getValue('fromEpoch');
     $to          = $request->getValue('toEpoch');
     $status      = $request->getValue('status');
     $description = $request->getValue('description', '');
 
     try {
       id(new PhabricatorCalendarEvent())
         ->setUserPHID($user_phid)
         ->setDateFrom($from)
         ->setDateTo($to)
         ->setTextStatus($status)
         ->setDescription($description)
         ->save();
     } catch (PhabricatorCalendarEventInvalidEpochException $e) {
       throw new ConduitException('ERR-BAD-EPOCH');
     }
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php b/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
index 6de78dcba..cca8ae00c 100644
--- a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
@@ -1,53 +1,53 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_user_disable_Method
   extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
-    return "Permanently disable specified users (admin only).";
+    return 'Permanently disable specified users (admin only).';
   }
 
   public function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-PERMISSIONS' => 'Only admins can call this method.',
       'ERR-BAD-PHID' => 'Non existent user PHID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $actor = $request->getUser();
     if (!$actor->getIsAdmin()) {
       throw new ConduitException('ERR-PERMISSIONS');
     }
 
     $phids = $request->getValue('phids');
 
     $users = id(new PhabricatorUser())->loadAllWhere(
       'phid IN (%Ls)',
       $phids);
 
     if (count($phids) != count($users)) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     foreach ($users as $user) {
       id(new PhabricatorUserEditor())
         ->setActor($actor)
         ->disableUser($user, true);
     }
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_enable_Method.php b/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
index 0c601cb0f..ad0b8b814 100644
--- a/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
@@ -1,53 +1,53 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_user_enable_Method
   extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
-    return "Re-enable specified users (admin only).";
+    return 'Re-enable specified users (admin only).';
   }
 
   public function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-PERMISSIONS' => 'Only admins can call this method.',
       'ERR-BAD-PHID' => 'Non existent user PHID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $actor = $request->getUser();
     if (!$actor->getIsAdmin()) {
       throw new ConduitException('ERR-PERMISSIONS');
     }
 
     $phids = $request->getValue('phids');
 
     $users = id(new PhabricatorUser())->loadAllWhere(
       'phid IN (%Ls)',
       $phids);
 
     if (count($phids) != count($users)) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     foreach ($users as $user) {
       id(new PhabricatorUserEditor())
         ->setActor($actor)
         ->disableUser($user, false);
     }
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_info_Method.php b/src/applications/people/conduit/ConduitAPI_user_info_Method.php
index 9397162b1..a514ab747 100644
--- a/src/applications/people/conduit/ConduitAPI_user_info_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_info_Method.php
@@ -1,50 +1,50 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_user_info_Method
   extends ConduitAPI_user_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'user.query'.";
   }
 
   public function getMethodDescription() {
-    return "Retrieve information about a user by PHID.";
+    return 'Retrieve information about a user by PHID.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'required phid',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-USER' => 'No such user exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $user = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $request->getValue('phid'));
 
     if (!$user) {
       throw new ConduitException('ERR-BAD-USER');
     }
 
     return $this->buildUserInformationDictionary($user);
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_query_Method.php b/src/applications/people/conduit/ConduitAPI_user_query_Method.php
index 890610694..1464dd0f8 100644
--- a/src/applications/people/conduit/ConduitAPI_user_query_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_query_Method.php
@@ -1,83 +1,83 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_user_query_Method
   extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
-    return "Query users.";
+    return 'Query users.';
   }
 
   public function defineParamTypes() {
 
     return array(
       'usernames'    => 'optional list<string>',
       'emails'       => 'optional list<string>',
       'realnames'    => 'optional list<string>',
       'phids'        => 'optional list<phid>',
       'ids'          => 'optional list<uint>',
       'offset'       => 'optional int',
       'limit'        => 'optional int (default = 100)',
     );
 
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $usernames   = $request->getValue('usernames', array());
     $emails      = $request->getValue('emails',    array());
     $realnames   = $request->getValue('realnames', array());
     $phids       = $request->getValue('phids',     array());
     $ids         = $request->getValue('ids',       array());
     $offset      = $request->getValue('offset',    0);
     $limit       = $request->getValue('limit',     100);
 
     $query = new PhabricatorPeopleQuery();
     $query->setViewer($request->getUser());
 
     if ($usernames) {
       $query->withUsernames($usernames);
     }
     if ($emails) {
       $query->withEmails($emails);
     }
     if ($realnames) {
       $query->withRealnames($realnames);
     }
     if ($phids) {
       $query->withPHIDs($phids);
     }
     if ($ids) {
       $query->withIDs($ids);
     }
     if ($limit) {
       $query->setLimit($limit);
     }
     if ($offset) {
       $query->setOffset($offset);
     }
     $users = $query->execute();
 
     $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
       mpull($users, 'getPHID'));
 
     $results = array();
     foreach ($users as $user) {
       $results[] = $this->buildUserInformationDictionary(
         $user,
         idx($statuses, $user->getPHID()));
     }
     return $results;
   }
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php b/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
index 6a5fa664b..6d741d6a3 100644
--- a/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
@@ -1,81 +1,81 @@
 <?php
 
 final class ConduitAPI_user_removestatus_Method extends ConduitAPI_user_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodDescription() {
-    return pht("Delete status information of the logged-in user.");
+    return pht('Delete status information of the logged-in user.');
   }
 
   public function getMethodStatusDescription() {
     return pht(
       'Statuses are becoming full-fledged events as part of the '.
       'Calendar application.');
   }
 
   public function defineParamTypes() {
     return array(
       'fromEpoch' => 'required int',
       'toEpoch' => 'required int',
     );
   }
 
   public function defineReturnType() {
     return 'int';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-EPOCH' => "'toEpoch' must be bigger than 'fromEpoch'.",
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user_phid = $request->getUser()->getPHID();
     $from = $request->getValue('fromEpoch');
     $to = $request->getValue('toEpoch');
 
     if ($to <= $from) {
       throw new ConduitException('ERR-BAD-EPOCH');
     }
 
     $table = new PhabricatorCalendarEvent();
     $table->openTransaction();
     $table->beginReadLocking();
 
     $overlap = $table->loadAllWhere(
       'userPHID = %s AND dateFrom < %d AND dateTo > %d',
       $user_phid,
       $to,
       $from);
     foreach ($overlap as $status) {
       if ($status->getDateFrom() < $from) {
         if ($status->getDateTo() > $to) {
           // Split the interval.
           id(new PhabricatorCalendarEvent())
             ->setUserPHID($user_phid)
             ->setDateFrom($to)
             ->setDateTo($status->getDateTo())
             ->setStatus($status->getStatus())
             ->setDescription($status->getDescription())
             ->save();
         }
         $status->setDateTo($from);
         $status->save();
       } else if ($status->getDateTo() > $to) {
         $status->setDateFrom($to);
         $status->save();
       } else {
         $status->delete();
       }
     }
 
     $table->endReadLocking();
     $table->saveTransaction();
     return count($overlap);
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php b/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
index dba0dbecb..aaf042970 100644
--- a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
@@ -1,35 +1,35 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_user_whoami_Method
   extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
-    return "Retrieve information about the logged-in user.";
+    return 'Retrieve information about the logged-in user.';
   }
 
   public function defineParamTypes() {
     return array(
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   public function getRequiredScope() {
     return PhabricatorOAuthServerScope::SCOPE_WHOAMI;
   }
 
   protected function execute(ConduitAPIRequest $request) {
     return $this->buildUserInformationDictionary($request->getUser());
   }
 
 }
diff --git a/src/applications/people/config/PhabricatorUserConfigOptions.php b/src/applications/people/config/PhabricatorUserConfigOptions.php
index 5c83312fc..e0c8cc4e8 100644
--- a/src/applications/people/config/PhabricatorUserConfigOptions.php
+++ b/src/applications/people/config/PhabricatorUserConfigOptions.php
@@ -1,49 +1,49 @@
 <?php
 
 final class PhabricatorUserConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("User Profiles");
+    return pht('User Profiles');
   }
 
   public function getDescription() {
-    return pht("User profiles configuration.");
+    return pht('User profiles configuration.');
   }
 
   public function getOptions() {
 
     $default = array(
       id(new PhabricatorUserRealNameField())->getFieldKey() => true,
       id(new PhabricatorUserTitleField())->getFieldKey() => true,
       id(new PhabricatorUserSinceField())->getFieldKey() => true,
       id(new PhabricatorUserRolesField())->getFieldKey() => true,
       id(new PhabricatorUserStatusField())->getFieldKey() => true,
       id(new PhabricatorUserBlurbField())->getFieldKey() => true,
     );
 
     foreach ($default as $key => $enabled) {
       $default[$key] = array(
         'disabled' => !$enabled,
       );
     }
 
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     return array(
       $this->newOption('user.fields', $custom_field_type, $default)
         ->setCustomData(id(new PhabricatorUser())->getCustomFieldBaseClass())
-        ->setDescription(pht("Select and reorder user profile fields.")),
+        ->setDescription(pht('Select and reorder user profile fields.')),
       $this->newOption('user.custom-field-definitions', 'map', array())
-        ->setDescription(pht("Add new simple fields to user profiles.")),
+        ->setDescription(pht('Add new simple fields to user profiles.')),
       $this->newOption('user.require-real-name', 'bool', true)
-        ->setDescription(pht("Always require real name for user profiles."))
+        ->setDescription(pht('Always require real name for user profiles.'))
         ->setBoolOptions(
           array(
             pht('Make real names required'),
             pht('Make real names optional'),
           )),
     );
   }
 
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php
index 280971bf0..48ba2f36d 100644
--- a/src/applications/people/controller/PhabricatorPeopleLdapController.php
+++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php
@@ -1,218 +1,218 @@
 <?php
 
 final class PhabricatorPeopleLdapController
   extends PhabricatorPeopleController {
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $admin = $request->getUser();
 
     $content = array();
 
     $form = id(new AphrontFormView())
       ->setAction($request->getRequestURI()
         ->alter('search', 'true')->alter('import', null))
       ->setUser($admin)
       ->appendChild(
         id(new AphrontFormTextControl())
         ->setLabel(pht('LDAP username'))
         ->setName('username'))
       ->appendChild(
         id(new AphrontFormPasswordControl())
         ->setLabel(pht('Password'))
         ->setName('password'))
       ->appendChild(
         id(new AphrontFormTextControl())
         ->setLabel(pht('LDAP query'))
         ->setCaption(pht('A filter such as (objectClass=*)'))
         ->setName('query'))
       ->appendChild(
         id(new AphrontFormSubmitControl())
         ->setValue(pht('Search')));
 
     $panel = id(new AphrontPanelView())
       ->setHeader(pht('Import LDAP Users'))
       ->setNoBackground()
       ->setWidth(AphrontPanelView::WIDTH_FORM)
       ->appendChild($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
       pht('Import Ldap Users'),
       $this->getApplicationURI('/ldap/'));
 
     $nav = $this->buildSideNavView();
     $nav->setCrumbs($crumbs);
     $nav->selectFilter('ldap');
     $nav->appendChild($content);
 
     if ($request->getStr('import')) {
       $nav->appendChild($this->processImportRequest($request));
     }
 
     $nav->appendChild($panel);
 
     if ($request->getStr('search')) {
       $nav->appendChild($this->processSearchRequest($request));
     }
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title'  => pht('Import Ldap Users'),
         'device' => true,
       ));
   }
 
   private function processImportRequest($request) {
     $admin = $request->getUser();
     $usernames = $request->getArr('usernames');
     $emails = $request->getArr('email');
     $names = $request->getArr('name');
 
     $notice_view = new AphrontErrorView();
     $notice_view->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
-    $notice_view->setTitle(pht("Import Successful"));
+    $notice_view->setTitle(pht('Import Successful'));
     $notice_view->setErrors(array(
-      pht("Successfully imported users from LDAP"),
+      pht('Successfully imported users from LDAP'),
     ));
 
     $list = new PHUIObjectItemListView();
-    $list->setNoDataString(pht("No users imported?"));
+    $list->setNoDataString(pht('No users imported?'));
 
     foreach ($usernames as $username) {
       $user = new PhabricatorUser();
       $user->setUsername($username);
       $user->setRealname($names[$username]);
 
       $email_obj = id(new PhabricatorUserEmail())
         ->setAddress($emails[$username])
         ->setIsVerified(1);
       try {
         id(new PhabricatorUserEditor())
           ->setActor($admin)
           ->createNewUser($user, $email_obj);
 
         id(new PhabricatorExternalAccount())
           ->setUserPHID($user->getPHID())
           ->setAccountType('ldap')
           ->setAccountDomain('self')
           ->setAccountID($username)
           ->save();
 
         $header = pht('Successfully added %s', $username);
         $attribute = null;
         $color = 'green';
       } catch (Exception $ex) {
         $header = pht('Failed to add %s', $username);
         $attribute = $ex->getMessage();
         $color = 'red';
       }
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($header)
         ->addAttribute($attribute)
         ->setBarColor($color);
 
       $list->addItem($item);
     }
 
     return array(
       $notice_view,
       $list,
     );
 
   }
 
   private function processSearchRequest($request) {
     $panel = new AphrontPanelView();
     $admin = $request->getUser();
 
     $search = $request->getStr('query');
 
     $ldap_provider = PhabricatorAuthProviderLDAP::getLDAPProvider();
     if (!$ldap_provider) {
-      throw new Exception("No LDAP provider enabled!");
+      throw new Exception('No LDAP provider enabled!');
     }
 
     $ldap_adapter = $ldap_provider->getAdapter();
     $ldap_adapter->setLoginUsername($request->getStr('username'));
     $ldap_adapter->setLoginPassword(
       new PhutilOpaqueEnvelope($request->getStr('password')));
 
     // This causes us to connect and bind.
     // TODO: Clean up this discard mode stuff.
     DarkConsoleErrorLogPluginAPI::enableDiscardMode();
       $ldap_adapter->getAccountID();
     DarkConsoleErrorLogPluginAPI::disableDiscardMode();
 
     $results = $ldap_adapter->searchLDAP('%Q', $search);
 
     foreach ($results as $key => $record) {
       $account_id = $ldap_adapter->readLDAPRecordAccountID($record);
       if (!$account_id) {
         unset($results[$key]);
         continue;
       }
 
       $info = array(
         $account_id,
         $ldap_adapter->readLDAPRecordEmail($record),
         $ldap_adapter->readLDAPRecordRealName($record),
       );
       $results[$key] = $info;
       $results[$key][] = $this->renderUserInputs($info);
     }
 
     $form = id(new AphrontFormView())
       ->setUser($admin);
 
     $table = new AphrontTableView($results);
     $table->setHeaders(
       array(
         pht('Username'),
         pht('Email'),
         pht('Real Name'),
         pht('Import?'),
       ));
     $form->appendChild($table);
     $form->setAction($request->getRequestURI()
       ->alter('import', 'true')->alter('search', null))
       ->appendChild(
         id(new AphrontFormSubmitControl())
         ->setValue(pht('Import')));
 
     $panel->appendChild($form);
 
     return $panel;
   }
 
   private function renderUserInputs($user) {
     $username = $user[0];
     return hsprintf(
       '%s%s%s',
       phutil_tag(
         'input',
         array(
           'type' => 'checkbox',
           'name' => 'usernames[]',
           'value' => $username,
         )),
       phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => "email[$username]",
           'value' => $user[1],
         )),
       phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => "name[$username]",
           'value' => $user[2],
         )));
   }
 
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php
index 5769c3aca..489ccda73 100644
--- a/src/applications/people/controller/PhabricatorPeopleNewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleNewController.php
@@ -1,224 +1,224 @@
 <?php
 
 final class PhabricatorPeopleNewController
   extends PhabricatorPeopleController {
 
   private $type;
 
   public function willProcessRequest(array $data) {
     $this->type = $data['type'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $admin = $request->getUser();
 
     switch ($this->type) {
       case 'standard':
         $is_bot = false;
         break;
       case 'bot':
         $is_bot = true;
         break;
       default:
         return new Aphront404Response();
     }
 
     $user = new PhabricatorUser();
     $require_real_name = PhabricatorEnv::getEnvConfig('user.require-real-name');
 
     $e_username = true;
     $e_realname = $require_real_name ? true : null;
     $e_email    = true;
     $errors = array();
 
     $welcome_checked = true;
 
     $new_email = null;
 
     $request = $this->getRequest();
     if ($request->isFormPost()) {
       $welcome_checked = $request->getInt('welcome');
 
       $user->setUsername($request->getStr('username'));
 
       $new_email = $request->getStr('email');
       if (!strlen($new_email)) {
         $errors[] = pht('Email is required.');
         $e_email = pht('Required');
       } else if (!PhabricatorUserEmail::isAllowedAddress($new_email)) {
         $e_email = pht('Invalid');
         $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
       } else {
         $e_email = null;
       }
 
       $user->setRealName($request->getStr('realname'));
 
       if (!strlen($user->getUsername())) {
-        $errors[] = pht("Username is required.");
+        $errors[] = pht('Username is required.');
         $e_username = pht('Required');
       } else if (!PhabricatorUser::validateUsername($user->getUsername())) {
         $errors[] = PhabricatorUser::describeValidUsername();
         $e_username = pht('Invalid');
       } else {
         $e_username = null;
       }
 
       if (!strlen($user->getRealName()) && $require_real_name) {
         $errors[] = pht('Real name is required.');
         $e_realname = pht('Required');
       } else {
         $e_realname = null;
       }
 
       if (!$errors) {
         try {
 
           $email = id(new PhabricatorUserEmail())
             ->setAddress($new_email)
             ->setIsVerified(0);
 
           // Automatically approve the user, since an admin is creating them.
           $user->setIsApproved(1);
 
           // If the user is a bot, approve their email too.
           if ($is_bot) {
             $email->setIsVerified(1);
           }
 
           id(new PhabricatorUserEditor())
             ->setActor($admin)
             ->createNewUser($user, $email);
 
           if ($is_bot) {
             id(new PhabricatorUserEditor())
               ->setActor($admin)
               ->makeSystemAgentUser($user, true);
           }
 
           if ($welcome_checked && !$is_bot) {
             $user->sendWelcomeEmail($admin);
           }
 
           $response = id(new AphrontRedirectResponse())
             ->setURI('/p/'.$user->getUsername().'/');
           return $response;
         } catch (AphrontQueryDuplicateKeyException $ex) {
           $errors[] = pht('Username and email must be unique.');
 
           $same_username = id(new PhabricatorUser())
             ->loadOneWhere('username = %s', $user->getUsername());
           $same_email = id(new PhabricatorUserEmail())
             ->loadOneWhere('address = %s', $new_email);
 
           if ($same_username) {
             $e_username = pht('Duplicate');
           }
 
           if ($same_email) {
             $e_email = pht('Duplicate');
           }
         }
       }
     }
 
     $form = id(new AphrontFormView())
       ->setUser($admin);
 
     if ($is_bot) {
       $form->appendRemarkupInstructions(
         pht(
           'You are creating a new **bot/script** user account.'));
     } else {
       $form->appendRemarkupInstructions(
         pht(
           'You are creating a new **standard** user account.'));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Username'))
           ->setName('username')
           ->setValue($user->getUsername())
           ->setError($e_username))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Real Name'))
           ->setName('realname')
           ->setValue($user->getRealName())
           ->setError($e_realname))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Email'))
           ->setName('email')
           ->setValue($new_email)
           ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
           ->setError($e_email));
 
     if (!$is_bot) {
       $form->appendChild(
         id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'welcome',
             1,
             pht('Send "Welcome to Phabricator" email with login instructions.'),
             $welcome_checked));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($this->getApplicationURI())
           ->setValue(pht('Create User')));
 
     if ($is_bot) {
       $form
         ->appendChild(id(new AphrontFormDividerControl()))
         ->appendRemarkupInstructions(
           pht(
             '**Why do bot/script accounts need an email address?**'.
             "\n\n".
             'Although bots do not normally receive email from Phabricator, '.
             'they can interact with other systems which require an email '.
             'address. Examples include:'.
             "\n\n".
             "  - If the account takes actions which //send// email, we need ".
             "    an address to use in the //From// header.\n".
             "  - If the account creates commits, Git and Mercurial require ".
             "    an email address for authorship.\n".
             "  - If you send email //to// Phabricator on behalf of the ".
             "    account, the address can identify the sender.\n".
             "  - Some internal authentication functions depend on accounts ".
             "    having an email address.\n".
             "\n\n".
             "The address will automatically be verified, so you do not need ".
             "to be able to receive mail at this address, and can enter some ".
             "invalid or nonexistent (but correctly formatted) address like ".
             "`bot@yourcompany.com` if you prefer."));
     }
 
 
     $title = pht('Create New User');
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/editor/PhabricatorUserEditor.php
index 21724b6e0..4f2c5ed8a 100644
--- a/src/applications/people/editor/PhabricatorUserEditor.php
+++ b/src/applications/people/editor/PhabricatorUserEditor.php
@@ -1,578 +1,578 @@
 <?php
 
 /**
  * Editor class for creating and adjusting users. This class guarantees data
  * integrity and writes logs when user information changes.
  *
  * @task config     Configuration
  * @task edit       Creating and Editing Users
  * @task role       Editing Roles
  * @task email      Adding, Removing and Changing Email
  * @task internal   Internals
  */
 final class PhabricatorUserEditor extends PhabricatorEditor {
 
   private $logs = array();
 
 
 /* -(  Creating and Editing Users  )----------------------------------------- */
 
 
   /**
    * @task edit
    */
   public function createNewUser(
     PhabricatorUser $user,
     PhabricatorUserEmail $email) {
 
     if ($user->getID()) {
-      throw new Exception("User has already been created!");
+      throw new Exception('User has already been created!');
     }
 
     if ($email->getID()) {
-      throw new Exception("Email has already been created!");
+      throw new Exception('Email has already been created!');
     }
 
     if (!PhabricatorUser::validateUsername($user->getUsername())) {
       $valid = PhabricatorUser::describeValidUsername();
       throw new Exception("Username is invalid! {$valid}");
     }
 
     // Always set a new user's email address to primary.
     $email->setIsPrimary(1);
 
     // If the primary address is already verified, also set the verified flag
     // on the user themselves.
     if ($email->getIsVerified()) {
       $user->setIsEmailVerified(1);
     }
 
     $this->willAddEmail($email);
 
     $user->openTransaction();
       try {
         $user->save();
         $email->setUserPHID($user->getPHID());
         $email->save();
       } catch (AphrontQueryDuplicateKeyException $ex) {
         // We might have written the user but failed to write the email; if
         // so, erase the IDs we attached.
         $user->setID(null);
         $user->setPHID(null);
 
         $user->killTransaction();
         throw $ex;
       }
 
       $log = PhabricatorUserLog::initializeNewLog(
         $this->requireActor(),
         $user->getPHID(),
         PhabricatorUserLog::ACTION_CREATE);
       $log->setNewValue($email->getAddress());
       $log->save();
 
     $user->saveTransaction();
 
     return $this;
   }
 
 
   /**
    * @task edit
    */
   public function updateUser(
     PhabricatorUser $user,
     PhabricatorUserEmail $email = null) {
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     $user->openTransaction();
       $user->save();
       if ($email) {
         $email->save();
       }
 
       $log = PhabricatorUserLog::initializeNewLog(
         $this->requireActor(),
         $user->getPHID(),
         PhabricatorUserLog::ACTION_EDIT);
       $log->save();
 
     $user->saveTransaction();
 
     return $this;
   }
 
 
   /**
    * @task edit
    */
   public function changePassword(
     PhabricatorUser $user,
     PhutilOpaqueEnvelope $envelope) {
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     $user->openTransaction();
       $user->reload();
 
       $user->setPassword($envelope);
       $user->save();
 
       $log = PhabricatorUserLog::initializeNewLog(
         $this->requireActor(),
         $user->getPHID(),
         PhabricatorUserLog::ACTION_CHANGE_PASSWORD);
       $log->save();
 
     $user->saveTransaction();
   }
 
 
   /**
    * @task edit
    */
   public function changeUsername(PhabricatorUser $user, $username) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     if (!PhabricatorUser::validateUsername($username)) {
       $valid = PhabricatorUser::describeValidUsername();
       throw new Exception("Username is invalid! {$valid}");
     }
 
     $old_username = $user->getUsername();
 
     $user->openTransaction();
       $user->reload();
       $user->setUsername($username);
 
       try {
         $user->save();
       } catch (AphrontQueryDuplicateKeyException $ex) {
         $user->setUsername($old_username);
         $user->killTransaction();
         throw $ex;
       }
 
       $log = PhabricatorUserLog::initializeNewLog(
         $actor,
         $user->getPHID(),
         PhabricatorUserLog::ACTION_CHANGE_USERNAME);
       $log->setOldValue($old_username);
       $log->setNewValue($username);
       $log->save();
 
     $user->saveTransaction();
 
     $user->sendUsernameChangeEmail($actor, $old_username);
   }
 
 
 /* -(  Editing Roles  )------------------------------------------------------ */
 
 
   /**
    * @task role
    */
   public function makeAdminUser(PhabricatorUser $user, $admin) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         if ($user->getIsAdmin() == $admin) {
           $user->endWriteLocking();
           $user->killTransaction();
           return $this;
         }
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_ADMIN);
         $log->setOldValue($user->getIsAdmin());
         $log->setNewValue($admin);
 
         $user->setIsAdmin((int)$admin);
         $user->save();
 
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     return $this;
   }
 
   /**
    * @task role
    */
   public function makeSystemAgentUser(PhabricatorUser $user, $system_agent) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         if ($user->getIsSystemAgent() == $system_agent) {
           $user->endWriteLocking();
           $user->killTransaction();
           return $this;
         }
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_SYSTEM_AGENT);
         $log->setOldValue($user->getIsSystemAgent());
         $log->setNewValue($system_agent);
 
         $user->setIsSystemAgent((int)$system_agent);
         $user->save();
 
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     return $this;
   }
 
 
   /**
    * @task role
    */
   public function disableUser(PhabricatorUser $user, $disable) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         if ($user->getIsDisabled() == $disable) {
           $user->endWriteLocking();
           $user->killTransaction();
           return $this;
         }
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_DISABLE);
         $log->setOldValue($user->getIsDisabled());
         $log->setNewValue($disable);
 
         $user->setIsDisabled((int)$disable);
         $user->save();
 
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     return $this;
   }
 
 
   /**
    * @task role
    */
   public function approveUser(PhabricatorUser $user, $approve) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         if ($user->getIsApproved() == $approve) {
           $user->endWriteLocking();
           $user->killTransaction();
           return $this;
         }
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_APPROVE);
         $log->setOldValue($user->getIsApproved());
         $log->setNewValue($approve);
 
         $user->setIsApproved($approve);
         $user->save();
 
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     return $this;
   }
 
 
 /* -(  Adding, Removing and Changing Email  )-------------------------------- */
 
 
   /**
    * @task email
    */
   public function addEmail(
     PhabricatorUser $user,
     PhabricatorUserEmail $email) {
 
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
     if ($email->getID()) {
-      throw new Exception("Email has already been created!");
+      throw new Exception('Email has already been created!');
     }
 
     // Use changePrimaryEmail() to change primary email.
     $email->setIsPrimary(0);
     $email->setUserPHID($user->getPHID());
 
     $this->willAddEmail($email);
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
 
         try {
           $email->save();
         } catch (AphrontQueryDuplicateKeyException $ex) {
           $user->endWriteLocking();
           $user->killTransaction();
 
           throw $ex;
         }
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_EMAIL_ADD);
         $log->setNewValue($email->getAddress());
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     return $this;
   }
 
 
   /**
    * @task email
    */
   public function removeEmail(
     PhabricatorUser $user,
     PhabricatorUserEmail $email) {
 
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
     if (!$email->getID()) {
-      throw new Exception("Email has not been created yet!");
+      throw new Exception('Email has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         $email->reload();
 
         if ($email->getIsPrimary()) {
           throw new Exception("Can't remove primary email!");
         }
         if ($email->getUserPHID() != $user->getPHID()) {
-          throw new Exception("Email not owned by user!");
+          throw new Exception('Email not owned by user!');
         }
 
         $email->delete();
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_EMAIL_REMOVE);
         $log->setOldValue($email->getAddress());
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     return $this;
   }
 
 
   /**
    * @task email
    */
   public function changePrimaryEmail(
     PhabricatorUser $user,
     PhabricatorUserEmail $email) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
-      throw new Exception("User has not been created yet!");
+      throw new Exception('User has not been created yet!');
     }
     if (!$email->getID()) {
-      throw new Exception("Email has not been created yet!");
+      throw new Exception('Email has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         $email->reload();
 
         if ($email->getUserPHID() != $user->getPHID()) {
-          throw new Exception("User does not own email!");
+          throw new Exception('User does not own email!');
         }
 
         if ($email->getIsPrimary()) {
-          throw new Exception("Email is already primary!");
+          throw new Exception('Email is already primary!');
         }
 
         if (!$email->getIsVerified()) {
-          throw new Exception("Email is not verified!");
+          throw new Exception('Email is not verified!');
         }
 
         $old_primary = $user->loadPrimaryEmail();
         if ($old_primary) {
           $old_primary->setIsPrimary(0);
           $old_primary->save();
         }
 
         $email->setIsPrimary(1);
         $email->save();
 
         $log = PhabricatorUserLog::initializeNewLog(
           $actor,
           $user->getPHID(),
           PhabricatorUserLog::ACTION_EMAIL_PRIMARY);
         $log->setOldValue($old_primary ? $old_primary->getAddress() : null);
         $log->setNewValue($email->getAddress());
 
         $log->save();
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
     if ($old_primary) {
       $old_primary->sendOldPrimaryEmail($user, $email);
     }
     $email->sendNewPrimaryEmail($user);
 
     return $this;
   }
 
 
   /**
    * Verify a user's email address.
    *
    * This verifies an individual email address. If the address is the user's
    * primary address and their account was not previously verified, their
    * account is marked as email verified.
    *
    * @task email
    */
   public function verifyEmail(
     PhabricatorUser $user,
     PhabricatorUserEmail $email) {
     $actor = $this->requireActor();
 
     if (!$user->getID()) {
       throw new Exception('User has not been created yet!');
     }
     if (!$email->getID()) {
       throw new Exception('Email has not been created yet!');
     }
 
     $user->openTransaction();
       $user->beginWriteLocking();
 
         $user->reload();
         $email->reload();
 
         if ($email->getUserPHID() != $user->getPHID()) {
           throw new Exception(pht('User does not own email!'));
         }
 
         if (!$email->getIsVerified()) {
           $email->setIsVerified(1);
           $email->save();
 
           $log = PhabricatorUserLog::initializeNewLog(
             $actor,
             $user->getPHID(),
             PhabricatorUserLog::ACTION_EMAIL_VERIFY);
           $log->setNewValue($email->getAddress());
           $log->save();
         }
 
         if (!$user->getIsEmailVerified()) {
           // If the user just verified their primary email address, mark their
           // account as email verified.
           $user_primary = $user->loadPrimaryEmail();
           if ($user_primary->getID() == $email->getID()) {
             $user->setIsEmailVerified(1);
             $user->save();
           }
         }
 
       $user->endWriteLocking();
     $user->saveTransaction();
 
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   private function willAddEmail(PhabricatorUserEmail $email) {
 
     // Hard check before write to prevent creation of disallowed email
     // addresses. Normally, the application does checks and raises more
     // user friendly errors for us, but we omit the courtesy checks on some
     // pathways like administrative scripts for simplicity.
 
     if (!PhabricatorUserEmail::isValidAddress($email->getAddress())) {
       throw new Exception(PhabricatorUserEmail::describeValidAddresses());
     }
 
     if (!PhabricatorUserEmail::isAllowedAddress($email->getAddress())) {
       throw new Exception(PhabricatorUserEmail::describeAllowedAddresses());
     }
   }
 
 }
diff --git a/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php b/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php
index 03faf81ac..410d46ae1 100644
--- a/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php
+++ b/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php
@@ -1,105 +1,105 @@
 <?php
 
 final class PhabricatorPeopleTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   public function generate() {
 
     while (true) {
       try {
         $realname = $this->generateRealname();
         $username = $this->generateUsername($realname);
         $email = $this->generateEmail($username);
 
         $admin = PhabricatorUser::getOmnipotentUser();
         $user = new PhabricatorUser();
         $user->setUsername($username);
         $user->setRealname($realname);
 
         $email_object = id(new PhabricatorUserEmail())
           ->setAddress($email)
           ->setIsVerified(1);
 
         id(new PhabricatorUserEditor())
           ->setActor($admin)
           ->createNewUser($user, $email_object);
 
         return $user;
       } catch (AphrontQueryDuplicateKeyException $ex) {
       }
     }
   }
 
   protected function generateRealname() {
     $realname_generator = new PhutilRealnameContextFreeGrammar();
     $random_real_name = $realname_generator->generate();
     return $random_real_name;
   }
 
   protected function generateUsername($random_real_name) {
     $name = strtolower($random_real_name);
     $name = preg_replace('/[^a-z]/s'  , ' ', $name);
     $name = preg_replace('/\s+/', ' ', $name);
-    $words = explode(" ", $name);
+    $words = explode(' ', $name);
     $random = rand(0, 4);
-    $reduced = "";
+    $reduced = '';
     if ($random == 0) {
       foreach ($words as $w) {
          if ($w == end($words)) {
           $reduced .= $w;
         }
         else {
           $reduced .= $w[0];
         }
       }
-    } elseif ($random == 1) {
+    } else if ($random == 1) {
         foreach ($words as $w) {
           if ($w == $words[0]) {
             $reduced .= $w;
           }
           else {
             $reduced .= $w[0];
           }
         }
-    } elseif ($random == 2) {
+    } else if ($random == 2) {
         foreach ($words as $w) {
           if ($w == $words[0] || $w == end($words)) {
             $reduced .= $w;
           }
           else {
             $reduced .= $w[0];
           }
         }
-    } elseif ($random == 3) {
+    } else if ($random == 3) {
         foreach ($words as $w) {
           if ($w == $words[0] || $w == end($words)) {
             $reduced .= $w;
           }
           else {
-            $reduced .= $w[0].".";
+            $reduced .= $w[0].'.';
           }
         }
-      } elseif ($random == 4) {
+      } else if ($random == 4) {
         foreach ($words as $w) {
           if ($w == $words[0] || $w == end($words)) {
             $reduced .= $w;
           }
           else {
-            $reduced .= $w[0]."_";
+            $reduced .= $w[0].'_';
           }
         }
       }
       $random1 = rand(0, 4);
       if ($random1 >= 1) {
         $reduced = ucfirst($reduced);
       }
       $username = $reduced;
       return $username;
   }
 
   protected function generateEmail($username) {
-    $default_email_domain = "example.com";
-    $email = $username."@".$default_email_domain;
+    $default_email_domain = 'example.com';
+    $email = $username.'@'.$default_email_domain;
     return $email;
   }
 }
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 94b59fed7..38c9b421a 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1,901 +1,901 @@
 <?php
 
 /**
  * @task factors  Multi-Factor Authentication
  */
 final class PhabricatorUser
   extends PhabricatorUserDAO
   implements
     PhutilPerson,
     PhabricatorPolicyInterface,
     PhabricatorCustomFieldInterface,
     PhabricatorDestructableInterface {
 
   const SESSION_TABLE = 'phabricator_session';
   const NAMETOKEN_TABLE = 'user_nametoken';
   const MAXIMUM_USERNAME_LENGTH = 64;
 
   protected $userName;
   protected $realName;
   protected $sex;
   protected $translation;
   protected $passwordSalt;
   protected $passwordHash;
   protected $profileImagePHID;
   protected $timezoneIdentifier = '';
 
   protected $consoleEnabled = 0;
   protected $consoleVisible = 0;
   protected $consoleTab = '';
 
   protected $conduitCertificate;
 
   protected $isSystemAgent = 0;
   protected $isAdmin = 0;
   protected $isDisabled = 0;
   protected $isEmailVerified = 0;
   protected $isApproved = 0;
   protected $isEnrolledInMultiFactor = 0;
 
   protected $accountSecret;
 
   private $profileImage = self::ATTACHABLE;
   private $profile = null;
   private $status = self::ATTACHABLE;
   private $preferences = null;
   private $omnipotent = false;
   private $customFields = self::ATTACHABLE;
 
   private $alternateCSRFString = self::ATTACHABLE;
   private $session = self::ATTACHABLE;
 
   protected function readField($field) {
     switch ($field) {
       case 'timezoneIdentifier':
         // If the user hasn't set one, guess the server's time.
         return nonempty(
           $this->timezoneIdentifier,
           date_default_timezone_get());
       // Make sure these return booleans.
       case 'isAdmin':
         return (bool)$this->isAdmin;
       case 'isDisabled':
         return (bool)$this->isDisabled;
       case 'isSystemAgent':
         return (bool)$this->isSystemAgent;
       case 'isEmailVerified':
         return (bool)$this->isEmailVerified;
       case 'isApproved':
         return (bool)$this->isApproved;
       default:
         return parent::readField($field);
     }
   }
 
 
   /**
    * Is this a live account which has passed required approvals? Returns true
    * if this is an enabled, verified (if required), approved (if required)
    * account, and false otherwise.
    *
    * @return bool True if this is a standard, usable account.
    */
   public function isUserActivated() {
     if ($this->getIsDisabled()) {
       return false;
     }
 
     if (!$this->getIsApproved()) {
       return false;
     }
 
     if (PhabricatorUserEmail::isEmailVerificationRequired()) {
       if (!$this->getIsEmailVerified()) {
         return false;
       }
     }
 
     return true;
   }
 
   /**
    * Returns `true` if this is a standard user who is logged in. Returns `false`
    * for logged out, anonymous, or external users.
    *
    * @return bool `true` if the user is a standard user who is logged in with
    *              a normal session.
    */
   public function getIsStandardUser() {
     $type_user = PhabricatorPeoplePHIDTypeUser::TYPECONST;
     return $this->getPHID() && (phid_get_type($this->getPHID()) == $type_user);
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_PARTIAL_OBJECTS => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorPeoplePHIDTypeUser::TYPECONST);
   }
 
   public function setPassword(PhutilOpaqueEnvelope $envelope) {
     if (!$this->getPHID()) {
       throw new Exception(
-        "You can not set a password for an unsaved user because their PHID ".
-        "is a salt component in the password hash.");
+        'You can not set a password for an unsaved user because their PHID '.
+        'is a salt component in the password hash.');
     }
 
     if (!strlen($envelope->openEnvelope())) {
       $this->setPasswordHash('');
     } else {
       $this->setPasswordSalt(md5(Filesystem::readRandomBytes(32)));
       $hash = $this->hashPassword($envelope);
       $this->setPasswordHash($hash->openEnvelope());
     }
     return $this;
   }
 
   // To satisfy PhutilPerson.
   public function getSex() {
     return $this->sex;
   }
 
   public function getMonogram() {
     return '@'.$this->getUsername();
   }
 
   public function getTranslation() {
     try {
       if ($this->translation &&
           class_exists($this->translation) &&
           is_subclass_of($this->translation, 'PhabricatorTranslation')) {
         return $this->translation;
       }
     } catch (PhutilMissingSymbolException $ex) {
       return null;
     }
     return null;
   }
 
   public function isLoggedIn() {
     return !($this->getPHID() === null);
   }
 
   public function save() {
     if (!$this->getConduitCertificate()) {
       $this->setConduitCertificate($this->generateConduitCertificate());
     }
 
     if (!strlen($this->getAccountSecret())) {
       $this->setAccountSecret(Filesystem::readRandomCharacters(64));
     }
 
     $result = parent::save();
 
     if ($this->profile) {
       $this->profile->save();
     }
 
     $this->updateNameTokens();
 
     id(new PhabricatorSearchIndexer())
       ->queueDocumentForIndexing($this->getPHID());
 
     return $result;
   }
 
   public function attachSession(PhabricatorAuthSession $session) {
     $this->session = $session;
     return $this;
   }
 
   public function getSession() {
     return $this->assertAttached($this->session);
   }
 
   public function hasSession() {
     return ($this->session !== self::ATTACHABLE);
   }
 
   private function generateConduitCertificate() {
     return Filesystem::readRandomCharacters(255);
   }
 
   public function comparePassword(PhutilOpaqueEnvelope $envelope) {
     if (!strlen($envelope->openEnvelope())) {
       return false;
     }
     if (!strlen($this->getPasswordHash())) {
       return false;
     }
 
     return PhabricatorPasswordHasher::comparePassword(
       $this->getPasswordHashInput($envelope),
       new PhutilOpaqueEnvelope($this->getPasswordHash()));
   }
 
   private function getPasswordHashInput(PhutilOpaqueEnvelope $password) {
     $input =
       $this->getUsername().
       $password->openEnvelope().
       $this->getPHID().
       $this->getPasswordSalt();
 
     return new PhutilOpaqueEnvelope($input);
   }
 
   private function hashPassword(PhutilOpaqueEnvelope $password) {
     $hasher = PhabricatorPasswordHasher::getBestHasher();
 
     $input_envelope = $this->getPasswordHashInput($password);
     return $hasher->getPasswordHashForStorage($input_envelope);
   }
 
   const CSRF_CYCLE_FREQUENCY  = 3600;
   const CSRF_SALT_LENGTH      = 8;
   const CSRF_TOKEN_LENGTH     = 16;
   const CSRF_BREACH_PREFIX    = 'B@';
 
   const EMAIL_CYCLE_FREQUENCY = 86400;
   const EMAIL_TOKEN_LENGTH    = 24;
 
   private function getRawCSRFToken($offset = 0) {
     return $this->generateToken(
       time() + (self::CSRF_CYCLE_FREQUENCY * $offset),
       self::CSRF_CYCLE_FREQUENCY,
       PhabricatorEnv::getEnvConfig('phabricator.csrf-key'),
       self::CSRF_TOKEN_LENGTH);
   }
 
   /**
    * @phutil-external-symbol class PhabricatorStartup
    */
   public function getCSRFToken() {
     $salt = PhabricatorStartup::getGlobal('csrf.salt');
     if (!$salt) {
       $salt = Filesystem::readRandomCharacters(self::CSRF_SALT_LENGTH);
       PhabricatorStartup::setGlobal('csrf.salt', $salt);
     }
 
     // Generate a token hash to mitigate BREACH attacks against SSL. See
     // discussion in T3684.
     $token = $this->getRawCSRFToken();
     $hash = PhabricatorHash::digest($token, $salt);
     return 'B@'.$salt.substr($hash, 0, self::CSRF_TOKEN_LENGTH);
   }
 
   public function validateCSRFToken($token) {
     $salt = null;
     $version = 'plain';
 
     // This is a BREACH-mitigating token. See T3684.
     $breach_prefix = self::CSRF_BREACH_PREFIX;
     $breach_prelen = strlen($breach_prefix);
 
     if (!strncmp($token, $breach_prefix, $breach_prelen)) {
       $version = 'breach';
       $salt = substr($token, $breach_prelen, self::CSRF_SALT_LENGTH);
       $token = substr($token, $breach_prelen + self::CSRF_SALT_LENGTH);
     }
 
     // When the user posts a form, we check that it contains a valid CSRF token.
     // Tokens cycle each hour (every CSRF_CYLCE_FREQUENCY seconds) and we accept
     // either the current token, the next token (users can submit a "future"
     // token if you have two web frontends that have some clock skew) or any of
     // the last 6 tokens. This means that pages are valid for up to 7 hours.
     // There is also some Javascript which periodically refreshes the CSRF
     // tokens on each page, so theoretically pages should be valid indefinitely.
     // However, this code may fail to run (if the user loses their internet
     // connection, or there's a JS problem, or they don't have JS enabled).
     // Choosing the size of the window in which we accept old CSRF tokens is
     // an issue of balancing concerns between security and usability. We could
     // choose a very narrow (e.g., 1-hour) window to reduce vulnerability to
     // attacks using captured CSRF tokens, but it's also more likely that real
     // users will be affected by this, e.g. if they close their laptop for an
     // hour, open it back up, and try to submit a form before the CSRF refresh
     // can kick in. Since the user experience of submitting a form with expired
     // CSRF is often quite bad (you basically lose data, or it's a big pain to
     // recover at least) and I believe we gain little additional protection
     // by keeping the window very short (the overwhelming value here is in
     // preventing blind attacks, and most attacks which can capture CSRF tokens
     // can also just capture authentication information [sniffing networks]
     // or act as the user [xss]) the 7 hour default seems like a reasonable
     // balance. Other major platforms have much longer CSRF token lifetimes,
     // like Rails (session duration) and Django (forever), which suggests this
     // is a reasonable analysis.
     $csrf_window = 6;
 
     for ($ii = -$csrf_window; $ii <= 1; $ii++) {
       $valid = $this->getRawCSRFToken($ii);
       switch ($version) {
         // TODO: We can remove this after the BREACH version has been in the
         // wild for a while.
         case 'plain':
           if ($token == $valid) {
             return true;
           }
           break;
         case 'breach':
           $digest = PhabricatorHash::digest($valid, $salt);
           if (substr($digest, 0, self::CSRF_TOKEN_LENGTH) == $token) {
             return true;
           }
           break;
         default:
-          throw new Exception("Unknown CSRF token format!");
+          throw new Exception('Unknown CSRF token format!');
       }
     }
 
     return false;
   }
 
   private function generateToken($epoch, $frequency, $key, $len) {
     if ($this->getPHID()) {
       $vec = $this->getPHID().$this->getAccountSecret();
     } else {
       $vec = $this->getAlternateCSRFString();
     }
 
     $time_block = floor($epoch / $frequency);
     $vec = $vec.$key.$time_block;
 
     return substr(PhabricatorHash::digest($vec), 0, $len);
   }
 
   public function attachUserProfile(PhabricatorUserProfile $profile) {
     $this->profile = $profile;
     return $this;
   }
 
   public function loadUserProfile() {
     if ($this->profile) {
       return $this->profile;
     }
 
     $profile_dao = new PhabricatorUserProfile();
     $this->profile = $profile_dao->loadOneWhere('userPHID = %s',
       $this->getPHID());
 
     if (!$this->profile) {
       $profile_dao->setUserPHID($this->getPHID());
       $this->profile = $profile_dao;
     }
 
     return $this->profile;
   }
 
   public function loadPrimaryEmailAddress() {
     $email = $this->loadPrimaryEmail();
     if (!$email) {
-      throw new Exception("User has no primary email address!");
+      throw new Exception('User has no primary email address!');
     }
     return $email->getAddress();
   }
 
   public function loadPrimaryEmail() {
     return $this->loadOneRelative(
       new PhabricatorUserEmail(),
       'userPHID',
       'getPHID',
       '(isPrimary = 1)');
   }
 
   public function loadPreferences() {
     if ($this->preferences) {
       return $this->preferences;
     }
 
     $preferences = null;
     if ($this->getPHID()) {
       $preferences = id(new PhabricatorUserPreferences())->loadOneWhere(
         'userPHID = %s',
         $this->getPHID());
     }
 
     if (!$preferences) {
       $preferences = new PhabricatorUserPreferences();
       $preferences->setUserPHID($this->getPHID());
 
       $default_dict = array(
         PhabricatorUserPreferences::PREFERENCE_TITLES => 'glyph',
         PhabricatorUserPreferences::PREFERENCE_EDITOR => '',
         PhabricatorUserPreferences::PREFERENCE_MONOSPACED => '',
         PhabricatorUserPreferences::PREFERENCE_DARK_CONSOLE => 0);
 
       $preferences->setPreferences($default_dict);
     }
 
     $this->preferences = $preferences;
     return $preferences;
   }
 
   public function loadEditorLink($path, $line, $callsign) {
     $editor = $this->loadPreferences()->getPreference(
       PhabricatorUserPreferences::PREFERENCE_EDITOR);
 
     if (is_array($path)) {
       $multiedit = $this->loadPreferences()->getPreference(
         PhabricatorUserPreferences::PREFERENCE_MULTIEDIT);
       switch ($multiedit) {
         case '':
           $path = implode(' ', $path);
           break;
         case 'disable':
           return null;
       }
     }
 
     if (!strlen($editor)) {
       return null;
     }
 
     $uri = strtr($editor, array(
       '%%' => '%',
       '%f' => phutil_escape_uri($path),
       '%l' => phutil_escape_uri($line),
       '%r' => phutil_escape_uri($callsign),
     ));
 
     // The resulting URI must have an allowed protocol. Otherwise, we'll return
     // a link to an error page explaining the misconfiguration.
 
     $ok = PhabricatorHelpEditorProtocolController::hasAllowedProtocol($uri);
     if (!$ok) {
       return '/help/editorprotocol/';
     }
 
     return (string)$uri;
   }
 
   public function getAlternateCSRFString() {
     return $this->assertAttached($this->alternateCSRFString);
   }
 
   public function attachAlternateCSRFString($string) {
     $this->alternateCSRFString = $string;
     return $this;
   }
 
   private static function tokenizeName($name) {
     if (function_exists('mb_strtolower')) {
       $name = mb_strtolower($name, 'UTF-8');
     } else {
       $name = strtolower($name);
     }
     $name = trim($name);
     if (!strlen($name)) {
       return array();
     }
     return preg_split('/\s+/', $name);
   }
 
   /**
    * Populate the nametoken table, which used to fetch typeahead results. When
    * a user types "linc", we want to match "Abraham Lincoln" from on-demand
    * typeahead sources. To do this, we need a separate table of name fragments.
    */
   public function updateNameTokens() {
     $tokens = array_merge(
       self::tokenizeName($this->getRealName()),
       self::tokenizeName($this->getUserName()));
     $tokens = array_unique($tokens);
     $table  = self::NAMETOKEN_TABLE;
     $conn_w = $this->establishConnection('w');
 
     $sql = array();
     foreach ($tokens as $token) {
       $sql[] = qsprintf(
         $conn_w,
         '(%d, %s)',
         $this->getID(),
         $token);
     }
 
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE userID = %d',
       $table,
       $this->getID());
     if ($sql) {
       queryfx(
         $conn_w,
         'INSERT INTO %T (userID, token) VALUES %Q',
         $table,
         implode(', ', $sql));
     }
   }
 
   public function sendWelcomeEmail(PhabricatorUser $admin) {
     $admin_username = $admin->getUserName();
     $admin_realname = $admin->getRealName();
     $user_username = $this->getUserName();
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     $base_uri = PhabricatorEnv::getProductionURI('/');
 
     $engine = new PhabricatorAuthSessionEngine();
     $uri = $engine->getOneTimeLoginURI(
       $this,
       $this->loadPrimaryEmail(),
       PhabricatorAuthSessionEngine::ONETIME_WELCOME);
 
     $body = <<<EOBODY
 Welcome to Phabricator!
 
 {$admin_username} ({$admin_realname}) has created an account for you.
 
   Username: {$user_username}
 
 To login to Phabricator, follow this link and set a password:
 
   {$uri}
 
 After you have set a password, you can login in the future by going here:
 
   {$base_uri}
 
 EOBODY;
 
     if (!$is_serious) {
       $body .= <<<EOBODY
 
 Love,
 Phabricator
 
 EOBODY;
     }
 
     $mail = id(new PhabricatorMetaMTAMail())
       ->addTos(array($this->getPHID()))
       ->setSubject('[Phabricator] Welcome to Phabricator')
       ->setBody($body)
       ->saveAndSend();
   }
 
   public function sendUsernameChangeEmail(
     PhabricatorUser $admin,
     $old_username) {
 
     $admin_username = $admin->getUserName();
     $admin_realname = $admin->getRealName();
     $new_username = $this->getUserName();
 
     $password_instructions = null;
     if (PhabricatorAuthProviderPassword::getPasswordProvider()) {
       $engine = new PhabricatorAuthSessionEngine();
       $uri = $engine->getOneTimeLoginURI(
         $this,
         null,
         PhabricatorAuthSessionEngine::ONETIME_USERNAME);
       $password_instructions = <<<EOTXT
 If you use a password to login, you'll need to reset it before you can login
 again. You can reset your password by following this link:
 
   {$uri}
 
 And, of course, you'll need to use your new username to login from now on. If
 you use OAuth to login, nothing should change.
 
 EOTXT;
     }
 
     $body = <<<EOBODY
 {$admin_username} ({$admin_realname}) has changed your Phabricator username.
 
   Old Username: {$old_username}
   New Username: {$new_username}
 
 {$password_instructions}
 EOBODY;
 
     $mail = id(new PhabricatorMetaMTAMail())
       ->addTos(array($this->getPHID()))
       ->setSubject('[Phabricator] Username Changed')
       ->setBody($body)
       ->saveAndSend();
   }
 
   public static function describeValidUsername() {
     return pht(
       'Usernames must contain only numbers, letters, period, underscore and '.
       'hyphen, and can not end with a period. They must have no more than %d '.
       'characters.',
       new PhutilNumber(self::MAXIMUM_USERNAME_LENGTH));
   }
 
   public static function validateUsername($username) {
     // NOTE: If you update this, make sure to update:
     //
     //  - Remarkup rule for @mentions.
     //  - Routing rule for "/p/username/".
     //  - Unit tests, obviously.
     //  - describeValidUsername() method, above.
 
     if (strlen($username) > self::MAXIMUM_USERNAME_LENGTH) {
       return false;
     }
 
     return (bool)preg_match('/^[a-zA-Z0-9._-]*[a-zA-Z0-9_-]\z/', $username);
   }
 
   public static function getDefaultProfileImageURI() {
     return celerity_get_resource_uri('/rsrc/image/avatar.png');
   }
 
   public function attachStatus(PhabricatorCalendarEvent $status) {
     $this->status = $status;
     return $this;
   }
 
   public function getStatus() {
     return $this->assertAttached($this->status);
   }
 
   public function hasStatus() {
     return $this->status !== self::ATTACHABLE;
   }
 
   public function attachProfileImageURI($uri) {
     $this->profileImage = $uri;
     return $this;
   }
 
   public function getProfileImageURI() {
     return $this->assertAttached($this->profileImage);
   }
 
   public function loadProfileImageURI() {
     if ($this->profileImage && ($this->profileImage !== self::ATTACHABLE)) {
       return $this->profileImage;
     }
 
     $src_phid = $this->getProfileImagePHID();
 
     if ($src_phid) {
       // TODO: (T603) Can we get rid of this entirely and move it to
       // PeopleQuery with attach/attachable?
       $file = id(new PhabricatorFile())->loadOneWhere('phid = %s', $src_phid);
       if ($file) {
         $this->profileImage = $file->getBestURI();
         return $this->profileImage;
       }
     }
 
     $this->profileImage = self::getDefaultProfileImageURI();
     return $this->profileImage;
   }
 
   public function getFullName() {
     if (strlen($this->getRealName())) {
       return $this->getUsername().' ('.$this->getRealName().')';
     } else {
       return $this->getUsername();
     }
   }
 
   public function __toString() {
     return $this->getUsername();
   }
 
   public static function loadOneWithEmailAddress($address) {
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'address = %s',
       $address);
     if (!$email) {
       return null;
     }
     return id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $email->getUserPHID());
   }
 
 /* -(  Multi-Factor Authentication  )---------------------------------------- */
 
 
   /**
    * Update the flag storing this user's enrollment in multi-factor auth.
    *
    * With certain settings, we need to check if a user has MFA on every page,
    * so we cache MFA enrollment on the user object for performance. Calling this
    * method synchronizes the cache by examining enrollment records. After
    * updating the cache, use @{method:getIsEnrolledInMultiFactor} to check if
    * the user is enrolled.
    *
    * This method should be called after any changes are made to a given user's
    * multi-factor configuration.
    *
    * @return void
    * @task factors
    */
   public function updateMultiFactorEnrollment() {
     $factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
       'userPHID = %s',
       $this->getPHID());
 
     $enrolled = count($factors) ? 1 : 0;
     if ($enrolled !== $this->isEnrolledInMultiFactor) {
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         queryfx(
           $this->establishConnection('w'),
           'UPDATE %T SET isEnrolledInMultiFactor = %d WHERE id = %d',
           $this->getTableName(),
           $enrolled,
           $this->getID());
       unset($unguarded);
 
       $this->isEnrolledInMultiFactor = $enrolled;
     }
   }
 
 
   /**
    * Check if the user is enrolled in multi-factor authentication.
    *
    * Enrolled users have one or more multi-factor authentication sources
    * attached to their account. For performance, this value is cached. You
    * can use @{method:updateMultiFactorEnrollment} to update the cache.
    *
    * @return bool True if the user is enrolled.
    * @task factors
    */
   public function getIsEnrolledInMultiFactor() {
     return $this->isEnrolledInMultiFactor;
   }
 
 
 /* -(  Omnipotence  )-------------------------------------------------------- */
 
 
   /**
    * Returns true if this user is omnipotent. Omnipotent users bypass all policy
    * checks.
    *
    * @return bool True if the user bypasses policy checks.
    */
   public function isOmnipotent() {
     return $this->omnipotent;
   }
 
 
   /**
    * Get an omnipotent user object for use in contexts where there is no acting
    * user, notably daemons.
    *
    * @return PhabricatorUser An omnipotent user.
    */
   public static function getOmnipotentUser() {
     static $user = null;
     if (!$user) {
       $user = new PhabricatorUser();
       $user->omnipotent = true;
       $user->makeEphemeral();
     }
     return $user;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return PhabricatorPolicies::POLICY_PUBLIC;
       case PhabricatorPolicyCapability::CAN_EDIT:
         if ($this->getIsSystemAgent()) {
           return PhabricatorPolicies::POLICY_ADMIN;
         } else {
           return PhabricatorPolicies::POLICY_NOONE;
         }
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getPHID() && ($viewer->getPHID() === $this->getPHID());
   }
 
   public function describeAutomaticCapability($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_EDIT:
         return pht('Only you can edit your information.');
       default:
         return null;
     }
   }
 
 
 /* -(  PhabricatorCustomFieldInterface  )------------------------------------ */
 
 
   public function getCustomFieldSpecificationForRole($role) {
     return PhabricatorEnv::getEnvConfig('user.fields');
   }
 
   public function getCustomFieldBaseClass() {
     return 'PhabricatorUserCustomField';
   }
 
   public function getCustomFields() {
     return $this->assertAttached($this->customFields);
   }
 
   public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
     $this->customFields = $fields;
     return $this;
   }
 
 
 /* -(  PhabricatorDestructableInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $this->delete();
 
       $externals = id(new PhabricatorExternalAccount())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($externals as $external) {
         $external->delete();
       }
 
       $prefs = id(new PhabricatorUserPreferences())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($prefs as $pref) {
         $pref->delete();
       }
 
       $profiles = id(new PhabricatorUserProfile())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($profiles as $profile) {
         $profile->delete();
       }
 
       $keys = id(new PhabricatorUserSSHKey())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($keys as $key) {
         $key->delete();
       }
 
       $emails = id(new PhabricatorUserEmail())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($emails as $email) {
         $email->delete();
       }
 
       $sessions = id(new PhabricatorAuthSession())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($sessions as $session) {
         $session->delete();
       }
 
       $factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
         'userPHID = %s',
         $this->getPHID());
       foreach ($factors as $factor) {
         $factor->delete();
       }
 
     $this->saveTransaction();
   }
 
 
 }
diff --git a/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
index 9f84ec0de..2cf9d18ba 100644
--- a/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
+++ b/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
@@ -1,84 +1,84 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phame_query_Method extends ConduitAPI_phame_Method {
 
   public function getMethodDescription() {
-    return "Query phame blogs.";
+    return 'Query phame blogs.';
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function defineParamTypes() {
     return array(
       'ids'           => 'optional list<int>',
       'phids'         => 'optional list<phid>',
       'after'         => 'optional int',
       'before'        => 'optional int',
       'limit'         => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $query = new PhameBlogQuery();
 
     $query->setViewer($request->getUser());
 
     $ids = $request->getValue('ids', array());
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $phids = $request->getValue('phids', array());
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $after = $request->getValue('after', null);
     if ($after !== null) {
       $query->setAfterID($after);
     }
 
     $before = $request->getValue('before', null);
     if ($before !== null) {
       $query->setBeforeID($before);
     }
 
     $limit = $request->getValue('limit', null);
     if ($limit !== null) {
       $query->setLimit($limit);
     }
 
     $blogs = $query->execute();
 
     $results = array();
     foreach ($blogs as $blog) {
       $results[] = array(
         'id'              => $blog->getID(),
         'phid'            => $blog->getPHID(),
         'name'            => $blog->getName(),
         'description'     => $blog->getDescription(),
         'domain'          => $blog->getDomain(),
         'creatorPHID'     => $blog->getCreatorPHID(),
       );
     }
 
     return $results;
   }
 
 
 }
diff --git a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
index 2c6d8cc68..3df67eb18 100644
--- a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
+++ b/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
@@ -1,109 +1,109 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phame_queryposts_Method extends ConduitAPI_phame_Method {
 
   public function getMethodDescription() {
-    return "Query phame posts.";
+    return 'Query phame posts.';
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function defineParamTypes() {
     return array(
       'ids'            => 'optional list<int>',
       'phids'          => 'optional list<phid>',
       'blogPHIDs'      => 'optional list<phid>',
       'bloggerPHIDs'   => 'optional list<phid>',
       'phameTitles'    => 'optional list<string>',
       'published'      => 'optional bool',
       'publishedAfter' => 'optional date',
       'before'         => 'optional int',
       'after'          => 'optional int',
       'limit'          => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $query = new PhamePostQuery();
 
     $query->setViewer($request->getUser());
 
     $ids = $request->getValue('ids', array());
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $phids = $request->getValue('phids', array());
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $blog_phids = $request->getValue('blogPHIDs', array());
     if ($blog_phids) {
       $query->withBlogPHIDs($blog_phids);
     }
 
     $blogger_phids = $request->getValue('bloggerPHIDs', array());
     if ($blogger_phids) {
       $query->withBloggerPHIDs($blogger_phids);
     }
 
     $phame_titles = $request->getValue('phameTitles', array());
     if ($phame_titles) {
       $query->withPhameTitles($phame_titles);
     }
 
     $published = $request->getValue('published', null);
     if ($published === true) {
       $query->withVisibility(PhamePost::VISIBILITY_PUBLISHED);
     } else if ($published === false) {
       $query->withVisibility(PhamePost::VISIBILITY_DRAFT);
     }
 
     $published_after = $request->getValue('publishedAfter', null);
     if ($published_after !== null) {
       $query->withPublishedAfter($published_after);
     }
 
     $after = $request->getValue('after', null);
     if ($after !== null) {
       $query->setAfterID($after);
     }
 
     $before = $request->getValue('before', null);
     if ($before !== null) {
       $query->setBeforeID($before);
     }
 
     $limit = $request->getValue('limit', null);
     if ($limit !== null) {
       $query->setLimit($limit);
     }
 
     $posts = $query->execute();
 
     $results = array();
     foreach ($posts as $post) {
       $results[] = $post->toDictionary();
     }
 
     return $results;
   }
 
 
 }
diff --git a/src/applications/phame/config/PhabricatorPhameConfigOptions.php b/src/applications/phame/config/PhabricatorPhameConfigOptions.php
index 1ec6f2aea..dd5a7a3da 100644
--- a/src/applications/phame/config/PhabricatorPhameConfigOptions.php
+++ b/src/applications/phame/config/PhabricatorPhameConfigOptions.php
@@ -1,28 +1,28 @@
 <?php
 
 final class PhabricatorPhameConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Phame");
+    return pht('Phame');
   }
 
   public function getDescription() {
-    return pht("Configure Phame blogs.");
+    return pht('Configure Phame blogs.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'phame.skins',
         'list<string>',
         array(
           'externals/skins/',
         ))
         ->setLocked(true)
         ->setDescription(
           pht('List of directories where Phame will look for skins.')),
     );
   }
 
 }
diff --git a/src/applications/phame/skins/PhameSkinSpecification.php b/src/applications/phame/skins/PhameSkinSpecification.php
index 326200dc9..5acd9e57b 100644
--- a/src/applications/phame/skins/PhameSkinSpecification.php
+++ b/src/applications/phame/skins/PhameSkinSpecification.php
@@ -1,174 +1,174 @@
 <?php
 
 /**
  * @group phame
  */
 final class PhameSkinSpecification {
 
   const TYPE_ADVANCED   = 'advanced';
   const TYPE_BASIC      = 'basic';
 
   private $type;
   private $rootDirectory;
   private $skinClass;
   private $phutilLibraries = array();
   private $name;
   private $config;
 
   public static function loadAllSkinSpecifications() {
 
     static $specs;
 
     if ($specs === null) {
       $paths = PhabricatorEnv::getEnvConfig('phame.skins');
       $base  = dirname(phutil_get_library_root('phabricator'));
 
       $specs = array();
 
       foreach ($paths as $path) {
         $path = Filesystem::resolvePath($path, $base);
         foreach (Filesystem::listDirectory($path) as $skin_directory) {
           $skin_path = $path.DIRECTORY_SEPARATOR.$skin_directory;
 
           if (!is_dir($skin_path)) {
             continue;
           }
           $spec = self::loadSkinSpecification($skin_path);
           if (!$spec) {
             continue;
           }
 
           $name = trim($skin_directory, DIRECTORY_SEPARATOR);
 
           $spec->setName($name);
 
           if (isset($specs[$name])) {
             $that_dir = $specs[$name]->getRootDirectory();
             $this_dir = $spec->getRootDirectory();
             throw new Exception(
               "Two skins have the same name ('{$name}'), in '{$this_dir}' and ".
               "'{$that_dir}'. Rename one or adjust your 'phame.skins' ".
               "configuration.");
           }
 
           $specs[$name] = $spec;
         }
       }
     }
 
     return $specs;
   }
 
   public static function loadOneSkinSpecification($name) {
     $paths = PhabricatorEnv::getEnvConfig('phame.skins');
     $base  = dirname(phutil_get_library_root('phabricator'));
     foreach ($paths as $path) {
       $path = Filesystem::resolvePath($path, $base);
       $skin_path = $path.DIRECTORY_SEPARATOR.$name;
       if (is_dir($skin_path)) {
         $spec = self::loadSkinSpecification($skin_path);
         if ($spec) {
           $spec->setName($name);
           return $spec;
         }
       }
     }
     return null;
   }
 
   public static function loadSkinSpecification($path) {
 
     $config_path = $path.DIRECTORY_SEPARATOR.'skin.json';
     $config = array();
     if (Filesystem::pathExists($config_path)) {
       $config = Filesystem::readFile($config_path);
       $config = json_decode($config, true);
       if (!is_array($config)) {
         throw new Exception(
           "Skin configuration file '{$config_path}' is not a valid JSON file.");
       }
       $type = idx($config, 'type', self::TYPE_BASIC);
     } else {
       $type = self::TYPE_BASIC;
     }
 
     $spec = new PhameSkinSpecification();
     $spec->setRootDirectory($path);
     $spec->setConfig($config);
 
     switch ($type) {
       case self::TYPE_BASIC:
         $spec->setSkinClass('PhameBasicTemplateBlogSkin');
         break;
       case self::TYPE_ADVANCED:
         $spec->setSkinClass($config['class']);
         $spec->addPhutilLibrary($path.DIRECTORY_SEPARATOR.'src');
         break;
       default:
-        throw new Exception("Unknown skin type!");
+        throw new Exception('Unknown skin type!');
     }
 
     $spec->setType($type);
 
     return $spec;
   }
 
   public function setConfig(array $config) {
     $this->config = $config;
     return $this;
   }
 
   public function getConfig($key, $default = null) {
     return idx($this->config, $key, $default);
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->getConfig('name', $this->name);
   }
 
   public function setRootDirectory($root_directory) {
     $this->rootDirectory = $root_directory;
     return $this;
   }
 
   public function getRootDirectory() {
     return $this->rootDirectory;
   }
 
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
   public function getType() {
     return $this->type;
   }
 
   public function setSkinClass($skin_class) {
     $this->skinClass = $skin_class;
     return $this;
   }
 
   public function getSkinClass() {
     return $this->skinClass;
   }
 
   public function addPhutilLibrary($library) {
     $this->phutilLibraries[] = $library;
     return $this;
   }
 
   public function buildSkin(AphrontRequest $request) {
     foreach ($this->phutilLibraries as $library) {
       phutil_load_library($library);
     }
 
     return newv($this->getSkinClass(), array($request, $this));
   }
 
 }
diff --git a/src/applications/phame/storage/PhameBlog.php b/src/applications/phame/storage/PhameBlog.php
index d3fb89ef5..3d752fc72 100644
--- a/src/applications/phame/storage/PhameBlog.php
+++ b/src/applications/phame/storage/PhameBlog.php
@@ -1,281 +1,281 @@
 <?php
 
 final class PhameBlog extends PhameDAO
   implements PhabricatorPolicyInterface, PhabricatorMarkupInterface {
 
   const MARKUP_FIELD_DESCRIPTION = 'markup:description';
 
   const SKIN_DEFAULT = 'oblivious';
 
   protected $name;
   protected $description;
   protected $domain;
   protected $configData;
   protected $creatorPHID;
   protected $viewPolicy;
   protected $editPolicy;
   protected $joinPolicy;
 
   private $bloggerPHIDs = self::ATTACHABLE;
   private $bloggers = self::ATTACHABLE;
 
   static private $requestBlog;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID   => true,
       self::CONFIG_SERIALIZATION => array(
         'configData' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorPhamePHIDTypeBlog::TYPECONST);
   }
 
   public function getSkinRenderer(AphrontRequest $request) {
     $spec = PhameSkinSpecification::loadOneSkinSpecification(
       $this->getSkin());
 
     if (!$spec) {
       $spec = PhameSkinSpecification::loadOneSkinSpecification(
         self::SKIN_DEFAULT);
     }
 
     if (!$spec) {
       throw new Exception(
-        "This blog has an invalid skin, and the default skin failed to ".
-        "load.");
+        'This blog has an invalid skin, and the default skin failed to '.
+        'load.');
     }
 
     $skin = newv($spec->getSkinClass(), array($request));
     $skin->setSpecification($spec);
 
     return $skin;
   }
 
   /**
    * Makes sure a given custom blog uri is properly configured in DNS
    * to point at this Phabricator instance. If there is an error in
    * the configuration, return a string describing the error and how
    * to fix it. If there is no error, return an empty string.
    *
    * @return string
    */
   public function validateCustomDomain($custom_domain) {
     $example_domain = 'blog.example.com';
     $label = pht('Invalid');
 
     // note this "uri" should be pretty busted given the desired input
     // so just use it to test if there's a protocol specified
     $uri = new PhutilURI($custom_domain);
     if ($uri->getProtocol()) {
       return array($label,
         pht(
           'The custom domain should not include a protocol. Just provide '.
           'the bare domain name (for example, "%s").',
           $example_domain));
     }
 
     if ($uri->getPort()) {
       return array($label,
         pht(
           'The custom domain should not include a port number. Just provide '.
           'the bare domain name (for example, "%s").',
           $example_domain));
     }
 
     if (strpos($custom_domain, '/') !== false) {
       return array($label,
         pht(
           'The custom domain should not specify a path (hosting a Phame '.
           'blog at a path is currently not supported). Instead, just provide '.
           'the bare domain name (for example, "%s").',
           $example_domain));
     }
 
     if (strpos($custom_domain, '.') === false) {
       return array($label,
         pht(
           'The custom domain should contain at least one dot (.) because '.
           'some browsers fail to set cookies on domains without a dot. '.
           'Instead, use a normal looking domain name like "%s".',
           $example_domain));
     }
 
     if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
       $href = PhabricatorEnv::getProductionURI(
         '/config/edit/policy.allow-public/');
       return array(pht('Fix Configuration'),
         pht(
           'For custom domains to work, this Phabricator instance must be '.
           'configured to allow the public access policy. Configure this '.
           'setting %s, or ask an administrator to configure this setting. '.
           'The domain can be specified later once this setting has been '.
           'changed.',
           phutil_tag(
             'a',
             array('href' => $href),
             pht('here'))));
     }
 
     return null;
   }
 
   public function getBloggerPHIDs() {
     return $this->assertAttached($this->bloggerPHIDs);
   }
 
   public function attachBloggers(array $bloggers) {
     assert_instances_of($bloggers, 'PhabricatorObjectHandle');
 
     $this->bloggers = $bloggers;
 
     return $this;
   }
 
   public function getBloggers() {
     return $this->assertAttached($this->bloggers);
   }
 
   public function getSkin() {
     $config = coalesce($this->getConfigData(), array());
     return idx($config, 'skin', self::SKIN_DEFAULT);
   }
 
   public function setSkin($skin) {
     $config = coalesce($this->getConfigData(), array());
     $config['skin'] = $skin;
     return $this->setConfigData($config);
   }
 
   static public function getSkinOptionsForSelect() {
     $classes = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhameBlogSkin')
       ->setType('class')
       ->setConcreteOnly(true)
       ->selectSymbolsWithoutLoading();
 
     return ipull($classes, 'name', 'name');
   }
 
   public static function setRequestBlog(PhameBlog $blog) {
     self::$requestBlog = $blog;
   }
 
   public static function getRequestBlog() {
     return self::$requestBlog;
   }
 
   public function getLiveURI(PhamePost $post = null) {
     if ($this->getDomain()) {
       $base = new PhutilURI('http://'.$this->getDomain().'/');
     } else {
       $base = '/phame/live/'.$this->getID().'/';
       $base = PhabricatorEnv::getURI($base);
     }
 
     if ($post) {
       $base .= '/post/'.$post->getPhameTitle();
     }
 
     return $base;
   }
 
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
       PhabricatorPolicyCapability::CAN_JOIN,
     );
   }
 
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
       case PhabricatorPolicyCapability::CAN_JOIN:
         return $this->getJoinPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
     $can_edit = PhabricatorPolicyCapability::CAN_EDIT;
     $can_join = PhabricatorPolicyCapability::CAN_JOIN;
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         // Users who can edit or post to a blog can always view it.
         if (PhabricatorPolicyFilter::hasCapability($user, $this, $can_edit)) {
           return true;
         }
         if (PhabricatorPolicyFilter::hasCapability($user, $this, $can_join)) {
           return true;
         }
         break;
       case PhabricatorPolicyCapability::CAN_JOIN:
         // Users who can edit a blog can always post to it.
         if (PhabricatorPolicyFilter::hasCapability($user, $this, $can_edit)) {
           return true;
         }
         break;
     }
 
     return false;
   }
 
 
   public function describeAutomaticCapability($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return pht(
           'Users who can edit or post on a blog can always view it.');
       case PhabricatorPolicyCapability::CAN_JOIN:
         return pht(
           'Users who can edit a blog can always post on it.');
     }
 
     return null;
   }
 
 
 /* -(  PhabricatorMarkupInterface Implementation  )-------------------------- */
 
 
   public function getMarkupFieldKey($field) {
     $hash = PhabricatorHash::digest($this->getMarkupText($field));
     return $this->getPHID().':'.$field.':'.$hash;
   }
 
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newPhameMarkupEngine();
   }
 
 
   public function getMarkupText($field) {
     return $this->getDescription();
   }
 
 
   public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine) {
     return $output;
   }
 
   public function shouldUseMarkupCache($field) {
     return (bool)$this->getPHID();
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
index df68c1845..01910c503 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
@@ -1,53 +1,53 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phid_info_Method
   extends ConduitAPI_phid_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'phid.query'.";
   }
 
   public function getMethodDescription() {
-    return "Retrieve information about an arbitrary PHID.";
+    return 'Retrieve information about an arbitrary PHID.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'required phid',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-PHID' => 'No such object exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $phid = $request->getValue('phid');
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(array($phid))
       ->executeOne();
 
     if (!$handle->isComplete()) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     return $this->buildHandleInformationDictionary($handle);
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
index 6a1e03b2f..9e09fc153 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
@@ -1,51 +1,51 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phid_lookup_Method
   extends ConduitAPI_phid_Method {
 
   public function getMethodDescription() {
-    return "Look up objects by name.";
+    return 'Look up objects by name.';
   }
 
   public function defineParamTypes() {
     return array(
       'names' => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $names = $request->getValue('names');
 
     $query = id(new PhabricatorObjectQuery())
       ->setViewer($request->getUser())
       ->withNames($names);
     $query->execute();
     $name_map = $query->getNamedResults();
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(mpull($name_map, 'getPHID'))
       ->execute();
 
     $result = array();
     foreach ($name_map as $name => $object) {
       $phid = $object->getPHID();
       $handle = $handles[$phid];
       $result[$name] = $this->buildHandleInformationDictionary($handle);
     }
 
     return $result;
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
index f5a840462..4dd6e3f4e 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
@@ -1,46 +1,46 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phid_query_Method
   extends ConduitAPI_phid_Method {
 
   public function getMethodDescription() {
-    return "Retrieve information about arbitrary PHIDs.";
+    return 'Retrieve information about arbitrary PHIDs.';
   }
 
   public function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $phids = $request->getValue('phids');
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $result = array();
     foreach ($handles as $phid => $handle) {
       if ($handle->isComplete()) {
         $result[$phid] = $this->buildHandleInformationDictionary($handle);
       }
     }
 
     return $result;
   }
 
 }
diff --git a/src/applications/phid/query/PhabricatorObjectQuery.php b/src/applications/phid/query/PhabricatorObjectQuery.php
index a786d4f72..8709cca7c 100644
--- a/src/applications/phid/query/PhabricatorObjectQuery.php
+++ b/src/applications/phid/query/PhabricatorObjectQuery.php
@@ -1,159 +1,159 @@
 <?php
 
 final class PhabricatorObjectQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $phids = array();
   private $names = array();
   private $types;
 
   private $namedResults;
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withNames(array $names) {
     $this->names = $names;
     return $this;
   }
 
   public function withTypes(array $types) {
     $this->types = $types;
     return $this;
   }
 
   public function loadPage() {
     if ($this->namedResults === null) {
       $this->namedResults = array();
     }
 
     $types = PhabricatorPHIDType::getAllTypes();
     if ($this->types) {
       $types = array_select_keys($types, $this->types);
     }
 
     $names = array_unique($this->names);
     $phids = $this->phids;
 
     // We allow objects to be named by their PHID in addition to their normal
     // name so that, e.g., CLI tools which accept object names can also accept
     // PHIDs and work as users expect.
     $actually_phids = array();
     if ($names) {
       foreach ($names as $key => $name) {
         if (!strncmp($name, 'PHID-', 5)) {
           $actually_phids[] = $name;
           $phids[] = $name;
           unset($names[$key]);
         }
       }
     }
 
     $phids = array_unique($phids);
 
     if ($names) {
       $name_results = $this->loadObjectsByName($types, $names);
     } else {
       $name_results = array();
     }
 
     if ($phids) {
       $phid_results = $this->loadObjectsByPHID($types, $phids);
     } else {
       $phid_results = array();
     }
 
     foreach ($actually_phids as $phid) {
       if (isset($phid_results[$phid])) {
         $name_results[$phid] = $phid_results[$phid];
       }
     }
 
     $this->namedResults += $name_results;
 
     return $phid_results + mpull($name_results, null, 'getPHID');
   }
 
   public function getNamedResults() {
     if ($this->namedResults === null) {
-      throw new Exception("Call execute() before getNamedResults()!");
+      throw new Exception('Call execute() before getNamedResults()!');
     }
     return $this->namedResults;
   }
 
   private function loadObjectsByName(array $types, array $names) {
     $groups = array();
     foreach ($names as $name) {
       foreach ($types as $type => $type_impl) {
         if (!$type_impl->canLoadNamedObject($name)) {
           continue;
         }
         $groups[$type][] = $name;
         break;
       }
     }
 
     $results = array();
     foreach ($groups as $type => $group) {
       $results += $types[$type]->loadNamedObjects($this, $group);
     }
 
     return $results;
   }
 
   private function loadObjectsByPHID(array $types, array $phids) {
     $results = array();
 
     $workspace = $this->getObjectsFromWorkspace($phids);
 
     foreach ($phids as $key => $phid) {
       if (isset($workspace[$phid])) {
         $results[$phid] = $workspace[$phid];
         unset($phids[$key]);
       }
     }
 
     if (!$phids) {
       return $results;
     }
 
     $groups = array();
     foreach ($phids as $phid) {
       $type = phid_get_type($phid);
       $groups[$type][] = $phid;
     }
 
     foreach ($groups as $type => $group) {
       if (isset($types[$type])) {
         $objects = $types[$type]->loadObjects($this, $group);
         $results += mpull($objects, null, 'getPHID');
       }
     }
 
     return $results;
   }
 
   protected function didFilterResults(array $filtered) {
     foreach ($this->namedResults as $name => $result) {
       if (isset($filtered[$result->getPHID()])) {
         unset($this->namedResults[$name]);
       }
     }
   }
 
   /**
    * This query disables policy filtering because it is performed in the
    * subqueries which actually load objects. We don't need to re-filter
    * results, since policies have already been applied.
    */
   protected function shouldDisablePolicyFiltering() {
     return true;
   }
 
   public function getQueryApplicationClass() {
     return null;
   }
 
 }
diff --git a/src/applications/phid/query/__tests__/PhabricatorObjectListQueryTestCase.php b/src/applications/phid/query/__tests__/PhabricatorObjectListQueryTestCase.php
index 419e47672..e7347d5db 100644
--- a/src/applications/phid/query/__tests__/PhabricatorObjectListQueryTestCase.php
+++ b/src/applications/phid/query/__tests__/PhabricatorObjectListQueryTestCase.php
@@ -1,87 +1,87 @@
 <?php
 
 final class PhabricatorObjectListQueryTestCase extends PhabricatorTestCase {
 
   protected function getPhabricatorTestCaseConfiguration() {
     return array(
       self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
     );
   }
 
   public function testObjectListQuery() {
     $user = $this->generateNewTestUser();
     $name = $user->getUsername();
     $phid = $user->getPHID();
 
 
     $result = $this->parseObjectList("@{$name}");
     $this->assertEqual(array($phid), $result);
 
     $result = $this->parseObjectList("{$name}");
     $this->assertEqual(array($phid), $result);
 
     $result = $this->parseObjectList("{$name}, {$name}");
     $this->assertEqual(array($phid), $result);
 
     $result = $this->parseObjectList("@{$name}, {$name}");
     $this->assertEqual(array($phid), $result);
 
-    $result = $this->parseObjectList("");
+    $result = $this->parseObjectList('');
     $this->assertEqual(array(), $result);
 
     // Expect failure when loading a user if objects must be of type "DUCK".
     $caught = null;
     try {
-      $result = $this->parseObjectList("{$name}", array("DUCK"));
+      $result = $this->parseObjectList("{$name}", array('DUCK'));
     } catch (Exception $ex) {
       $caught = $ex;
     }
     $this->assertTrue($caught instanceof Exception);
 
 
     // Expect failure when loading an invalid object.
     $caught = null;
     try {
-      $result = $this->parseObjectList("invalid");
+      $result = $this->parseObjectList('invalid');
     } catch (Exception $ex) {
       $caught = $ex;
     }
     $this->assertTrue($caught instanceof Exception);
 
 
     // Expect failure when loading ANY invalid object, by default.
     $caught = null;
     try {
       $result = $this->parseObjectList("{$name}, invalid");
     } catch (Exception $ex) {
       $caught = $ex;
     }
     $this->assertTrue($caught instanceof Exception);
 
 
     // With partial results, this should load the valid user.
     $result = $this->parseObjectList("{$name}, invalid", array(), true);
     $this->assertEqual(array($phid), $result);
   }
 
   private function parseObjectList(
     $list,
     array $types = array(),
     $allow_partial = false) {
 
     $query = id(new PhabricatorObjectListQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->setObjectList($list);
 
     if ($types) {
       $query->setAllowedTypes($types);
     }
 
     if ($allow_partial) {
       $query->setAllowPartialResults(true);
     }
 
     return $query->execute();
   }
 
 }
diff --git a/src/applications/phid/storage/PhabricatorPHID.php b/src/applications/phid/storage/PhabricatorPHID.php
index 9c9018645..43896045b 100644
--- a/src/applications/phid/storage/PhabricatorPHID.php
+++ b/src/applications/phid/storage/PhabricatorPHID.php
@@ -1,27 +1,27 @@
 <?php
 
 final class PhabricatorPHID {
 
   protected $phid;
   protected $phidType;
   protected $ownerPHID;
   protected $parentPHID;
 
   public static function generateNewPHID($type, $subtype = null) {
     if (!$type) {
-      throw new Exception("Can not generate PHID with no type.");
+      throw new Exception('Can not generate PHID with no type.');
     }
 
     if ($subtype === null) {
       $uniq_len = 20;
       $type_str = "{$type}";
     } else {
       $uniq_len = 15;
       $type_str = "{$type}-{$subtype}";
     }
 
     $uniq = Filesystem::readRandomCharacters($uniq_len);
     return "PHID-{$type_str}-{$uniq}";
   }
 
 }
diff --git a/src/applications/phid/type/PhabricatorPHIDType.php b/src/applications/phid/type/PhabricatorPHIDType.php
index cbb7d0237..e1d1647eb 100644
--- a/src/applications/phid/type/PhabricatorPHIDType.php
+++ b/src/applications/phid/type/PhabricatorPHIDType.php
@@ -1,203 +1,203 @@
 <?php
 
 abstract class PhabricatorPHIDType {
 
   abstract public function getTypeConstant();
   abstract public function getTypeName();
 
   public function newObject() {
     return null;
   }
 
   public function getTypeIcon() {
     return null;
   }
 
 
   /**
    * Get the class name for the application this type belongs to.
    *
    * @return string|null Class name of the corresponding application, or null
    *   if the type is not bound to an application.
    */
   public function getPHIDTypeApplicationClass() {
     // TODO: Some day this should probably be abstract, but for now it only
     // affects global search and there's no real burning need to go classify
     // every PHID type.
     return null;
   }
 
   /**
    * Build a @{class:PhabricatorPolicyAwareQuery} to load objects of this type
    * by PHID.
    *
    * If you can not build a single query which satisfies this requirement, you
    * can provide a dummy implementation for this method and overload
    * @{method:loadObjects} instead.
    *
    * @param PhabricatorObjectQuery Query being executed.
    * @param list<phid> PHIDs to load.
    * @return PhabricatorPolicyAwareQuery Query object which loads the
    *   specified PHIDs when executed.
    */
   abstract protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids);
 
 
   /**
    * Load objects of this type, by PHID. For most PHID types, it is only
    * necessary to implement @{method:buildQueryForObjects} to get object
    * loading to work.
    *
    * @param PhabricatorObjectQuery Query being executed.
    * @param list<phid> PHIDs to load.
    * @return list<wild> Corresponding objects.
    */
   public function loadObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     $object_query = $this->buildQueryForObjects($query, $phids)
       ->setViewer($query->getViewer())
       ->setParentQuery($query);
 
     // If the user doesn't have permission to use the application at all,
     // just mark all the PHIDs as filtered. This primarily makes these
     // objects show up as "Restricted" instead of "Unknown" when loaded as
     // handles, which is technically true.
     if (!$object_query->canViewerUseQueryApplication()) {
       $object_query->addPolicyFilteredPHIDs(array_fuse($phids));
       return array();
     }
 
     return $object_query->execute();
   }
 
 
   /**
    * Populate provided handles with application-specific data, like titles and
    * URIs.
    *
    * NOTE: The `$handles` and `$objects` lists are guaranteed to be nonempty
    * and have the same keys: subclasses are expected to load information only
    * for handles with visible objects.
    *
    * Because of this guarantee, a safe implementation will typically look like*
    *
    *   foreach ($handles as $phid => $handle) {
    *     $object = $objects[$phid];
    *
    *     $handle->setStuff($object->getStuff());
    *     // ...
    *   }
    *
    * In general, an implementation should call `setName()` and `setURI()` on
    * each handle at a minimum. See @{class:PhabricatorObjectHandle} for other
    * handle properties.
    *
    * @param PhabricatorHandleQuery          Issuing query object.
    * @param list<PhabricatorObjectHandle>   Handles to populate with data.
    * @param list<Object>                    Objects for these PHIDs loaded by
    *                                        @{method:buildQueryForObjects()}.
    * @return void
    */
   abstract public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects);
 
   public function canLoadNamedObject($name) {
     return false;
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
-    throw new Exception("Not implemented!");
+    throw new Exception('Not implemented!');
   }
 
 
   /**
    * Get all known PHID types.
    *
    * To get PHID types a given user has access to, see
    * @{method:getAllInstalledTypes}.
    *
    * @return dict<string, PhabricatorPHIDType> Map of type constants to types.
    */
   public static function getAllTypes() {
     static $types;
     if ($types === null) {
       $objects = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
         ->loadObjects();
 
       $map = array();
       $original = array();
       foreach ($objects as $object) {
         $type = $object->getTypeConstant();
         if (isset($map[$type])) {
           $that_class = $original[$type];
           $this_class = get_class($object);
           throw new Exception(
             "Two PhabricatorPHIDType classes ({$that_class}, {$this_class}) ".
             "both handle PHID type '{$type}'. A type may be handled by only ".
             "one class.");
         }
 
         $original[$type] = get_class($object);
         $map[$type] = $object;
       }
 
       $types = $map;
     }
 
     return $types;
   }
 
 
   /**
    * Get all PHID types of applications installed for a given viewer.
    *
    * @param PhabricatorUser Viewing user.
    * @return dict<string, PhabricatorPHIDType> Map of constants to installed
    *  types.
    */
   public static function getAllInstalledTypes(PhabricatorUser $viewer) {
     $all_types = self::getAllTypes();
 
     $installed_types = array();
 
     $app_classes = array();
     foreach ($all_types as $key => $type) {
       $app_class = $type->getPHIDTypeApplicationClass();
 
       if ($app_class === null) {
         // If the PHID type isn't bound to an application, include it as
         // installed.
         $installed_types[$key] = $type;
         continue;
       }
 
       // Otherwise, we need to check if this application is installed before
       // including the PHID type.
       $app_classes[$app_class][$key] = $type;
     }
 
     if ($app_classes) {
       $apps = id(new PhabricatorApplicationQuery())
         ->setViewer($viewer)
         ->withInstalled(true)
         ->withClasses(array_keys($app_classes))
         ->execute();
 
       foreach ($apps as $app_class => $app) {
         $installed_types += $app_classes[$app_class];
       }
     }
 
     return $installed_types;
   }
 
 }
diff --git a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
index 708f62387..1f31095c7 100644
--- a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
+++ b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
@@ -1,29 +1,29 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PhabricatorPholioConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Pholio");
+    return pht('Pholio');
   }
 
   public function getDescription() {
-    return pht("Configure Pholio.");
+    return pht('Configure Pholio.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('metamta.pholio.reply-handler-domain', 'string', null)
         ->setDescription(
           pht(
             'Like {{metamta.maniphest.reply-handler-domain}}, but affects '.
             'Pholio.')),
       $this->newOption('metamta.pholio.subject-prefix', 'string', '[Pholio]')
         ->setDescription(pht('Subject prefix for Pholio email.'))
     );
   }
 
 }
diff --git a/src/applications/pholio/controller/PholioInlineSaveController.php b/src/applications/pholio/controller/PholioInlineSaveController.php
index 300e39be7..d08ba6975 100644
--- a/src/applications/pholio/controller/PholioInlineSaveController.php
+++ b/src/applications/pholio/controller/PholioInlineSaveController.php
@@ -1,94 +1,94 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioInlineSaveController extends PholioController {
 
   private $operation;
 
   public function getOperation() {
     return $this->operation;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $mock = id(new PholioMockQuery())
       ->setViewer($user)
       ->withIDs(array($request->getInt('mockID')))
       ->executeOne();
 
     if (!$mock) {
       return new Aphront404Response();
     }
 
     $this->operation = $request->getStr('op');
 
     if ($this->getOperation() == 'save') {
       $new_content = $request->getStr('text');
 
       if (!strlen($new_content)) {
-        throw new Exception("Content must not be empty.");
+        throw new Exception('Content must not be empty.');
       }
 
       $draft = id(new PholioTransactionComment());
       $draft->setImageID($request->getInt('imageID'));
       $draft->setX($request->getInt('startX'));
       $draft->setY($request->getInt('startY'));
 
       $draft->setCommentVersion(1);
       $draft->setAuthorPHID($user->getPHID());
       $draft->setEditPolicy($user->getPHID());
       $draft->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC);
       $draft->setContentSourceFromRequest($request);
 
       $draft->setWidth($request->getInt('endX') - $request->getInt('startX'));
       $draft->setHeight($request->getInt('endY') - $request->getInt('startY'));
 
       $draft->setContent($new_content);
 
       $draft->save();
 
       $handle = head($this->loadViewerHandles(array($user->getPHID())));
 
       $inline_view = id(new PholioInlineCommentView())
         ->setInlineComment($draft)
         ->setEngine(new PhabricatorMarkupEngine())
         ->setUser($user)
         ->setHandle($handle);
 
       return id(new AphrontAjaxResponse())
         ->setContent(
           $draft->toDictionary() + array(
             'contentHTML' => $inline_view->render(),
           ));
     } else {
       $dialog = new PholioInlineCommentSaveView();
 
       $dialog->setUser($user);
       $dialog->setSubmitURI($request->getRequestURI());
 
       $dialog->setTitle(pht('Add Inline Comment'));
 
       $dialog->addHiddenInput('op', 'save');
 
       $dialog->appendChild($this->renderTextArea(''));
 
       return id(new AphrontAjaxResponse())->setContent($dialog->render());
     }
 
   }
 
   private function renderTextArea($text) {
     return javelin_tag(
       'textarea',
       array(
         'class' => 'pholio-inline-comment-dialog-textarea',
         'name' => 'text',
       ),
       $text);
   }
 
 }
diff --git a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
index 0f0299d28..655ec5d95 100644
--- a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
+++ b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
@@ -1,111 +1,111 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PhabricatorPholioMockTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   public function generate() {
     $authorPHID = $this->loadPhabrictorUserPHID();
     $author = id(new PhabricatorUser())
           ->loadOneWhere('phid = %s', $authorPHID);
     $mock = id(new PholioMock())
       ->setAuthorPHID($authorPHID);
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_UNKNOWN,
       array());
     $template = id(new PholioTransaction())
       ->setContentSource($content_source);
 
     // Accumulate Transactions
     $changes = array();
     $changes[PholioTransactionType::TYPE_NAME] =
       $this->generateTitle();
     $changes[PholioTransactionType::TYPE_DESCRIPTION] =
       $this->generateDescription();
     $changes[PhabricatorTransactions::TYPE_VIEW_POLICY] =
       PhabricatorPolicies::POLICY_PUBLIC;
     $changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
       array('=' => $this->getCCPHIDs());
 
     // Get Files and make Images
     $filePHIDS = $this->generateImages();
     $files = id(new PhabricatorFileQuery())
       ->setViewer($author)
       ->withPHIDs($filePHIDS)
       ->execute();
     $mock->setCoverPHID(head($files)->getPHID());
     $sequence = 0;
     $images = array();
     foreach ($files as $file) {
       $image = new PholioImage();
       $image->setFilePHID($file->getPHID());
       $image->setSequence($sequence++);
       $image->attachMock($mock);
       $images[] = $image;
     }
 
     // Apply Transactions
     $transactions = array();
     foreach ($changes as $type => $value) {
       $transaction = clone $template;
       $transaction->setTransactionType($type);
       $transaction->setNewValue($value);
       $transactions[] = $transaction;
     }
     $mock->openTransaction();
     $editor = id(new PholioMockEditor())
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setActor($author)
       ->applyTransactions($mock, $transactions);
     foreach ($images as $image) {
       $image->setMockID($mock->getID());
       $image->save();
     }
 
     $mock->saveTransaction();
     return $mock->save();
   }
 
   public function generateTitle() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generate();
   }
 
   public function generateDescription() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generateSeveral(rand(30, 40));
   }
 
   public function getCCPHIDs() {
     $ccs = array();
     for ($i = 0; $i < rand(1, 4);$i++) {
       $ccs[] = $this->loadPhabrictorUserPHID();
     }
     return $ccs;
   }
 
   public function generateImages() {
-    $images = newv("PhabricatorFile", array())
-      ->loadAllWhere("mimeType = %s", "image/jpeg");
+    $images = newv('PhabricatorFile', array())
+      ->loadAllWhere('mimeType = %s', 'image/jpeg');
     $rand_images = array();
     $quantity = rand(2, 10);
     $quantity = min($quantity, count($images));
     foreach (array_rand($images, $quantity) as $random) {
       $rand_images[] = $images[$random]->getPHID();
     }
     // this means you don't have any jpegs yet. we'll
     // just use a builtin image
     if (empty($rand_images)) {
       $default = PhabricatorFile::loadBuiltin(
         PhabricatorUser::getOmnipotentUser(),
         'profile.png');
       $rand_images[] = $default->getPHID();
     }
     return $rand_images;
   }
 
 
 }
diff --git a/src/applications/pholio/mail/PholioReplyHandler.php b/src/applications/pholio/mail/PholioReplyHandler.php
index 46efa2dc9..c3743a8ee 100644
--- a/src/applications/pholio/mail/PholioReplyHandler.php
+++ b/src/applications/pholio/mail/PholioReplyHandler.php
@@ -1,43 +1,43 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PholioMock)) {
-      throw new Exception("Mail receiver is not a PholioMock!");
+      throw new Exception('Mail receiver is not a PholioMock!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'M');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('M');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.pholio.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       // TODO: Implement.
       return null;
-      return pht("Reply to comment.");
+      return pht('Reply to comment.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     // TODO: Implement this.
     return null;
   }
 
 }
diff --git a/src/applications/pholio/view/PholioInlineCommentEditView.php b/src/applications/pholio/view/PholioInlineCommentEditView.php
index d36c78801..f4a1242ba 100644
--- a/src/applications/pholio/view/PholioInlineCommentEditView.php
+++ b/src/applications/pholio/view/PholioInlineCommentEditView.php
@@ -1,140 +1,140 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioInlineCommentEditView extends AphrontView {
 
   private $inputs = array();
   private $uri;
   private $title;
 
   private $inlineComment;
 
   public function addHiddenInput($key, $value) {
     $this->inputs[] = array($key, $value);
     return $this;
   }
 
   public function setSubmitURI($uri) {
     $this->uri = $uri;
     return $this;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function setInlineComment($inline_comment) {
     $this->inlineComment = $inline_comment;
     return $this;
   }
 
   public function render() {
     if (!$this->uri) {
-      throw new Exception("Call setSubmitURI() before render()!");
+      throw new Exception('Call setSubmitURI() before render()!');
     }
     if (!$this->user) {
-      throw new Exception("Call setUser() before render()!");
+      throw new Exception('Call setUser() before render()!');
     }
 
     $content = phabricator_form(
       $this->user,
       array(
         'action'    => $this->uri,
         'method'    => 'POST',
         'sigil'     => 'inline-edit-form',
       ),
       array(
         $this->renderInputs(),
         $this->renderBody(),
       ));
 
     return $content;
   }
 
   private function renderInputs() {
     $out = array();
     foreach ($this->inputs as $input) {
       list($name, $value) = $input;
       $out[] = phutil_tag(
         'input',
         array(
           'type'  => 'hidden',
           'name'  => $name,
           'value' => $value,
         ));
     }
     return $out;
   }
 
   private function renderBody() {
     $buttons = array();
 
     $buttons[] = javelin_tag(
       'button',
       array(
         'sigil' => 'inline-edit-submit',
         'meta' => array(
           'id' => $this->inlineComment->getID(),
           'phid' => $this->inlineComment->getPHID()
         )
       ),
       pht('Ready'));
     $buttons[] = javelin_tag(
       'button',
       array(
         'sigil' => 'inline-edit-cancel',
         'meta' => array(
           'id' => $this->inlineComment->getID()
         ),
         'class' => 'grey',
       ),
       pht('Cancel'));
 
     $formatting = phutil_tag(
       'a',
       array(
         'href' => PhabricatorEnv::getDoclink('Remarkup Reference'),
         'tabindex' => '-1',
         'target' => '_blank',
       ),
       pht('Formatting Reference'));
 
     $title = phutil_tag(
       'div',
       array(
         'class' => 'pholio-inline-comment-dialog-title',
       ),
       $this->title);
 
     $body = phutil_tag(
       'div',
       array(),
       $this->renderChildren());
 
     $edit = phutil_tag(
       'edit',
       array(
         'class' => 'pholio-inline-comment-dialog-buttons',
       ),
       array(
         $formatting,
         $buttons,
         phutil_tag('div', array('style' => 'clear: both'), ''),
       ));
 
     return javelin_tag(
       'div',
       array(
         'class' => 'pholio-inline-comment-dialog',
       ),
       array(
         $title,
         $body,
         $edit,
       ));
   }
 
 }
diff --git a/src/applications/pholio/view/PholioInlineCommentSaveView.php b/src/applications/pholio/view/PholioInlineCommentSaveView.php
index 6f79c81f4..5d271c451 100644
--- a/src/applications/pholio/view/PholioInlineCommentSaveView.php
+++ b/src/applications/pholio/view/PholioInlineCommentSaveView.php
@@ -1,127 +1,127 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioInlineCommentSaveView extends AphrontView {
 
   private $inputs = array();
   private $uri;
   private $title;
 
   public function addHiddenInput($key, $value) {
     $this->inputs[] = array($key, $value);
     return $this;
   }
 
   public function setSubmitURI($uri) {
     $this->uri = $uri;
     return $this;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function render() {
     if (!$this->uri) {
-      throw new Exception("Call setSubmitURI() before render()!");
+      throw new Exception('Call setSubmitURI() before render()!');
     }
     if (!$this->user) {
-      throw new Exception("Call setUser() before render()!");
+      throw new Exception('Call setUser() before render()!');
     }
 
     $content = phabricator_form(
       $this->user,
       array(
         'action'    => $this->uri,
         'method'    => 'POST',
         'sigil'     => 'inline-save-form',
         'class'     => 'pholio-new-inline-comment',
         'id'        => 'pholio-new-inline-comment-dialog'
       ),
       array(
         $this->renderInputs(),
         $this->renderBody(),
       ));
 
     return $content;
   }
 
   private function renderInputs() {
     $out = array();
     foreach ($this->inputs as $input) {
       list($name, $value) = $input;
       $out[] = phutil_tag(
         'input',
         array(
           'type'  => 'hidden',
           'name'  => $name,
           'value' => $value,
         ));
     }
     return $out;
   }
 
   private function renderBody() {
     $buttons = array();
 
     $buttons[] = javelin_tag(
       'button',
       array(
         'sigil' => 'inline-save-submit',
       ),
       pht('Done'));
     $buttons[] = javelin_tag(
       'button',
       array(
         'sigil' => 'inline-save-cancel',
         'class' => 'grey',
       ),
       pht('Cancel'));
 
     $formatting = phutil_tag(
       'a',
       array(
         'href' => PhabricatorEnv::getDoclink('Remarkup Reference'),
         'tabindex' => '-1',
         'target' => '_blank',
       ),
       pht('Formatting Reference'));
 
     $title = phutil_tag(
       'div',
       array(
         'class' => 'pholio-inline-comment-dialog-title',
       ),
       $this->title);
 
     $body = phutil_tag(
       'div',
       array(),
       $this->renderChildren());
 
     $edit = phutil_tag(
       'edit',
       array(
         'class' => 'pholio-inline-comment-dialog-buttons',
       ),
       array(
         $formatting,
         $buttons,
         phutil_tag('div', array('style' => 'clear: both'), ''),
       ));
 
     return javelin_tag(
       'div',
       array(
       ),
       array(
         $title,
         $body,
         $edit,
       ));
   }
 
 }
diff --git a/src/applications/pholio/view/PholioInlineCommentView.php b/src/applications/pholio/view/PholioInlineCommentView.php
index d59c6e847..4e2310e9e 100644
--- a/src/applications/pholio/view/PholioInlineCommentView.php
+++ b/src/applications/pholio/view/PholioInlineCommentView.php
@@ -1,136 +1,136 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioInlineCommentView extends AphrontView {
 
   private $engine;
   private $handle;
   private $inlineComment;
 
   public function setEngine(PhabricatorMarkupEngine $engine) {
     $this->engine = $engine;
     return $this;
   }
 
   public function setHandle(PhabricatorObjectHandle $handle) {
      $this->handle = $handle;
      return $this;
   }
 
   public function setInlineComment(PholioTransactionComment $inline_comment) {
     if ($inline_comment->getImageID() === null) {
-      throw new Exception("Comment provided is not inline comment");
+      throw new Exception('Comment provided is not inline comment');
     }
 
     $this->inlineComment = $inline_comment;
     return $this;
   }
 
   public function render() {
     if (!$this->inlineComment) {
-      throw new Exception("Call setInlineComment() before render()!");
+      throw new Exception('Call setInlineComment() before render()!');
     }
     if ($this->user === null) {
-      throw new Exception("Call setUser() before render()!");
+      throw new Exception('Call setUser() before render()!');
     }
     if ($this->engine === null) {
-      throw new Exception("Call setEngine() before render()!");
+      throw new Exception('Call setEngine() before render()!');
     }
     if ($this->handle === null) {
-      throw new Exception("Call setHandle() before render()!");
+      throw new Exception('Call setHandle() before render()!');
     }
 
     $actions = null;
     $inline = $this->inlineComment;
     $phid = $inline->getPHID();
     $id = $inline->getID();
     $user = $this->user;
 
     $is_draft = ($inline->getTransactionPHID() === null);
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
       $inline,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     if ($is_draft && $can_edit) {
       $draft = phutil_tag(
         'span',
         array(
           'class' => 'pholio-inline-status',
         ),
         pht('Not Submitted Yet'));
 
       $edit_action = javelin_tag(
         'a',
         array(
           'href' => '/pholio/inline/edit/'.$id.'/',
           'sigil' => 'inline-edit',
           'meta' => array(
             'phid' => $phid,
             'id' => $id,
           )
         ),
         pht('Edit'));
 
       $delete_action = javelin_tag(
         'a',
         array(
           'href' => '/pholio/inline/delete/'.$id.'/',
           'sigil' => 'inline-delete',
           'meta' => array(
             'phid' => $phid,
             'id' => $id,
           )
         ),
         pht('Delete'));
 
       $actions = phutil_tag(
         'span',
         array(
           'class' => 'pholio-inline-head-links'
         ),
         phutil_implode_html(
           " \xC2\xB7 ",
           array($draft, $edit_action, $delete_action)));
     }
 
     $comment_header = phutil_tag(
       'div',
       array(
         'class' => 'pholio-inline-comment-header'
       ),
       array($this->handle->getName(), $actions));
 
 
     $comment = $this->engine->renderOneObject(
       $inline,
       PholioTransactionComment::MARKUP_FIELD_COMMENT,
       $this->user);
 
     $comment_body = phutil_tag(
       'div',
       array(),
       $comment);
 
     $classes = array();
     $classes[] = 'pholio-inline-comment';
 
     if ($is_draft) {
       $classes[] = 'pholio-inline-comment-draft';
     }
 
     return javelin_tag(
       'div',
       array(
         'id' => "{$phid}_comment",
         'class' => implode(' ', $classes),
         'sigil' => 'inline_comment',
         'meta' => array(
           'phid' => $phid,
         )
       ),
       array($comment_header, $comment_body));
   }
 }
diff --git a/src/applications/pholio/view/PholioMockEmbedView.php b/src/applications/pholio/view/PholioMockEmbedView.php
index cdabc1272..d932dd648 100644
--- a/src/applications/pholio/view/PholioMockEmbedView.php
+++ b/src/applications/pholio/view/PholioMockEmbedView.php
@@ -1,119 +1,119 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioMockEmbedView extends AphrontView {
 
   private $mock;
   private $images = array();
 
   public function setMock(PholioMock $mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function setImages(array $images) {
     $this->images = $images;
     return $this;
   }
 
   public function render() {
     if (!$this->mock) {
-      throw new Exception("Call setMock() before render()!");
+      throw new Exception('Call setMock() before render()!');
     }
 
     require_celerity_resource('pholio-css');
 
     $mock_link = phutil_tag(
       'a',
       array(
         'href' => '/M'.$this->mock->getID(),
       ),
       'M'.$this->mock->getID().' '.$this->mock->getName());
 
     $mock_header = phutil_tag(
       'div',
       array(
         'class' => 'pholio-mock-embed-head',
       ),
       $mock_link);
 
     $images_to_show = array();
     if (!empty($this->images)) {
       $images_to_show = array_intersect_key(
         $this->mock->getImages(), array_flip($this->images));
     }
 
     if (empty($images_to_show)) {
       $images_to_show = array_slice($this->mock->getImages(), 0, 4);
     }
 
     $thumbnails = array();
     foreach ($images_to_show as $image) {
       $thumbfile = $image->getFile();
 
       $dimensions = PhabricatorImageTransformer::getPreviewDimensions(
         $thumbfile,
         140);
 
       $tag = phutil_tag(
         'img',
         array(
             'width' => $dimensions['sdx'],
             'height' => $dimensions['sdy'],
             'class' => 'pholio-mock-carousel-thumbnail',
             'src' => $thumbfile->getPreview140URI(),
             'style' => 'top: '.floor((140 - $dimensions['sdy'] ) / 2).'px',
           ));
 
         $thumbnails[] = javelin_tag(
           'a',
           array(
             'class' => 'pholio-mock-carousel-thumb-item',
             'href' => '/M'.$this->mock->getID().'/'.$image->getID().'/',
           ),
           $tag);
     }
 
     $mock_body = phutil_tag(
       'div',
       array(),
       $thumbnails);
 
     $icons_data = array(
       'fa-picture-o' => count($this->mock->getImages()),
       'fa-trophy' => $this->mock->getTokenCount());
 
     $icon_list = array();
     foreach ($icons_data as $icon_name => $icon_value) {
       $icon = id(new PHUIIconView())
         ->setIconFont($icon_name.' white')
         ->addClass('pholio-mock-embed-icon');
 
       $count = phutil_tag('span', array(), $icon_value);
 
       $icon_list[] = phutil_tag(
         'span',
         array(
           'class' => 'pholio-mock-embed-icons'
         ),
         array($icon, $count));
     }
 
     $mock_footer = phutil_tag(
       'div',
       array(
          'class' => 'pholio-mock-embed-footer',
       ),
       $icon_list);
 
 
     return phutil_tag(
       'div',
       array(
         'class' => 'pholio-mock-embed'
       ),
       array($mock_header, $mock_body, $mock_footer));
   }
 }
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
index 0622d0a2a..6583f6806 100644
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -1,202 +1,202 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioMockImagesView extends AphrontView {
 
   private $mock;
   private $imageID;
   private $requestURI;
   private $commentFormID;
   private $viewMode = 'normal';
 
   /**
    * Supports normal (/MX, /MX/Y/) and history (/pholio/image/history/Y/)
    * modes. The former has handy dandy commenting functionality and the
    * latter does not.
    */
   public function setViewMode($view_mode) {
     $this->viewMode = $view_mode;
     return $this;
   }
   public function getViewMode() {
     return $this->viewMode;
   }
 
   public function setCommentFormID($comment_form_id) {
     $this->commentFormID = $comment_form_id;
     return $this;
   }
   public function getCommentFormID() {
     return $this->commentFormID;
   }
 
   public function setRequestURI(PhutilURI $request_uri) {
     $this->requestURI = $request_uri;
     return $this;
   }
   public function getRequestURI() {
     return $this->requestURI;
   }
 
   public function setImageID($image_id) {
     $this->imageID = $image_id;
     return $this;
   }
 
   public function getImageID() {
     return $this->imageID;
   }
 
   public function setMock(PholioMock $mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function render() {
     if (!$this->mock) {
-      throw new Exception("Call setMock() before render()!");
+      throw new Exception('Call setMock() before render()!');
     }
 
     $mock = $this->mock;
 
     require_celerity_resource('javelin-behavior-pholio-mock-view');
 
     $images = array();
     $panel_id = celerity_generate_unique_node_id();
     $viewport_id = celerity_generate_unique_node_id();
 
     $ids = mpull($mock->getImages(), 'getID');
     if ($this->imageID && isset($ids[$this->imageID])) {
       $selected_id = $this->imageID;
     } else {
       $selected_id = head_key($ids);
     }
 
     foreach ($mock->getImages() as $image) {
       $file = $image->getFile();
       $metadata = $file->getMetadata();
       $x = idx($metadata, PhabricatorFile::METADATA_IMAGE_WIDTH);
       $y = idx($metadata, PhabricatorFile::METADATA_IMAGE_HEIGHT);
 
       $history_uri = '/pholio/image/history/'.$image->getID().'/';
       $images[] = array(
         'id' => $image->getID(),
         'fullURI' => $file->getBestURI(),
         'pageURI' => $this->getImagePageURI($image, $mock),
         'historyURI' => $history_uri,
         'width' => $x,
         'height' => $y,
         'title' => $image->getName(),
         'desc' => $image->getDescription(),
         'isObsolete' => (bool) $image->getIsObsolete(),
       );
     }
 
     $login_uri = id(new PhutilURI('/login/'))
       ->setQueryParam('next', (string) $this->getRequestURI());
     $config = array(
       'mockID' => $mock->getID(),
       'panelID' => $panel_id,
       'viewportID' => $viewport_id,
       'commentFormID' => $this->getCommentFormID(),
       'images' => $images,
       'selectedID' => $selected_id,
       'loggedIn' => $this->getUser()->isLoggedIn(),
       'logInLink' => (string) $login_uri,
       'viewMode' => $this->getViewMode()
     );
     Javelin::initBehavior('pholio-mock-view', $config);
 
     $mockview = '';
 
     $mock_wrapper = javelin_tag(
       'div',
       array(
         'id' => $viewport_id,
         'sigil' => 'mock-viewport',
         'class' => 'pholio-mock-image-viewport'
       ),
       '');
 
     $mock_wrapper = javelin_tag(
       'div',
       array(
         'id' => $panel_id,
         'sigil' => 'mock-panel touchable',
         'class' => 'pholio-mock-image-panel',
       ),
       $mock_wrapper);
 
     $inline_comments_holder = javelin_tag(
       'div',
       array(
         'id' => 'mock-inline-comments',
         'sigil' => 'mock-inline-comments',
         'class' => 'pholio-mock-inline-comments'
       ),
       '');
 
     $carousel_holder = '';
     if (count($mock->getImages()) > 0) {
       $thumbnails = array();
       foreach ($mock->getImages() as $image) {
         $thumbfile = $image->getFile();
 
         $dimensions = PhabricatorImageTransformer::getPreviewDimensions(
           $thumbfile,
           140);
 
         $tag = phutil_tag(
           'img',
           array(
             'width' => $dimensions['sdx'],
             'height' => $dimensions['sdy'],
             'src' => $thumbfile->getPreview140URI(),
             'class' => 'pholio-mock-carousel-thumbnail',
             'style' => 'top: '.floor((140 - $dimensions['sdy'] ) / 2).'px',
         ));
 
         $thumbnails[] = javelin_tag(
           'a',
           array(
             'sigil' => 'mock-thumbnail',
             'class' => 'pholio-mock-carousel-thumb-item',
             'href' => $this->getImagePageURI($image, $mock),
             'meta' => array(
               'imageID' => $image->getID(),
             ),
           ),
           $tag);
       }
 
       $carousel_holder = phutil_tag(
         'div',
         array(
           'id' => 'pholio-mock-carousel',
           'class' => 'pholio-mock-carousel',
         ),
         $thumbnails);
     }
 
     $mockview[] = phutil_tag(
       'div',
         array(
           'class' => 'pholio-mock-image-container',
           'id' => 'pholio-mock-image-container'
         ),
       array($mock_wrapper, $carousel_holder, $inline_comments_holder));
 
     return $mockview;
   }
 
   private function getImagePageURI(PholioImage $image, PholioMock $mock) {
     if ($this->getViewMode() == 'normal') {
       $uri = '/M'.$mock->getID().'/'.$image->getID().'/';
     } else {
       $uri = '/pholio/image/history/'.$image->getID().'/';
     }
     return $uri;
   }
 }
diff --git a/src/applications/pholio/view/PholioTransactionView.php b/src/applications/pholio/view/PholioTransactionView.php
index 5ba716f63..f4428262e 100644
--- a/src/applications/pholio/view/PholioTransactionView.php
+++ b/src/applications/pholio/view/PholioTransactionView.php
@@ -1,110 +1,110 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioTransactionView
   extends PhabricatorApplicationTransactionView {
 
   protected function shouldGroupTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     if ($u->getAuthorPHID() != $v->getAuthorPHID()) {
       // Don't group transactions by different authors.
       return false;
     }
 
     if (($v->getDateCreated() - $u->getDateCreated()) > 60) {
       // Don't group if transactions happened more than 60s apart.
       return false;
     }
 
     switch ($u->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
       case PholioTransactionType::TYPE_INLINE:
         break;
       default:
         return false;
     }
 
     switch ($v->getTransactionType()) {
       case PholioTransactionType::TYPE_INLINE:
         return true;
     }
 
     return parent::shouldGroupTransactions($u, $v);
   }
 
   protected function renderTransactionContent(
     PhabricatorApplicationTransaction $xaction) {
 
     $out = array();
 
     $group = $xaction->getTransactionGroup();
     if ($xaction->getTransactionType() == PholioTransactionType::TYPE_INLINE) {
       array_unshift($group, $xaction);
     } else {
       $out[] = parent::renderTransactionContent($xaction);
     }
 
     if (!$group) {
       return $out;
     }
 
     $inlines = array();
     foreach ($group as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PholioTransactionType::TYPE_INLINE:
           $inlines[] = $xaction;
           break;
         default:
-          throw new Exception("Unknown grouped transaction type!");
+          throw new Exception('Unknown grouped transaction type!');
       }
     }
 
     if ($inlines) {
       $header = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-transaction-subheader',
         ),
         pht('Inline Comments'));
 
       $out[] = $header;
       foreach ($inlines as $inline) {
         if (!$inline->getComment()) {
           continue;
         }
         $out[] = $this->renderInlineContent($inline);
       }
     }
 
     return $out;
   }
 
   private function renderInlineContent(PholioTransaction $inline) {
     $comment = $inline->getComment();
 
     $thumb = phutil_tag(
       'img',
       array(
         'src' => '/pholio/inline/thumb/'.$comment->getImageID(),
         ));
 
     $link = phutil_tag(
       'a',
       array(
         'href' => '#'
       ),
       $thumb);
 
     $inline_comment = parent::renderTransactionContent($inline);
 
     return phutil_tag(
       'div',
       array('class' => 'pholio-transaction-inline-comment'),
       array($link, $inline_comment));
   }
 
 }
diff --git a/src/applications/phortune/controller/PhortuneAccountBuyController.php b/src/applications/phortune/controller/PhortuneAccountBuyController.php
index de0c6ae85..ed399a5f0 100644
--- a/src/applications/phortune/controller/PhortuneAccountBuyController.php
+++ b/src/applications/phortune/controller/PhortuneAccountBuyController.php
@@ -1,183 +1,183 @@
 <?php
 
 final class PhortuneAccountBuyController
   extends PhortuneController {
 
   private $accountID;
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->accountID = $data['accountID'];
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $account = id(new PhortuneAccountQuery())
       ->setViewer($user)
       ->withIDs(array($this->accountID))
       ->executeOne();
     if (!$account) {
       return new Aphront404Response();
     }
 
     $account_uri = $this->getApplicationURI($account->getID().'/');
 
     $product = id(new PhortuneProductQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$product) {
       return new Aphront404Response();
     }
 
     $purchase = new PhortunePurchase();
     $purchase->setProductPHID($product->getPHID());
     $purchase->setAccountPHID($account->getPHID());
     $purchase->setPurchaseName($product->getProductName());
     $purchase->setBasePriceInCents($product->getPriceInCents());
     $purchase->setQuantity(1);
     $purchase->setTotalPriceInCents(
       $purchase->getBasePriceInCents() * $purchase->getQuantity());
     $purchase->setStatus(PhortunePurchase::STATUS_PENDING);
 
     $cart = new PhortuneCart();
     $cart->setAccountPHID($account->getPHID());
     $cart->setOwnerPHID($user->getPHID());
     $cart->attachPurchases(
       array(
         $purchase,
       ));
 
     $rows = array();
     $total = 0;
     foreach ($cart->getPurchases() as $purchase) {
       $rows[] = array(
         $purchase->getPurchaseName(),
         PhortuneCurrency::newFromUSDCents($purchase->getBasePriceInCents())
           ->formatForDisplay(),
         $purchase->getQuantity(),
         PhortuneCurrency::newFromUSDCents($purchase->getTotalPriceInCents())
           ->formatForDisplay(),
       );
 
       $total += $purchase->getTotalPriceInCents();
     }
 
     $rows[] = array(
       phutil_tag('strong', array(), pht('Total')),
       '',
       '',
       phutil_tag('strong', array(),
         PhortuneCurrency::newFromUSDCents($total)->formatForDisplay()),
     );
 
     $table = new AphrontTableView($rows);
     $table->setHeaders(
       array(
         pht('Item'),
         pht('Price'),
         pht('Qty.'),
         pht('Total'),
       ));
 
     $panel = new AphrontPanelView();
     $panel->setNoBackground(true);
     $panel->appendChild($table);
 
 
     $title = pht('Buy Stuff');
 
 
     $methods = id(new PhortunePaymentMethodQuery())
       ->setViewer($user)
       ->withAccountPHIDs(array($account->getPHID()))
       ->withStatus(PhortunePaymentMethodQuery::STATUS_OPEN)
       ->execute();
 
     $method_control = id(new AphrontFormRadioButtonControl())
       ->setLabel(pht('Payment Method'));
 
     if (!$methods) {
       $method_control = id(new AphrontFormStaticControl())
         ->setLabel(pht('Payment Method'))
         ->setValue(
           phutil_tag('em', array(), pht('No payment methods configured.')));
     } else {
       $method_control = id(new AphrontFormRadioButtonControl())
         ->setLabel(pht('Payment Method'))
         ->setName('paymentMethodID')
         ->setValue($request->getInt('paymentMethodID'));
       foreach ($methods as $method) {
         $method_control->addButton(
           $method->getID(),
           $method->getBrand().' / '.$method->getLastFourDigits(),
           $method->getDescription());
       }
     }
 
     $payment_method_uri = $this->getApplicationURI(
       $account->getID().'/paymentmethod/edit/');
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild($method_control);
 
     $add_providers = PhortunePaymentProvider::getProvidersForAddPaymentMethod();
     if ($add_providers) {
       $new_method = phutil_tag(
         'a',
         array(
           'class' => 'button grey',
           'href'  => $payment_method_uri,
           'sigil' => 'workflow',
         ),
         pht('Add New Payment Method'));
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setValue($new_method));
     }
 
     if ($methods || $add_providers) {
       $form
         ->appendChild(
           id(new AphrontFormSubmitControl())
-            ->setValue(pht("Submit Payment"))
+            ->setValue(pht('Submit Payment'))
             ->setDisabled(!$methods));
     }
 
     $provider_form = null;
 
     $pay_providers = PhortunePaymentProvider::getProvidersForOneTimePayment();
     if ($pay_providers) {
       $one_time_options = array();
       foreach ($pay_providers as $provider) {
         $one_time_options[] = $provider->renderOneTimePaymentButton(
           $account,
           $cart,
           $user);
       }
 
       $provider_form = new PHUIFormLayoutView();
       $provider_form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel('Pay With')
           ->setValue($one_time_options));
     }
 
     return $this->buildApplicationPage(
       array(
         $panel,
         $form,
         phutil_tag('br', array()),
         $provider_form,
       ),
       array(
         'title'   => $title,
         'device'  => true,
       ));
 
   }
 }
diff --git a/src/applications/phortune/controller/PhortuneController.php b/src/applications/phortune/controller/PhortuneController.php
index 93bb99a1f..66ba0e654 100644
--- a/src/applications/phortune/controller/PhortuneController.php
+++ b/src/applications/phortune/controller/PhortuneController.php
@@ -1,56 +1,56 @@
 <?php
 
 abstract class PhortuneController extends PhabricatorController {
 
   protected function loadActiveAccount(PhabricatorUser $user) {
     $accounts = id(new PhortuneAccountQuery())
       ->setViewer($user)
       ->withMemberPHIDs(array($user->getPHID()))
       ->execute();
 
     if (!$accounts) {
       return $this->createUserAccount($user);
     } else if (count($accounts) == 1) {
       return head($accounts);
     } else {
-      throw new Exception("TODO: No account selection yet.");
+      throw new Exception('TODO: No account selection yet.');
     }
   }
 
   protected function createUserAccount(PhabricatorUser $user) {
     $request = $this->getRequest();
 
     $xactions = array();
     $xactions[] = id(new PhortuneAccountTransaction())
       ->setTransactionType(PhortuneAccountTransaction::TYPE_NAME)
       ->setNewValue(pht('Account (%s)', $user->getUserName()));
 
     $xactions[] = id(new PhortuneAccountTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
       ->setMetadataValue(
         'edge:type',
         PhabricatorEdgeConfig::TYPE_ACCOUNT_HAS_MEMBER)
       ->setNewValue(
         array(
           '=' => array($user->getPHID() => $user->getPHID()),
         ));
 
     $account = id(new PhortuneAccount())
       ->attachMemberPHIDs(array());
 
     $editor = id(new PhortuneAccountEditor())
       ->setActor($user)
       ->setContentSourceFromRequest($request);
 
     // We create an account for you the first time you visit Phortune.
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
 
       $editor->applyTransactions($account, $xactions);
 
     unset($unguarded);
 
     return $account;
   }
 
 
 }
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php
index 4a82a219c..8eeced43b 100644
--- a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php
+++ b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php
@@ -1,234 +1,234 @@
 <?php
 
 final class PhortunePaymentMethodEditController
   extends PhortuneController {
 
   private $accountID;
 
   public function willProcessRequest(array $data) {
     $this->accountID = $data['accountID'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $account = id(new PhortuneAccountQuery())
       ->setViewer($user)
       ->withIDs(array($this->accountID))
       ->executeOne();
     if (!$account) {
       return new Aphront404Response();
     }
 
     $cancel_uri = $this->getApplicationURI($account->getID().'/');
     $account_uri = $this->getApplicationURI($account->getID().'/');
 
     $providers = PhortunePaymentProvider::getProvidersForAddPaymentMethod();
     if (!$providers) {
       throw new Exception(
-        "There are no payment providers enabled that can add payment ".
-        "methods.");
+        'There are no payment providers enabled that can add payment '.
+        'methods.');
     }
 
     $provider_key = $request->getStr('providerKey');
     if (empty($providers[$provider_key])) {
       $choices = array();
       foreach ($providers as $provider) {
         $choices[] = $this->renderSelectProvider($provider);
       }
       return $this->buildResponse($choices, $account_uri);
     }
 
     $provider = $providers[$provider_key];
 
     $errors = array();
     if ($request->isFormPost() && $request->getBool('isProviderForm')) {
       $method = id(new PhortunePaymentMethod())
         ->setAccountPHID($account->getPHID())
         ->setAuthorPHID($user->getPHID())
         ->setStatus(PhortunePaymentMethod::STATUS_ACTIVE)
         ->setProviderType($provider->getProviderType())
         ->setProviderDomain($provider->getProviderDomain());
 
       if (!$errors) {
         $errors = $this->processClientErrors(
           $provider,
           $request->getStr('errors'));
       }
 
       if (!$errors) {
         $client_token_raw = $request->getStr('token');
         $client_token = json_decode($client_token_raw, true);
         if (!is_array($client_token)) {
           $errors[] = pht(
             'There was an error decoding token information submitted by the '.
             'client. Expected a JSON-encoded token dictionary, received: %s.',
             nonempty($client_token_raw, pht('nothing')));
         } else {
           if (!$provider->validateCreatePaymentMethodToken($client_token)) {
             $errors[] = pht(
               'There was an error with the payment token submitted by the '.
               'client. Expected a valid dictionary, received: %s.',
               $client_token_raw);
           }
         }
         if (!$errors) {
           $errors = $provider->createPaymentMethodFromRequest(
             $request,
             $method,
             $client_token);
         }
       }
 
       if (!$errors) {
         $method->save();
 
         $save_uri = new PhutilURI($account_uri);
         $save_uri->setFragment('payment');
         return id(new AphrontRedirectResponse())->setURI($save_uri);
       } else {
         $dialog = id(new AphrontDialogView())
           ->setUser($user)
           ->setTitle(pht('Error Adding Payment Method'))
           ->appendChild(id(new AphrontErrorView())->setErrors($errors))
           ->addCancelButton($request->getRequestURI());
 
         return id(new AphrontDialogResponse())->setDialog($dialog);
       }
     }
 
     $form = $provider->renderCreatePaymentMethodForm($request, $errors);
 
     $form
       ->setUser($user)
       ->setAction($request->getRequestURI())
       ->setWorkflow(true)
       ->addHiddenInput('providerKey', $provider_key)
       ->addHiddenInput('isProviderForm', true)
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Add Payment Method'))
           ->addCancelButton($account_uri));
 
     if ($errors) {
       $errors = id(new AphrontErrorView())
         ->setErrors($errors);
     }
 
     return $this->buildResponse(
       array($errors, $form),
       $account_uri);
   }
 
   private function renderSelectProvider(
     PhortunePaymentProvider $provider) {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $description = $provider->getPaymentMethodDescription();
     $icon = $provider->getPaymentMethodIcon();
     $details = $provider->getPaymentMethodProviderDescription();
 
     $button = phutil_tag(
       'button',
       array(
         'class' => 'grey',
       ),
       array(
         $description,
         phutil_tag('br'),
         $icon,
         $details,
       ));
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->addHiddenInput('providerKey', $provider->getProviderKey())
       ->appendChild($button);
 
     return $form;
   }
 
   private function buildResponse($content, $account_uri) {
     $request = $this->getRequest();
 
     $title = pht('Add Payment Method');
     $header = id(new PHUIHeaderView())
       ->setHeader($title);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Account'), $account_uri);
     $crumbs->addTextCrumb(pht('Payment Methods'), $request->getRequestURI());
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $header,
         $content,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function processClientErrors(
     PhortunePaymentProvider $provider,
     $client_errors_raw) {
 
     $errors = array();
 
     $client_errors = json_decode($client_errors_raw, true);
     if (!is_array($client_errors)) {
       $errors[] = pht(
         'There was an error decoding error information submitted by the '.
         'client. Expected a JSON-encoded list of error codes, received: %s.',
         nonempty($client_errors_raw, pht('nothing')));
     }
 
     foreach (array_unique($client_errors) as $key => $client_error) {
       $client_errors[$key] = $provider->translateCreatePaymentMethodErrorCode(
         $client_error);
     }
 
     foreach (array_unique($client_errors) as $client_error) {
       switch ($client_error) {
         case PhortuneErrCode::ERR_CC_INVALID_NUMBER:
           $message = pht(
             'The card number you entered is not a valid card number. Check '.
             'that you entered it correctly.');
           break;
         case PhortuneErrCode::ERR_CC_INVALID_CVC:
           $message = pht(
             'The CVC code you entered is not a valid CVC code. Check that '.
             'you entered it correctly. The CVC code is a 3-digit or 4-digit '.
             'numeric code which usually appears on the back of the card.');
           break;
         case PhortuneErrCode::ERR_CC_INVALID_EXPIRY:
           $message = pht(
             'The card expiration date is not a valid expiration date. Check '.
             'that you entered it correctly. You can not add an expired card '.
             'as a payment method.');
           break;
         default:
           $message = $provider->getCreatePaymentErrorMessage($client_error);
           if (!$message) {
             $message = pht(
               "There was an unexpected error ('%s') processing payment ".
               "information.",
               $client_error);
 
             phlog($message);
           }
           break;
       }
 
       $errors[$client_error] = $message;
     }
 
     return $errors;
   }
 
 }
diff --git a/src/applications/phortune/controller/PhortuneProviderController.php b/src/applications/phortune/controller/PhortuneProviderController.php
index b59a6831c..483551f78 100644
--- a/src/applications/phortune/controller/PhortuneProviderController.php
+++ b/src/applications/phortune/controller/PhortuneProviderController.php
@@ -1,63 +1,63 @@
 <?php
 
 final class PhortuneProviderController extends PhortuneController {
 
   private $digest;
   private $action;
 
   public function willProcessRequest(array $data) {
     $this->digest = $data['digest'];
     $this->setAction($data['action']);
   }
 
   public function setAction($action) {
     $this->action = $action;
     return $this;
   }
 
   public function getAction() {
     return $this->action;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
 
     // NOTE: This use of digests to identify payment providers is because
     // payment provider keys don't necessarily have restrictions on what they
     // contain (so they might have stuff that's not safe to put in URIs), and
     // using digests prevents errors with URI encoding.
 
     $provider = PhortunePaymentProvider::getProviderByDigest($this->digest);
     if (!$provider) {
-      throw new Exception("Invalid payment provider digest!");
+      throw new Exception('Invalid payment provider digest!');
     }
 
     if (!$provider->canRespondToControllerAction($this->getAction())) {
       return new Aphront404Response();
     }
 
 
     $response = $provider->processControllerRequest($this, $request);
 
     if ($response instanceof AphrontResponse) {
       return $response;
     }
 
     $title = 'Phortune';
 
     return $this->buildApplicationPage(
       $response,
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 
   public function loadCart($id) {
     return id(new PhortuneCart());
   }
 
 }
diff --git a/src/applications/phortune/currency/PhortuneCurrency.php b/src/applications/phortune/currency/PhortuneCurrency.php
index 68bc3d0be..978bc282f 100644
--- a/src/applications/phortune/currency/PhortuneCurrency.php
+++ b/src/applications/phortune/currency/PhortuneCurrency.php
@@ -1,95 +1,95 @@
 <?php
 
 final class PhortuneCurrency {
 
   private $value;
   private $currency;
 
   private function __construct() {
     // Intentionally private.
   }
 
   public static function newFromUserInput(PhabricatorUser $user, $string) {
     $matches = null;
     $ok = preg_match(
       '/^([-$]*(?:\d+)?(?:[.]\d{0,2})?)(?:\s+([A-Z]+))?$/',
       trim($string),
       $matches);
 
     if (!$ok) {
       self::throwFormatException($string);
     }
 
     $value = $matches[1];
 
     if (substr_count($value, '-') > 1) {
       self::throwFormatException($string);
     }
 
     if (substr_count($value, '$') > 1) {
       self::throwFormatException($string);
     }
 
     $value = str_replace('$', '', $value);
     $value = (float)$value;
     $value = (int)round(100 * $value);
 
     $currency = idx($matches, 2, 'USD');
     if ($currency) {
       switch ($currency) {
         case 'USD':
           break;
         default:
           throw new Exception("Unsupported currency '{$currency}'!");
       }
     }
 
     $obj = new PhortuneCurrency();
 
     $obj->value = $value;
     $obj->currency = $currency;
 
     return $obj;
   }
 
   public static function newFromUSDCents($cents) {
     if (!is_int($cents)) {
-      throw new Exception("USDCents value is not an integer!");
+      throw new Exception('USDCents value is not an integer!');
     }
 
     $obj = new PhortuneCurrency();
 
     $obj->value = $cents;
     $obj->currency = 'USD';
 
     return $obj;
   }
 
   public function formatForDisplay() {
     $bare = $this->formatBareValue();
     return '$'.$bare.' USD';
   }
 
   public function formatBareValue() {
     switch ($this->currency) {
       case 'USD':
         return sprintf('%.02f', $this->value / 100);
       default:
-        throw new Exception("Unsupported currency!");
+        throw new Exception('Unsupported currency!');
 
     }
   }
 
   public function getValue() {
     return $this->value;
   }
 
   public function getCurrency() {
     return $this->currency;
   }
 
   private static function throwFormatException($string) {
     throw new Exception("Invalid currency format ('{$string}').");
   }
 
 }
diff --git a/src/applications/phortune/option/PhabricatorPhortuneConfigOptions.php b/src/applications/phortune/option/PhabricatorPhortuneConfigOptions.php
index 02bc1d468..6f9c4df6c 100644
--- a/src/applications/phortune/option/PhabricatorPhortuneConfigOptions.php
+++ b/src/applications/phortune/option/PhabricatorPhortuneConfigOptions.php
@@ -1,70 +1,70 @@
 <?php
 
 final class PhabricatorPhortuneConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Phortune");
+    return pht('Phortune');
   }
 
   public function getDescription() {
-    return pht("Configure payments and billing.");
+    return pht('Configure payments and billing.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('phortune.stripe.publishable-key', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Stripe publishable key.')),
       $this->newOption('phortune.stripe.secret-key', 'string', null)
         ->setHidden(true)
         ->setDescription(pht('Stripe secret key.')),
       $this->newOption('phortune.balanced.marketplace-uri', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('Balanced Marketplace URI.')),
       $this->newOption('phortune.balanced.secret-key', 'string', null)
         ->setHidden(true)
         ->setDescription(pht('Balanced secret key.')),
       $this->newOption('phortune.test.enabled', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Enable Test Provider'),
             pht('Disable Test Provider'),
           ))
         ->setSummary(pht('Enable test payment provider.'))
         ->setDescription(
           pht(
             "Enable the test payment provider.\n\n".
             "NOTE: Enabling this provider gives all users infinite free ".
             "money! You should enable it **ONLY** for testing and ".
             "development."))
         ->setLocked(true),
       $this->newOption('phortune.paypal.api-username', 'string', null)
         ->setLocked(true)
         ->setDescription(
           pht('PayPal API username.')),
       $this->newOption('phortune.paypal.api-password', 'string', null)
         ->setHidden(true)
         ->setDescription(
           pht('PayPal API password.')),
       $this->newOption('phortune.paypal.api-signature', 'string', null)
         ->setHidden(true)
         ->setDescription(
           pht('PayPal API signature.')),
       $this->newOption('phortune.wepay.client-id', 'string', null)
         ->setLocked(true)
         ->setDescription(pht('WePay application ID.')),
       $this->newOption('phortune.wepay.client-secret', 'string', null)
         ->setHidden(true)
         ->setDescription(pht('WePay application secret.')),
       $this->newOption('phortune.wepay.access-token', 'string', null)
         ->setHidden(true)
         ->setDescription(pht('WePay access token.')),
       $this->newOption('phortune.wepay.account-id', 'string', null)
         ->setLocked(true)
         ->setHidden(true)
         ->setDescription(pht('WePay account ID.')),
     );
   }
 
 }
diff --git a/src/applications/phortune/provider/PhortunePaypalPaymentProvider.php b/src/applications/phortune/provider/PhortunePaypalPaymentProvider.php
index a56cc5112..55c9b82b9 100644
--- a/src/applications/phortune/provider/PhortunePaypalPaymentProvider.php
+++ b/src/applications/phortune/provider/PhortunePaypalPaymentProvider.php
@@ -1,168 +1,168 @@
 <?php
 
 final class PhortunePaypalPaymentProvider extends PhortunePaymentProvider {
 
   public function isEnabled() {
     return $this->getPaypalAPIUsername() &&
            $this->getPaypalAPIPassword() &&
            $this->getPaypalAPISignature();
   }
 
   public function getProviderType() {
     return 'paypal';
   }
 
   public function getProviderDomain() {
     return 'paypal.com';
   }
 
   public function getPaymentMethodDescription() {
     return 'Paypal Account';
   }
 
   public function getPaymentMethodIcon() {
     return 'rsrc/phortune/paypal.png';
   }
 
   public function getPaymentMethodProviderDescription() {
-    return "Paypal";
+    return 'Paypal';
   }
 
 
   public function canHandlePaymentMethod(PhortunePaymentMethod $method) {
     $type = $method->getMetadataValue('type');
     return ($type == 'paypal');
   }
 
   protected function executeCharge(
     PhortunePaymentMethod $payment_method,
     PhortuneCharge $charge) {
-    throw new Exception("!");
+    throw new Exception('!');
   }
 
   private function getPaypalAPIUsername() {
     return PhabricatorEnv::getEnvConfig('phortune.paypal.api-username');
   }
 
   private function getPaypalAPIPassword() {
     return PhabricatorEnv::getEnvConfig('phortune.paypal.api-password');
   }
 
   private function getPaypalAPISignature() {
     return PhabricatorEnv::getEnvConfig('phortune.paypal.api-signature');
   }
 
 /* -(  One-Time Payments  )-------------------------------------------------- */
 
   public function canProcessOneTimePayments() {
     return true;
   }
 
   public function renderOneTimePaymentButton(
     PhortuneAccount $account,
     PhortuneCart $cart,
     PhabricatorUser $user) {
 
     $uri = $this->getControllerURI(
       'checkout',
       array(
         'cartID' => $cart->getID(),
       ));
 
     return phabricator_form(
       $user,
       array(
         'action' => $uri,
         'method' => 'POST',
       ),
       phutil_tag(
         'button',
         array(
           'class' => 'green',
           'type'  => 'submit',
         ),
         pht('Pay with Paypal')));
   }
 
 
 /* -(  Controllers  )-------------------------------------------------------- */
 
 
   public function canRespondToControllerAction($action) {
     switch ($action) {
       case 'checkout':
       case 'charge':
       case 'cancel':
         return true;
     }
     return parent::canRespondToControllerAction();
   }
 
   public function processControllerRequest(
     PhortuneProviderController $controller,
     AphrontRequest $request) {
 
     $cart = $controller->loadCart($request->getInt('cartID'));
     if (!$cart) {
       return new Aphront404Response();
     }
 
     switch ($controller->getAction()) {
       case 'checkout':
         $return_uri = $this->getControllerURI(
           'charge',
           array(
             'cartID' => $cart->getID(),
           ));
 
         $cancel_uri = $this->getControllerURI(
           'cancel',
           array(
             'cartID' => $cart->getID(),
           ));
 
         $total_in_cents = $cart->getTotalInCents();
         $price = PhortuneCurrency::newFromUSDCents($total_in_cents);
 
         $result = $this
           ->newPaypalAPICall()
           ->setRawPayPalQuery(
             'SetExpressCheckout',
             array(
               'PAYMENTREQUEST_0_AMT'            => $price->formatBareValue(),
               'PAYMENTREQUEST_0_CURRENCYCODE'   => $price->getCurrency(),
               'RETURNURL'                       => $return_uri,
               'CANCELURL'                       => $cancel_uri,
               'PAYMENTREQUEST_0_PAYMENTACTION'  => 'Sale',
               ))
           ->resolve();
 
         $uri = new PhutilURI('https://www.sandbox.paypal.com/cgi-bin/webscr');
         $uri->setQueryParams(
           array(
             'cmd'   => '_express-checkout',
             'token' => $result['TOKEN'],
           ));
 
         return id(new AphrontRedirectResponse())->setURI($uri);
       case 'charge':
         var_dump($_REQUEST);
         break;
       case 'cancel':
         var_dump($_REQUEST);
         break;
     }
 
     throw new Exception("The rest of this isn't implemented yet.");
   }
 
   private function newPaypalAPICall() {
     return id(new PhutilPayPalAPIFuture())
       ->setHost('https://api-3t.sandbox.paypal.com/nvp')
       ->setAPIUsername($this->getPaypalAPIUsername())
       ->setAPIPassword($this->getPaypalAPIPassword())
       ->setAPISignature($this->getPaypalAPISignature());
   }
 
 
 }
diff --git a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
index eee9e11b8..f7042c192 100644
--- a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
@@ -1,226 +1,226 @@
 <?php
 
 final class PhortuneStripePaymentProvider extends PhortunePaymentProvider {
 
   public function isEnabled() {
     return $this->getPublishableKey() &&
            $this->getSecretKey();
   }
 
   public function getProviderType() {
     return 'stripe';
   }
 
   public function getProviderDomain() {
     return 'stripe.com';
   }
 
   public function getPaymentMethodDescription() {
     return pht('Add Credit or Debit Card (US and Canada)');
   }
 
   public function getPaymentMethodIcon() {
     return celerity_get_resource_uri('/rsrc/image/phortune/stripe.png');
   }
 
   public function getPaymentMethodProviderDescription() {
     return pht('Processed by Stripe');
   }
 
 
   public function canHandlePaymentMethod(PhortunePaymentMethod $method) {
     $type = $method->getMetadataValue('type');
     return ($type === 'stripe.customer');
   }
 
   /**
    * @phutil-external-symbol class Stripe_Charge
    */
   protected function executeCharge(
     PhortunePaymentMethod $method,
     PhortuneCharge $charge) {
 
     $secret_key = $this->getSecretKey();
     $params = array(
       'amount'      => $charge->getAmountInCents(),
       'currency'    => 'usd',
       'customer'    => $method->getMetadataValue('stripe.customerID'),
       'description' => $charge->getPHID(),
       'capture'     => true,
     );
 
     $stripe_charge = Stripe_Charge::create($params, $secret_key);
     $id = $stripe_charge->id;
     if (!$id) {
-      throw new Exception("Stripe charge call did not return an ID!");
+      throw new Exception('Stripe charge call did not return an ID!');
     }
 
     $charge->setMetadataValue('stripe.chargeID', $id);
   }
 
   private function getPublishableKey() {
     return PhabricatorEnv::getEnvConfig('phortune.stripe.publishable-key');
   }
 
   private function getSecretKey() {
     return PhabricatorEnv::getEnvConfig('phortune.stripe.secret-key');
   }
 
 
 /* -(  Adding Payment Methods  )--------------------------------------------- */
 
 
   public function canCreatePaymentMethods() {
     return true;
   }
 
 
   /**
    * @phutil-external-symbol class Stripe_Token
    * @phutil-external-symbol class Stripe_Customer
    */
   public function createPaymentMethodFromRequest(
     AphrontRequest $request,
     PhortunePaymentMethod $method,
     array $token) {
 
     $errors = array();
 
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/externals/stripe-php/lib/Stripe.php';
 
     $secret_key = $this->getSecretKey();
     $stripe_token = $token['stripeCardToken'];
 
     // First, make sure the token is valid.
     $info = id(new Stripe_Token())->retrieve($stripe_token, $secret_key);
 
     $account_phid = $method->getAccountPHID();
     $author_phid = $method->getAuthorPHID();
 
     $params = array(
       'card' => $stripe_token,
       'description' => $account_phid.':'.$author_phid,
     );
 
     // Then, we need to create a Customer in order to be able to charge
     // the card more than once. We create one Customer for each card;
     // they do not map to PhortuneAccounts because we allow an account to
     // have more than one active card.
     $customer = Stripe_Customer::create($params, $secret_key);
 
     $card = $info->card;
     $method
       ->setBrand($card->type)
       ->setLastFourDigits($card->last4)
       ->setExpires($card->exp_year, $card->exp_month)
       ->setMetadata(
         array(
           'type' => 'stripe.customer',
           'stripe.customerID' => $customer->id,
           'stripe.cardToken' => $stripe_token,
         ));
 
     return $errors;
   }
 
   public function renderCreatePaymentMethodForm(
     AphrontRequest $request,
     array $errors) {
 
     $ccform = id(new PhortuneCreditCardForm())
       ->setUser($request->getUser())
       ->setErrors($errors)
       ->addScript('https://js.stripe.com/v2/');
 
     Javelin::initBehavior(
       'stripe-payment-form',
       array(
         'stripePublishableKey' => $this->getPublishableKey(),
         'formID'               => $ccform->getFormID(),
       ));
 
     return $ccform->buildForm();
   }
 
   private function getStripeShortErrorCode($error_code) {
     $prefix = 'cc:stripe:';
     if (strncmp($error_code, $prefix, strlen($prefix))) {
       return null;
     }
     return substr($error_code, strlen($prefix));
   }
 
   public function validateCreatePaymentMethodToken(array $token) {
     return isset($token['stripeCardToken']);
   }
 
   public function translateCreatePaymentMethodErrorCode($error_code) {
     $short_code = $this->getStripeShortErrorCode($error_code);
 
     if ($short_code) {
       static $map = array(
         'error:invalid_number'        => PhortuneErrCode::ERR_CC_INVALID_NUMBER,
         'error:invalid_cvc'           => PhortuneErrCode::ERR_CC_INVALID_CVC,
         'error:invalid_expiry_month'  => PhortuneErrCode::ERR_CC_INVALID_EXPIRY,
         'error:invalid_expiry_year'   => PhortuneErrCode::ERR_CC_INVALID_EXPIRY,
       );
 
       if (isset($map[$short_code])) {
         return $map[$short_code];
       }
     }
 
     return $error_code;
   }
 
   /**
    * See https://stripe.com/docs/api#errors for more information on possible
    * errors.
    */
   public function getCreatePaymentMethodErrorMessage($error_code) {
     $short_code = $this->getStripeShortErrorCode($error_code);
     if (!$short_code) {
       return null;
     }
 
     switch ($short_code) {
       case 'error:incorrect_number':
         $error_key = 'number';
         $message = pht('Invalid or incorrect credit card number.');
         break;
       case 'error:incorrect_cvc':
         $error_key = 'cvc';
         $message = pht('Card CVC is invalid or incorrect.');
         break;
         $error_key = 'exp';
         $message = pht('Card expiration date is invalid or incorrect.');
         break;
       case 'error:invalid_expiry_month':
       case 'error:invalid_expiry_year':
       case 'error:invalid_cvc':
       case 'error:invalid_number':
         // NOTE: These should be translated into Phortune error codes earlier,
         // so we don't expect to receive them here. They are listed for clarity
         // and completeness. If we encounter one, we treat it as an unknown
         // error.
         break;
       case 'error:invalid_amount':
       case 'error:missing':
       case 'error:card_declined':
       case 'error:expired_card':
       case 'error:duplicate_transaction':
       case 'error:processing_error':
       default:
         // NOTE: These errors currently don't recevive a detailed message.
         // NOTE: We can also end up here with "http:nnn" messages.
 
         // TODO: At least some of these should have a better message, or be
         // translated into common errors above.
         break;
     }
 
     return null;
   }
 
 }
diff --git a/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php b/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php
index 927feeba5..b496cf91c 100644
--- a/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php
+++ b/src/applications/phortune/provider/PhortuneWePayPaymentProvider.php
@@ -1,187 +1,187 @@
 <?php
 
 final class PhortuneWePayPaymentProvider extends PhortunePaymentProvider {
 
   public function isEnabled() {
     return $this->getWePayClientID() &&
            $this->getWePayClientSecret() &&
            $this->getWePayAccessToken() &&
            $this->getWePayAccountID();
   }
 
   public function getProviderType() {
     return 'wepay';
   }
 
   public function getProviderDomain() {
     return 'wepay.com';
   }
 
   public function getPaymentMethodDescription() {
     return pht('Credit Card or Bank Account');
   }
 
   public function getPaymentMethodIcon() {
     return 'rsrc/phortune/wepay.png';
   }
 
   public function getPaymentMethodProviderDescription() {
-    return "WePay";
+    return 'WePay';
   }
 
 
   public function canHandlePaymentMethod(PhortunePaymentMethod $method) {
     $type = $method->getMetadataValue('type');
     return ($type == 'wepay');
   }
 
   protected function executeCharge(
     PhortunePaymentMethod $payment_method,
     PhortuneCharge $charge) {
-    throw new Exception("!");
+    throw new Exception('!');
   }
 
   private function getWePayClientID() {
     return PhabricatorEnv::getEnvConfig('phortune.wepay.client-id');
   }
 
   private function getWePayClientSecret() {
     return PhabricatorEnv::getEnvConfig('phortune.wepay.client-secret');
   }
 
   private function getWePayAccessToken() {
     return PhabricatorEnv::getEnvConfig('phortune.wepay.access-token');
   }
 
   private function getWePayAccountID() {
     return PhabricatorEnv::getEnvConfig('phortune.wepay.account-id');
   }
 
 
 /* -(  One-Time Payments  )-------------------------------------------------- */
 
   public function canProcessOneTimePayments() {
     return true;
   }
 
   public function renderOneTimePaymentButton(
     PhortuneAccount $account,
     PhortuneCart $cart,
     PhabricatorUser $user) {
 
     $uri = $this->getControllerURI(
       'checkout',
       array(
         'cartID' => $cart->getID(),
       ));
 
     return phabricator_form(
       $user,
       array(
         'action' => $uri,
         'method' => 'POST',
       ),
       phutil_tag(
         'button',
         array(
           'class' => 'green',
           'type'  => 'submit',
         ),
         pht('Pay with WePay')));
   }
 
 
 /* -(  Controllers  )-------------------------------------------------------- */
 
 
   public function canRespondToControllerAction($action) {
     switch ($action) {
       case 'checkout':
       case 'charge':
       case 'cancel':
         return true;
     }
     return parent::canRespondToControllerAction();
   }
 
   /**
    * @phutil-external-symbol class WePay
    */
   public function processControllerRequest(
     PhortuneProviderController $controller,
     AphrontRequest $request) {
 
     $cart = $controller->loadCart($request->getInt('cartID'));
     if (!$cart) {
       return new Aphront404Response();
     }
 
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/externals/wepay/wepay.php';
 
     WePay::useStaging(
       $this->getWePayClientID(),
       $this->getWePayClientSecret());
 
     $wepay = new WePay($this->getWePayAccessToken());
 
     switch ($controller->getAction()) {
       case 'checkout':
         $return_uri = $this->getControllerURI(
           'charge',
           array(
             'cartID' => $cart->getID(),
           ));
 
         $cancel_uri = $this->getControllerURI(
           'cancel',
           array(
             'cartID' => $cart->getID(),
           ));
 
         $total_in_cents = $cart->getTotalInCents();
         $price = PhortuneCurrency::newFromUSDCents($total_in_cents);
 
         $params = array(
           'account_id'        => $this->getWePayAccountID(),
           'short_description' => 'Services', // TODO
           'type'              => 'SERVICE',
           'amount'            => $price->formatBareValue(),
           'long_description'  => 'Services', // TODO
           'reference_id'      => $cart->getPHID(),
           'app_fee'           => 0,
           'fee_payer'         => 'Payee',
           'redirect_uri'      => $return_uri,
           'fallback_uri'      => $cancel_uri,
           'auto_capture'      => false,
           'require_shipping'  => 0,
           'shipping_fee'      => 0,
           'charge_tax'        => 0,
           'mode'              => 'regular',
           'funding_sources'   => 'bank,cc'
         );
 
         $result = $wepay->request('checkout/create', $params);
 
         // NOTE: We might want to store "$result->checkout_id" on the Cart.
 
         $uri = new PhutilURI($result->checkout_uri);
         return id(new AphrontRedirectResponse())->setURI($uri);
       case 'charge':
 
         // NOTE: We get $_REQUEST['checkout_id'] here, but our parameters are
         // dropped so we should stop depending on them or shove them into the
         // URI.
 
         var_dump($_REQUEST);
         break;
       case 'cancel':
         var_dump($_REQUEST);
         break;
     }
 
     throw new Exception("The rest of this isn't implemented yet.");
   }
 
 
 }
diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php
index 0e43c418f..53a93b138 100644
--- a/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php
+++ b/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php
@@ -1,70 +1,70 @@
 <?php
 
 abstract class PhabricatorXHPASTViewPanelController
   extends PhabricatorXHPASTViewController {
 
   private $id;
   private $storageTree;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
     $this->storageTree = id(new PhabricatorXHPASTViewParseTree())
       ->load($this->id);
     if (!$this->storageTree) {
-      throw new Exception("No such AST!");
+      throw new Exception('No such AST!');
     }
   }
 
   protected function getStorageTree() {
     return $this->storageTree;
   }
 
   protected function buildXHPASTViewPanelResponse($content) {
     $content = hsprintf(
       '<!DOCTYPE html>'.
       '<html>'.
         '<head>'.
           '<style type="text/css">
 body {
   white-space: pre;
   font: 10px "Monaco";
   cursor: pointer;
 }
 
 .token {
   padding: 2px 4px;
   margin: 2px 2px;
   border: 1px solid #bbbbbb;
   line-height: 24px;
 }
 
 ul {
   margin: 0 0 0 1em;
   padding: 0;
   list-style: none;
   line-height: 1em;
 }
 
 li {
   margin: 0;
   padding: 0;
 }
 
 li span {
   background: #dddddd;
   padding: 3px 6px;
 }
 
           </style>'.
         '</head>'.
         '<body>%s</body>'.
       '</html>',
       $content);
 
     $response = new AphrontWebpageResponse();
     $response->setFrameable(true);
     $response->setContent($content);
     return $response;
   }
 
 }
diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
index 495a92c14..b7563d6c8 100644
--- a/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
+++ b/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
@@ -1,185 +1,185 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phragment_getpatch_Method
   extends ConduitAPI_phragment_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return pht("Retrieve the patches to apply for a given set of files.");
+    return pht('Retrieve the patches to apply for a given set of files.');
   }
 
   public function defineParamTypes() {
     return array(
       'path' => 'required string',
       'state' => 'required dict<string, string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_FRAGMENT' => 'No such fragment exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $path = $request->getValue('path');
     $state = $request->getValue('state');
     // The state is an array mapping file paths to hashes.
 
     $patches = array();
 
     // We need to get all of the mappings (like phragment.getstate) first
     // so that we can detect deletions and creations of files.
     $fragment = id(new PhragmentFragmentQuery())
       ->setViewer($request->getUser())
       ->withPaths(array($path))
       ->executeOne();
     if ($fragment === null) {
       throw new ConduitException('ERR_BAD_FRAGMENT');
     }
 
     $mappings = $fragment->getFragmentMappings(
       $request->getUser(),
       $fragment->getPath());
 
     $file_phids = mpull(mpull($mappings, 'getLatestVersion'), 'getFilePHID');
     $files = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($file_phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
 
     // Scan all of the files that the caller currently has and iterate
     // over that.
     foreach ($state as $path => $hash) {
       // If $mappings[$path] exists, then the user has the file and it's
       // also a fragment.
       if (array_key_exists($path, $mappings)) {
         $file_phid = $mappings[$path]->getLatestVersion()->getFilePHID();
         if ($file_phid !== null) {
           // If the file PHID is present, then we need to check the
           // hashes to see if they are the same.
           $hash_caller = strtolower($state[$path]);
           $hash_current = $files[$file_phid]->getContentHash();
           if ($hash_caller === $hash_current) {
             // The user's version is identical to our version, so
             // there is no update needed.
           } else {
             // The hash differs, and the user needs to update.
             $patches[] = array(
               'path' => $path,
               'fileOld' => null,
               'fileNew' => $files[$file_phid],
               'hashOld' => $hash_caller,
               'hashNew' => $hash_current,
               'patchURI' => null);
           }
         } else {
           // We have a record of this as a file, but there is no file
           // attached to the latest version, so we consider this to be
           // a deletion.
           $patches[] = array(
             'path' => $path,
             'fileOld' => null,
             'fileNew' => null,
             'hashOld' => $hash_caller,
             'hashNew' => PhragmentPatchUtil::EMPTY_HASH,
             'patchURI' => null);
         }
       } else {
         // If $mappings[$path] does not exist, then the user has a file,
         // and we have absolutely no record of it what-so-ever (we haven't
         // even recorded a deletion).  Assuming most applications will store
         // some form of data near their own files, this is probably a data
         // file relevant for the application that is not versioned, so we
         // don't tell the client to do anything with it.
       }
     }
 
     // Check the remaining files that we know about but the caller has
     // not reported.
     foreach ($mappings as $path => $child) {
       if (array_key_exists($path, $state)) {
         // We have already evaluated this above.
       } else {
         $file_phid = $mappings[$path]->getLatestVersion()->getFilePHID();
         if ($file_phid !== null) {
           // If the file PHID is present, then this is a new file that
           // we know about, but the caller does not.  We need to tell
           // the caller to create the file.
           $hash_current = $files[$file_phid]->getContentHash();
           $patches[] = array(
             'path' => $path,
             'fileOld' => null,
             'fileNew' => $files[$file_phid],
             'hashOld' => PhragmentPatchUtil::EMPTY_HASH,
             'hashNew' => $hash_current,
             'patchURI' => null);
         } else {
           // We have a record of deleting this file, and the caller hasn't
           // reported it, so they've probably deleted it in a previous
           // update.
         }
       }
     }
 
     // Before we can calculate patches, we need to resolve the old versions
     // of files so we can draw diffs on them.
     $hashes = array();
     foreach ($patches as $patch) {
-      if ($patch["hashOld"] !== PhragmentPatchUtil::EMPTY_HASH) {
-        $hashes[] = $patch["hashOld"];
+      if ($patch['hashOld'] !== PhragmentPatchUtil::EMPTY_HASH) {
+        $hashes[] = $patch['hashOld'];
       }
     }
     $old_files = array();
     if (count($hashes) !== 0) {
       $old_files = id(new PhabricatorFileQuery())
         ->setViewer($request->getUser())
         ->withContentHashes($hashes)
         ->execute();
     }
     $old_files = mpull($old_files, null, 'getContentHash');
     foreach ($patches as $key => $patch) {
-      if ($patch["hashOld"] !== PhragmentPatchUtil::EMPTY_HASH) {
+      if ($patch['hashOld'] !== PhragmentPatchUtil::EMPTY_HASH) {
         if (array_key_exists($patch['hashOld'], $old_files)) {
           $patches[$key]['fileOld'] = $old_files[$patch['hashOld']];
         } else {
           // We either can't see or can't read the old file.
           $patches[$key]['hashOld'] = PhragmentPatchUtil::EMPTY_HASH;
           $patches[$key]['fileOld'] = null;
         }
       }
     }
 
     // Now run through all of the patch entries, calculate the patches
     // and return the results.
     foreach ($patches as $key => $patch) {
       $data = PhragmentPatchUtil::calculatePatch(
         $patches[$key]['fileOld'],
         $patches[$key]['fileNew']);
       unset($patches[$key]['fileOld']);
       unset($patches[$key]['fileNew']);
 
       $file = PhabricatorFile::buildFromFileDataOrHash(
         $data,
         array(
           'name' => 'patch.dmp',
           'ttl' => time() + 60 * 60 * 24,
         ));
       $patches[$key]['patchURI'] = $file->getDownloadURI();
     }
 
     return $patches;
   }
 
 }
diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
index d08c6c42e..7d5f6cff5 100644
--- a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
+++ b/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
@@ -1,83 +1,83 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_phragment_queryfragments_Method
   extends ConduitAPI_phragment_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return pht("Query fragments based on their paths.");
+    return pht('Query fragments based on their paths.');
   }
 
   public function defineParamTypes() {
     return array(
       'paths' => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_FRAGMENT' => 'No such fragment exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $paths = $request->getValue('paths');
 
     $fragments = id(new PhragmentFragmentQuery())
       ->setViewer($request->getUser())
       ->withPaths($paths)
       ->execute();
     $fragments = mpull($fragments, null, 'getPath');
     foreach ($paths as $path) {
       if (!array_key_exists($path, $fragments)) {
         throw new ConduitException('ERR_BAD_FRAGMENT');
       }
     }
 
     $results = array();
     foreach ($fragments as $path => $fragment) {
       $mappings = $fragment->getFragmentMappings(
         $request->getUser(),
         $fragment->getPath());
 
       $file_phids = mpull(mpull($mappings, 'getLatestVersion'), 'getFilePHID');
       $files = id(new PhabricatorFileQuery())
         ->setViewer($request->getUser())
         ->withPHIDs($file_phids)
         ->execute();
       $files = mpull($files, null, 'getPHID');
 
       $result = array();
       foreach ($mappings as $cpath => $child) {
         $file_phid = $child->getLatestVersion()->getFilePHID();
         if (!isset($files[$file_phid])) {
           // Skip any files we don't have permission to access.
           continue;
         }
 
         $file = $files[$file_phid];
         $cpath = substr($child->getPath(), strlen($fragment->getPath()) + 1);
         $result[] = array(
           'phid' => $child->getPHID(),
           'phidVersion' => $child->getLatestVersionPHID(),
           'path' => $cpath,
           'hash' => $file->getContentHash(),
           'version' => $child->getLatestVersion()->getSequence(),
           'uri' => $file->getViewURI());
       }
       $results[$path] = $result;
     }
     return $results;
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentBrowseController.php b/src/applications/phragment/controller/PhragmentBrowseController.php
index f4f5d9ad5..e40a1426a 100644
--- a/src/applications/phragment/controller/PhragmentBrowseController.php
+++ b/src/applications/phragment/controller/PhragmentBrowseController.php
@@ -1,97 +1,97 @@
 <?php
 
 final class PhragmentBrowseController extends PhragmentController {
 
   private $dblob;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
+    $this->dblob = idx($data, 'dblob', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     $current = nonempty(last($parents), null);
 
     $path = '';
     if ($current !== null) {
       $path = $current->getPath();
     }
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     if ($this->hasApplicationCapability(
       PhragmentCapabilityCanCreate::CAPABILITY)) {
       $crumbs->addAction(
         id(new PHUIListItemView())
           ->setName(pht('Create Fragment'))
           ->setHref($this->getApplicationURI('/create/'.$path))
           ->setIcon('fa-plus-square'));
     }
 
     $current_box = $this->createCurrentFragmentView($current, false);
 
     $list = id(new PHUIObjectItemListView())
       ->setUser($viewer);
 
     $fragments = null;
     if ($current === null) {
       // Find all root fragments.
       $fragments = id(new PhragmentFragmentQuery())
         ->setViewer($this->getRequest()->getUser())
         ->needLatestVersion(true)
         ->withDepths(array(1))
         ->execute();
     } else {
       // Find all child fragments.
       $fragments = id(new PhragmentFragmentQuery())
         ->setViewer($this->getRequest()->getUser())
         ->needLatestVersion(true)
         ->withLeadingPath($current->getPath().'/')
         ->withDepths(array($current->getDepth() + 1))
         ->execute();
     }
 
     foreach ($fragments as $fragment) {
       $item = id(new PHUIObjectItemView());
       $item->setHeader($fragment->getName());
       $item->setHref($fragment->getURI());
       if (!$fragment->isDirectory()) {
         $item->addAttribute(pht(
           'Last Updated %s',
           phabricator_datetime(
             $fragment->getLatestVersion()->getDateCreated(),
             $viewer)));
         $item->addAttribute(pht(
           'Latest Version %s',
           $fragment->getLatestVersion()->getSequence()));
         if ($fragment->isDeleted()) {
           $item->setDisabled(true);
           $item->addAttribute(pht('Deleted'));
         }
       } else {
         $item->addAttribute('Directory');
       }
       $list->addItem($item);
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $current_box,
         $list),
       array(
         'title' => pht('Browse Fragments'),
         'device' => true));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php
index 0b875ea35..586c28f4a 100644
--- a/src/applications/phragment/controller/PhragmentController.php
+++ b/src/applications/phragment/controller/PhragmentController.php
@@ -1,233 +1,233 @@
 <?php
 
 abstract class PhragmentController extends PhabricatorController {
 
   protected function loadParentFragments($path) {
     $components = explode('/', $path);
 
     $combinations = array();
     $current = '';
     foreach ($components as $component) {
       $current .= '/'.$component;
       $current = trim($current, '/');
       if (trim($current) === '') {
         continue;
       }
 
       $combinations[] = $current;
     }
 
     $fragments = array();
     $results = id(new PhragmentFragmentQuery())
       ->setViewer($this->getRequest()->getUser())
       ->needLatestVersion(true)
       ->withPaths($combinations)
       ->execute();
     foreach ($combinations as $combination) {
       $found = false;
       foreach ($results as $fragment) {
         if ($fragment->getPath() === $combination) {
           $fragments[] = $fragment;
           $found = true;
           break;
         }
       }
       if (!$found) {
         return null;
       }
     }
     return $fragments;
   }
 
   protected function buildApplicationCrumbsWithPath(array $fragments) {
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb('/', '/phragment/');
     foreach ($fragments as $parent) {
       $crumbs->addTextCrumb(
         $parent->getName(),
         '/phragment/browse/'.$parent->getPath());
     }
     return $crumbs;
   }
 
   protected function createCurrentFragmentView($fragment, $is_history_view) {
     if ($fragment === null) {
       return null;
     }
 
     $viewer = $this->getRequest()->getUser();
 
     $phids = array();
     $phids[] = $fragment->getLatestVersionPHID();
 
     $snapshot_phids = array();
     $snapshots = id(new PhragmentSnapshotQuery())
       ->setViewer($viewer)
       ->withPrimaryFragmentPHIDs(array($fragment->getPHID()))
       ->execute();
     foreach ($snapshots as $snapshot) {
       $phids[] = $snapshot->getPHID();
       $snapshot_phids[] = $snapshot->getPHID();
     }
 
     $this->loadHandles($phids);
 
     $file = null;
     $file_uri = null;
     if (!$fragment->isDirectory()) {
       $file = id(new PhabricatorFileQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($fragment->getLatestVersion()->getFilePHID()))
         ->executeOne();
       if ($file !== null) {
         $file_uri = $file->getDownloadURI();
       }
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader($fragment->getName())
       ->setPolicyObject($fragment)
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $fragment,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $zip_uri = $this->getApplicationURI("zip/".$fragment->getPath());
+    $zip_uri = $this->getApplicationURI('zip/'.$fragment->getPath());
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($fragment)
       ->setObjectURI($fragment->getURI());
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Download Fragment'))
         ->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
         ->setDisabled($file === null || !$this->isCorrectlyConfigured())
         ->setIcon('fa-download'));
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Download Contents as ZIP'))
         ->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
         ->setDisabled(!$this->isCorrectlyConfigured())
         ->setIcon('fa-floppy-o'));
     if (!$fragment->isDirectory()) {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Update Fragment'))
-          ->setHref($this->getApplicationURI("update/".$fragment->getPath()))
+          ->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit)
           ->setIcon('fa-refresh'));
     } else {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Convert to File'))
-          ->setHref($this->getApplicationURI("update/".$fragment->getPath()))
+          ->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit)
           ->setIcon('fa-file-o'));
     }
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Set Fragment Policies'))
-        ->setHref($this->getApplicationURI("policy/".$fragment->getPath()))
+        ->setHref($this->getApplicationURI('policy/'.$fragment->getPath()))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit)
         ->setIcon('fa-asterisk'));
     if ($is_history_view) {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View Child Fragments'))
-          ->setHref($this->getApplicationURI("browse/".$fragment->getPath()))
+          ->setHref($this->getApplicationURI('browse/'.$fragment->getPath()))
           ->setIcon('fa-search-plus'));
     } else {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View History'))
-          ->setHref($this->getApplicationURI("history/".$fragment->getPath()))
+          ->setHref($this->getApplicationURI('history/'.$fragment->getPath()))
           ->setIcon('fa-list'));
     }
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Create Snapshot'))
         ->setHref($this->getApplicationURI(
-          "snapshot/create/".$fragment->getPath()))
+          'snapshot/create/'.$fragment->getPath()))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit)
         ->setIcon('fa-files-o'));
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Promote Snapshot to Here'))
         ->setHref($this->getApplicationURI(
-          "snapshot/promote/latest/".$fragment->getPath()))
+          'snapshot/promote/latest/'.$fragment->getPath()))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-arrow-circle-up'));
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($fragment)
       ->setActionList($actions);
 
     if (!$fragment->isDirectory()) {
       if ($fragment->isDeleted()) {
         $properties->addProperty(
           pht('Type'),
           pht('File (Deleted)'));
       } else {
         $properties->addProperty(
           pht('Type'),
           pht('File'));
       }
       $properties->addProperty(
         pht('Latest Version'),
         $this->renderHandlesForPHIDs(array($fragment->getLatestVersionPHID())));
     } else {
       $properties->addProperty(
         pht('Type'),
         pht('Directory'));
     }
 
     if (count($snapshot_phids) > 0) {
       $properties->addProperty(
         pht('Snapshots'),
         $this->renderHandlesForPHIDs($snapshot_phids));
     }
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
   }
 
   function renderConfigurationWarningIfRequired() {
-    $alt = PhabricatorEnv::getEnvConfig("security.alternate-file-domain");
+    $alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
     if ($alt === null) {
       return id(new AphrontErrorView())
         ->setTitle(pht('security.alternate-file-domain must be configured!'))
         ->setSeverity(AphrontErrorView::SEVERITY_ERROR)
         ->appendChild(phutil_tag('p', array(), pht(
           'Because Phragment generates files (such as ZIP archives and '.
           'patches) as they are requested, it requires that you configure '.
           'the `security.alterate-file-domain` option.  This option on it\'s '.
           'own will also provide additional security when serving files '.
           'across Phabricator.')));
     }
     return null;
   }
 
   /**
    * We use this to disable the download links if the alternate domain is
    * not configured correctly.  Although the download links will mostly work
    * for logged in users without an alternate domain, the behaviour is
    * reasonably non-consistent and will deny public users, even if policies
    * are configured otherwise (because the Files app does not support showing
    * the info page to viewers who are not logged in).
    */
   function isCorrectlyConfigured() {
-    $alt = PhabricatorEnv::getEnvConfig("security.alternate-file-domain");
+    $alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
     return $alt !== null;
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentCreateController.php b/src/applications/phragment/controller/PhragmentCreateController.php
index 564091337..e07bb1414 100644
--- a/src/applications/phragment/controller/PhragmentCreateController.php
+++ b/src/applications/phragment/controller/PhragmentCreateController.php
@@ -1,131 +1,131 @@
 <?php
 
 final class PhragmentCreateController extends PhragmentController {
 
   private $dblob;
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
+    $this->dblob = idx($data, 'dblob', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parent = null;
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     if (count($parents) !== 0) {
       $parent = idx($parents, count($parents) - 1, null);
     }
 
     $parent_path = '';
     if ($parent !== null) {
       $parent_path = $parent->getPath();
     }
     $parent_path = trim($parent_path, '/');
 
     $fragment = id(new PhragmentFragment());
 
     $error_view = null;
 
     if ($request->isFormPost()) {
       $errors = array();
 
       $v_name = $request->getStr('name');
       $v_fileid = $request->getInt('fileID');
       $v_viewpolicy = $request->getStr('viewPolicy');
       $v_editpolicy = $request->getStr('editPolicy');
 
       if (strpos($v_name, '/') !== false) {
         $errors[] = pht('The fragment name can not contain \'/\'.');
       }
 
       $file = id(new PhabricatorFile())->load($v_fileid);
       if ($file === null) {
         $errors[] = pht('The specified file doesn\'t exist.');
       }
 
       if (!count($errors)) {
         $depth = 1;
         if ($parent !== null) {
           $depth = $parent->getDepth() + 1;
         }
 
         PhragmentFragment::createFromFile(
           $viewer,
           $file,
           trim($parent_path.'/'.$v_name, '/'),
           $v_viewpolicy,
           $v_editpolicy);
 
         return id(new AphrontRedirectResponse())
           ->setURI('/phragment/browse/'.trim($parent_path.'/'.$v_name, '/'));
       } else {
         $error_view = id(new AphrontErrorView())
           ->setErrors($errors)
           ->setTitle(pht('Errors while creating fragment'));
       }
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($fragment)
       ->execute();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Parent Path'))
           ->setDisabled(true)
           ->setValue('/'.trim($parent_path.'/', '/')))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Name'))
           ->setName('name'))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('File ID'))
           ->setName('fileID'))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($viewer)
           ->setName('viewPolicy')
           ->setPolicyObject($fragment)
           ->setPolicies($policies)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($viewer)
           ->setName('editPolicy')
           ->setPolicyObject($fragment)
           ->setPolicies($policies)
           ->setCapability(PhabricatorPolicyCapability::CAN_EDIT))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Create Fragment'))
           ->addCancelButton(
             $this->getApplicationURI('browse/'.$parent_path)));
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     $crumbs->addTextCrumb(pht('Create Fragment'));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText('Create Fragment')
       ->setValidationException(null)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $box),
       array(
         'title' => pht('Create Fragment'),
         'device' => true));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentHistoryController.php b/src/applications/phragment/controller/PhragmentHistoryController.php
index 396a2a38b..205f9eec0 100644
--- a/src/applications/phragment/controller/PhragmentHistoryController.php
+++ b/src/applications/phragment/controller/PhragmentHistoryController.php
@@ -1,111 +1,111 @@
 <?php
 
 final class PhragmentHistoryController extends PhragmentController {
 
   private $dblob;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
+    $this->dblob = idx($data, 'dblob', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     $current = idx($parents, count($parents) - 1, null);
 
     $path = $current->getPath();
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     if ($this->hasApplicationCapability(
       PhragmentCapabilityCanCreate::CAPABILITY)) {
       $crumbs->addAction(
         id(new PHUIListItemView())
           ->setName(pht('Create Fragment'))
           ->setHref($this->getApplicationURI('/create/'.$path))
           ->setIcon('fa-plus-square'));
     }
 
     $current_box = $this->createCurrentFragmentView($current, true);
 
     $versions = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($current->getPHID()))
       ->execute();
 
     $list = id(new PHUIObjectItemListView())
       ->setUser($viewer);
 
     $file_phids = mpull($versions, 'getFilePHID');
     $files = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withPHIDs($file_phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $current,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $first = true;
     foreach ($versions as $version) {
       $item = id(new PHUIObjectItemView());
       $item->setHeader('Version '.$version->getSequence());
       $item->setHref($version->getURI());
       $item->addAttribute(phabricator_datetime(
         $version->getDateCreated(),
         $viewer));
 
       if ($version->getFilePHID() === null) {
         $item->setDisabled(true);
         $item->addAttribute('Deletion');
       }
 
       if (!$first && $can_edit) {
         $item->addAction(id(new PHUIListItemView())
           ->setIcon('fa-refresh')
           ->setRenderNameAsTooltip(true)
           ->setWorkflow(true)
-          ->setName(pht("Revert to Here"))
+          ->setName(pht('Revert to Here'))
           ->setHref($this->getApplicationURI(
-            "revert/".$version->getID()."/".$current->getPath())));
+            'revert/'.$version->getID().'/'.$current->getPath())));
       }
 
       $disabled = !isset($files[$version->getFilePHID()]);
       $action = id(new PHUIListItemView())
         ->setIcon('fa-download')
         ->setDisabled($disabled || !$this->isCorrectlyConfigured())
         ->setRenderNameAsTooltip(true)
-        ->setName(pht("Download"));
+        ->setName(pht('Download'));
       if (!$disabled && $this->isCorrectlyConfigured()) {
         $action->setHref($files[$version->getFilePHID()]
           ->getDownloadURI($version->getURI()));
       }
       $item->addAction($action);
 
       $list->addItem($item);
 
       $first = false;
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $current_box,
         $list),
       array(
         'title' => pht('Fragment History'),
         'device' => true));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentPatchController.php b/src/applications/phragment/controller/PhragmentPatchController.php
index b3f6b6bfa..8d7b497f2 100644
--- a/src/applications/phragment/controller/PhragmentPatchController.php
+++ b/src/applications/phragment/controller/PhragmentPatchController.php
@@ -1,104 +1,104 @@
 <?php
 
 final class PhragmentPatchController extends PhragmentController {
 
   private $aid;
   private $bid;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
-    $this->aid = idx($data, "aid", 0);
-    $this->bid = idx($data, "bid", 0);
+    $this->aid = idx($data, 'aid', 0);
+    $this->bid = idx($data, 'bid', 0);
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     // If "aid" is "x", then it means the user wants to generate
     // a patch of an empty file to the version specified by "bid".
 
     $ids = array($this->aid, $this->bid);
-    if ($this->aid === "x") {
+    if ($this->aid === 'x') {
       $ids = array($this->bid);
     }
 
     $versions = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->execute();
 
     $version_a = null;
-    if ($this->aid !== "x") {
+    if ($this->aid !== 'x') {
       $version_a = idx($versions, $this->aid, null);
       if ($version_a === null) {
         return new Aphront404Response();
       }
     }
 
     $version_b = idx($versions, $this->bid, null);
     if ($version_b === null) {
       return new Aphront404Response();
     }
 
     $file_phids = array();
     if ($version_a !== null) {
       $file_phids[] = $version_a->getFilePHID();
     }
     $file_phids[] = $version_b->getFilePHID();
 
     $files = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withPHIDs($file_phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
 
     $file_a = null;
     if ($version_a != null) {
       $file_a = idx($files, $version_a->getFilePHID(), null);
     }
     $file_b = idx($files, $version_b->getFilePHID(), null);
 
     $patch = PhragmentPatchUtil::calculatePatch($file_a, $file_b);
 
     if ($patch === null) {
       // There are no differences between the two files, so we output
       // an empty patch.
       $patch = '';
     }
 
     $a_sequence = 'x';
     if ($version_a !== null) {
       $a_sequence = $version_a->getSequence();
     }
 
     $name =
       $version_b->getFragment()->getName().'.'.
       $a_sequence.'.'.
       $version_b->getSequence().'.patch';
 
     $return = $version_b->getURI();
     if ($request->getExists('return')) {
       $return = $request->getStr('return');
     }
 
     $result = PhabricatorFile::buildFromFileDataOrHash(
       $patch,
       array(
         'name' => $name,
         'mime-type' => 'text/plain',
         'ttl' => time() + 60 * 60 * 24,
       ));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $result->attachToObject($viewer, $version_b->getFragmentPHID());
     unset($unguarded);
 
     return id(new AphrontRedirectResponse())
       ->setURI($result->getDownloadURI($return));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentPolicyController.php b/src/applications/phragment/controller/PhragmentPolicyController.php
index b135e23f5..dc8da7119 100644
--- a/src/applications/phragment/controller/PhragmentPolicyController.php
+++ b/src/applications/phragment/controller/PhragmentPolicyController.php
@@ -1,108 +1,108 @@
 <?php
 
 final class PhragmentPolicyController extends PhragmentController {
 
   private $dblob;
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
+    $this->dblob = idx($data, 'dblob', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     $fragment = idx($parents, count($parents) - 1, null);
 
     $error_view = null;
 
     if ($request->isFormPost()) {
       $errors = array();
 
       $v_view_policy = $request->getStr('viewPolicy');
       $v_edit_policy = $request->getStr('editPolicy');
       $v_replace_children = $request->getBool('replacePoliciesOnChildren');
 
       $fragment->setViewPolicy($v_view_policy);
       $fragment->setEditPolicy($v_edit_policy);
 
       $fragment->save();
 
       if ($v_replace_children) {
         // If you can edit a fragment, you can forcibly set the policies
         // on child fragments, regardless of whether you can see them or not.
         $children = id(new PhragmentFragmentQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withLeadingPath($fragment->getPath().'/')
           ->execute();
         $children_phids = mpull($children, 'getPHID');
 
         $fragment->openTransaction();
           foreach ($children as $child) {
             $child->setViewPolicy($v_view_policy);
             $child->setEditPolicy($v_edit_policy);
             $child->save();
           }
         $fragment->saveTransaction();
       }
 
       return id(new AphrontRedirectResponse())
         ->setURI('/phragment/browse/'.$fragment->getPath());
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($fragment)
       ->execute();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setName('viewPolicy')
           ->setPolicyObject($fragment)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
           ->setPolicies($policies))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setName('editPolicy')
           ->setPolicyObject($fragment)
           ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
           ->setPolicies($policies))
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'replacePoliciesOnChildren',
             'true',
             pht(
               'Replace policies on child fragments with '.
               'the policies above.')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Fragment Policies'))
           ->addCancelButton(
             $this->getApplicationURI('browse/'.$fragment->getPath())));
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     $crumbs->addTextCrumb(pht('Edit Fragment Policies'));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Edit Fragment Policies: %s', $fragment->getPath()))
       ->setValidationException(null)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $box),
       array(
         'title' => pht('Edit Fragment Policies'),
         'device' => true));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentRevertController.php b/src/applications/phragment/controller/PhragmentRevertController.php
index b9943a6a6..ccf5d3299 100644
--- a/src/applications/phragment/controller/PhragmentRevertController.php
+++ b/src/applications/phragment/controller/PhragmentRevertController.php
@@ -1,87 +1,87 @@
 <?php
 
 final class PhragmentRevertController extends PhragmentController {
 
   private $dblob;
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->dblob = $data['dblob'];
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $fragment = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->withPaths(array($this->dblob))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if ($fragment === null) {
       return new Aphront404Response();
     }
 
     $version = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($fragment->getPHID()))
       ->withIDs(array($this->id))
       ->executeOne();
     if ($version === null) {
       return new Aphront404Response();
     }
 
     if ($request->isDialogFormPost()) {
       $file_phid = $version->getFilePHID();
 
       $file = null;
       if ($file_phid !== null) {
         $file = id(new PhabricatorFileQuery())
           ->setViewer($viewer)
           ->withPHIDs(array($file_phid))
           ->executeOne();
         if ($file === null) {
           throw new Exception(
-            "The file associated with this version was not found.");
+            'The file associated with this version was not found.');
         }
       }
 
       if ($file === null) {
         $fragment->deleteFile($viewer);
       } else {
         $fragment->updateFromFile($viewer, $file);
       }
 
       return id(new AphrontRedirectResponse())
         ->setURI($this->getApplicationURI('/history/'.$this->dblob));
     }
 
     return $this->createDialog($fragment, $version);
   }
 
   function createDialog(
     PhragmentFragment $fragment,
     PhragmentFragmentVersion $version) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setTitle(pht('Really revert this fragment?'))
       ->setUser($request->getUser())
       ->addSubmitButton(pht('Revert'))
       ->addCancelButton(pht('Cancel'))
       ->appendParagraph(pht(
-        "Reverting this fragment to version %d will create a new version of ".
-        "the fragment.  It will not delete any version history.",
+        'Reverting this fragment to version %d will create a new version of '.
+        'the fragment.  It will not delete any version history.',
         $version->getSequence(),
         $version->getSequence()));
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php
index a689b9951..579885f5f 100644
--- a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php
@@ -1,168 +1,168 @@
 <?php
 
 final class PhragmentSnapshotCreateController extends PhragmentController {
 
   private $dblob;
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
+    $this->dblob = idx($data, 'dblob', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     $fragment = nonempty(last($parents), null);
     if ($fragment === null) {
       return new Aphront404Response();
     }
 
     PhabricatorPolicyFilter::requireCapability(
       $viewer,
       $fragment,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $children = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->needLatestVersion(true)
       ->withLeadingPath($fragment->getPath().'/')
       ->execute();
 
     $errors = array();
     if ($request->isFormPost()) {
 
       $v_name = $request->getStr('name');
       if (strlen($v_name) === 0) {
         $errors[] = pht('You must specify a name.');
       }
       if (strpos($v_name, '/') !== false) {
         $errors[] = pht('Snapshot names can not contain "/".');
       }
 
       if (!count($errors)) {
         $snapshot = null;
 
         try {
           // Create the snapshot.
           $snapshot = id(new PhragmentSnapshot())
             ->setPrimaryFragmentPHID($fragment->getPHID())
             ->setName($v_name)
             ->save();
         } catch (AphrontQueryDuplicateKeyException $e) {
           $errors[] = pht('A snapshot with this name already exists.');
         }
 
         if (!count($errors)) {
           // Add the primary fragment.
           id(new PhragmentSnapshotChild())
             ->setSnapshotPHID($snapshot->getPHID())
             ->setFragmentPHID($fragment->getPHID())
             ->setFragmentVersionPHID($fragment->getLatestVersionPHID())
             ->save();
 
           // Add all of the child fragments.
           foreach ($children as $child) {
             id(new PhragmentSnapshotChild())
               ->setSnapshotPHID($snapshot->getPHID())
               ->setFragmentPHID($child->getPHID())
               ->setFragmentVersionPHID($child->getLatestVersionPHID())
               ->save();
           }
 
           return id(new AphrontRedirectResponse())
             ->setURI('/phragment/snapshot/view/'.$snapshot->getID());
         }
       }
     }
 
-    $fragment_sequence = "-";
+    $fragment_sequence = '-';
     if ($fragment->getLatestVersion() !== null) {
       $fragment_sequence = $fragment->getLatestVersion()->getSequence();
     }
 
     $rows = array();
     $rows[] = phutil_tag(
       'tr',
       array(),
       array(
         phutil_tag('th', array(), 'Fragment'),
         phutil_tag('th', array(), 'Version')));
     $rows[] = phutil_tag(
       'tr',
       array(),
       array(
         phutil_tag('td', array(), $fragment->getPath()),
         phutil_tag('td', array(), $fragment_sequence)));
     foreach ($children as $child) {
-      $sequence = "-";
+      $sequence = '-';
       if ($child->getLatestVersion() !== null) {
         $sequence = $child->getLatestVersion()->getSequence();
       }
       $rows[] = phutil_tag(
         'tr',
         array(),
         array(
           phutil_tag('td', array(), $child->getPath()),
           phutil_tag('td', array(), $sequence)));
     }
 
     $table = phutil_tag(
       'table',
       array('class' => 'remarkup-table'),
       $rows);
 
     $container = phutil_tag(
       'div',
       array('class' => 'phabricator-remarkup'),
       array(
         phutil_tag(
           'p',
           array(),
           pht(
-            "The snapshot will contain the following fragments at ".
-            "the specified versions: ")),
+            'The snapshot will contain the following fragments at '.
+            'the specified versions: ')),
         $table));
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Fragment Path'))
           ->setDisabled(true)
           ->setValue('/'.$fragment->getPath()))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Snapshot Name'))
           ->setName('name'))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Create Snapshot'))
           ->addCancelButton(
             $this->getApplicationURI('browse/'.$fragment->getPath())))
       ->appendChild(
         id(new PHUIFormDividerControl()))
       ->appendInstructions($container);
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     $crumbs->addTextCrumb(pht('Create Snapshot'));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Create Snapshot of %s', $fragment->getName()))
       ->setFormErrors($errors)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $box),
       array(
         'title' => pht('Create Fragment'),
         'device' => true));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
index 902e51e1d..4c94e5d28 100644
--- a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
@@ -1,53 +1,53 @@
 <?php
 
 final class PhragmentSnapshotDeleteController extends PhragmentController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $snapshot = id(new PhragmentSnapshotQuery())
       ->setViewer($viewer)
       ->requireCapabilities(array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT))
       ->withIDs(array($this->id))
       ->executeOne();
     if ($snapshot === null) {
       return new Aphront404Response();
     }
 
     if ($request->isDialogFormPost()) {
       $fragment_uri = $snapshot->getPrimaryFragment()->getURI();
 
       $snapshot->delete();
 
       return id(new AphrontRedirectResponse())
         ->setURI($fragment_uri);
     }
 
     return $this->createDialog();
   }
 
   function createDialog() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setTitle(pht('Really delete this snapshot?'))
       ->setUser($request->getUser())
       ->addSubmitButton(pht('Delete'))
       ->addCancelButton(pht('Cancel'))
       ->appendParagraph(pht(
-        "Deleting this snapshot is a permanent operation.  You can not ".
-        "recover the state of the snapshot."));
+        'Deleting this snapshot is a permanent operation.  You can not '.
+        'recover the state of the snapshot.'));
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
index 9876c69e3..fe08f9901 100644
--- a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
@@ -1,192 +1,192 @@
 <?php
 
 final class PhragmentSnapshotPromoteController extends PhragmentController {
 
   private $dblob;
   private $id;
   private $targetSnapshot;
   private $targetFragment;
   private $snapshots;
   private $options;
 
   public function willProcessRequest(array $data) {
     $this->dblob = idx($data, 'dblob', null);
     $this->id = idx($data, 'id', null);
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     // When the user is promoting a snapshot to the latest version, the
     // identifier is a fragment path.
     if ($this->dblob !== null) {
       $this->targetFragment = id(new PhragmentFragmentQuery())
         ->setViewer($viewer)
         ->requireCapabilities(array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT))
         ->withPaths(array($this->dblob))
         ->executeOne();
       if ($this->targetFragment === null) {
         return new Aphront404Response();
       }
 
       $this->snapshots = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withPrimaryFragmentPHIDs(array($this->targetFragment->getPHID()))
         ->execute();
     }
 
     // When the user is promoting a snapshot to another snapshot, the
     // identifier is another snapshot ID.
     if ($this->id !== null) {
       $this->targetSnapshot = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->requireCapabilities(array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT))
         ->withIDs(array($this->id))
         ->executeOne();
       if ($this->targetSnapshot === null) {
         return new Aphront404Response();
       }
 
       $this->snapshots = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withPrimaryFragmentPHIDs(array(
           $this->targetSnapshot->getPrimaryFragmentPHID()))
         ->execute();
     }
 
     // If there's no identifier, just 404.
     if ($this->snapshots === null) {
       return new Aphront404Response();
     }
 
     // Work out what options the user has.
     $this->options = mpull(
       $this->snapshots,
       'getName',
       'getID');
     if ($this->id !== null) {
       unset($this->options[$this->id]);
     }
 
     // If there's no options, show a dialog telling the
     // user there are no snapshots to promote.
     if (count($this->options) === 0) {
       return id(new AphrontDialogResponse())->setDialog(
         id(new AphrontDialogView())
           ->setTitle(pht('No snapshots to promote'))
           ->appendParagraph(pht(
-            "There are no snapshots available to promote."))
+            'There are no snapshots available to promote.'))
           ->setUser($request->getUser())
           ->addCancelButton(pht('Cancel')));
     }
 
     // Handle snapshot promotion.
     if ($request->isDialogFormPost()) {
       $snapshot = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withIDs(array($request->getStr('snapshot')))
         ->executeOne();
       if ($snapshot === null) {
         return new Aphront404Response();
       }
 
       $snapshot->openTransaction();
         // Delete all existing child entries.
         $children = id(new PhragmentSnapshotChildQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withSnapshotPHIDs(array($snapshot->getPHID()))
           ->execute();
         foreach ($children as $child) {
           $child->delete();
         }
 
         if ($this->id === null) {
           // The user is promoting the snapshot to the latest version.
           $children = id(new PhragmentFragmentQuery())
             ->setViewer($viewer)
             ->needLatestVersion(true)
             ->withLeadingPath($this->targetFragment->getPath().'/')
             ->execute();
 
           // Add the primary fragment.
           id(new PhragmentSnapshotChild())
             ->setSnapshotPHID($snapshot->getPHID())
             ->setFragmentPHID($this->targetFragment->getPHID())
             ->setFragmentVersionPHID(
               $this->targetFragment->getLatestVersionPHID())
             ->save();
 
           // Add all of the child fragments.
           foreach ($children as $child) {
             id(new PhragmentSnapshotChild())
               ->setSnapshotPHID($snapshot->getPHID())
               ->setFragmentPHID($child->getPHID())
               ->setFragmentVersionPHID($child->getLatestVersionPHID())
               ->save();
           }
         } else {
           // The user is promoting the snapshot to another snapshot.  We just
           // copy the other snapshot's child entries and change the snapshot
           // PHID to make it identical.
           $children = id(new PhragmentSnapshotChildQuery())
             ->setViewer($viewer)
             ->withSnapshotPHIDs(array($this->targetSnapshot->getPHID()))
             ->execute();
           foreach ($children as $child) {
             id(new PhragmentSnapshotChild())
               ->setSnapshotPHID($snapshot->getPHID())
               ->setFragmentPHID($child->getFragmentPHID())
               ->setFragmentVersionPHID($child->getFragmentVersionPHID())
               ->save();
           }
         }
       $snapshot->saveTransaction();
 
       if ($this->id === null) {
         return id(new AphrontRedirectResponse())
           ->setURI($this->targetFragment->getURI());
       } else {
         return id(new AphrontRedirectResponse())
           ->setURI($this->targetSnapshot->getURI());
       }
     }
 
     return $this->createDialog();
   }
 
   function createDialog() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setTitle(pht('Promote which snapshot?'))
       ->setUser($request->getUser())
       ->addSubmitButton(pht('Promote'))
       ->addCancelButton(pht('Cancel'));
 
     if ($this->id === null) {
       // The user is promoting a snapshot to the latest version.
       $dialog->appendParagraph(pht(
-        "Select the snapshot you want to promote to the latest version:"));
+        'Select the snapshot you want to promote to the latest version:'));
     } else {
       // The user is promoting a snapshot to another snapshot.
       $dialog->appendParagraph(pht(
         "Select the snapshot you want to promote to '%s':",
         $this->targetSnapshot->getName()));
     }
 
     $dialog->appendChild(
       id(new AphrontFormSelectControl())
         ->setUser($viewer)
         ->setName('snapshot')
         ->setOptions($this->options));
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
index 26d2a9f17..1062bca7d 100644
--- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
@@ -1,154 +1,154 @@
 <?php
 
 final class PhragmentSnapshotViewController extends PhragmentController {
 
   private $id;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
-    $this->id = idx($data, "id", "");
+    $this->id = idx($data, 'id', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $snapshot = id(new PhragmentSnapshotQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->id))
       ->executeOne();
     if ($snapshot === null) {
       return new Aphront404Response();
     }
 
     $box = $this->createSnapshotView($snapshot);
 
     $fragment = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($snapshot->getPrimaryFragmentPHID()))
       ->executeOne();
     if ($fragment === null) {
       return new Aphront404Response();
     }
 
     $parents = $this->loadParentFragments($fragment->getPath());
     if ($parents === null) {
       return new Aphront404Response();
     }
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     $crumbs->addTextCrumb(pht('"%s" Snapshot', $snapshot->getName()));
 
     $children = id(new PhragmentSnapshotChildQuery())
       ->setViewer($viewer)
       ->needFragments(true)
       ->needFragmentVersions(true)
       ->withSnapshotPHIDs(array($snapshot->getPHID()))
       ->execute();
 
     $list = id(new PHUIObjectItemListView())
       ->setUser($viewer);
 
     foreach ($children as $child) {
       $item = id(new PHUIObjectItemView())
         ->setHeader($child->getFragment()->getPath());
 
       if ($child->getFragmentVersion() !== null) {
         $item
           ->setHref($child->getFragmentVersion()->getURI())
           ->addAttribute(pht(
             'Version %s',
             $child->getFragmentVersion()->getSequence()));
       } else {
         $item
           ->setHref($child->getFragment()->getURI())
           ->addAttribute(pht('Directory'));
       }
 
       $list->addItem($item);
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $box,
         $list),
       array(
         'title' => pht('View Snapshot'),
         'device' => true));
   }
 
   protected function createSnapshotView($snapshot) {
     if ($snapshot === null) {
       return null;
     }
 
     $viewer = $this->getRequest()->getUser();
 
     $phids = array();
     $phids[] = $snapshot->getPrimaryFragmentPHID();
 
     $this->loadHandles($phids);
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('"%s" Snapshot', $snapshot->getName()))
       ->setPolicyObject($snapshot)
       ->setUser($viewer);
 
     $zip_uri = $this->getApplicationURI(
-      "zip@".$snapshot->getName().
-      "/".$snapshot->getPrimaryFragment()->getPath());
+      'zip@'.$snapshot->getName().
+      '/'.$snapshot->getPrimaryFragment()->getPath());
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $snapshot,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($snapshot)
       ->setObjectURI($snapshot->getURI());
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Download Snapshot as ZIP'))
         ->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
         ->setDisabled(!$this->isCorrectlyConfigured())
         ->setIcon('fa-floppy-o'));
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Delete Snapshot'))
         ->setHref($this->getApplicationURI(
-          "snapshot/delete/".$snapshot->getID()."/"))
+          'snapshot/delete/'.$snapshot->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(true)
         ->setIcon('fa-times'));
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Promote Another Snapshot to Here'))
         ->setHref($this->getApplicationURI(
-          "snapshot/promote/".$snapshot->getID()."/"))
+          'snapshot/promote/'.$snapshot->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(true)
         ->setIcon('fa-arrow-up'));
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($snapshot)
       ->setActionList($actions);
 
     $properties->addProperty(
       pht('Name'),
       $snapshot->getName());
     $properties->addProperty(
       pht('Fragment'),
       $this->renderHandlesForPHIDs(array($snapshot->getPrimaryFragmentPHID())));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
   }
 }
diff --git a/src/applications/phragment/controller/PhragmentUpdateController.php b/src/applications/phragment/controller/PhragmentUpdateController.php
index f14d16e2f..d63f22769 100644
--- a/src/applications/phragment/controller/PhragmentUpdateController.php
+++ b/src/applications/phragment/controller/PhragmentUpdateController.php
@@ -1,82 +1,82 @@
 <?php
 
 final class PhragmentUpdateController extends PhragmentController {
 
   private $dblob;
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
+    $this->dblob = idx($data, 'dblob', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     $fragment = idx($parents, count($parents) - 1, null);
 
     $error_view = null;
 
     if ($request->isFormPost()) {
       $errors = array();
 
       $v_fileid = $request->getInt('fileID');
 
       $file = id(new PhabricatorFile())->load($v_fileid);
       if ($file === null) {
         $errors[] = pht('The specified file doesn\'t exist.');
       }
 
       if (!count($errors)) {
         // If the file is a ZIP archive (has application/zip mimetype)
         // then we extract the zip and apply versions for each of the
         // individual fragments, creating and deleting files as needed.
-        if ($file->getMimeType() === "application/zip") {
+        if ($file->getMimeType() === 'application/zip') {
           $fragment->updateFromZIP($viewer, $file);
         } else {
           $fragment->updateFromFile($viewer, $file);
         }
 
         return id(new AphrontRedirectResponse())
           ->setURI('/phragment/browse/'.$fragment->getPath());
       } else {
         $error_view = id(new AphrontErrorView())
           ->setErrors($errors)
           ->setTitle(pht('Errors while updating fragment'));
       }
     }
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('File ID'))
           ->setName('fileID'))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Update Fragment'))
           ->addCancelButton(
             $this->getApplicationURI('browse/'.$fragment->getPath())));
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     $crumbs->addTextCrumb(pht('Update Fragment'));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Update Fragment: %s', $fragment->getPath()))
       ->setValidationException(null)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $box),
       array(
         'title' => pht('Update Fragment'),
         'device' => true));
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php
index 0373f55e8..98ed79d42 100644
--- a/src/applications/phragment/controller/PhragmentVersionController.php
+++ b/src/applications/phragment/controller/PhragmentVersionController.php
@@ -1,136 +1,136 @@
 <?php
 
 final class PhragmentVersionController extends PhragmentController {
 
   private $id;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
-    $this->id = idx($data, "id", 0);
+    $this->id = idx($data, 'id', 0);
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $version = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->id))
       ->executeOne();
     if ($version === null) {
       return new Aphront404Response();
     }
 
     $parents = $this->loadParentFragments($version->getFragment()->getPath());
     if ($parents === null) {
       return new Aphront404Response();
     }
     $current = idx($parents, count($parents) - 1, null);
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     $crumbs->addTextCrumb(pht('View Version %d', $version->getSequence()));
 
     $phids = array();
     $phids[] = $version->getFilePHID();
 
     $this->loadHandles($phids);
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($version->getFilePHID()))
       ->executeOne();
     if ($file !== null) {
       $file_uri = $file->getDownloadURI();
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht(
-        "%s at version %d",
+        '%s at version %d',
         $version->getFragment()->getName(),
         $version->getSequence()))
       ->setPolicyObject($version)
       ->setUser($viewer);
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($version)
       ->setObjectURI($version->getURI());
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Download Version'))
         ->setDisabled($file === null || !$this->isCorrectlyConfigured())
         ->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
         ->setIcon('fa-download'));
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($version)
       ->setActionList($actions);
     $properties->addProperty(
       pht('File'),
       $this->renderHandlesForPHIDs(array($version->getFilePHID())));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $this->renderConfigurationWarningIfRequired(),
         $box,
         $this->renderPreviousVersionList($version)),
       array(
         'title' => pht('View Version'),
         'device' => true));
   }
 
   private function renderPreviousVersionList(
     PhragmentFragmentVersion $version) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $previous_versions = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($version->getFragmentPHID()))
       ->withSequenceBefore($version->getSequence())
       ->execute();
 
     $list = id(new PHUIObjectItemListView())
       ->setUser($viewer);
 
     foreach ($previous_versions as $previous_version) {
       $item = id(new PHUIObjectItemView());
       $item->setHeader('Version '.$previous_version->getSequence());
       $item->setHref($previous_version->getURI());
       $item->addAttribute(phabricator_datetime(
         $previous_version->getDateCreated(),
         $viewer));
       $patch_uri = $this->getApplicationURI(
         'patch/'.$previous_version->getID().'/'.$version->getID());
       $item->addAction(id(new PHUIListItemView())
         ->setIcon('fa-file-o')
-        ->setName(pht("Get Patch"))
+        ->setName(pht('Get Patch'))
         ->setHref($this->isCorrectlyConfigured() ? $patch_uri : null)
         ->setDisabled(!$this->isCorrectlyConfigured()));
       $list->addItem($item);
     }
 
     $item = id(new PHUIObjectItemView());
     $item->setHeader('Prior to Version 0');
     $item->addAttribute('Prior to any content (empty file)');
     $item->addAction(id(new PHUIListItemView())
       ->setIcon('fa-file-o')
-      ->setName(pht("Get Patch"))
+      ->setName(pht('Get Patch'))
       ->setHref($this->getApplicationURI(
         'patch/x/'.$version->getID())));
     $list->addItem($item);
 
     return $list;
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentZIPController.php b/src/applications/phragment/controller/PhragmentZIPController.php
index add1fe74d..ab1f204dc 100644
--- a/src/applications/phragment/controller/PhragmentZIPController.php
+++ b/src/applications/phragment/controller/PhragmentZIPController.php
@@ -1,155 +1,155 @@
 <?php
 
 final class PhragmentZIPController extends PhragmentController {
 
   private $dblob;
   private $snapshot;
 
   private $snapshotCache;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
-    $this->dblob = idx($data, "dblob", "");
-    $this->snapshot = idx($data, "snapshot", null);
+    $this->dblob = idx($data, 'dblob', '');
+    $this->snapshot = idx($data, 'snapshot', null);
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $parents = $this->loadParentFragments($this->dblob);
     if ($parents === null) {
       return new Aphront404Response();
     }
     $fragment = idx($parents, count($parents) - 1, null);
 
     if ($this->snapshot !== null) {
       $snapshot = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withPrimaryFragmentPHIDs(array($fragment->getPHID()))
         ->withNames(array($this->snapshot))
         ->executeOne();
       if ($snapshot === null) {
         return new Aphront404Response();
       }
 
       $cache = id(new PhragmentSnapshotChildQuery())
         ->setViewer($viewer)
         ->needFragmentVersions(true)
         ->withSnapshotPHIDs(array($snapshot->getPHID()))
         ->execute();
       $this->snapshotCache = mpull(
         $cache,
         'getFragmentVersion',
         'getFragmentPHID');
     }
 
     $temp = new TempFile();
 
     $zip = null;
     try {
       $zip = new ZipArchive();
     } catch (Exception $e) {
       $dialog = new AphrontDialogView();
       $dialog->setUser($viewer);
 
       $inst = pht(
         'This system does not have the ZIP PHP extension installed. This '.
         'is required to download ZIPs from Phragment.');
 
       $dialog->setTitle(pht('ZIP Extension Not Installed'));
       $dialog->appendParagraph($inst);
 
       $dialog->addCancelButton('/phragment/browse/'.$this->dblob);
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     if (!$zip->open((string)$temp, ZipArchive::CREATE)) {
-      throw new Exception("Unable to create ZIP archive!");
+      throw new Exception('Unable to create ZIP archive!');
     }
 
     $mappings = $this->getFragmentMappings($fragment, $fragment->getPath());
 
     $phids = array();
     foreach ($mappings as $path => $file_phid) {
       $phids[] = $file_phid;
     }
 
     $files = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withPHIDs($phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
     foreach ($mappings as $path => $file_phid) {
       if (!isset($files[$file_phid])) {
         // The path is most likely pointing to a deleted fragment, which
         // hence no longer has a file associated with it.
         unset($mappings[$path]);
         continue;
       }
       $mappings[$path] = $files[$file_phid];
     }
 
     foreach ($mappings as $path => $file) {
       if ($file !== null) {
         $zip->addFromString($path, $file->loadFileData());
       }
     }
     $zip->close();
 
     $zip_name = $fragment->getName();
     if (substr($zip_name, -4) !== '.zip') {
       $zip_name .= '.zip';
     }
 
     $data = Filesystem::readFile((string)$temp);
     $file = PhabricatorFile::buildFromFileDataOrHash(
       $data,
       array(
         'name' => $zip_name,
         'ttl' => time() + 60 * 60 * 24,
       ));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $file->attachToObject($viewer, $fragment->getPHID());
     unset($unguarded);
 
     $return = $fragment->getURI();
     if ($request->getExists('return')) {
       $return = $request->getStr('return');
     }
 
     return id(new AphrontRedirectResponse())
       ->setURI($file->getDownloadURI($return));
   }
 
   /**
    * Returns a list of mappings like array('some/path.txt' => 'file PHID');
    */
   private function getFragmentMappings(PhragmentFragment $current, $base_path) {
     $mappings = $current->getFragmentMappings(
       $this->getRequest()->getUser(),
       $base_path);
 
     $result = array();
     foreach ($mappings as $path => $fragment) {
       $version = $this->getVersion($fragment);
       if ($version !== null) {
         $result[$path] = $version->getFilePHID();
       }
     }
     return $result;
   }
 
   private function getVersion($fragment) {
     if ($this->snapshot === null) {
       return $fragment->getLatestVersion();
     } else {
       return idx($this->snapshotCache, $fragment->getPHID(), null);
     }
   }
 
 }
diff --git a/src/applications/phragment/phid/PhragmentPHIDTypeFragment.php b/src/applications/phragment/phid/PhragmentPHIDTypeFragment.php
index df7fdfec1..0a5484911 100644
--- a/src/applications/phragment/phid/PhragmentPHIDTypeFragment.php
+++ b/src/applications/phragment/phid/PhragmentPHIDTypeFragment.php
@@ -1,45 +1,45 @@
 <?php
 
 final class PhragmentPHIDTypeFragment
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHRF';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Fragment');
   }
 
   public function newObject() {
     return new PhragmentFragment();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhragmentFragmentQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $fragment = $objects[$phid];
 
       $handle->setName(pht(
-        "Fragment %s: %s",
+        'Fragment %s: %s',
         $fragment->getID(),
         $fragment->getName()));
       $handle->setURI($fragment->getURI());
     }
   }
 
 }
diff --git a/src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php b/src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php
index 640c4aaf6..b66762570 100644
--- a/src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php
+++ b/src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php
@@ -1,45 +1,45 @@
 <?php
 
 final class PhragmentPHIDTypeFragmentVersion
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHRV';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Fragment Version');
   }
 
   public function newObject() {
     return new PhragmentFragmentVersion();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhragmentFragmentVersionQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $version = $objects[$phid];
 
       $handle->setName(pht(
-        "Fragment Version %d: %s",
+        'Fragment Version %d: %s',
         $version->getSequence(),
         $version->getFragment()->getName()));
       $handle->setURI($version->getURI());
     }
   }
 
 }
diff --git a/src/applications/phragment/storage/PhragmentFragment.php b/src/applications/phragment/storage/PhragmentFragment.php
index c18ef3ff8..49e49713e 100644
--- a/src/applications/phragment/storage/PhragmentFragment.php
+++ b/src/applications/phragment/storage/PhragmentFragment.php
@@ -1,340 +1,340 @@
 <?php
 
 final class PhragmentFragment extends PhragmentDAO
   implements PhabricatorPolicyInterface {
 
   protected $path;
   protected $depth;
   protected $latestVersionPHID;
   protected $viewPolicy;
   protected $editPolicy;
 
   private $latestVersion = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhragmentPHIDTypeFragment::TYPECONST);
   }
 
   public function getURI() {
     return '/phragment/browse/'.$this->getPath();
   }
 
   public function getName() {
     return basename($this->path);
   }
 
   public function getFile() {
     return $this->assertAttached($this->file);
   }
 
   public function attachFile(PhabricatorFile $file) {
     return $this->file = $file;
   }
 
   public function isDirectory() {
     return $this->latestVersionPHID === null;
   }
 
   public function isDeleted() {
     return $this->getLatestVersion()->getFilePHID() === null;
   }
 
   public function getLatestVersion() {
     if ($this->latestVersionPHID === null) {
       return null;
     }
     return $this->assertAttached($this->latestVersion);
   }
 
   public function attachLatestVersion(PhragmentFragmentVersion $version) {
     return $this->latestVersion = $version;
   }
 
 
 /* -(  Updating  )  --------------------------------------------------------- */
 
 
   /**
    * Create a new fragment from a file.
    */
   public static function createFromFile(
     PhabricatorUser $viewer,
     PhabricatorFile $file = null,
     $path,
     $view_policy,
     $edit_policy) {
 
     $fragment = id(new PhragmentFragment());
     $fragment->setPath($path);
     $fragment->setDepth(count(explode('/', $path)));
     $fragment->setLatestVersionPHID(null);
     $fragment->setViewPolicy($view_policy);
     $fragment->setEditPolicy($edit_policy);
     $fragment->save();
 
     // Directory fragments have no versions associated with them, so we
     // just return the fragment at this point.
     if ($file === null) {
       return $fragment;
     }
 
-    if ($file->getMimeType() === "application/zip") {
+    if ($file->getMimeType() === 'application/zip') {
       $fragment->updateFromZIP($viewer, $file);
     } else {
       $fragment->updateFromFile($viewer, $file);
     }
 
     return $fragment;
   }
 
 
   /**
    * Set the specified file as the next version for the fragment.
    */
   public function updateFromFile(
     PhabricatorUser $viewer,
     PhabricatorFile $file) {
 
     $existing = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($this->getPHID()))
       ->execute();
     $sequence = count($existing);
 
     $this->openTransaction();
       $version = id(new PhragmentFragmentVersion());
       $version->setSequence($sequence);
       $version->setFragmentPHID($this->getPHID());
       $version->setFilePHID($file->getPHID());
       $version->save();
 
       $this->setLatestVersionPHID($version->getPHID());
       $this->save();
     $this->saveTransaction();
 
     $file->attachToObject($viewer, $version->getPHID());
   }
 
   /**
    * Apply the specified ZIP archive onto the fragment, removing
    * and creating fragments as needed.
    */
   public function updateFromZIP(
     PhabricatorUser $viewer,
     PhabricatorFile $file) {
 
-    if ($file->getMimeType() !== "application/zip") {
+    if ($file->getMimeType() !== 'application/zip') {
       throw new Exception("File must have mimetype 'application/zip'");
     }
 
     // First apply the ZIP as normal.
     $this->updateFromFile($viewer, $file);
 
     // Ensure we have ZIP support.
     $zip = null;
     try {
       $zip = new ZipArchive();
     } catch (Exception $e) {
       // The server doesn't have php5-zip, so we can't do recursive updates.
       return;
     }
 
     $temp = new TempFile();
     Filesystem::writeFile($temp, $file->loadFileData());
     if (!$zip->open($temp)) {
-      throw new Exception("Unable to open ZIP");
+      throw new Exception('Unable to open ZIP');
     }
 
     // Get all of the paths and their data from the ZIP.
     $mappings = array();
     for ($i = 0; $i < $zip->numFiles; $i++) {
       $path = trim($zip->getNameIndex($i), '/');
       $stream = $zip->getStream($path);
       $data = null;
       // If the stream is false, then it is a directory entry.  We leave
       // $data set to null for directories so we know not to create a
       // version entry for them.
       if ($stream !== false) {
         $data = stream_get_contents($stream);
         fclose($stream);
       }
       $mappings[$path] = $data;
     }
 
     // We need to detect any directories that are in the ZIP folder that
     // aren't explicitly noted in the ZIP.  This can happen if the file
     // entries in the ZIP look like:
     //
     //  * something/blah.png
     //  * something/other.png
     //  * test.png
     //
     // Where there is no explicit "something/" entry.
     foreach ($mappings as $path_key => $data) {
       if ($data === null) {
         continue;
       }
       $directory = dirname($path_key);
-      while ($directory !== ".") {
+      while ($directory !== '.') {
         if (!array_key_exists($directory, $mappings)) {
           $mappings[$directory] = null;
         }
         if (dirname($directory) === $directory) {
           // dirname() will not reduce this directory any further; to
           // prevent infinite loop we just break out here.
           break;
         }
         $directory = dirname($directory);
       }
     }
 
     // Adjust the paths relative to this fragment so we can look existing
     // fragments up in the DB.
     $base_path = $this->getPath();
     $paths = array();
     foreach ($mappings as $p => $data) {
       $paths[] = $base_path.'/'.$p;
     }
 
     // FIXME: What happens when a child exists, but the current user
     // can't see it.  We're going to create a new child with the exact
     // same path and then bad things will happen.
     $children = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->needLatestVersion(true)
       ->withLeadingPath($this->getPath().'/')
       ->execute();
     $children = mpull($children, null, 'getPath');
 
     // Iterate over the existing fragments.
     foreach ($children as $full_path => $child) {
       $path = substr($full_path, strlen($base_path) + 1);
       if (array_key_exists($path, $mappings)) {
         if ($child->isDirectory() && $mappings[$path] === null) {
           // Don't create a version entry for a directory
           // (unless it's been converted into a file).
           continue;
         }
 
         // The file is being updated.
         $file = PhabricatorFile::newFromFileData(
           $mappings[$path],
           array('name' => basename($path)));
         $child->updateFromFile($viewer, $file);
       } else {
         // The file is being deleted.
         $child->deleteFile($viewer);
       }
     }
 
     // Iterate over the mappings to find new files.
     foreach ($mappings as $path => $data) {
       if (!array_key_exists($base_path.'/'.$path, $children)) {
         // The file is being created.  If the data is null,
         // then this is explicitly a directory being created.
         $file = null;
         if ($mappings[$path] !== null) {
           $file = PhabricatorFile::newFromFileData(
             $mappings[$path],
             array('name' => basename($path)));
         }
         PhragmentFragment::createFromFile(
           $viewer,
           $file,
           $base_path.'/'.$path,
           $this->getViewPolicy(),
           $this->getEditPolicy());
       }
     }
   }
 
   /**
    * Delete the contents of the specified fragment.
    */
   public function deleteFile(PhabricatorUser $viewer) {
     $existing = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($this->getPHID()))
       ->execute();
     $sequence = count($existing);
 
     $this->openTransaction();
       $version = id(new PhragmentFragmentVersion());
       $version->setSequence($sequence);
       $version->setFragmentPHID($this->getPHID());
       $version->setFilePHID(null);
       $version->save();
 
       $this->setLatestVersionPHID($version->getPHID());
       $this->save();
     $this->saveTransaction();
   }
 
 
 /* -(  Utility  )  ---------------------------------------------------------- */
 
 
   public function getFragmentMappings(
     PhabricatorUser $viewer,
     $base_path) {
 
     $children = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->needLatestVersion(true)
       ->withLeadingPath($this->getPath().'/')
       ->withDepths(array($this->getDepth() + 1))
       ->execute();
 
     if (count($children) === 0) {
       $path = substr($this->getPath(), strlen($base_path) + 1);
       return array($path => $this);
     } else {
       $mappings = array();
       foreach ($children as $child) {
         $child_mappings = $child->getFragmentMappings(
           $viewer,
           $base_path);
         foreach ($child_mappings as $key => $value) {
           $mappings[$key] = $value;
         }
       }
       return $mappings;
     }
   }
 
 
 /* -(  Policy Interface  )--------------------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/phragment/util/PhragmentPatchUtil.php b/src/applications/phragment/util/PhragmentPatchUtil.php
index c395a14e3..5319ba603 100644
--- a/src/applications/phragment/util/PhragmentPatchUtil.php
+++ b/src/applications/phragment/util/PhragmentPatchUtil.php
@@ -1,53 +1,53 @@
 <?php
 
 final class PhragmentPatchUtil extends Phobject {
 
-  const EMPTY_HASH = "0000000000000000000000000000000000000000";
+  const EMPTY_HASH = '0000000000000000000000000000000000000000';
 
   /**
    * Calculate the DiffMatchPatch patch between two Phabricator files.
    *
    * @phutil-external-symbol class diff_match_patch
    */
   public static function calculatePatch(
     PhabricatorFile $old = null,
     PhabricatorFile $new = null) {
 
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/externals/diff_match_patch/diff_match_patch.php';
 
     $old_hash = self::EMPTY_HASH;
     $new_hash = self::EMPTY_HASH;
 
     if ($old !== null) {
       $old_hash = $old->getContentHash();
     }
     if ($new !== null) {
       $new_hash = $new->getContentHash();
     }
 
-    $old_content = "";
-    $new_content = "";
+    $old_content = '';
+    $new_content = '';
 
     if ($old_hash === $new_hash) {
       return null;
     }
 
     if ($old_hash !== self::EMPTY_HASH) {
       $old_content = $old->loadFileData();
     } else {
-      $old_content = "";
+      $old_content = '';
     }
 
     if ($new_hash !== self::EMPTY_HASH) {
       $new_content = $new->loadFileData();
     } else {
-      $new_content = "";
+      $new_content = '';
     }
 
     $dmp = new diff_match_patch();
     $dmp_patches = $dmp->patch_make($old_content, $new_content);
     return $dmp->patch_toText($dmp_patches);
   }
 
 }
diff --git a/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php b/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php
index 7ec707eaa..c6f8f0cc6 100644
--- a/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php
+++ b/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php
@@ -1,18 +1,18 @@
 <?php
 
 final class PhabricatorPhrequentConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Phrequent");
+    return pht('Phrequent');
   }
 
   public function getDescription() {
-    return pht("Configure Phrequent.");
+    return pht('Configure Phrequent.');
   }
 
   public function getOptions() {
     return array();
   }
 
 }
diff --git a/src/applications/phrequent/controller/PhrequentTrackController.php b/src/applications/phrequent/controller/PhrequentTrackController.php
index 29751559e..0dd5219d7 100644
--- a/src/applications/phrequent/controller/PhrequentTrackController.php
+++ b/src/applications/phrequent/controller/PhrequentTrackController.php
@@ -1,146 +1,146 @@
 <?php
 
 final class PhrequentTrackController
   extends PhrequentController {
 
   private $verb;
   private $phid;
 
   public function willProcessRequest(array $data) {
     $this->phid = $data['phid'];
     $this->verb = $data['verb'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $phid = $this->phid;
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($phid))
       ->executeOne();
 
     if (!$this->isStartingTracking() &&
         !$this->isStoppingTracking()) {
       throw new Exception('Unrecognized verb: ' . $this->verb);
     }
 
     switch ($this->verb) {
       case 'start':
         $button_text = pht('Start Tracking');
         $title_text = pht('Start Tracking Time');
         $inner_text = pht('What time did you start working?');
         $action_text = pht('Start Timer');
         $label_text = pht('Start Time');
         break;
       case 'stop':
         $button_text = pht('Stop Tracking');
         $title_text = pht('Stop Tracking Time');
         $inner_text = pht('What time did you stop working?');
         $action_text = pht('Stop Timer');
         $label_text = pht('Stop Time');
         break;
     }
 
     $epoch_control = id(new AphrontFormDateControl())
       ->setUser($user)
       ->setName('epoch')
       ->setLabel($action_text)
       ->setValue(time());
 
     $err = array();
 
     if ($request->isDialogFormPost()) {
       $timestamp = $epoch_control->readValueFromRequest($request);
       $note = $request->getStr('note');
 
       if (!$epoch_control->isValid() || $timestamp > time()) {
         $err[] = pht('Invalid date, please enter a valid non-future date');
       }
 
       if (!$err) {
         if ($this->isStartingTracking()) {
           $this->startTracking($user, $this->phid, $timestamp);
         } else if ($this->isStoppingTracking()) {
           $this->stopTracking($user, $this->phid, $timestamp, $note);
         }
         return id(new AphrontRedirectResponse());
       }
 
     }
 
     $dialog = $this->newDialog()
       ->setTitle($title_text)
       ->setWidth(AphrontDialogView::WIDTH_FORM);
 
     if ($err) {
       $dialog->setErrors($err);
     }
 
     $form = new PHUIFormLayoutView();
     $form
       ->appendChild(hsprintf(
-        "<p>%s</p><br />", $inner_text));
+        '<p>%s</p><br />', $inner_text));
 
     $form->appendChild($epoch_control);
 
     if ($this->isStoppingTracking()) {
       $form
         ->appendChild(
           id(new AphrontFormTextControl())
             ->setLabel(pht('Note'))
             ->setName('note'));
     }
 
     $dialog->appendChild($form);
 
     $dialog->addCancelButton($handle->getURI());
     $dialog->addSubmitButton($action_text);
 
     return $dialog;
   }
 
   private function isStartingTracking() {
     return $this->verb === 'start';
   }
 
   private function isStoppingTracking() {
     return $this->verb === 'stop';
   }
 
   private function startTracking($user, $phid, $timestamp) {
     $usertime = new PhrequentUserTime();
     $usertime->setDateStarted($timestamp);
     $usertime->setUserPHID($user->getPHID());
     $usertime->setObjectPHID($phid);
     $usertime->save();
   }
 
   private function stopTracking($user, $phid, $timestamp, $note) {
     if (!PhrequentUserTimeQuery::isUserTrackingObject($user, $phid)) {
       // Don't do anything, it's not being tracked.
       return;
     }
 
     $usertime_dao = new PhrequentUserTime();
     $conn = $usertime_dao->establishConnection('r');
 
     queryfx(
       $conn,
       'UPDATE %T usertime '.
       'SET usertime.dateEnded = %d, '.
       'usertime.note = %s '.
       'WHERE usertime.userPHID = %s '.
       'AND usertime.objectPHID = %s '.
       'AND usertime.dateEnded IS NULL '.
       'ORDER BY usertime.dateStarted, usertime.id DESC '.
       'LIMIT 1',
       $usertime_dao->getTableName(),
       $timestamp,
       $note,
       $user->getPHID(),
       $phid);
   }
 
 }
diff --git a/src/applications/phrequent/query/PhrequentSearchEngine.php b/src/applications/phrequent/query/PhrequentSearchEngine.php
index abf92b8cb..79002b70a 100644
--- a/src/applications/phrequent/query/PhrequentSearchEngine.php
+++ b/src/applications/phrequent/query/PhrequentSearchEngine.php
@@ -1,202 +1,202 @@
 <?php
 
 final class PhrequentSearchEngine
   extends PhabricatorApplicationSearchEngine {
 
   public function getApplicationClassName() {
     return 'PhabricatorApplicationPhrequent';
   }
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
     return $saved->getParameter('limit', 1000);
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
     $saved = new PhabricatorSavedQuery();
 
     $saved->setParameter(
       'userPHIDs',
       $this->readUsersFromRequest($request, 'users'));
 
     $saved->setParameter('ended', $request->getStr('ended'));
 
     $saved->setParameter('order', $request->getStr('order'));
 
     return $saved;
   }
 
   public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
     $query = id(new PhrequentUserTimeQuery());
 
     $user_phids = $saved->getParameter('userPHIDs');
     if ($user_phids) {
       $query->withUserPHIDs($user_phids);
     }
 
     $ended = $saved->getParameter('ended');
     if ($ended != null) {
       $query->withEnded($ended);
     }
 
     $order = $saved->getParameter('order');
     if ($order != null) {
       $query->setOrder($order);
     }
 
     return $query;
   }
 
   public function buildSearchForm(
     AphrontFormView $form,
     PhabricatorSavedQuery $saved_query) {
 
     $user_phids = $saved_query->getParameter('userPHIDs', array());
     $ended = $saved_query->getParameter(
       'ended', PhrequentUserTimeQuery::ENDED_ALL);
     $order = $saved_query->getParameter(
       'order', PhrequentUserTimeQuery::ORDER_ENDED_DESC);
 
     $phids = array_merge($user_phids);
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->requireViewer())
       ->withPHIDs($phids)
       ->execute();
 
     $form
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setDatasource('/typeahead/common/users/')
           ->setName('users')
           ->setLabel(pht('Users'))
           ->setValue($handles))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Ended'))
           ->setName('ended')
           ->setValue($ended)
           ->setOptions(PhrequentUserTimeQuery::getEndedSearchOptions()))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Order'))
           ->setName('order')
           ->setValue($order)
           ->setOptions(PhrequentUserTimeQuery::getOrderSearchOptions()));
   }
 
   protected function getURI($path) {
     return '/phrequent/'.$path;
   }
 
   public function getBuiltinQueryNames() {
     $names = array(
       'tracking' => pht('Currently Tracking'),
       'all' => pht('All Tracked'),
     );
 
     return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
 
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
     switch ($query_key) {
       case 'all':
         return $query
           ->setParameter('order', PhrequentUserTimeQuery::ORDER_ENDED_DESC);
       case 'tracking':
         return $query
           ->setParameter('ended', PhrequentUserTimeQuery::ENDED_NO)
           ->setParameter('order', PhrequentUserTimeQuery::ORDER_ENDED_DESC);
     }
 
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
   protected function getRequiredHandlePHIDsForResultList(
     array $usertimes,
     PhabricatorSavedQuery $query) {
     return array_mergev(
       array(
         mpull($usertimes, 'getUserPHID'),
         mpull($usertimes, 'getObjectPHID'),
       ));
   }
 
   protected function renderResultList(
     array $usertimes,
     PhabricatorSavedQuery $query,
     array $handles) {
     assert_instances_of($usertimes, 'PhrequentUserTime');
     $viewer = $this->requireViewer();
 
     $view = id(new PHUIObjectItemListView())
       ->setUser($viewer);
 
     foreach ($usertimes as $usertime) {
       $item = new PHUIObjectItemView();
 
       if ($usertime->getObjectPHID() === null) {
         $item->setHeader($usertime->getNote());
       } else {
         $obj = $handles[$usertime->getObjectPHID()];
         $item->setHeader($obj->getLinkName());
         $item->setHref($obj->getURI());
       }
       $item->setObject($usertime);
 
       $item->addByline(
         pht(
           'Tracked: %s',
           $handles[$usertime->getUserPHID()]->renderLink()));
 
       $started_date = phabricator_date($usertime->getDateStarted(), $viewer);
       $item->addIcon('none', $started_date);
 
       if ($usertime->getDateEnded() !== null) {
         $time_spent = $usertime->getDateEnded() - $usertime->getDateStarted();
         $time_ended = phabricator_datetime($usertime->getDateEnded(), $viewer);
       } else {
         $time_spent = time() - $usertime->getDateStarted();
       }
 
       $time_spent = $time_spent == 0 ? 'none' :
         phabricator_format_relative_time_detailed($time_spent);
 
       if ($usertime->getDateEnded() !== null) {
         $item->addAttribute(
           pht(
             'Tracked %s',
             $time_spent));
         $item->addAttribute(
           pht(
             'Ended on %s',
             $time_ended));
       } else {
         $item->addAttribute(
           pht(
             'Tracked %s so far',
             $time_spent));
         if ($usertime->getObjectPHID() !== null &&
             $usertime->getUserPHID() === $viewer->getPHID()) {
           $item->addAction(
             id(new PHUIListItemView())
               ->setIcon('fa-time-o')
               ->addSigil('phrequent-stop-tracking')
               ->setWorkflow(true)
               ->setRenderNameAsTooltip(true)
-              ->setName(pht("Stop"))
+              ->setName(pht('Stop'))
               ->setHref(
                 '/phrequent/track/stop/'.
                 $usertime->getObjectPHID().'/'));
         }
         $item->setBarColor('green');
       }
 
       $view->addItem($item);
     }
 
     return $view;
   }
 }
diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php b/src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php
index 9208d6825..70a984d30 100644
--- a/src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php
+++ b/src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php
@@ -1,54 +1,54 @@
 <?php
 
 final class ConduitAPI_phriction_edit_Method
   extends ConduitAPI_phriction_Method {
 
   public function getMethodDescription() {
-    return "Update a Phriction document.";
+    return 'Update a Phriction document.';
   }
 
   public function defineParamTypes() {
     return array(
       'slug'          => 'required string',
       'title'         => 'optional string',
       'content'       => 'optional string',
       'description'   => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $slug = $request->getValue('slug');
 
     $doc = id(new PhrictionDocumentQuery())
       ->setViewer($request->getUser())
       ->withSlugs(array(PhabricatorSlug::normalize($slug)))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$doc) {
       throw new Exception(pht('No such document.'));
     }
 
     $editor = id(PhrictionDocumentEditor::newForSlug($slug))
       ->setActor($request->getUser())
       ->setTitle($request->getValue('title'))
       ->setContent($request->getValue('content'))
       ->setDescription($request->getvalue('description'))
       ->save();
 
     return $this->buildDocumentInfoDictionary($editor->getDocument());
   }
 
 }
diff --git a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
index cfa9b0a88..a39710df7 100644
--- a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
+++ b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
@@ -1,22 +1,22 @@
 <?php
 
 final class PhabricatorPhrictionConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Phriction");
+    return pht('Phriction');
   }
 
   public function getDescription() {
-    return pht("Options related to Phriction (wiki).");
+    return pht('Options related to Phriction (wiki).');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'metamta.phriction.subject-prefix', 'string', '[Phriction]')
-        ->setDescription(pht("Subject prefix for Phriction email.")),
+        ->setDescription(pht('Subject prefix for Phriction email.')),
     );
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index 559e47842..96f17950e 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -1,294 +1,294 @@
 <?php
 
 /**
  * @group phriction
  */
 final class PhrictionDiffController
   extends PhrictionController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $document = id(new PhrictionDocumentQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needContent(true)
       ->executeOne();
     if (!$document) {
       return new Aphront404Response();
     }
 
     $current = $document->getContent();
 
     $l = $request->getInt('l');
     $r = $request->getInt('r');
 
     $ref = $request->getStr('ref');
     if ($ref) {
       list($l, $r) = explode(',', $ref);
     }
 
     $content = id(new PhrictionContent())->loadAllWhere(
       'documentID = %d AND version IN (%Ld)',
       $document->getID(),
       array($l, $r));
     $content = mpull($content, null, 'getVersion');
 
     $content_l = idx($content, $l, null);
     $content_r = idx($content, $r, null);
 
     if (!$content_l || !$content_r) {
       return new Aphront404Response();
     }
 
     $text_l = $content_l->getContent();
     $text_r = $content_r->getContent();
 
     $text_l = phutil_utf8_hard_wrap($text_l, 80);
     $text_l = implode("\n", $text_l);
     $text_r = phutil_utf8_hard_wrap($text_r, 80);
     $text_r = implode("\n", $text_r);
 
     $engine = new PhabricatorDifferenceEngine();
     $changeset = $engine->generateChangesetFromFileContent($text_l, $text_r);
 
     $changeset->setOldProperties(
       array(
         'Title'   => $content_l->getTitle(),
       ));
     $changeset->setNewProperties(
       array(
         'Title'   => $content_r->getTitle(),
       ));
 
     $whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
 
     $parser = new DifferentialChangesetParser();
     $parser->setChangeset($changeset);
     $parser->setRenderingReference("{$l},{$r}");
     $parser->setWhitespaceMode($whitespace_mode);
 
     $engine = new PhabricatorMarkupEngine();
     $engine->setViewer($user);
     $engine->process();
     $parser->setMarkupEngine($engine);
 
     $spec = $request->getStr('range');
     list($range_s, $range_e, $mask) =
       DifferentialChangesetParser::parseRangeSpecification($spec);
     $output = $parser->render($range_s, $range_e, $mask);
 
     if ($request->isAjax()) {
       return id(new PhabricatorChangesetResponse())
         ->setRenderedChangeset($output);
     }
 
     require_celerity_resource('differential-changeset-view-css');
     require_celerity_resource('syntax-highlighting-css');
     require_celerity_resource('phriction-document-css');
 
     Javelin::initBehavior('differential-show-more', array(
       'uri'         => '/phriction/diff/'.$document->getID().'/',
       'whitespace'  => $whitespace_mode,
     ));
 
     $slug = $document->getSlug();
 
     $revert_l = $this->renderRevertButton($content_l, $current);
     $revert_r = $this->renderRevertButton($content_r, $current);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumb_views = $this->renderBreadcrumbs($slug);
     foreach ($crumb_views as $view) {
       $crumbs->addCrumb($view);
     }
 
     $crumbs->addTextCrumb(
       pht('History'),
       PhrictionDocument::getSlugURI($slug, 'history'));
 
-    $title = pht("Version %s vs %s", $l, $r);
+    $title = pht('Version %s vs %s', $l, $r);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title);
 
     $crumbs->addTextCrumb($title, $request->getRequestURI());
 
 
     $comparison_table = $this->renderComparisonTable(
       array(
         $content_r,
         $content_l,
       ));
 
     $navigation_table = null;
     if ($l + 1 == $r) {
       $nav_l = ($l > 1);
       $nav_r = ($r != $current->getVersion());
 
       $uri = $request->getRequestURI();
 
       if ($nav_l) {
         $link_l = phutil_tag(
           'a',
           array(
             'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1),
             'class' => 'button',
           ),
           pht("\xC2\xAB Previous Change"));
       } else {
         $link_l = phutil_tag(
           'a',
           array(
             'href' => '#',
             'class' => 'button grey disabled',
           ),
           pht('Original Change'));
       }
 
       $link_r = null;
       if ($nav_r) {
         $link_r = phutil_tag(
           'a',
           array(
             'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1),
             'class' => 'button',
           ),
           pht("Next Change \xC2\xBB"));
       } else {
         $link_r = phutil_tag(
           'a',
           array(
             'href' => '#',
             'class' => 'button grey disabled',
           ),
           pht('Most Recent Change'));
       }
 
       $navigation_table = phutil_tag(
         'table',
         array('class' => 'phriction-history-nav-table'),
         phutil_tag('tr', array(), array(
           phutil_tag('td', array('class' => 'nav-prev'), $link_l),
           phutil_tag('td', array('class' => 'nav-next'), $link_r),
         )));
     }
 
 
     $output = hsprintf(
       '<div class="phriction-document-history-diff">'.
         '%s%s'.
         '<table class="phriction-revert-table">'.
           '<tr><td>%s</td><td>%s</td>'.
         '</table>'.
         '%s'.
       '</div>',
       $comparison_table->render(),
       $navigation_table,
       $revert_l,
       $revert_r,
       $output);
 
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($output);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
       ),
       array(
         'title'     => pht('Document History'),
         'device'    => true,
       ));
 
   }
 
   private function renderRevertButton(
     PhrictionContent $content,
     PhrictionContent $current) {
 
     $document_id = $content->getDocumentID();
     $version = $content->getVersion();
 
     $hidden_statuses = array(
       PhrictionChangeType::CHANGE_DELETE    => true, // Silly
       PhrictionChangeType::CHANGE_MOVE_AWAY => true, // Plain silly
       PhrictionChangeType::CHANGE_STUB      => true, // Utterly silly
     );
     if (isset($hidden_statuses[$content->getChangeType()])) {
       // Don't show an edit/revert button for changes which deleted, moved or
       // stubbed the content since it's silly.
       return null;
     }
 
     if ($content->getID() == $current->getID()) {
       return phutil_tag(
         'a',
         array(
           'href'  => '/phriction/edit/'.$document_id.'/',
           'class' => 'button grey',
         ),
         pht('Edit Current Version'));
     }
 
 
     return phutil_tag(
       'a',
       array(
         'href'  => '/phriction/edit/'.$document_id.'/?revert='.$version,
         'class' => 'button grey',
       ),
       pht('Revert to Version %s...', $version));
   }
 
   private function renderComparisonTable(array $content) {
     assert_instances_of($content, 'PhrictionContent');
 
     $user = $this->getRequest()->getUser();
 
     $phids = mpull($content, 'getAuthorPHID');
     $handles = $this->loadViewerHandles($phids);
 
     $list = new PHUIObjectItemListView();
     $list->setFlush(true);
 
     $first = true;
     foreach ($content as $c) {
       $author = $handles[$c->getAuthorPHID()]->renderLink();
       $item = id(new PHUIObjectItemView())
         ->setHeader(pht('%s by %s, %s',
           PhrictionChangeType::getChangeTypeLabel($c->getChangeType()),
           $author,
           pht('Version %s', $c->getVersion())))
         ->addAttribute(pht('%s %s',
           phabricator_date($c->getDateCreated(), $user),
           phabricator_time($c->getDateCreated(), $user)));
 
       if ($c->getDescription()) {
         $item->addAttribute($c->getDescription());
       }
 
       if ($first == true) {
         $item->setBarColor('green');
         $first = false;
       } else {
         $item->setBarColor('red');
       }
 
       $list->addItem($item);
     }
 
     return $list;
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index dbb25bc9e..6a06f314c 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -1,499 +1,499 @@
 <?php
 
 final class PhrictionDocumentController
   extends PhrictionController {
 
   private $slug;
 
   public function willProcessRequest(array $data) {
     $this->slug = $data['slug'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $slug = PhabricatorSlug::normalize($this->slug);
     if ($slug != $this->slug) {
       $uri = PhrictionDocument::getSlugURI($slug);
       // Canonicalize pages to their one true URI.
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     require_celerity_resource('phriction-document-css');
 
     $document = id(new PhrictionDocumentQuery())
       ->setViewer($user)
       ->withSlugs(array($slug))
       ->executeOne();
 
     $version_note = null;
     $core_content = '';
     $move_notice = '';
     $properties = null;
 
     if (!$document) {
 
       $document = new PhrictionDocument();
 
       if (PhrictionDocument::isProjectSlug($slug)) {
         $project = id(new PhabricatorProjectQuery())
           ->setViewer($user)
           ->withPhrictionSlugs(array(
             PhrictionDocument::getProjectSlugIdentifier($slug)))
           ->executeOne();
         if (!$project) {
           return new Aphront404Response();
         }
       }
       $create_uri = '/phriction/edit/?slug='.$slug;
 
       $notice = new AphrontErrorView();
       $notice->setSeverity(AphrontErrorView::SEVERITY_NODATA);
       $notice->setTitle(pht('No content here!'));
       $notice->appendChild(
         pht(
           'No document found at %s. You can <strong>'.
             '<a href="%s">create a new document here</a></strong>.',
           phutil_tag('tt', array(), $slug),
           $create_uri));
       $core_content = $notice;
 
       $page_title = pht('Page Not Found');
     } else {
       $version = $request->getInt('v');
       if ($version) {
         $content = id(new PhrictionContent())->loadOneWhere(
           'documentID = %d AND version = %d',
           $document->getID(),
           $version);
         if (!$content) {
           return new Aphront404Response();
         }
 
         if ($content->getID() != $document->getContentID()) {
           $vdate = phabricator_datetime($content->getDateCreated(), $user);
           $version_note = new AphrontErrorView();
           $version_note->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
           $version_note->appendChild(
             pht('You are viewing an older version of this document, as it '.
             'appeared on %s.', $vdate));
         }
       } else {
         $content = id(new PhrictionContent())->load($document->getContentID());
       }
       $page_title = $content->getTitle();
 
       $properties = $this
         ->buildPropertyListView($document, $content, $slug);
 
       $doc_status = $document->getStatus();
       $current_status = $content->getChangeType();
       if ($current_status == PhrictionChangeType::CHANGE_EDIT ||
         $current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {
 
         $core_content = $content->renderContent($user);
       } else if ($current_status == PhrictionChangeType::CHANGE_DELETE) {
         $notice = new AphrontErrorView();
         $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
         $notice->setTitle(pht('Document Deleted'));
         $notice->appendChild(
           pht('This document has been deleted. You can edit it to put new '.
           'content here, or use history to revert to an earlier version.'));
         $core_content = $notice->render();
       } else if ($current_status == PhrictionChangeType::CHANGE_STUB) {
         $notice = new AphrontErrorView();
         $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
         $notice->setTitle(pht('Empty Document'));
         $notice->appendChild(
           pht('This document is empty. You can edit it to put some proper '.
           'content here.'));
         $core_content = $notice->render();
       } else if ($current_status == PhrictionChangeType::CHANGE_MOVE_AWAY) {
         $new_doc_id = $content->getChangeRef();
 
         $slug_uri = null;
 
         // If the new document exists and the viewer can see it, provide a link
         // to it. Otherwise, render a generic message.
         $new_docs = id(new PhrictionDocumentQuery())
           ->setViewer($user)
           ->withIDs(array($new_doc_id))
           ->execute();
         if ($new_docs) {
           $new_doc = head($new_docs);
           $slug_uri = PhrictionDocument::getSlugURI($new_doc->getSlug());
         }
 
         $notice = id(new AphrontErrorView())
           ->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
 
         if ($slug_uri) {
           $notice->appendChild(
             phutil_tag(
               'p',
               array(),
               pht(
                 'This document has been moved to %s. You can edit it to put '.
                 'new content here, or use history to revert to an earlier '.
                 'version.',
                 phutil_tag('a', array('href' => $slug_uri), $slug_uri))));
         } else {
           $notice->appendChild(
             phutil_tag(
               'p',
               array(),
               pht(
                 'This document has been moved. You can edit it to put new '.
                 'contne here, or use history to revert to an earlier '.
                 'version.')));
         }
 
         $core_content = $notice->render();
       } else {
         throw new Exception("Unknown document status '{$doc_status}'!");
       }
 
       $move_notice = null;
       if ($current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {
         $from_doc_id = $content->getChangeRef();
 
         $slug_uri = null;
 
         // If the old document exists and is visible, provide a link to it.
         $from_docs = id(new PhrictionDocumentQuery())
           ->setViewer($user)
           ->withIDs(array($from_doc_id))
           ->execute();
         if ($from_docs) {
           $from_doc = head($from_docs);
           $slug_uri = PhrictionDocument::getSlugURI($from_doc->getSlug());
         }
 
         $move_notice = id(new AphrontErrorView())
           ->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
 
         if ($slug_uri) {
           $move_notice->appendChild(
             pht(
               'This document was moved from %s.',
               phutil_tag('a', array('href' => $slug_uri), $slug_uri)));
         } else {
           // Render this for consistency, even though it's a bit silly.
           $move_notice->appendChild(
             pht('This document was moved from elsewhere.'));
         }
       }
     }
 
     $children = $this->renderDocumentChildren($slug);
 
     $actions = $this->buildActionView($user, $document);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setActionList($actions);
     $crumb_views = $this->renderBreadcrumbs($slug);
     foreach ($crumb_views as $view) {
       $crumbs->addCrumb($view);
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader($page_title);
 
     $prop_list = null;
     if ($properties) {
       $prop_list = new PHUIPropertyGroupView();
       $prop_list->addPropertyList($properties);
     }
 
     $page_content = id(new PHUIDocumentView())
       ->setOffset(true)
       ->setHeader($header)
       ->appendChild(
         array(
           $actions,
           $prop_list,
           $version_note,
           $move_notice,
           $core_content,
         ));
 
     $core_page = phutil_tag(
       'div',
         array(
           'class' => 'phriction-offset'
         ),
         array(
           $page_content,
           $children,
         ));
 
     return $this->buildApplicationPage(
       array(
         $crumbs->render(),
         $core_page,
       ),
       array(
         'pageObjects' => array($document->getPHID()),
         'title'   => $page_title,
         'device'  => true,
       ));
 
   }
 
   private function buildPropertyListView(
     PhrictionDocument $document,
     PhrictionContent $content,
     $slug) {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($document);
 
     $project_phid = null;
     if (PhrictionDocument::isProjectSlug($slug)) {
       $project = id(new PhabricatorProjectQuery())
         ->setViewer($viewer)
         ->withPhrictionSlugs(array(
           PhrictionDocument::getProjectSlugIdentifier($slug)))
         ->executeOne();
       if ($project) {
         $project_phid = $project->getPHID();
       }
     }
 
     $phids = array_filter(
       array(
         $content->getAuthorPHID(),
         $project_phid,
       ));
 
     $this->loadHandles($phids);
 
     $project_info = null;
     if ($project_phid) {
       $view->addProperty(
         pht('Project Info'),
         $this->getHandle($project_phid)->renderLink());
     }
 
     $view->addProperty(
       pht('Last Author'),
       $this->getHandle($content->getAuthorPHID())->renderLink());
 
     $age = time() - $content->getDateCreated();
     $age = floor($age / (60 * 60 * 24));
     if ($age < 1) {
       $when = pht('Today');
     } else if ($age == 1) {
       $when = pht('Yesterday');
     } else {
-      $when = pht("%d Days Ago", $age);
+      $when = pht('%d Days Ago', $age);
     }
     $view->addProperty(pht('Last Updated'), $when);
 
     return $view;
   }
 
   private function buildActionView(
     PhabricatorUser $user,
     PhrictionDocument $document) {
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
       $document,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $slug = PhabricatorSlug::normalize($this->slug);
 
     $action_view = id(new PhabricatorActionListView())
       ->setUser($user)
       ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($document);
 
     if (!$document->getID()) {
       return $action_view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Create This Document'))
           ->setIcon('fa-plus-square')
           ->setHref('/phriction/edit/?slug='.$slug));
     }
 
     $action_view->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Document'))
         ->setIcon('fa-pencil')
         ->setHref('/phriction/edit/'.$document->getID().'/'));
 
     if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
       $action_view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Move Document'))
           ->setIcon('fa-arrows')
           ->setHref('/phriction/move/'.$document->getID().'/')
           ->setWorkflow(true));
 
       $action_view->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Delete Document'))
           ->setIcon('fa-times')
           ->setHref('/phriction/delete/'.$document->getID().'/')
           ->setWorkflow(true));
     }
 
     return
       $action_view->addAction(
         id(new PhabricatorActionView())
         ->setName(pht('View History'))
         ->setIcon('fa-list')
         ->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
   }
 
   private function renderDocumentChildren($slug) {
     $document_dao = new PhrictionDocument();
     $content_dao = new PhrictionContent();
     $conn = $document_dao->establishConnection('r');
 
     $limit = 250;
     $d_child = PhabricatorSlug::getDepth($slug) + 1;
     $d_grandchild = PhabricatorSlug::getDepth($slug) + 2;
 
     // Select children and grandchildren.
     $children = queryfx_all(
       $conn,
       'SELECT d.slug, d.depth, c.title FROM %T d JOIN %T c
         ON d.contentID = c.id
         WHERE d.slug LIKE %> AND d.depth IN (%d, %d)
           AND d.status IN (%Ld)
         ORDER BY d.depth, c.title LIMIT %d',
       $document_dao->getTableName(),
       $content_dao->getTableName(),
       ($slug == '/' ? '' : $slug),
       $d_child,
       $d_grandchild,
       array(
         PhrictionDocumentStatus::STATUS_EXISTS,
         PhrictionDocumentStatus::STATUS_STUB,
       ),
       $limit);
 
     if (!$children) {
       return;
     }
 
     // We're going to render in one of three modes to try to accommodate
     // different information scales:
     //
     //  - If we found fewer than $limit rows, we know we have all the children
     //    and grandchildren and there aren't all that many. We can just render
     //    everything.
     //  - If we found $limit rows but the results included some grandchildren,
     //    we just throw them out and render only the children, as we know we
     //    have them all.
     //  - If we found $limit rows and the results have no grandchildren, we
     //    have a ton of children. Render them and then let the user know that
     //    this is not an exhaustive list.
 
     if (count($children) == $limit) {
       $more_children = true;
       foreach ($children as $child) {
         if ($child['depth'] == $d_grandchild) {
           $more_children = false;
         }
       }
       $show_grandchildren = false;
     } else {
       $show_grandchildren = true;
       $more_children = false;
     }
 
     $grandchildren = array();
     foreach ($children as $key => $child) {
       if ($child['depth'] == $d_child) {
         continue;
       } else {
         unset($children[$key]);
         if ($show_grandchildren) {
           $ancestors = PhabricatorSlug::getAncestry($child['slug']);
           $grandchildren[end($ancestors)][] = $child;
         }
       }
     }
 
     // Fill in any missing children.
     $known_slugs = ipull($children, null, 'slug');
     foreach ($grandchildren as $slug => $ignored) {
       if (empty($known_slugs[$slug])) {
         $children[] = array(
           'slug'    => $slug,
           'depth'   => $d_child,
           'title'   => PhabricatorSlug::getDefaultTitle($slug),
           'empty'   => true,
         );
       }
     }
 
     $children = isort($children, 'title');
 
     $list = array();
     foreach ($children as $child) {
       $list[] = hsprintf('<li>');
       $list[] = $this->renderChildDocumentLink($child);
       $grand = idx($grandchildren, $child['slug'], array());
       if ($grand) {
         $list[] = hsprintf('<ul>');
         foreach ($grand as $grandchild) {
           $list[] = hsprintf('<li>');
           $list[] = $this->renderChildDocumentLink($grandchild);
           $list[] = hsprintf('</li>');
         }
         $list[] = hsprintf('</ul>');
       }
       $list[] = hsprintf('</li>');
     }
     if ($more_children) {
       $list[] = phutil_tag('li', array(), pht('More...'));
     }
 
     $content = array(
       phutil_tag(
         'div',
         array(
           'class' => 'phriction-children-header '.
             'sprite-gradient gradient-lightblue-header',
         ),
         pht('Document Hierarchy')),
       phutil_tag(
         'div',
         array(
           'class' => 'phriction-children',
         ),
         phutil_tag('ul', array(), $list)),
     );
 
     return id(new PHUIDocumentView())
       ->setOffset(true)
       ->appendChild($content);
   }
 
   private function renderChildDocumentLink(array $info) {
     $title = nonempty($info['title'], pht('(Untitled Document)'));
     $item = phutil_tag(
       'a',
       array(
         'href' => PhrictionDocument::getSlugURI($info['slug']),
       ),
       $title);
 
     if (isset($info['empty'])) {
       $item = phutil_tag('em', array(), $item);
     }
 
     return $item;
   }
 
   protected function getDocumentSlug() {
     return $this->slug;
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
index 9ee8352e3..cf29b6afe 100644
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -1,170 +1,170 @@
 <?php
 
 final class PhrictionHistoryController
   extends PhrictionController {
 
   private $slug;
 
   public function willProcessRequest(array $data) {
     $this->slug = $data['slug'];
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $document = id(new PhrictionDocumentQuery())
       ->setViewer($user)
       ->withSlugs(array(PhabricatorSlug::normalize($this->slug)))
       ->needContent(true)
       ->executeOne();
     if (!$document) {
       return new Aphront404Response();
     }
 
     $current = $document->getContent();
 
     $pager = new AphrontPagerView();
     $pager->setOffset($request->getInt('page'));
     $pager->setURI($request->getRequestURI(), 'page');
 
     $history = id(new PhrictionContent())->loadAllWhere(
       'documentID = %d ORDER BY version DESC LIMIT %d, %d',
       $document->getID(),
       $pager->getOffset(),
       $pager->getPageSize() + 1);
     $history = $pager->sliceResults($history);
 
     $author_phids = mpull($history, 'getAuthorPHID');
     $handles = $this->loadViewerHandles($author_phids);
 
     $list = new PHUIObjectItemListView();
     $list->setFlush(true);
 
     foreach ($history as $content) {
 
       $author = $handles[$content->getAuthorPHID()]->renderLink();
       $slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
       $version = $content->getVersion();
 
       $diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
 
       $vs_previous = null;
       if ($content->getVersion() != 1) {
         $vs_previous = $diff_uri
           ->alter('l', $content->getVersion() - 1)
           ->alter('r', $content->getVersion());
       }
 
       $vs_head = null;
       if ($content->getID() != $document->getContentID()) {
         $vs_head = $diff_uri
           ->alter('l', $content->getVersion())
           ->alter('r', $current->getVersion());
       }
 
       $change_type = PhrictionChangeType::getChangeTypeLabel(
         $content->getChangeType());
       switch ($content->getChangeType()) {
         case PhrictionChangeType::CHANGE_DELETE:
           $color = 'red';
           break;
         case PhrictionChangeType::CHANGE_EDIT:
           $color = 'blue';
           break;
         case PhrictionChangeType::CHANGE_MOVE_HERE:
             $color = 'yellow';
           break;
         case PhrictionChangeType::CHANGE_MOVE_AWAY:
             $color = 'orange';
           break;
         case PhrictionChangeType::CHANGE_STUB:
           $color = 'green';
           break;
         default:
-          throw new Exception("Unknown change type!");
+          throw new Exception('Unknown change type!');
           break;
       }
 
       $item = id(new PHUIObjectItemView())
         ->setHeader(pht('%s by %s', $change_type, $author))
         ->setBarColor($color)
         ->addAttribute(
           phutil_tag(
             'a',
             array(
               'href' => $slug_uri.'?v='.$version,
             ),
             pht('Version %s', $version)))
         ->addAttribute(pht('%s %s',
           phabricator_date($content->getDateCreated(), $user),
           phabricator_time($content->getDateCreated(), $user)));
 
       if ($content->getDescription()) {
         $item->addAttribute($content->getDescription());
       }
 
       if ($vs_previous) {
         $item->addIcon(
           'fa-reply',
           pht('Show Change'),
           array(
             'href' => $vs_previous,
           ));
       } else {
         $item->addIcon(
           'fa-reply grey',
           phutil_tag('em', array(), pht('No previous change')));
       }
 
       if ($vs_head) {
         $item->addIcon(
           'fa-reply-all',
           pht('Show Later Changes'),
           array(
             'href' => $vs_head,
           ));
       } else {
         $item->addIcon(
           'fa-reply-all grey',
           phutil_tag('em', array(), pht('No later changes')));
       }
 
       $list->addItem($item);
     }
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumb_views = $this->renderBreadcrumbs($document->getSlug());
     foreach ($crumb_views as $view) {
       $crumbs->addCrumb($view);
     }
     $crumbs->addTextCrumb(
       pht('History'),
       PhrictionDocument::getSlugURI($document->getSlug(), 'history'));
 
     $header = new PHUIHeaderView();
     $header->setHeader(pht('Document History for %s',
       phutil_tag(
         'a',
         array('href' => PhrictionDocument::getSlugURI($document->getSlug())),
         head($history)->getTitle())));
 
     $obj_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($list)
       ->appendChild($pager);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $obj_box,
       ),
       array(
         'title'     => pht('Document History'),
         'device'    => true,
       ));
 
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionMoveController.php b/src/applications/phriction/controller/PhrictionMoveController.php
index bf7475526..f855fa6be 100644
--- a/src/applications/phriction/controller/PhrictionMoveController.php
+++ b/src/applications/phriction/controller/PhrictionMoveController.php
@@ -1,164 +1,164 @@
 <?php
 
 /**
  * @group phriction
  */
 final class PhrictionMoveController
   extends PhrictionController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($this->id) {
       $document = id(new PhrictionDocumentQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
     } else {
       $slug = PhabricatorSlug::normalize(
         $request->getStr('slug'));
       if (!$slug) {
         return new Aphront404Response();
       }
 
       $document = id(new PhrictionDocumentQuery())
         ->setViewer($user)
         ->withSlugs(array($slug))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
     }
 
     if (!$document) {
       return new Aphront404Response();
     }
 
     if (!isset($slug)) {
       $slug = $document->getSlug();
     }
 
     $target_slug = PhabricatorSlug::normalize(
       $request->getStr('new-slug', $slug));
 
     $submit_uri = $request->getRequestURI()->getPath();
     $cancel_uri = PhrictionDocument::getSlugURI($slug);
 
     $errors = array();
     $error_view = null;
     $e_url = null;
 
     $disallowed_statuses = array(
       PhrictionDocumentStatus::STATUS_DELETED => true, // Silly
       PhrictionDocumentStatus::STATUS_MOVED => true, // Plain silly
       PhrictionDocumentStatus::STATUS_STUB => true, // Utterly silly
     );
     if (isset($disallowed_statuses[$document->getStatus()])) {
       $error_dialog = id(new AphrontDialogView())
         ->setUser($user)
-        ->setTitle("Can not move page!")
+        ->setTitle('Can not move page!')
         ->appendChild(pht('An already moved or deleted document '.
           'can not be moved again.'))
         ->addCancelButton($cancel_uri);
 
       return id(new AphrontDialogResponse())->setDialog($error_dialog);
     }
 
     $content = id(new PhrictionContent())->load($document->getContentID());
 
     if ($request->isFormPost() && !count($errors)) {
       if (!count($errors)) { // First check if the target document exists
 
         // NOTE: We use the ominpotent user because we can't let users overwrite
         // documents even if they can't see them.
         $target_document = id(new PhrictionDocumentQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withSlugs(array($target_slug))
           ->executeOne();
 
         // Considering to overwrite existing docs? Nuke this!
         if ($target_document && $target_document->getStatus() ==
           PhrictionDocumentStatus::STATUS_EXISTS) {
 
           $errors[] = pht('Can not overwrite existing target document.');
           $e_url = pht('Already exists.');
         }
       }
 
       if (!count($errors)) { // I like to move it, move it!
         $from_editor = id(PhrictionDocumentEditor::newForSlug($slug))
           ->setActor($user)
           ->setTitle($content->getTitle())
           ->setContent($content->getContent())
           ->setDescription($content->getDescription());
 
         $target_editor = id(PhrictionDocumentEditor::newForSlug(
           $target_slug))
           ->setActor($user)
           ->setTitle($content->getTitle())
           ->setContent($content->getContent())
           ->setDescription($content->getDescription());
 
         // Move it!
         $target_editor->moveHere($document->getID(), $document->getPHID());
 
         // Retrieve the target doc directly from the editor
         // No need to load it per Sql again
         $target_document = $target_editor->getDocument();
         $from_editor->moveAway($target_document->getID());
 
         $redir_uri = PhrictionDocument::getSlugURI($target_document->getSlug());
         return id(new AphrontRedirectResponse())->setURI($redir_uri);
       }
     }
 
     if ($errors) {
       $error_view = id(new AphrontErrorView())
         ->setErrors($errors);
     }
 
     $form = id(new PHUIFormLayoutView())
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Title'))
           ->setValue($content->getTitle()))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('New URI'))
           ->setValue($target_slug)
           ->setError($e_url)
           ->setName('new-slug')
           ->setCaption(pht('The new location of the document.')))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Edit Notes'))
           ->setValue($content->getDescription())
           ->setError(null)
           ->setName('description'));
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Move Document'))
       ->appendChild($form)
       ->setSubmitURI($submit_uri)
       ->addSubmitButton(pht('Move Document'))
       ->addCancelButton($cancel_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 }
diff --git a/src/applications/phriction/editor/PhrictionDocumentEditor.php b/src/applications/phriction/editor/PhrictionDocumentEditor.php
index b78f0ede3..f095abd97 100644
--- a/src/applications/phriction/editor/PhrictionDocumentEditor.php
+++ b/src/applications/phriction/editor/PhrictionDocumentEditor.php
@@ -1,377 +1,377 @@
 <?php
 
 /**
  * Create or update Phriction documents.
  *
  * @group phriction
  */
 final class PhrictionDocumentEditor extends PhabricatorEditor {
 
   private $document;
   private $content;
 
   private $newTitle;
   private $newContent;
   private $description;
 
   // For the Feed Story when moving documents
   private $fromDocumentPHID;
 
   private function __construct() {
     // <restricted>
   }
 
   public static function newForSlug($slug) {
     $slug = PhabricatorSlug::normalize($slug);
 
     // TODO: Get rid of this.
     $document = id(new PhrictionDocument())->loadOneWhere(
       'slug = %s',
       $slug);
     $content = null;
 
     if ($document) {
       $content = id(new PhrictionContent())->load($document->getContentID());
     } else {
       $document = new PhrictionDocument();
       $document->setSlug($slug);
     }
 
     if (!$content) {
       $default_title = PhabricatorSlug::getDefaultTitle($slug);
       $content = new PhrictionContent();
       $content->setSlug($slug);
       $content->setTitle($default_title);
       $content->setContent('');
     }
 
     $obj = new PhrictionDocumentEditor();
     $obj->document = $document;
     $obj->content  = $content;
 
     return $obj;
   }
 
   public function setTitle($title) {
     $this->newTitle = $title;
     return $this;
   }
 
   public function setContent($content) {
     $this->newContent = $content;
     return $this;
   }
 
   public function setDescription($description) {
     $this->description = $description;
     return $this;
   }
 
   public function getDocument() {
     return $this->document;
   }
 
   public function moveAway($new_doc_id) {
     return $this->execute(
       PhrictionChangeType::CHANGE_MOVE_AWAY, true, $new_doc_id);
   }
 
   public function moveHere($old_doc_id, $old_doc_phid) {
     $this->fromDocumentPHID = $old_doc_phid;
     return $this->execute(
       PhrictionChangeType::CHANGE_MOVE_HERE, false, $old_doc_id);
   }
 
   private function execute(
     $change_type, $del_new_content = true, $doc_ref = null) {
 
     $actor = $this->requireActor();
 
     $document = $this->document;
     $content  = $this->content;
 
     $new_content = $this->buildContentTemplate($document, $content);
     $new_content->setChangeType($change_type);
 
     if ($del_new_content) {
       $new_content->setContent('');
     }
 
     if ($doc_ref) {
       $new_content->setChangeRef($doc_ref);
     }
 
     return $this->updateDocument($document, $content, $new_content);
   }
 
   public function delete() {
     return $this->execute(PhrictionChangeType::CHANGE_DELETE, true);
   }
 
   private function stub() {
     return $this->execute(PhrictionChangeType::CHANGE_STUB, true);
   }
 
   public function save() {
     $actor = $this->requireActor();
 
     if ($this->newContent === '') {
       // If this is an edit which deletes all the content, just treat it as
       // a delete. NOTE: null means "don't change the content", not "delete
       // the page"! Thus the strict type check.
       return $this->delete();
     }
 
     $document = $this->document;
     $content  = $this->content;
 
     $new_content = $this->buildContentTemplate($document, $content);
 
     return $this->updateDocument($document, $content, $new_content);
   }
 
   private function buildContentTemplate(
     PhrictionDocument $document,
     PhrictionContent $content) {
 
     $new_content = new PhrictionContent();
     $new_content->setSlug($document->getSlug());
     $new_content->setAuthorPHID($this->getActor()->getPHID());
     $new_content->setChangeType(PhrictionChangeType::CHANGE_EDIT);
 
     $new_content->setTitle(
       coalesce(
         $this->newTitle,
         $content->getTitle()));
 
     $new_content->setContent(
       coalesce(
         $this->newContent,
         $content->getContent()));
 
     if (strlen($this->description)) {
       $new_content->setDescription($this->description);
     }
 
     return $new_content;
   }
 
   private function updateDocument($document, $content, $new_content) {
 
     $is_new = false;
     if (!$document->getID()) {
       $is_new = true;
     }
 
     $new_content->setVersion($content->getVersion() + 1);
 
     $change_type = $new_content->getChangeType();
     switch ($change_type) {
       case PhrictionChangeType::CHANGE_EDIT:
         $doc_status = PhrictionDocumentStatus::STATUS_EXISTS;
         $feed_action = $is_new
           ? PhrictionActionConstants::ACTION_CREATE
           : PhrictionActionConstants::ACTION_EDIT;
         break;
       case PhrictionChangeType::CHANGE_DELETE:
         $doc_status = PhrictionDocumentStatus::STATUS_DELETED;
         $feed_action = PhrictionActionConstants::ACTION_DELETE;
         if ($is_new) {
           throw new Exception(
             "You can not delete a document which doesn't exist yet!");
         }
         break;
       case PhrictionChangeType::CHANGE_STUB:
         $doc_status = PhrictionDocumentStatus::STATUS_STUB;
         $feed_action = null;
         break;
       case PhrictionChangeType::CHANGE_MOVE_AWAY:
         $doc_status = PhrictionDocumentStatus::STATUS_MOVED;
         $feed_action = null;
         break;
       case PhrictionChangeType::CHANGE_MOVE_HERE:
         $doc_status = PhrictionDocumentStatus::STATUS_EXISTS;
         $feed_action = PhrictionActionConstants::ACTION_MOVE_HERE;
         break;
       default:
         throw new Exception(
           "Unsupported content change type '{$change_type}'!");
     }
 
     $document->setStatus($doc_status);
 
     // TODO: This should be transactional.
 
     if ($is_new) {
       $document->save();
     }
 
     $new_content->setDocumentID($document->getID());
     $new_content->save();
 
     $document->setContentID($new_content->getID());
     $document->save();
 
     $document->attachContent($new_content);
 
     id(new PhabricatorSearchIndexer())
       ->queueDocumentForIndexing($document->getPHID());
 
     // Stub out empty parent documents if they don't exist
     $ancestral_slugs = PhabricatorSlug::getAncestry($document->getSlug());
     if ($ancestral_slugs) {
       $ancestors = id(new PhrictionDocument())->loadAllWhere(
         'slug IN (%Ls)',
         $ancestral_slugs);
       $ancestors = mpull($ancestors, null, 'getSlug');
       foreach ($ancestral_slugs as $slug) {
         // We check for change type to prevent near-infinite recursion
         if (!isset($ancestors[$slug]) &&
           $new_content->getChangeType() != PhrictionChangeType::CHANGE_STUB) {
 
           id(PhrictionDocumentEditor::newForSlug($slug))
             ->setActor($this->getActor())
             ->setTitle(PhabricatorSlug::getDefaultTitle($slug))
             ->setContent('')
             ->setDescription(pht('Empty Parent Document'))
             ->stub();
         }
       }
     }
 
     $project_phid = null;
     $slug = $document->getSlug();
     if (PhrictionDocument::isProjectSlug($slug)) {
       $project = id(new PhabricatorProjectQuery())
         ->setViewer($this->requireActor())
         ->withPhrictionSlugs(array(
           PhrictionDocument::getProjectSlugIdentifier($slug)))
         ->executeOne();
       if ($project) {
         $project_phid = $project->getPHID();
       }
     }
 
     $related_phids = array(
       $document->getPHID(),
       $this->getActor()->getPHID(),
     );
 
     if ($project_phid) {
       $related_phids[] = $project_phid;
     }
 
     if ($this->fromDocumentPHID) {
       $related_phids[] = $this->fromDocumentPHID;
     }
 
     if ($feed_action) {
       id(new PhabricatorFeedStoryPublisher())
         ->setRelatedPHIDs($related_phids)
         ->setStoryAuthorPHID($this->getActor()->getPHID())
         ->setStoryTime(time())
         ->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_PHRICTION)
         ->setStoryData(
           array(
             'phid'      => $document->getPHID(),
             'action'    => $feed_action,
             'content'   => phutil_utf8_shorten($new_content->getContent(), 140),
             'project'   => $project_phid,
             'movedFromPHID' => $this->fromDocumentPHID,
           ))
         ->publish();
     }
 
     // TODO: Migrate to ApplicationTransactions fast, so we get rid of this code
     $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
       $document->getPHID());
     $this->sendMailToSubscribers($subscribers, $content);
 
     return $this;
   }
 
   private function getChangeTypeDescription($const, $title) {
     $map = array(
       PhrictionChangeType::CHANGE_EDIT =>
-        pht("Phriction Document %s was edited.", $title),
+        pht('Phriction Document %s was edited.', $title),
       PhrictionChangeType::CHANGE_DELETE =>
-        pht("Phriction Document %s was deleted.", $title),
+        pht('Phriction Document %s was deleted.', $title),
       PhrictionChangeType::CHANGE_MOVE_HERE =>
-        pht("Phriction Document %s was moved here.", $title),
+        pht('Phriction Document %s was moved here.', $title),
       PhrictionChangeType::CHANGE_MOVE_AWAY =>
-        pht("Phriction Document %s was moved away.", $title),
+        pht('Phriction Document %s was moved away.', $title),
       PhrictionChangeType::CHANGE_STUB =>
-        pht("Phriction Document %s was created through child.", $title),
+        pht('Phriction Document %s was created through child.', $title),
     );
     return idx($map, $const, pht('Something magical occurred.'));
   }
 
   private function sendMailToSubscribers(array $subscribers, $old_content) {
     if (!$subscribers) {
       return;
     }
 
     $author_phid = $this->getActor()->getPHID();
     $document = $this->document;
     $content = $document->getContent();
     $slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
     $diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
     $prod_uri = PhabricatorEnv::getProductionURI('');
 
     $vs_head = $diff_uri
       ->alter('l', $old_content->getVersion())
       ->alter('r', $content->getVersion());
 
     $old_title = $old_content->getTitle();
     $title = $content->getTitle();
     $name = $this->getChangeTypeDescription($content->getChangeType(), $title);
     $action = PhrictionChangeType::getChangeTypeLabel(
       $content->getChangeType());
 
     $body = array($name);
     // Content may have changed, you never know
     if ($content->getChangeType() == PhrictionChangeType::CHANGE_EDIT) {
 
       if ($old_title != $title) {
         $body[] = pht('Title was changed from "%s" to "%s"',
           $old_title, $title);
       }
 
       $body[] = pht("Link to new version:\n%s",
         $prod_uri.$slug_uri.'?v='.$content->getVersion());
 
       $body[] = pht("Link to diff:\n%s", $prod_uri.$vs_head);
     } else if ($content->getChangeType() ==
       PhrictionChangeType::CHANGE_MOVE_AWAY) {
 
       $target_document = id(new PhrictionDocument())
         ->load($content->getChangeRef());
       $slug_uri = PhrictionDocument::getSlugURI($target_document->getSlug());
       $body[] = pht("Link to destination document:\n%s", $prod_uri.$slug_uri);
     }
 
     $body = implode("\n\n", $body);
 
     $subject_prefix = $this->getMailSubjectPrefix();
 
     $mail = new PhabricatorMetaMTAMail();
     $mail->setSubject($name)
       ->setSubjectPrefix($subject_prefix)
       ->setVarySubjectPrefix('['.$action.']')
       ->addHeader('Thread-Topic', $name)
       ->setFrom($author_phid)
       ->addTos($subscribers)
       ->setBody($body)
       ->setRelatedPHID($document->getPHID())
       ->setIsBulk(true);
 
     $mail->saveAndSend();
   }
 
   /* --( For less copy-pasting when switching to ApplicationTransactions )--- */
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.phriction.subject-prefix');
   }
 
 }
diff --git a/src/applications/policy/__tests__/PhabricatorPolicyTestCase.php b/src/applications/policy/__tests__/PhabricatorPolicyTestCase.php
index d54ca7365..dca771156 100644
--- a/src/applications/policy/__tests__/PhabricatorPolicyTestCase.php
+++ b/src/applications/policy/__tests__/PhabricatorPolicyTestCase.php
@@ -1,335 +1,335 @@
 <?php
 
 final class PhabricatorPolicyTestCase extends PhabricatorTestCase {
 
   /**
    * Verify that any user can view an object with POLICY_PUBLIC.
    */
   public function testPublicPolicyEnabled() {
     $env = PhabricatorEnv::beginScopedEnv();
     $env->overrideEnvConfig('policy.allow-public', true);
 
     $this->expectVisibility(
       $this->buildObject(PhabricatorPolicies::POLICY_PUBLIC),
       array(
         'public'  => true,
         'user'    => true,
         'admin'   => true,
       ),
       'Public Policy (Enabled in Config)');
   }
 
 
   /**
    * Verify that POLICY_PUBLIC is interpreted as POLICY_USER when public
    * policies are disallowed.
    */
   public function testPublicPolicyDisabled() {
     $env = PhabricatorEnv::beginScopedEnv();
     $env->overrideEnvConfig('policy.allow-public', false);
 
     $this->expectVisibility(
       $this->buildObject(PhabricatorPolicies::POLICY_PUBLIC),
       array(
         'public'  => false,
         'user'    => true,
         'admin'   => true,
       ),
       'Public Policy (Disabled in Config)');
   }
 
 
   /**
    * Verify that any logged-in user can view an object with POLICY_USER, but
    * logged-out users can not.
    */
   public function testUsersPolicy() {
     $this->expectVisibility(
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       array(
         'public'  => false,
         'user'    => true,
         'admin'   => true,
       ),
       'User Policy');
   }
 
 
   /**
    * Verify that only administrators can view an object with POLICY_ADMIN.
    */
   public function testAdminPolicy() {
     $this->expectVisibility(
       $this->buildObject(PhabricatorPolicies::POLICY_ADMIN),
       array(
         'public'  => false,
         'user'    => false,
         'admin'   => true,
       ),
       'Admin Policy');
   }
 
 
   /**
    * Verify that no one can view an object with POLICY_NOONE.
    */
   public function testNoOnePolicy() {
     $this->expectVisibility(
       $this->buildObject(PhabricatorPolicies::POLICY_NOONE),
       array(
         'public'  => false,
         'user'    => false,
         'admin'   => false,
       ),
       'No One Policy');
   }
 
 
   /**
    * Test offset-based filtering.
    */
   public function testOffsets() {
     $results = array(
       $this->buildObject(PhabricatorPolicies::POLICY_NOONE),
       $this->buildObject(PhabricatorPolicies::POLICY_NOONE),
       $this->buildObject(PhabricatorPolicies::POLICY_NOONE),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
     );
 
     $query = new PhabricatorPolicyAwareTestQuery();
     $query->setResults($results);
     $query->setViewer($this->buildUser('user'));
 
     $this->assertEqual(
       3,
       count($query->setLimit(3)->setOffset(0)->execute()),
       'Invisible objects are ignored.');
 
     $this->assertEqual(
       0,
       count($query->setLimit(3)->setOffset(3)->execute()),
       'Offset pages through visible objects only.');
 
     $this->assertEqual(
       2,
       count($query->setLimit(3)->setOffset(1)->execute()),
       'Offsets work correctly.');
 
     $this->assertEqual(
       2,
       count($query->setLimit(0)->setOffset(1)->execute()),
       'Offset with no limit works.');
   }
 
 
   /**
    * Test limits.
    */
   public function testLimits() {
     $results = array(
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
       $this->buildObject(PhabricatorPolicies::POLICY_USER),
     );
 
     $query = new PhabricatorPolicyAwareTestQuery();
     $query->setResults($results);
     $query->setViewer($this->buildUser('user'));
 
     $this->assertEqual(
       3,
       count($query->setLimit(3)->setOffset(0)->execute()),
       'Limits work.');
 
     $this->assertEqual(
       2,
       count($query->setLimit(3)->setOffset(4)->execute()),
       'Limit + offset work.');
   }
 
 
   /**
    * Test that omnipotent users bypass policies.
    */
   public function testOmnipotence() {
     $results = array(
       $this->buildObject(PhabricatorPolicies::POLICY_NOONE),
     );
 
     $query = new PhabricatorPolicyAwareTestQuery();
     $query->setResults($results);
     $query->setViewer(PhabricatorUser::getOmnipotentUser());
 
     $this->assertEqual(
       1,
       count($query->execute()));
   }
 
 
   /**
    * Test that invalid policies reject viewers of all types.
    */
   public function testRejectInvalidPolicy() {
-    $invalid_policy = "the duck goes quack";
+    $invalid_policy = 'the duck goes quack';
     $object = $this->buildObject($invalid_policy);
 
     $this->expectVisibility(
       $object = $this->buildObject($invalid_policy),
       array(
         'public'  => false,
         'user'    => false,
         'admin'   => false,
       ),
       'Invalid Policy');
   }
 
 
   /**
    * An omnipotent user should be able to see even objects with invalid
    * policies.
    */
   public function testInvalidPolicyVisibleByOmnipotentUser() {
-    $invalid_policy = "the cow goes moo";
+    $invalid_policy = 'the cow goes moo';
     $object = $this->buildObject($invalid_policy);
 
     $results = array(
       $object,
     );
 
     $query = new PhabricatorPolicyAwareTestQuery();
     $query->setResults($results);
     $query->setViewer(PhabricatorUser::getOmnipotentUser());
 
     $this->assertEqual(
       1,
       count($query->execute()));
   }
 
   public function testAllQueriesBelongToActualApplications() {
     $queries = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorPolicyAwareQuery')
       ->loadObjects();
 
     foreach ($queries as $qclass => $query) {
       $class = $query->getQueryApplicationClass();
       if (!$class) {
         continue;
       }
       $this->assertTrue(
         (bool)PhabricatorApplication::getByClass($class),
         "Application class '{$class}' for query '{$qclass}'");
     }
   }
 
   public function testMultipleCapabilities() {
     $object = new PhabricatorPolicyTestObject();
     $object->setCapabilities(
       array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT,
       ));
     $object->setPolicies(
       array(
         PhabricatorPolicyCapability::CAN_VIEW
           => PhabricatorPolicies::POLICY_USER,
         PhabricatorPolicyCapability::CAN_EDIT
           => PhabricatorPolicies::POLICY_NOONE,
       ));
 
     $filter = new PhabricatorPolicyFilter();
     $filter->requireCapabilities(
       array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT,
       ));
     $filter->setViewer($this->buildUser('user'));
 
     $result = $filter->apply(array($object));
 
     $this->assertEqual(array(), $result);
   }
 
 
   /**
    * Test an object for visibility across multiple user specifications.
    */
   private function expectVisibility(
     PhabricatorPolicyTestObject $object,
     array $map,
     $description) {
 
     foreach ($map as $spec => $expect) {
       $viewer = $this->buildUser($spec);
 
       $query = new PhabricatorPolicyAwareTestQuery();
       $query->setResults(array($object));
       $query->setViewer($viewer);
 
       $caught = null;
       try {
         $result = $query->executeOne();
       } catch (PhabricatorPolicyException $ex) {
         $caught = $ex;
       }
 
       if ($expect) {
         $this->assertEqual(
           $object,
           $result,
           "{$description} with user {$spec} should succeed.");
       } else {
         $this->assertTrue(
           $caught instanceof PhabricatorPolicyException,
           "{$description} with user {$spec} should fail.");
       }
     }
   }
 
 
   /**
    * Build a test object to spec.
    */
   private function buildObject($policy) {
     $object = new PhabricatorPolicyTestObject();
     $object->setCapabilities(
       array(
         PhabricatorPolicyCapability::CAN_VIEW,
       ));
     $object->setPolicies(
       array(
         PhabricatorPolicyCapability::CAN_VIEW => $policy,
       ));
 
     return $object;
   }
 
 
   /**
    * Build a test user to spec.
    */
   private function buildUser($spec) {
     $user = new PhabricatorUser();
 
     switch ($spec) {
       case 'public':
         break;
       case 'user':
         $user->setPHID(1);
         break;
       case 'admin':
         $user->setPHID(1);
         $user->setIsAdmin(true);
         break;
       default:
         throw new Exception("Unknown user spec '{$spec}'.");
     }
 
     return $user;
   }
 
 }
diff --git a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
index b17456006..03328a6c4 100644
--- a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
+++ b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
@@ -1,44 +1,44 @@
 <?php
 
 final class PhabricatorPolicyConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Policy");
+    return pht('Policy');
   }
 
   public function getDescription() {
-    return pht("Options relating to object visibility.");
+    return pht('Options relating to object visibility.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('policy.allow-public', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow Public Visibility'),
             pht('Require Login')))
-        ->setSummary(pht("Allow users to set object visibility to public."))
+        ->setSummary(pht('Allow users to set object visibility to public.'))
         ->setDescription(
           pht(
             "Phabricator allows you to set the visibility of objects (like ".
             "repositories and tasks) to 'Public', which means **anyone ".
             "on the internet can see them, without needing to log in or ".
             "have an account**.".
             "\n\n".
             "This is intended for open source projects. Many installs will ".
             "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'.".
             "\n\n".
             "Enabling this setting will immediately open up some features, ".
             "like the user directory. Anyone on the internet will be able to ".
             "access these features.".
             "\n\n".
             "With this setting disabled, the 'Public' policy is not ".
             "available, and the most open policy is 'All Users' (which means ".
             "users must have accounts and be logged in to view things).")),
     );
   }
 
 }
diff --git a/src/applications/policy/controller/PhabricatorPolicyEditController.php b/src/applications/policy/controller/PhabricatorPolicyEditController.php
index e48057305..3560f4bea 100644
--- a/src/applications/policy/controller/PhabricatorPolicyEditController.php
+++ b/src/applications/policy/controller/PhabricatorPolicyEditController.php
@@ -1,219 +1,219 @@
 <?php
 
 final class PhabricatorPolicyEditController
   extends PhabricatorPolicyController {
 
   private $phid;
 
   public function willProcessRequest(array $data) {
     $this->phid = idx($data, 'phid');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $action_options = array(
       PhabricatorPolicy::ACTION_ALLOW => pht('Allow'),
       PhabricatorPolicy::ACTION_DENY => pht('Deny'),
     );
 
     $rules = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorPolicyRule')
       ->loadObjects();
     $rules = msort($rules, 'getRuleOrder');
 
     $default_rule = array(
       'action' => head_key($action_options),
       'rule' => head_key($rules),
       'value' => null,
     );
 
     if ($this->phid) {
       $policies = id(new PhabricatorPolicyQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($this->phid))
         ->execute();
       if (!$policies) {
         return new Aphront404Response();
       }
       $policy = head($policies);
     } else {
       $policy = id(new PhabricatorPolicy())
         ->setRules(array($default_rule))
         ->setDefaultAction(PhabricatorPolicy::ACTION_DENY);
     }
 
     $root_id = celerity_generate_unique_node_id();
 
     $default_action = $policy->getDefaultAction();
     $rule_data = $policy->getRules();
 
     $errors = array();
     if ($request->isFormPost()) {
       $data = $request->getStr('rules');
       $data = @json_decode($data, true);
       if (!is_array($data)) {
-        throw new Exception("Failed to JSON decode rule data!");
+        throw new Exception('Failed to JSON decode rule data!');
       }
 
       $rule_data = array();
       foreach ($data as $rule) {
         $action = idx($rule, 'action');
         switch ($action) {
           case 'allow':
           case 'deny':
             break;
           default:
             throw new Exception("Invalid action '{$action}'!");
         }
 
         $rule_class = idx($rule, 'rule');
         if (empty($rules[$rule_class])) {
           throw new Exception("Invalid rule class '{$rule_class}'!");
         }
 
         $rule_obj = $rules[$rule_class];
 
         $value = $rule_obj->getValueForStorage(idx($rule, 'value'));
 
         $rule_data[] = array(
           'action' => $action,
           'rule' => $rule_class,
           'value' => $value,
         );
       }
 
       // Filter out nonsense rules, like a "users" rule without any users
       // actually specified.
       $valid_rules = array();
       foreach ($rule_data as $rule) {
         $rule_class = $rule['rule'];
         if ($rules[$rule_class]->ruleHasEffect($rule['value'])) {
           $valid_rules[] = $rule;
         }
       }
 
       if (!$valid_rules) {
         $errors[] = pht('None of these policy rules have any effect.');
       }
 
       // NOTE: Policies are immutable once created, and we always create a new
       // policy here. If we didn't, we would need to lock this endpoint down,
       // as users could otherwise just go edit the policies of objects with
       // custom policies.
 
       if (!$errors) {
         $new_policy = new PhabricatorPolicy();
         $new_policy->setRules($valid_rules);
         $new_policy->setDefaultAction($request->getStr('default'));
         $new_policy->save();
 
         $data = array(
           'phid' => $new_policy->getPHID(),
           'info' => array(
             'name' => $new_policy->getName(),
             'full' => $new_policy->getName(),
             'icon' => $new_policy->getIcon(),
           ),
         );
 
         return id(new AphrontAjaxResponse())->setContent($data);
       }
     }
 
     // Convert rule values to display format (for example, expanding PHIDs
     // into tokens).
     foreach ($rule_data as $key => $rule) {
       $rule_data[$key]['value'] = $rules[$rule['rule']]->getValueForDisplay(
         $viewer,
         $rule['value']);
     }
 
     $default_select = AphrontFormSelectControl::renderSelectTag(
       $default_action,
       $action_options,
       array(
         'name' => 'default',
       ));
 
     if ($errors) {
       $errors = id(new AphrontErrorView())
         ->setErrors($errors);
     }
 
     $form = id(new PHUIFormLayoutView())
       ->appendChild($errors)
       ->appendChild(
         javelin_tag(
           'input',
           array(
             'type' => 'hidden',
             'name' => 'rules',
             'sigil' => 'rules',
           )))
       ->appendChild(
         id(new AphrontFormInsetView())
           ->setTitle(pht('Rules'))
           ->setRightButton(
             javelin_tag(
               'a',
               array(
                 'href' => '#',
                 'class' => 'button green',
                 'sigil' => 'create-rule',
                 'mustcapture' => true
               ),
               pht('New Rule')))
           ->setDescription(
             pht('These rules are processed in order.'))
           ->setContent(javelin_tag(
             'table',
             array(
               'sigil' => 'rules',
               'class' => 'policy-rules-table'
             ),
             '')))
       ->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('If No Rules Match'))
           ->setValue(pht(
-            "%s all other users.",
+            '%s all other users.',
             $default_select)));
 
     $form = phutil_tag(
       'div',
       array(
         'id' => $root_id,
       ),
       $form);
 
     $rule_options = mpull($rules, 'getRuleDescription');
     $type_map = mpull($rules, 'getValueControlType');
     $templates = mpull($rules, 'getValueControlTemplate');
 
     require_celerity_resource('policy-edit-css');
     Javelin::initBehavior(
       'policy-rule-editor',
       array(
         'rootID' => $root_id,
         'actions' => $action_options,
         'rules' => $rule_options,
         'types' => $type_map,
         'templates' => $templates,
         'data' => $rule_data,
         'defaultRule' => $default_rule,
       ));
 
     $dialog = id(new AphrontDialogView())
       ->setWidth(AphrontDialogView::WIDTH_FULL)
       ->setUser($viewer)
       ->setTitle(pht('Edit Policy'))
       ->appendChild($form)
       ->addSubmitButton(pht('Save Policy'))
       ->addCancelButton('#');
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/policy/management/PhabricatorPolicyManagementShowWorkflow.php b/src/applications/policy/management/PhabricatorPolicyManagementShowWorkflow.php
index be832aa12..e6d2741bf 100644
--- a/src/applications/policy/management/PhabricatorPolicyManagementShowWorkflow.php
+++ b/src/applications/policy/management/PhabricatorPolicyManagementShowWorkflow.php
@@ -1,82 +1,82 @@
 <?php
 
 final class PhabricatorPolicyManagementShowWorkflow
   extends PhabricatorPolicyManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('show')
       ->setSynopsis('Show policy information about an object.')
       ->setExamples(
-        "**show** D123")
+        '**show** D123')
       ->setArguments(
         array(
           array(
             'name'      => 'objects',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $obj_names = $args->getArg('objects');
     if (!$obj_names) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Specify the name of an object to show policy information for."));
+          'Specify the name of an object to show policy information for.'));
     } else if (count($obj_names) > 1) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Specify the name of exactly one object to show policy information ".
-          "for."));
+          'Specify the name of exactly one object to show policy information '.
+          'for.'));
     }
 
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
       ->withNames($obj_names)
       ->executeOne();
 
     if (!$object) {
       $name = head($obj_names);
       throw new PhutilArgumentUsageException(
         pht(
           "No such object '%s'!",
           $name));
     }
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($object->getPHID()))
       ->executeOne();
 
     $policies = PhabricatorPolicyQuery::loadPolicies(
       $viewer,
       $object);
 
     $console->writeOut("__%s__\n\n", pht('OBJECT'));
     $console->writeOut("  %s\n", $handle->getFullName());
     $console->writeOut("\n");
 
     $console->writeOut("__%s__\n\n", pht('CAPABILITIES'));
     foreach ($policies as $capability => $policy) {
       $console->writeOut("  **%s**\n", $capability);
       $console->writeOut("    %s\n", $policy->renderDescription());
       $console->writeOut("    %s\n",
         PhabricatorPolicy::getPolicyExplanation($viewer, $policy->getPHID()));
       $console->writeOut("\n");
 
       $more = (array)$object->describeAutomaticCapability($capability);
       if ($more) {
         foreach ($more as $line) {
           $console->writeOut("    %s\n", $line);
         }
         $console->writeOut("\n");
       }
     }
 
   }
 
 }
diff --git a/src/applications/policy/management/PhabricatorPolicyManagementUnlockWorkflow.php b/src/applications/policy/management/PhabricatorPolicyManagementUnlockWorkflow.php
index 7d0768801..22e498452 100644
--- a/src/applications/policy/management/PhabricatorPolicyManagementUnlockWorkflow.php
+++ b/src/applications/policy/management/PhabricatorPolicyManagementUnlockWorkflow.php
@@ -1,136 +1,136 @@
 <?php
 
 final class PhabricatorPolicyManagementUnlockWorkflow
   extends PhabricatorPolicyManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('unlock')
       ->setSynopsis(
         'Unlock an object by setting its policies to allow anyone to view '.
         'and edit it.')
       ->setExamples(
-        "**unlock** D123")
+        '**unlock** D123')
       ->setArguments(
         array(
           array(
             'name'      => 'objects',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $obj_names = $args->getArg('objects');
     if (!$obj_names) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Specify the name of an object to unlock."));
+          'Specify the name of an object to unlock.'));
     } else if (count($obj_names) > 1) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Specify the name of exactly one object to unlock."));
+          'Specify the name of exactly one object to unlock.'));
     }
 
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
       ->withNames($obj_names)
       ->executeOne();
 
     if (!$object) {
       $name = head($obj_names);
       throw new PhutilArgumentUsageException(
         pht(
           "No such object '%s'!",
           $name));
     }
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($object->getPHID()))
       ->executeOne();
 
     if ($object instanceof PhabricatorApplication) {
       $application = $object;
 
       $console->writeOut(
         "%s\n",
         pht('Unlocking Application: %s', $handle->getFullName()));
 
       // For applications, we can't unlock them in a normal way and don't want
       // to unlock every capability, just view and edit.
       $capabilities = array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT,
       );
 
       $key = 'phabricator.application-settings';
       $config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
       $value = $config_entry->getValue();
 
       foreach ($capabilities as $capability) {
         if ($application->isCapabilityEditable($capability)) {
           unset($value[$application->getPHID()]['policy'][$capability]);
         }
       }
 
       $config_entry->setValue($value);
       $config_entry->save();
 
       $console->writeOut("%s\n", pht('Saved application.'));
 
       return 0;
     }
 
     $console->writeOut("%s\n", pht('Unlocking: %s', $handle->getFullName()));
 
     $updated = false;
     foreach ($object->getCapabilities() as $capability) {
       switch ($capability) {
         case PhabricatorPolicyCapability::CAN_VIEW:
           try {
             $object->setViewPolicy(PhabricatorPolicies::POLICY_USER);
             $console->writeOut("%s\n", pht('Unlocked view policy.'));
             $updated = true;
           } catch (Exception $ex) {
             $console->writeOut("%s\n", pht('View policy is not mutable.'));
           }
           break;
         case PhabricatorPolicyCapability::CAN_EDIT:
           try {
             $object->setEditPolicy(PhabricatorPolicies::POLICY_USER);
             $console->writeOut("%s\n", pht('Unlocked edit policy.'));
             $updated = true;
           } catch (Exception $ex) {
             $console->writeOut("%s\n", pht('Edit policy is not mutable.'));
           }
           break;
         case PhabricatorPolicyCapability::CAN_JOIN:
           try {
             $object->setJoinPolicy(PhabricatorPolicies::POLICY_USER);
             $console->writeOut("%s\n", pht('Unlocked join policy.'));
             $updated = true;
           } catch (Exception $ex) {
             $console->writeOut("%s\n", pht('Join policy is not mutable.'));
           }
           break;
       }
     }
 
     if ($updated) {
       $object->save();
       $console->writeOut("%s\n", pht('Saved object.'));
     } else {
       $console->writeOut(
         "%s\n",
         pht(
           'Object has no mutable policies. Try unlocking parent/container '.
           'object instead. For example, to gain access to a commit, unlock '.
           'the repository it belongs to.'));
     }
   }
 
 }
diff --git a/src/applications/policy/query/PhabricatorPolicyQuery.php b/src/applications/policy/query/PhabricatorPolicyQuery.php
index ac2c60030..88f8d7a42 100644
--- a/src/applications/policy/query/PhabricatorPolicyQuery.php
+++ b/src/applications/policy/query/PhabricatorPolicyQuery.php
@@ -1,236 +1,236 @@
 <?php
 
 final class PhabricatorPolicyQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $object;
   private $phids;
 
   public function setObject(PhabricatorPolicyInterface $object) {
     $this->object = $object;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public static function loadPolicies(
     PhabricatorUser $viewer,
     PhabricatorPolicyInterface $object) {
 
     $results = array();
 
     $map = array();
     foreach ($object->getCapabilities() as $capability) {
       $map[$capability] = $object->getPolicy($capability);
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->withPHIDs($map)
       ->execute();
 
     foreach ($map as $capability => $phid) {
       $results[$capability] = $policies[$phid];
     }
 
     return $results;
   }
 
   public static function renderPolicyDescriptions(
     PhabricatorUser $viewer,
     PhabricatorPolicyInterface $object,
     $icon = false) {
 
     $policies = self::loadPolicies($viewer, $object);
 
     foreach ($policies as $capability => $policy) {
       $policies[$capability] = $policy->renderDescription($icon);
     }
 
     return $policies;
   }
 
   public function loadPage() {
     if ($this->object && $this->phids) {
       throw new Exception(
-        "You can not issue a policy query with both setObject() and ".
-        "setPHIDs().");
+        'You can not issue a policy query with both setObject() and '.
+        'setPHIDs().');
     } else if ($this->object) {
       $phids = $this->loadObjectPolicyPHIDs();
     } else {
       $phids = $this->phids;
     }
 
     $phids = array_fuse($phids);
 
     $results = array();
 
     // First, load global policies.
     foreach ($this->getGlobalPolicies() as $phid => $policy) {
       if (isset($phids[$phid])) {
         $results[$phid] = $policy;
         unset($phids[$phid]);
       }
     }
 
     // If we still need policies, we're going to have to fetch data. Bucket
     // the remaining policies into rule-based policies and handle-based
     // policies.
     if ($phids) {
       $rule_policies = array();
       $handle_policies = array();
       foreach ($phids as $phid) {
         $phid_type = phid_get_type($phid);
         if ($phid_type == PhabricatorPolicyPHIDTypePolicy::TYPECONST) {
           $rule_policies[$phid] = $phid;
         } else {
           $handle_policies[$phid] = $phid;
         }
       }
 
       if ($handle_policies) {
         $handles = id(new PhabricatorHandleQuery())
           ->setViewer($this->getViewer())
           ->withPHIDs($handle_policies)
           ->execute();
         foreach ($handle_policies as $phid) {
           $results[$phid] = PhabricatorPolicy::newFromPolicyAndHandle(
             $phid,
             $handles[$phid]);
         }
       }
 
       if ($rule_policies) {
         $rules = id(new PhabricatorPolicy())->loadAllWhere(
           'phid IN (%Ls)',
           $rule_policies);
         $results += mpull($rules, null, 'getPHID');
       }
     }
 
     $results = msort($results, 'getSortKey');
 
     return $results;
   }
 
   public static function isGlobalPolicy($policy) {
     $globalPolicies = self::getGlobalPolicies();
 
     if (isset($globalPolicies[$policy])) {
       return true;
     }
 
     return false;
   }
 
   public static function getGlobalPolicy($policy) {
     if (!self::isGlobalPolicy($policy)) {
       throw new Exception("Policy '{$policy}' is not a global policy!");
     }
     return idx(self::getGlobalPolicies(), $policy);
   }
 
   private static function getGlobalPolicies() {
     static $constants = array(
       PhabricatorPolicies::POLICY_PUBLIC,
       PhabricatorPolicies::POLICY_USER,
       PhabricatorPolicies::POLICY_ADMIN,
       PhabricatorPolicies::POLICY_NOONE,
     );
 
     $results = array();
     foreach ($constants as $constant) {
       $results[$constant] = id(new PhabricatorPolicy())
         ->setType(PhabricatorPolicyType::TYPE_GLOBAL)
         ->setPHID($constant)
         ->setName(self::getGlobalPolicyName($constant))
         ->setShortName(self::getGlobalPolicyShortName($constant))
         ->makeEphemeral();
     }
 
     return $results;
   }
 
   private static function getGlobalPolicyName($policy) {
     switch ($policy) {
       case PhabricatorPolicies::POLICY_PUBLIC:
         return pht('Public (No Login Required)');
       case PhabricatorPolicies::POLICY_USER:
         return pht('All Users');
       case PhabricatorPolicies::POLICY_ADMIN:
         return pht('Administrators');
       case PhabricatorPolicies::POLICY_NOONE:
         return pht('No One');
       default:
         return pht('Unknown Policy');
     }
   }
 
   private static function getGlobalPolicyShortName($policy) {
     switch ($policy) {
       case PhabricatorPolicies::POLICY_PUBLIC:
         return pht('Public');
       default:
         return null;
     }
   }
 
   private function loadObjectPolicyPHIDs() {
     $phids = array();
     $viewer = $this->getViewer();
 
     if ($viewer->getPHID()) {
       $projects = id(new PhabricatorProjectQuery())
         ->setViewer($viewer)
         ->withMemberPHIDs(array($viewer->getPHID()))
         ->execute();
       foreach ($projects as $project) {
         $phids[] = $project->getPHID();
       }
 
       // Include the "current viewer" policy. This improves consistency, but
       // is also useful for creating private instances of normally-shared object
       // types, like repositories.
       $phids[] = $viewer->getPHID();
     }
 
     $capabilities = $this->object->getCapabilities();
     foreach ($capabilities as $capability) {
       $policy = $this->object->getPolicy($capability);
       if (!$policy) {
         continue;
       }
       $phids[] = $policy;
     }
 
     // If this install doesn't have "Public" enabled, don't include it as an
     // option unless the object already has a "Public" policy. In this case we
     // retain the policy but enforce it as though it was "All Users".
     $show_public = PhabricatorEnv::getEnvConfig('policy.allow-public');
     foreach ($this->getGlobalPolicies() as $phid => $policy) {
       if ($phid == PhabricatorPolicies::POLICY_PUBLIC) {
         if (!$show_public) {
           continue;
         }
       }
       $phids[] = $phid;
     }
 
     return $phids;
   }
 
   protected function shouldDisablePolicyFiltering() {
     // Policy filtering of policies is currently perilous and not required by
     // the application.
     return true;
   }
 
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationPolicy';
   }
 
 }
diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
index 5da76e926..10e8e82c0 100644
--- a/src/applications/ponder/controller/PonderQuestionViewController.php
+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
@@ -1,416 +1,416 @@
 <?php
 
 final class PonderQuestionViewController extends PonderController {
 
   private $questionID;
 
   public function willProcessRequest(array $data) {
     $this->questionID = $data['id'];
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $question = id(new PonderQuestionQuery())
       ->setViewer($user)
       ->withIDs(array($this->questionID))
       ->needAnswers(true)
       ->needViewerVotes(true)
       ->executeOne();
     if (!$question) {
       return new Aphront404Response();
     }
 
     $question->attachVotes($user->getPHID());
 
     $question_xactions = $this->buildQuestionTransactions($question);
     $answers = $this->buildAnswers($question->getAnswers());
 
     $authors = mpull($question->getAnswers(), null, 'getAuthorPHID');
     if (isset($authors[$user->getPHID()])) {
       $answer_add_panel = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_NODATA)
         ->appendChild(
           pht(
             'You have already answered this question. You can not answer '.
             'twice, but you can edit your existing answer.'));
     } else {
       $answer_add_panel = new PonderAddAnswerView();
       $answer_add_panel
         ->setQuestion($question)
         ->setUser($user)
-        ->setActionURI("/ponder/answer/add/");
+        ->setActionURI('/ponder/answer/add/');
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader($question->getTitle());
 
     $actions = $this->buildActionListView($question);
     $properties = $this->buildPropertyListView($question, $actions);
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
     $crumbs->setActionList($actions);
     $crumbs->addTextCrumb('Q'.$this->questionID, '/Q'.$this->questionID);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
         $question_xactions,
         $answers,
         $answer_add_panel
       ),
       array(
         'device' => true,
         'title' => 'Q'.$question->getID().' '.$question->getTitle(),
         'pageObjects' => array_merge(
           array($question->getPHID()),
           mpull($question->getAnswers(), 'getPHID')),
       ));
   }
 
   private function buildActionListView(PonderQuestion $question) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $question->getID();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $question,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $view = id(new PhabricatorActionListView())
       ->setUser($request->getUser())
       ->setObject($question)
       ->setObjectURI($request->getRequestURI());
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Question'))
         ->setHref($this->getApplicationURI("/question/edit/{$id}/"))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
       $name = pht('Close Question');
       $icon = 'fa-times';
       $href = 'close';
     } else {
       $name = pht('Reopen Question');
       $icon = 'fa-check-circle-o';
       $href = 'open';
     }
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName($name)
         ->setIcon($icon)
         ->setRenderAsForm($can_edit)
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit)
         ->setHref($this->getApplicationURI("/question/{$href}/{$id}/")));
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-list')
         ->setName(pht('View History'))
         ->setHref($this->getApplicationURI("/question/history/{$id}/")));
 
     return $view;
   }
 
   private function buildPropertyListView(
     PonderQuestion $question,
     PhabricatorActionListView $actions) {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($question)
       ->setActionList($actions);
 
     $this->loadHandles(array($question->getAuthorPHID()));
 
     $view->addProperty(
       pht('Status'),
       PonderQuestionStatus::getQuestionStatusFullName($question->getStatus()));
 
     $view->addProperty(
       pht('Author'),
       $this->getHandle($question->getAuthorPHID())->renderLink());
 
     $view->addProperty(
       pht('Created'),
       phabricator_datetime($question->getDateCreated(), $viewer));
 
     $view->invokeWillRenderEvent();
 
     $votable = id(new PonderVotableView())
       ->setPHID($question->getPHID())
       ->setURI($this->getApplicationURI('vote/'))
       ->setCount($question->getVoteCount())
       ->setVote($question->getUserVote());
 
     $view->addSectionHeader(pht('Question'));
     $view->addTextContent(
       array(
         $votable,
         phutil_tag(
           'div',
           array(
             'class' => 'phabricator-remarkup',
           ),
           PhabricatorMarkupEngine::renderOneObject(
             $question,
             $question->getMarkupField(),
             $viewer)),
       ));
 
 
     return $view;
   }
 
   private function buildQuestionTransactions(PonderQuestion $question) {
     $viewer = $this->getRequest()->getUser();
     $id = $question->getID();
 
     $xactions = id(new PonderQuestionTransactionQuery())
       ->setViewer($viewer)
       ->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT))
       ->withObjectPHIDs(array($question->getPHID()))
       ->execute();
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($viewer);
     foreach ($xactions as $xaction) {
       if ($xaction->getComment()) {
         $engine->addObject(
           $xaction->getComment(),
           PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
       }
     }
     $engine->process();
 
     $timeline = id(new PhabricatorApplicationTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($question->getPHID())
       ->setTransactions($xactions)
       ->setMarkupEngine($engine);
 
     $add_comment = id(new PhabricatorApplicationTransactionCommentView())
       ->setUser($viewer)
       ->setObjectPHID($question->getPHID())
       ->setShowPreview(false)
       ->setHeaderText(pht('Question Comment'))
       ->setAction($this->getApplicationURI("/question/comment/{$id}/"))
       ->setSubmitButtonName(pht('Comment'));
 
     return $this->wrapComments(
       count($xactions),
       array(
         $timeline,
         $add_comment,
       ));
   }
 
   private function buildAnswers(array $answers) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $out = array();
 
     $phids = mpull($answers, 'getAuthorPHID');
     $this->loadHandles($phids);
 
     $xactions = id(new PonderAnswerTransactionQuery())
       ->setViewer($viewer)
       ->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT))
       ->withObjectPHIDs(mpull($answers, 'getPHID'))
       ->execute();
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($viewer);
     foreach ($xactions as $xaction) {
       if ($xaction->getComment()) {
         $engine->addObject(
           $xaction->getComment(),
           PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
       }
     }
     $engine->process();
 
     $xaction_groups = mgroup($xactions, 'getObjectPHID');
 
     foreach ($answers as $answer) {
       $author_phid = $answer->getAuthorPHID();
       $xactions = idx($xaction_groups, $answer->getPHID(), array());
       $id = $answer->getID();
 
       $out[] = phutil_tag('br');
       $out[] = phutil_tag('br');
       $out[] = id(new PhabricatorAnchorView())
         ->setAnchorName("A$id");
       $header = id(new PHUIHeaderView())
         ->setHeader($this->getHandle($author_phid)->getFullName());
 
       $actions = $this->buildAnswerActions($answer);
       $properties = $this->buildAnswerProperties($answer, $actions);
 
       $object_box = id(new PHUIObjectBoxView())
         ->setHeader($header)
         ->addPropertyList($properties);
 
       $out[] = $object_box;
       $details = array();
 
       $details[] = id(new PhabricatorApplicationTransactionView())
         ->setUser($viewer)
         ->setObjectPHID($answer->getPHID())
         ->setTransactions($xactions)
         ->setMarkupEngine($engine);
 
       $form = id(new PhabricatorApplicationTransactionCommentView())
         ->setUser($viewer)
         ->setObjectPHID($answer->getPHID())
         ->setShowPreview(false)
         ->setHeaderText(pht('Answer Comment'))
         ->setAction($this->getApplicationURI("/answer/comment/{$id}/"))
         ->setSubmitButtonName(pht('Comment'));
 
       $details[] = $form;
 
       $out[] = $this->wrapComments(
         count($xactions),
         $details);
     }
 
     $out[] = phutil_tag('br');
     $out[] = phutil_tag('br');
 
     return $out;
   }
 
   private function buildAnswerActions(PonderAnswer $answer) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $answer->getID();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $answer,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $view = id(new PhabricatorActionListView())
       ->setUser($request->getUser())
       ->setObject($answer)
       ->setObjectURI($request->getRequestURI());
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Answer'))
         ->setHref($this->getApplicationURI("/answer/edit/{$id}/"))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-list')
         ->setName(pht('View History'))
         ->setHref($this->getApplicationURI("/answer/history/{$id}/")));
 
     return $view;
   }
 
   private function buildAnswerProperties(
     PonderAnswer $answer,
     PhabricatorActionListView $actions) {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($answer)
       ->setActionList($actions);
 
     $view->addProperty(
       pht('Created'),
       phabricator_datetime($answer->getDateCreated(), $viewer));
 
     $view->invokeWillRenderEvent();
 
     $votable = id(new PonderVotableView())
       ->setPHID($answer->getPHID())
       ->setURI($this->getApplicationURI('vote/'))
       ->setCount($answer->getVoteCount())
       ->setVote($answer->getUserVote());
 
     $view->addSectionHeader(pht('Answer'));
     $view->addTextContent(
       array(
         $votable,
         phutil_tag(
           'div',
           array(
             'class' => 'phabricator-remarkup',
           ),
           PhabricatorMarkupEngine::renderOneObject(
             $answer,
             $answer->getMarkupField(),
             $viewer)),
       ));
 
     return $view;
   }
 
   private function wrapComments($n, $stuff) {
     if ($n == 0) {
       $text = pht('Add a Comment');
     } else {
       $text = pht('Show %s Comments', new PhutilNumber($n));
     }
 
     $show_id = celerity_generate_unique_node_id();
     $hide_id = celerity_generate_unique_node_id();
 
     Javelin::initBehavior('phabricator-reveal-content');
     require_celerity_resource('ponder-comment-table-css');
 
     $show = phutil_tag(
       'div',
       array(
         'id' => $show_id,
         'class' => 'ponder-show-comments',
       ),
       javelin_tag(
         'a',
         array(
           'href' => '#',
           'sigil' => 'reveal-content',
           'meta' => array(
             'showIDs' => array($hide_id),
             'hideIDs' => array($show_id),
           ),
         ),
         $text));
 
     $hide = phutil_tag(
       'div',
       array(
         'id' => $hide_id,
         'style' => 'display: none',
       ),
       $stuff);
 
     return array($show, $hide);
   }
 
 }
diff --git a/src/applications/ponder/editor/PonderVoteEditor.php b/src/applications/ponder/editor/PonderVoteEditor.php
index a47726535..c1448d2b7 100644
--- a/src/applications/ponder/editor/PonderVoteEditor.php
+++ b/src/applications/ponder/editor/PonderVoteEditor.php
@@ -1,78 +1,78 @@
 <?php
 
 final class PonderVoteEditor extends PhabricatorEditor {
 
   private $answer;
   private $votable;
   private $anwer;
   private $vote;
 
   public function setAnswer($answer) {
     $this->answer = $answer;
     return $this;
   }
 
   public function setVotable($votable) {
     $this->votable = $votable;
     return $this;
   }
 
   public function setVote($vote) {
     $this->vote = $vote;
     return $this;
   }
 
   public function saveVote() {
     $actor = $this->requireActor();
     if (!$this->votable) {
-      throw new Exception("Must set votable before saving vote");
+      throw new Exception('Must set votable before saving vote');
     }
 
     $votable = $this->votable;
     $newvote = $this->vote;
 
     // prepare vote add, or update if this user is amending an
     // earlier vote
     $editor = id(new PhabricatorEdgeEditor())
       ->setActor($actor)
       ->addEdge(
         $actor->getPHID(),
         $votable->getUserVoteEdgeType(),
         $votable->getVotablePHID(),
         array('data' => $newvote))
       ->removeEdge(
         $actor->getPHID(),
         $votable->getUserVoteEdgeType(),
         $votable->getVotablePHID());
 
     $conn = $votable->establishConnection('w');
     $trans = $conn->openTransaction();
     $trans->beginReadLocking();
 
       $votable->reload();
       $curvote = (int)PhabricatorEdgeQuery::loadSingleEdgeData(
         $actor->getPHID(),
         $votable->getUserVoteEdgeType(),
         $votable->getVotablePHID());
 
       if (!$curvote) {
         $curvote = PonderVote::VOTE_NONE;
       }
 
       // adjust votable's score by this much
       $delta = $newvote - $curvote;
 
       queryfx($conn,
         'UPDATE %T as t
         SET t.`voteCount` = t.`voteCount` + %d
         WHERE t.`PHID` = %s',
         $votable->getTableName(),
         $delta,
         $votable->getVotablePHID());
 
       $editor->save();
 
     $trans->endReadLocking();
     $trans->saveTransaction();
   }
 }
diff --git a/src/applications/ponder/mail/PonderQuestionReplyHandler.php b/src/applications/ponder/mail/PonderQuestionReplyHandler.php
index d78899611..f5923f39d 100644
--- a/src/applications/ponder/mail/PonderQuestionReplyHandler.php
+++ b/src/applications/ponder/mail/PonderQuestionReplyHandler.php
@@ -1,27 +1,27 @@
 <?php
 
 final class PonderQuestionReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PonderQuestion)) {
-      throw new Exception("Mail receiver is not a PonderQuestion!");
+      throw new Exception('Mail receiver is not a PonderQuestion!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'Q');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('Q');
   }
 
   public function getReplyHandlerInstructions() {
     return null;
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     // ignore this entirely for now
   }
 }
diff --git a/src/applications/ponder/storage/PonderAnswer.php b/src/applications/ponder/storage/PonderAnswer.php
index f21d22e05..b281961c3 100644
--- a/src/applications/ponder/storage/PonderAnswer.php
+++ b/src/applications/ponder/storage/PonderAnswer.php
@@ -1,199 +1,199 @@
 <?php
 
 final class PonderAnswer extends PonderDAO
   implements
     PhabricatorMarkupInterface,
     PonderVotableInterface,
     PhabricatorPolicyInterface,
     PhabricatorFlaggableInterface,
     PhabricatorSubscribableInterface,
     PhabricatorTokenReceiverInterface {
 
   const MARKUP_FIELD_CONTENT = 'markup:content';
 
   protected $authorPHID;
   protected $questionID;
 
   protected $content;
   protected $contentSource;
 
   protected $voteCount;
   private $vote;
   private $question = self::ATTACHABLE;
   private $comments;
 
   private $userVotes = array();
 
   public function attachQuestion(PonderQuestion $question = null) {
     $this->question = $question;
     return $this;
   }
 
   public function getQuestion() {
     return $this->assertAttached($this->question);
   }
 
   public function getURI() {
     return '/Q'.$this->getQuestionID().'#A'.$this->getID();
   }
 
   public function setUserVote($vote) {
     $this->vote = $vote['data'];
     if (!$this->vote) {
       $this->vote = PonderVote::VOTE_NONE;
     }
     return $this;
   }
 
   public function attachUserVote($user_phid, $vote) {
     $this->vote = $vote;
     return $this;
   }
 
   public function getUserVote() {
     return $this->vote;
   }
 
   public function setComments($comments) {
     $this->comments = $comments;
     return $this;
   }
 
   public function getComments() {
     return $this->comments;
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PonderPHIDTypeAnswer::TYPECONST);
   }
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source->serialize();
     return $this;
   }
 
   public function getContentSource() {
     return PhabricatorContentSource::newFromSerialized($this->contentSource);
   }
 
   public function getMarkupField() {
     return self::MARKUP_FIELD_CONTENT;
   }
 
   // Markup interface
 
   public function getMarkupFieldKey($field) {
     $hash = PhabricatorHash::digest($this->getMarkupText($field));
     $id = $this->getID();
     return "ponder:A{$id}:{$field}:{$hash}";
   }
 
   public function getMarkupText($field) {
     return $this->getContent();
   }
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::getEngine();
   }
 
   public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine) {
     return $output;
   }
 
   public function shouldUseMarkupCache($field) {
     return (bool)$this->getID();
   }
 
   // votable interface
   public function getUserVoteEdgeType() {
     return PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_ANSWER;
   }
 
   public function getVotablePHID() {
     return $this->getPHID();
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getQuestion()->getPolicy($capability);
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_NOONE;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         if ($this->getAuthorPHID() == $viewer->getPHID()) {
           return true;
         }
         return $this->getQuestion()->hasAutomaticCapability(
           $capability,
           $viewer);
       case PhabricatorPolicyCapability::CAN_EDIT:
         return ($this->getAuthorPHID() == $viewer->getPHID());
     }
   }
 
 
   public function describeAutomaticCapability($capability) {
     $out = array();
-    $out[] = pht("The author of an answer can always view and edit it.");
+    $out[] = pht('The author of an answer can always view and edit it.');
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         $out[] = pht(
-          "The user who asks a question can always view the answers.");
+          'The user who asks a question can always view the answers.');
         break;
     }
     return $out;
   }
 
 
 /* -(  PhabricatorTokenReceiverInterface  )---------------------------------- */
 
 
   public function getUsersToNotifyOfTokenGiven() {
     return array(
       $this->getAuthorPHID(),
     );
   }
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return ($phid == $this->getAuthorPHID());
   }
 
   public function shouldShowSubscribersProperty() {
     return true;
   }
 
   public function shouldAllowSubscription($phid) {
     return true;
   }
 
 }
diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
index ed21352ce..6788f4fa1 100644
--- a/src/applications/ponder/storage/PonderQuestion.php
+++ b/src/applications/ponder/storage/PonderQuestion.php
@@ -1,249 +1,249 @@
 <?php
 
 final class PonderQuestion extends PonderDAO
   implements
     PhabricatorMarkupInterface,
     PonderVotableInterface,
     PhabricatorSubscribableInterface,
     PhabricatorFlaggableInterface,
     PhabricatorPolicyInterface,
     PhabricatorTokenReceiverInterface {
 
   const MARKUP_FIELD_CONTENT = 'markup:content';
 
   protected $title;
   protected $phid;
 
   protected $authorPHID;
   protected $status;
   protected $content;
   protected $contentSource;
 
   protected $voteCount;
   protected $answerCount;
   protected $heat;
   protected $mailKey;
 
   private $answers;
   private $vote;
   private $comments;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(PonderPHIDTypeQuestion::TYPECONST);
   }
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source->serialize();
     return $this;
   }
 
   public function getContentSource() {
     return PhabricatorContentSource::newFromSerialized($this->contentSource);
   }
 
   public function attachRelated() {
-    $this->answers = $this->loadRelatives(new PonderAnswer(), "questionID");
+    $this->answers = $this->loadRelatives(new PonderAnswer(), 'questionID');
     $qa_phids = mpull($this->answers, 'getPHID') + array($this->getPHID());
 
     if ($qa_phids) {
       $comments = id(new PonderCommentQuery())
         ->withTargetPHIDs($qa_phids)
         ->execute();
 
       $comments = mgroup($comments, 'getTargetPHID');
     } else {
       $comments = array();
     }
 
     $this->setComments(idx($comments, $this->getPHID(), array()));
     foreach ($this->answers as $answer) {
       $answer->attachQuestion($this);
       $answer->setComments(idx($comments, $answer->getPHID(), array()));
     }
   }
 
   public function attachVotes($user_phid) {
     $qa_phids = mpull($this->answers, 'getPHID') + array($this->getPHID());
 
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array($user_phid))
       ->withDestinationPHIDs($qa_phids)
       ->withEdgeTypes(
         array(
           PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_QUESTION,
           PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_ANSWER
         ))
       ->needEdgeData(true)
       ->execute();
 
     $question_edge =
       $edges[$user_phid][PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_QUESTION];
     $answer_edges =
       $edges[$user_phid][PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_ANSWER];
     $edges = null;
 
     $this->setUserVote(idx($question_edge, $this->getPHID()));
     foreach ($this->answers as $answer) {
       $answer->setUserVote(idx($answer_edges, $answer->getPHID()));
     }
   }
 
   public function setUserVote($vote) {
     $this->vote = $vote['data'];
     if (!$this->vote) {
       $this->vote = PonderVote::VOTE_NONE;
     }
     return $this;
   }
 
   public function attachUserVote($user_phid, $vote) {
     $this->vote = $vote;
     return $this;
   }
 
   public function getUserVote() {
     return $this->vote;
   }
 
   public function setComments($comments) {
     $this->comments = $comments;
     return $this;
   }
 
   public function getComments() {
     return $this->comments;
   }
 
   public function attachAnswers(array $answers) {
     assert_instances_of($answers, 'PonderAnswer');
     $this->answers = $answers;
     return $this;
   }
 
   public function getAnswers() {
     return $this->answers;
   }
 
   public function getMarkupField() {
     return self::MARKUP_FIELD_CONTENT;
   }
 
   // Markup interface
 
   public function getMarkupFieldKey($field) {
     $hash = PhabricatorHash::digest($this->getMarkupText($field));
     $id = $this->getID();
     return "ponder:Q{$id}:{$field}:{$hash}";
   }
 
   public function getMarkupText($field) {
     return $this->getContent();
   }
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::getEngine();
   }
 
   public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine) {
     return $output;
   }
 
   public function shouldUseMarkupCache($field) {
     return (bool)$this->getID();
   }
 
   // votable interface
   public function getUserVoteEdgeType() {
     return PhabricatorEdgeConfig::TYPE_VOTING_USER_HAS_QUESTION;
   }
 
   public function getVotablePHID() {
     return $this->getPHID();
   }
 
   public function save() {
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
   public function getOriginalTitle() {
     // TODO: Make this actually save/return the original title.
     return $this->getTitle();
   }
 
   public function getFullTitle() {
     $id = $this->getID();
     $title = $this->getTitle();
     return "Q{$id}: {$title}";
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     $policy = PhabricatorPolicies::POLICY_NOONE;
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         $policy = PhabricatorPolicies::POLICY_USER;
         break;
     }
 
     return $policy;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return ($viewer->getPHID() == $this->getAuthorPHID());
   }
 
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'The user who asked a question can always view and edit it.');
   }
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return ($phid == $this->getAuthorPHID());
   }
 
   public function shouldShowSubscribersProperty() {
     return true;
   }
 
   public function shouldAllowSubscription($phid) {
     return true;
   }
 
 
 /* -(  PhabricatorTokenReceiverInterface  )---------------------------------- */
 
 
   public function getUsersToNotifyOfTokenGiven() {
     return array(
       $this->getAuthorPHID(),
     );
   }
 
 }
diff --git a/src/applications/project/conduit/ConduitAPI_project_query_Method.php b/src/applications/project/conduit/ConduitAPI_project_query_Method.php
index b43374140..40785eb00 100644
--- a/src/applications/project/conduit/ConduitAPI_project_query_Method.php
+++ b/src/applications/project/conduit/ConduitAPI_project_query_Method.php
@@ -1,84 +1,84 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_project_query_Method extends ConduitAPI_project_Method {
 
   public function getMethodDescription() {
-    return "Execute searches for Projects.";
+    return 'Execute searches for Projects.';
   }
 
   public function defineParamTypes() {
 
     $statuses = array(
       PhabricatorProjectQuery::STATUS_ANY,
       PhabricatorProjectQuery::STATUS_OPEN,
       PhabricatorProjectQuery::STATUS_CLOSED,
       PhabricatorProjectQuery::STATUS_ACTIVE,
       PhabricatorProjectQuery::STATUS_ARCHIVED,
     );
 
     $status_const = $this->formatStringConstants($statuses);
 
     return array(
       'ids'               => 'optional list<int>',
       'phids'             => 'optional list<phid>',
       'status'            => 'optional '.$status_const,
 
       'members'           => 'optional list<phid>',
 
       'limit'             => 'optional int',
       'offset'            => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = new PhabricatorProjectQuery();
     $query->setViewer($request->getUser());
     $query->needMembers(true);
 
     $ids = $request->getValue('ids');
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $status = $request->getValue('status');
     if ($status) {
       $query->withStatus($status);
     }
 
     $phids = $request->getValue('phids');
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $members = $request->getValue('members');
     if ($members) {
       $query->withMemberPHIDs($members);
     }
 
     $limit = $request->getValue('limit');
     if ($limit) {
       $query->setLimit($limit);
     }
 
     $offset = $request->getValue('offset');
     if ($offset) {
       $query->setOffset($offset);
     }
 
     $results = $query->execute();
     return $this->buildProjectInfoDictionaries($results);
   }
 
 }
diff --git a/src/applications/project/config/PhabricatorProjectConfigOptions.php b/src/applications/project/config/PhabricatorProjectConfigOptions.php
index 83907a926..149ba13dc 100644
--- a/src/applications/project/config/PhabricatorProjectConfigOptions.php
+++ b/src/applications/project/config/PhabricatorProjectConfigOptions.php
@@ -1,43 +1,43 @@
 <?php
 
 final class PhabricatorProjectConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Projects");
+    return pht('Projects');
   }
 
   public function getDescription() {
-    return pht("Configure Projects.");
+    return pht('Configure Projects.');
   }
 
   public function getOptions() {
     $default_fields = array(
       'std:project:internal:description' => true,
     );
 
     foreach ($default_fields as $key => $enabled) {
       $default_fields[$key] = array(
         'disabled' => !$enabled,
       );
     }
 
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     return array(
       $this->newOption('projects.custom-field-definitions', 'wild', array())
         ->setSummary(pht('Custom Projects fields.'))
         ->setDescription(
           pht(
-            "Array of custom fields for Projects."))
+            'Array of custom fields for Projects.'))
         ->addExample(
           '{"mycompany:motto": {"name": "Project Motto", '.
           '"type": "string"}}',
           pht('Valid Setting')),
       $this->newOption('projects.fields', $custom_field_type, $default_fields)
         ->setCustomData(id(new PhabricatorProject())->getCustomFieldBaseClass())
-        ->setDescription(pht("Select and reorder project fields.")),
+        ->setDescription(pht('Select and reorder project fields.')),
     );
   }
 
 }
diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
index e7c56f2e0..94b2e7e12 100644
--- a/src/applications/project/storage/PhabricatorProject.php
+++ b/src/applications/project/storage/PhabricatorProject.php
@@ -1,274 +1,274 @@
 <?php
 
 final class PhabricatorProject extends PhabricatorProjectDAO
   implements
     PhabricatorFlaggableInterface,
     PhabricatorPolicyInterface,
     PhabricatorSubscribableInterface,
     PhabricatorCustomFieldInterface,
     PhabricatorDestructableInterface {
 
   protected $name;
   protected $status = PhabricatorProjectStatus::STATUS_ACTIVE;
   protected $authorPHID;
   protected $subprojectPHIDs = array();
   protected $phrictionSlug;
   protected $profileImagePHID;
   protected $icon;
 
   protected $viewPolicy;
   protected $editPolicy;
   protected $joinPolicy;
 
   private $memberPHIDs = self::ATTACHABLE;
   private $watcherPHIDs = self::ATTACHABLE;
   private $sparseWatchers = self::ATTACHABLE;
   private $sparseMembers = self::ATTACHABLE;
   private $customFields = self::ATTACHABLE;
   private $profileImageFile = self::ATTACHABLE;
   private $slugs = self::ATTACHABLE;
 
   const DEFAULT_ICON = 'fa-briefcase';
 
   public static function initializeNewProject(PhabricatorUser $actor) {
     return id(new PhabricatorProject())
       ->setName('')
       ->setAuthorPHID($actor->getPHID())
       ->setIcon(self::DEFAULT_ICON)
       ->setViewPolicy(PhabricatorPolicies::POLICY_USER)
       ->setEditPolicy(PhabricatorPolicies::POLICY_USER)
       ->setJoinPolicy(PhabricatorPolicies::POLICY_USER)
       ->attachMemberPHIDs(array());
   }
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
       PhabricatorPolicyCapability::CAN_JOIN,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
       case PhabricatorPolicyCapability::CAN_JOIN:
         return $this->getJoinPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         if ($this->isUserMember($viewer->getPHID())) {
           // Project members can always view a project.
           return true;
         }
         break;
       case PhabricatorPolicyCapability::CAN_EDIT:
         break;
       case PhabricatorPolicyCapability::CAN_JOIN:
         $can_edit = PhabricatorPolicyCapability::CAN_EDIT;
         if (PhabricatorPolicyFilter::hasCapability($viewer, $this, $can_edit)) {
           // Project editors can always join a project.
           return true;
         }
         break;
     }
 
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
-        return pht("Members of a project can always view it.");
+        return pht('Members of a project can always view it.');
       case PhabricatorPolicyCapability::CAN_JOIN:
-        return pht("Users who can edit a project can always join it.");
+        return pht('Users who can edit a project can always join it.');
     }
     return null;
   }
 
   public function isUserMember($user_phid) {
     if ($this->memberPHIDs !== self::ATTACHABLE) {
       return in_array($user_phid, $this->memberPHIDs);
     }
     return $this->assertAttachedKey($this->sparseMembers, $user_phid);
   }
 
   public function setIsUserMember($user_phid, $is_member) {
     if ($this->sparseMembers === self::ATTACHABLE) {
       $this->sparseMembers = array();
     }
     $this->sparseMembers[$user_phid] = $is_member;
     return $this;
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'subprojectPHIDs' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorProjectPHIDTypeProject::TYPECONST);
   }
 
   public function attachMemberPHIDs(array $phids) {
     $this->memberPHIDs = $phids;
     return $this;
   }
 
   public function getMemberPHIDs() {
     return $this->assertAttached($this->memberPHIDs);
   }
 
   public function setPhrictionSlug($slug) {
 
     // NOTE: We're doing a little magic here and stripping out '/' so that
     // project pages always appear at top level under projects/ even if the
     // display name is "Hack / Slash" or similar (it will become
     // 'hack_slash' instead of 'hack/slash').
 
     $slug = str_replace('/', ' ', $slug);
     $slug = PhabricatorSlug::normalize($slug);
     $this->phrictionSlug = $slug;
     return $this;
   }
 
   public function getFullPhrictionSlug() {
     $slug = $this->getPhrictionSlug();
     return 'projects/'.$slug;
   }
 
   // TODO - once we sever project => phriction automagicalness,
   // migrate getPhrictionSlug to have no trailing slash and be called
   // getPrimarySlug
   public function getPrimarySlug() {
     $slug = $this->getPhrictionSlug();
     return rtrim($slug, '/');
   }
 
   public function isArchived() {
     return ($this->getStatus() == PhabricatorProjectStatus::STATUS_ARCHIVED);
   }
 
   public function getProfileImageURI() {
     return $this->getProfileImageFile()->getBestURI();
   }
 
   public function attachProfileImageFile(PhabricatorFile $file) {
     $this->profileImageFile = $file;
     return $this;
   }
 
   public function getProfileImageFile() {
     return $this->assertAttached($this->profileImageFile);
   }
 
 
   public function isUserWatcher($user_phid) {
     if ($this->watcherPHIDs !== self::ATTACHABLE) {
       return in_array($user_phid, $this->watcherPHIDs);
     }
     return $this->assertAttachedKey($this->sparseWatchers, $user_phid);
   }
 
   public function setIsUserWatcher($user_phid, $is_watcher) {
     if ($this->sparseWatchers === self::ATTACHABLE) {
       $this->sparseWatchers = array();
     }
     $this->sparseWatchers[$user_phid] = $is_watcher;
     return $this;
   }
 
   public function attachWatcherPHIDs(array $phids) {
     $this->watcherPHIDs = $phids;
     return $this;
   }
 
   public function getWatcherPHIDs() {
     return $this->assertAttached($this->watcherPHIDs);
   }
 
   public function attachSlugs(array $slugs) {
     $this->slugs = $slugs;
     return $this;
   }
 
   public function getSlugs() {
     return $this->assertAttached($this->slugs);
   }
 
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return false;
   }
 
   public function shouldShowSubscribersProperty() {
     return false;
   }
 
   public function shouldAllowSubscription($phid) {
     return $this->isUserMember($phid) &&
            !$this->isUserWatcher($phid);
   }
 
 
 /* -(  PhabricatorCustomFieldInterface  )------------------------------------ */
 
 
   public function getCustomFieldSpecificationForRole($role) {
     return PhabricatorEnv::getEnvConfig('projects.fields');
   }
 
   public function getCustomFieldBaseClass() {
     return 'PhabricatorProjectCustomField';
   }
 
   public function getCustomFields() {
     return $this->assertAttached($this->customFields);
   }
 
   public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
     $this->customFields = $fields;
     return $this;
   }
 
 
 /* -(  PhabricatorDestructableInterface  )----------------------------------- */
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $this->delete();
 
       $columns = id(new PhabricatorProjectColumn())
         ->loadAllWhere('projectPHID = %s', $this->getPHID());
       foreach ($columns as $column) {
         $engine->destroyObject($column);
       }
 
       $slugs = id(new PhabricatorProjectSlug())
         ->loadAllWhere('projectPHID = %s', $this->getPHID());
       foreach ($slugs as $slug) {
         $slug->delete();
       }
 
     $this->saveTransaction();
   }
 
 }
diff --git a/src/applications/releeph/commitfinder/ReleephCommitFinder.php b/src/applications/releeph/commitfinder/ReleephCommitFinder.php
index e1d569d92..00821cdd6 100644
--- a/src/applications/releeph/commitfinder/ReleephCommitFinder.php
+++ b/src/applications/releeph/commitfinder/ReleephCommitFinder.php
@@ -1,105 +1,105 @@
 <?php
 
 final class ReleephCommitFinder {
 
   private $releephProject;
   private $user;
   private $objectPHID;
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
   public function getUser() {
     return $this->user;
   }
 
   public function setReleephProject(ReleephProject $rp) {
     $this->releephProject = $rp;
     return $this;
   }
 
   public function getRequestedObjectPHID() {
     return $this->objectPHID;
   }
 
   public function fromPartial($partial_string) {
     $this->objectPHID = null;
 
     // Look for diffs
     $matches = array();
     if (preg_match('/^D([1-9]\d*)$/', $partial_string, $matches)) {
       $diff_id = $matches[1];
       // TOOD: (T603) This is all slated for annihilation.
       $diff_rev = id(new DifferentialRevision())->load($diff_id);
       if (!$diff_rev) {
         throw new ReleephCommitFinderException(
           "{$partial_string} does not refer to an existing diff.");
       }
       $commit_phids = $diff_rev->loadCommitPHIDs();
 
       if (!$commit_phids) {
         throw new ReleephCommitFinderException(
           "{$partial_string} has no commits associated with it yet.");
       }
 
       $this->objectPHID = $diff_rev->getPHID();
 
       $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
         'phid IN (%Ls) ORDER BY epoch ASC',
         $commit_phids);
       return head($commits);
     }
 
     // Look for a raw commit number, or r<callsign><commit-number>.
     $repository = $this->releephProject->getRepository();
     $dr_data = null;
     $matches = array();
     if (preg_match('/^r(?P<callsign>[A-Z]+)(?P<commit>\w+)$/',
       $partial_string, $matches)) {
       $callsign = $matches['callsign'];
       if ($callsign != $repository->getCallsign()) {
         throw new ReleephCommitFinderException(sprintf(
-          "%s is in a different repository to this Releeph project (%s).",
+          '%s is in a different repository to this Releeph project (%s).',
           $partial_string,
           $repository->getCallsign()));
       } else {
         $dr_data = $matches;
       }
     } else {
       $dr_data = array(
         'callsign' => $repository->getCallsign(),
         'commit' => $partial_string
       );
     }
 
     try {
       $dr_data['user'] = $this->getUser();
       $dr = DiffusionRequest::newFromDictionary($dr_data);
     } catch (Exception $ex) {
       $message = "No commit matches {$partial_string}: ".$ex->getMessage();
       throw new ReleephCommitFinderException($message);
     }
 
     $phabricator_repository_commit = $dr->loadCommit();
 
     if (!$phabricator_repository_commit) {
       throw new ReleephCommitFinderException(
         "The commit {$partial_string} doesn't exist in this repository.");
     }
 
     // When requesting a single commit, if it has an associated review we
     // imply the review was requested instead. This is always correct for now
     // and consistent with the older behavior, although it might not be the
     // right rule in the future.
     $phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $phabricator_repository_commit->getPHID(),
       PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV);
     if ($phids) {
       $this->objectPHID = head($phids);
     }
 
     return $phabricator_repository_commit;
   }
 
 }
diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
index ca99b1e13..a74119631 100644
--- a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
+++ b/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
@@ -1,62 +1,62 @@
 <?php
 
 final class ConduitAPI_releeph_getbranches_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodDescription() {
-    return "Return information about all active Releeph branches.";
+    return 'Return information about all active Releeph branches.';
   }
 
   public function defineParamTypes() {
     return array(
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict<string, wild>>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
 
     $projects = id(new ReleephProductQuery())
       ->setViewer($request->getUser())
       ->withActive(1)
       ->execute();
 
     foreach ($projects as $project) {
       $repository = $project->getRepository();
 
       $branches = $project->loadRelatives(
         id(new ReleephBranch()),
         'releephProjectID',
         'getID',
         'isActive = 1');
 
       foreach ($branches as $branch) {
         $full_branch_name = $branch->getName();
 
         $cut_point_commit = $branch->loadOneRelative(
           id(new PhabricatorRepositoryCommit()),
           'phid',
           'getCutPointCommitPHID');
 
         $results[] = array(
           'project'         => $project->getName(),
           'repository'      => $repository->getCallsign(),
           'branch'          => $branch->getBasename(),
           'fullBranchName'  => $full_branch_name,
           'symbolicName'    => $branch->getSymbolicName(),
           'cutPoint'        => $cut_point_commit->getCommitIdentifier(),
         );
       }
     }
 
     return $results;
   }
 }
diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php
index 950e62953..23fe38cf0 100644
--- a/src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php
+++ b/src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php
@@ -1,96 +1,96 @@
 <?php
 
 final class ConduitAPI_releeph_projectinfo_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodDescription() {
     return
-      "Fetch information about all Releeph projects ".
-      "for a given Arcanist project.";
+      'Fetch information about all Releeph projects '.
+      'for a given Arcanist project.';
   }
 
   public function defineParamTypes() {
     return array(
       'arcProjectName' => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
-      "ERR_UNKNOWN_ARC" =>
+      'ERR_UNKNOWN_ARC' =>
         "The given Arcanist project name doesn't exist in the ".
         "installation of Phabricator you are accessing.",
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $arc_project_name = $request->getValue('arcProjectName');
     if ($arc_project_name) {
       $arc_project = id(new PhabricatorRepositoryArcanistProject())
         ->loadOneWhere('name = %s', $arc_project_name);
       if (!$arc_project) {
-        throw id(new ConduitException("ERR_UNKNOWN_ARC"))
+        throw id(new ConduitException('ERR_UNKNOWN_ARC'))
           ->setErrorDescription(
             "Unknown Arcanist project '{$arc_project_name}': ".
             "are you using the correct Conduit URI?");
       }
 
       $releeph_projects = id(new ReleephProject())
         ->loadAllWhere('arcanistProjectID = %d', $arc_project->getID());
     } else {
       $releeph_projects = id(new ReleephProject())->loadAll();
     }
 
     $releeph_projects = mfilter($releeph_projects, 'getIsActive');
 
     $result = array();
     foreach ($releeph_projects as $releeph_project) {
       $selector = $releeph_project->getReleephFieldSelector();
       $fields = $selector->getFieldSpecifications();
 
       $fields_info = array();
       foreach ($fields as $field) {
         $field->setReleephProject($releeph_project);
         if ($field->isEditable()) {
           $key = $field->getKeyForConduit();
           $fields_info[$key] = array(
             'class'   => get_class($field),
             'name'    => $field->getName(),
             'key'     => $key,
             'arcHelp' => $field->renderHelpForArcanist(),
           );
         }
       }
 
       $releeph_branches = mfilter(
         id(new ReleephBranch())
           ->loadAllWhere('releephProjectID = %d', $releeph_project->getID()),
         'getIsActive');
 
       $releeph_branches_struct = array();
       foreach ($releeph_branches as $branch) {
         $releeph_branches_struct[] = array(
           'branchName'  => $branch->getName(),
           'projectName' => $releeph_project->getName(),
           'projectPHID' => $releeph_project->getPHID(),
           'branchPHID'  => $branch->getPHID(),
         );
       }
 
       $result[] = array(
         'projectName' => $releeph_project->getName(),
         'projectPHID' => $releeph_project->getPHID(),
         'branches'    => $releeph_branches_struct,
         'fields'      => $fields_info,
       );
     }
 
     return $result;
   }
 
 
 }
diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php
index 44767e6b6..b0b77340b 100644
--- a/src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php
+++ b/src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php
@@ -1,77 +1,77 @@
 <?php
 
 final class ConduitAPI_releeph_queryrequests_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodDescription() {
     return
-      "Return information about all Releeph requests linked to the given ids.";
+      'Return information about all Releeph requests linked to the given ids.';
   }
 
   public function defineParamTypes() {
     return array(
       'revisionPHIDs'         => 'optional list<phid>',
       'requestedCommitPHIDs'  => 'optional list<phid>'
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $conduit_request) {
     $revision_phids = $conduit_request->getValue('revisionPHIDs');
     $requested_commit_phids =
       $conduit_request->getValue('requestedCommitPHIDs');
     $result = array();
 
     if (!$revision_phids && !$requested_commit_phids) {
       return $result;
     }
 
     $query = new ReleephRequestQuery();
     $query->setViewer($conduit_request->getUser());
 
     if ($revision_phids) {
       $query->withRequestedObjectPHIDs($revision_phids);
     } else if ($requested_commit_phids) {
       $query->withRequestedCommitPHIDs($requested_commit_phids);
     }
 
     $releephRequests = $query->execute();
 
     foreach ($releephRequests as $releephRequest) {
       $branch = $releephRequest->getBranch();
 
       $request_commit_phid = $releephRequest->getRequestCommitPHID();
 
       $object = $releephRequest->getRequestedObject();
       if ($object instanceof DifferentialRevision) {
         $object_phid = $object->getPHID();
       }  else {
         $object_phid = null;
       }
 
       $status = $releephRequest->getStatus();
       $statusName = ReleephRequestStatus::getStatusDescriptionFor($status);
       $url = PhabricatorEnv::getProductionURI('/RQ'.$releephRequest->getID());
 
       $result[] = array(
         'branchBasename' => $branch->getBasename(),
         'branchSymbolic' => $branch->getSymbolicName(),
         'requestID'      => $releephRequest->getID(),
         'revisionPHID'   => $object_phid,
         'status'         => $status,
         'statusName'     => $statusName,
         'url'            => $url,
       );
     }
 
     return $result;
   }
 
 }
diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php
index 88ae176c7..f0be4d07a 100644
--- a/src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php
+++ b/src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php
@@ -1,166 +1,166 @@
 <?php
 
 final class ConduitAPI_releeph_request_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodDescription() {
-    return "Request a commit or diff to be picked to a branch.";
+    return 'Request a commit or diff to be picked to a branch.';
   }
 
   public function defineParamTypes() {
     return array(
       'branchPHID'  => 'required string',
       'things'      => 'required list<string>',
       'fields'      => 'dict<string, string>',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
-      "ERR_BRANCH"      => 'Unknown Releeph branch.',
-      "ERR_FIELD_PARSE" => 'Unable to parse a Releeph field.',
+      'ERR_BRANCH'      => 'Unknown Releeph branch.',
+      'ERR_FIELD_PARSE' => 'Unable to parse a Releeph field.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser();
 
     $viewer_handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($user->getPHID()))
       ->executeOne();
 
     $branch_phid = $request->getValue('branchPHID');
     $releeph_branch = id(new ReleephBranchQuery())
       ->setViewer($user)
       ->withPHIDs(array($branch_phid))
       ->executeOne();
 
     if (!$releeph_branch) {
-      throw id(new ConduitException("ERR_BRANCH"))->setErrorDescription(
+      throw id(new ConduitException('ERR_BRANCH'))->setErrorDescription(
         "No ReleephBranch found with PHID {$branch_phid}!");
     }
 
     $releeph_project = $releeph_branch->getProduct();
 
     // Find the requested commit identifiers
     $requested_commits = array();
     $requested_object_phids = array();
     $things = $request->getValue('things');
     $finder = id(new ReleephCommitFinder())
       ->setUser($user)
       ->setReleephProject($releeph_project);
     foreach ($things as $thing) {
       try {
         $requested_commits[$thing] = $finder->fromPartial($thing);
         $object_phid = $finder->getRequestedObjectPHID();
         if (!$object_phid) {
           $object_phid = $requested_commits[$thing]->getPHID();
         }
         $requested_object_phids[$thing] = $object_phid;
       } catch (ReleephCommitFinderException $ex) {
         throw id(new ConduitException('ERR_NO_MATCHES'))
           ->setErrorDescription($ex->getMessage());
       }
     }
     $requested_commit_phids = mpull($requested_commits, 'getPHID');
 
     // Find any existing requests that clash on the commit id, for this branch
     $existing_releeph_requests = id(new ReleephRequest())->loadAllWhere(
       'requestCommitPHID IN (%Ls) AND branchID = %d',
       $requested_commit_phids,
       $releeph_branch->getID());
     $existing_releeph_requests = mpull(
       $existing_releeph_requests,
       null,
       'getRequestCommitPHID');
 
     $selector = $releeph_project->getReleephFieldSelector();
     $fields = $selector->getFieldSpecifications();
     foreach ($fields as $field) {
       $field
         ->setReleephProject($releeph_project)
         ->setReleephBranch($releeph_branch);
     }
 
     $results = array();
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs($requested_commit_phids)
       ->execute();
     foreach ($requested_commits as $thing => $commit) {
       $phid = $commit->getPHID();
       $name = id($handles[$phid])->getName();
 
       $releeph_request = null;
 
       $existing_releeph_request = idx($existing_releeph_requests, $phid);
       if ($existing_releeph_request) {
         $releeph_request = $existing_releeph_request;
       } else {
         $releeph_request = id(new ReleephRequest())
           ->setRequestUserPHID($user->getPHID())
           ->setBranchID($releeph_branch->getID())
           ->setInBranch(0)
           ->setRequestedObjectPHID($requested_object_phids[$thing]);
 
         $xactions = array();
 
         $xactions[] = id(new ReleephRequestTransaction())
           ->setTransactionType(ReleephRequestTransaction::TYPE_REQUEST)
           ->setNewValue($commit->getPHID());
 
         $xactions[] = id(new ReleephRequestTransaction())
           ->setTransactionType(ReleephRequestTransaction::TYPE_USER_INTENT)
           ->setMetadataValue('userPHID', $user->getPHID())
           ->setMetadataValue(
             'isAuthoritative',
             $releeph_project->isAuthoritative($user))
           ->setNewValue(ReleephRequest::INTENT_WANT);
 
         foreach ($fields as $field) {
           if (!$field->isEditable()) {
             continue;
           }
           $field->setReleephRequest($releeph_request);
           try {
             $field->setValueFromConduitAPIRequest($request);
           } catch (ReleephFieldParseException $ex) {
             throw id(new ConduitException('ERR_FIELD_PARSE'))
               ->setErrorDescription($ex->getMessage());
           }
         }
 
         $editor = id(new ReleephRequestTransactionalEditor())
           ->setActor($user)
           ->setContinueOnNoEffect(true)
           ->setContentSource(
             PhabricatorContentSource::newForSource(
               PhabricatorContentSource::SOURCE_CONDUIT,
               array()));
 
         $editor->applyTransactions($releeph_request, $xactions);
       }
 
       $url = PhabricatorEnv::getProductionURI('/Y'.$releeph_request->getID());
       $results[$thing] = array(
         'thing'         => $thing,
         'branch'        => $releeph_branch->getDisplayNameWithDetail(),
         'commitName'    => $name,
         'commitID'      => $commit->getCommitIdentifier(),
         'url'           => $url,
         'requestID'     => $releeph_request->getID(),
         'requestor'     => $viewer_handle->getName(),
         'requestTime'   => $releeph_request->getDateCreated(),
         'existing'      => $existing_releeph_request !== null,
       );
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php
index c0b4d4b1c..15bd190bc 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php
@@ -1,34 +1,34 @@
 <?php
 
 final class ConduitAPI_releephwork_canpush_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Return whether the conduit user is allowed to push.";
+    return 'Return whether the conduit user is allowed to push.';
   }
 
   public function defineParamTypes() {
     return array(
       'projectPHID' => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'bool';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $releeph_project = id(new ReleephProject())
       ->loadOneWhere('phid = %s', $request->getValue('projectPHID'));
     $user = $request->getUser();
     return $releeph_project->isAuthoritative($user);
   }
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php
index 62b594c78..04d3b80b8 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php
@@ -1,43 +1,43 @@
 <?php
 
 final class ConduitAPI_releephwork_getauthorinfo_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Return a string to use as the VCS author.";
+    return 'Return a string to use as the VCS author.';
   }
 
   public function defineParamTypes() {
     return array(
       'userPHID'  => 'required string',
       'vcsType'   => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty string';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = id(new PhabricatorUser())
       ->loadOneWhere('phid = %s', $request->getValue('userPHID'));
 
     $email = $user->loadPrimaryEmailAddress();
     if (is_numeric($email)) {
       $email = $user->getUserName().'@fb.com';
     }
 
     return sprintf(
       '%s <%s>',
       $user->getRealName(),
       $email);
   }
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php
index 96aacdde2..020b1440b 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php
@@ -1,57 +1,57 @@
 <?php
 
 final class ConduitAPI_releephwork_getbranch_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Return information to help checkout / cut a Releeph branch.";
+    return 'Return information to help checkout / cut a Releeph branch.';
   }
 
   public function defineParamTypes() {
     return array(
       'branchPHID'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $branch = id(new ReleephBranchQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(array($request->getValue('branchPHID')))
       ->needCutPointCommits(true)
       ->executeOne();
 
     $cut_phid = $branch->getCutPointCommitPHID();
     $phids = array($cut_phid);
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $project = $branch->getProject();
     $repo = $project->getRepository();
     $commit = $branch->getCutPointCommit();
 
     return array(
       'branchName'      => $branch->getName(),
       'branchPHID'      => $branch->getPHID(),
       'vcsType'         => $repo->getVersionControlSystem(),
       'cutCommitID'     => $commit->getCommitIdentifier(),
       'cutCommitName'   => $handles[$cut_phid]->getName(),
       'creatorPHID'     => $branch->getCreatedByUserPHID(),
       'trunk'           => $project->getTrunkBranch(),
     );
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
index a5cc3d8b5..d93da01a3 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
@@ -1,100 +1,100 @@
 <?php
 
 final class ConduitAPI_releephwork_getbranchcommitmessage_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Get a commit message for committing a Releeph branch.";
+    return 'Get a commit message for committing a Releeph branch.';
   }
 
   public function defineParamTypes() {
     return array(
       'branchPHID'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty string';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
 
     $branch = id(new ReleephBranchQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($request->getValue('branchPHID')))
       ->executeOne();
 
     $project = $branch->getProduct();
 
     $creator_phid = $branch->getCreatedByUserPHID();
     $cut_phid = $branch->getCutPointCommitPHID();
 
     $phids = array(
       $branch->getPHID(),
       $project->getPHID(),
       $creator_phid,
       $cut_phid,
     );
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $h_branch = $handles[$branch->getPHID()];
     $h_project = $handles[$project->getPHID()];
 
     // Not as customizable as a ReleephRequest's commit message.  It doesn't
     // really need to be.
     // TODO: Yes it does, see FB-specific stuff below.
     $commit_message = array();
     $commit_message[] = $h_branch->getFullName();
     $commit_message[] = $h_branch->getURI();
 
-    $commit_message[] = "Cut Point: ".$handles[$cut_phid]->getName();
+    $commit_message[] = 'Cut Point: '.$handles[$cut_phid]->getName();
 
     $cut_point_pr_commit = id(new PhabricatorRepositoryCommit())
       ->loadOneWhere('phid = %s', $cut_phid);
     $cut_point_commit_date = strftime(
       '%Y-%m-%d %H:%M:%S%z',
       $cut_point_pr_commit->getEpoch());
     $commit_message[] = "Cut Point Date: {$cut_point_commit_date}";
 
-    $commit_message[] = "Created By: ".$handles[$creator_phid]->getName();
+    $commit_message[] = 'Created By: '.$handles[$creator_phid]->getName();
 
     $project_uri = $project->getURI();
-    $commit_message[] = "Project: ".$h_project->getName()." ".$project_uri;
+    $commit_message[] = 'Project: '.$h_project->getName().' '.$project_uri;
 
     /**
      * Required for 090-limit_new_branch_creations.sh in
      * admin/scripts/git/hosting/hooks/update.d (in the E repo):
      *
      *   http://fburl.com/2372545
      *
      * The commit message must have a line saying:
      *
      *   @new-branch: <branch-name>
      *
      */
     $repo = $project->getRepository();
     switch ($repo->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $commit_message[] = sprintf(
           '@new-branch: %s',
           $branch->getName());
         break;
     }
 
     return implode("\n\n", $commit_message);
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php
index 632af4b8b..4e2ddb7be 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php
@@ -1,96 +1,96 @@
 <?php
 
 final class ConduitAPI_releephwork_getcommitmessage_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return
-      "Get commit message components for building ".
-      "a ReleephRequest commit message.";
+      'Get commit message components for building '.
+      'a ReleephRequest commit message.';
   }
 
   public function defineParamTypes() {
     $action_const = $this->formatStringConstants(array('pick', 'revert'));
 
     return array(
       'requestPHID' => 'required string',
       'action'      => 'required '.$action_const,
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, string>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
 
     $releeph_request = id(new ReleephRequestQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($request->getValue('requestPHID')))
       ->executeOne();
 
     $action = $request->getValue('action');
 
     $title = $releeph_request->getSummaryForDisplay();
 
     $commit_message = array();
 
     $branch = $releeph_request->getBranch();
     $project = $branch->getProduct();
 
     $selector = $project->getReleephFieldSelector();
     $fields = $selector->getFieldSpecifications();
     $fields = $selector->sortFieldsForCommitMessage($fields);
 
     foreach ($fields as $field) {
       $field
         ->setUser($request->getUser())
         ->setReleephProject($project)
         ->setReleephBranch($branch)
         ->setReleephRequest($releeph_request);
 
       $label = null;
       $value = null;
 
       switch ($action) {
         case 'pick':
           if ($field->shouldAppearOnCommitMessage()) {
             $label = $field->renderLabelForCommitMessage();
             $value = $field->renderValueForCommitMessage();
           }
           break;
 
         case 'revert':
           if ($field->shouldAppearOnRevertMessage()) {
             $label = $field->renderLabelForRevertMessage();
             $value = $field->renderValueForRevertMessage();
           }
           break;
       }
 
       if ($label && $value) {
         if (strpos($value, "\n") !== false ||
             substr($value, 0, 2) === '  ') {
           $commit_message[] = "{$label}:\n{$value}";
         } else {
           $commit_message[] = "{$label}: {$value}";
         }
       }
     }
 
     return array(
       'title' => $title,
       'body'  => implode("\n\n", $commit_message),
     );
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
index f39a02568..7082aaba2 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
@@ -1,223 +1,223 @@
 <?php
 
 final class ConduitAPI_releephwork_nextrequest_Method
   extends ConduitAPI_releeph_Method {
 
   private $project;
   private $branch;
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return
-      "Return info required to cut a branch, ".
-      "and pick and revert ReleephRequests";
+      'Return info required to cut a branch, '.
+      'and pick and revert ReleephRequests';
   }
 
   public function defineParamTypes() {
     return array(
       'branchPHID'  => 'required phid',
       'seen'        => 'required map<string, bool>',
     );
   }
 
   public function defineReturnType() {
     return '';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NOT-PUSHER' =>
         'You are not listed as a pusher for thie Releeph project!',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $seen = $request->getValue('seen');
 
     $branch = id(new ReleephBranchQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($request->getValue('branchPHID')))
       ->executeOne();
 
     $project = $branch->getProduct();
 
     $needs_pick = array();
     $needs_revert = array();
 
     // Load every request ever made for this branch...?!!!
     $releeph_requests = id(new ReleephRequestQuery())
       ->setViewer($viewer)
       ->withBranchIDs(array($branch->getID()))
       ->execute();
 
     foreach ($releeph_requests as $candidate) {
       $phid = $candidate->getPHID();
       if (idx($seen, $phid)) {
         continue;
       }
 
       $should = $candidate->shouldBeInBranch();
       $in = $candidate->getInBranch();
       if ($should && !$in) {
         $needs_pick[] = $candidate;
       }
       if (!$should && $in) {
         $needs_revert[] = $candidate;
       }
     }
 
     /**
      * Sort both needs_pick and needs_revert in ascending commit order, as
      * discovered by Phabricator (using the `id` column to perform that
      * ordering).
      *
      * This is easy for $needs_pick as the ordinal is stored.  It is hard for
      * reverts, as we have to look that information up.
      */
     $needs_pick = $this->sortPicks($needs_pick);
     $needs_revert = $this->sortReverts($needs_revert);
 
     /**
      * Do reverts first in reverse order, then the picks in original-commit
      * order.
      *
      * This seems like the correct thing to do, but there may be a better
      * algorithm for the releephwork.nextrequest Conduit call that orders
      * things better.
      *
      * We could also button-mash our way through everything that failed (at the
      * end of the run) to try failed things again.
      */
     $releeph_request = null;
     $action = null;
     if ($needs_revert) {
       $releeph_request = last($needs_revert);
       $action = 'revert';
       $commit_id = $releeph_request->getCommitIdentifier();
       $commit_phid = $releeph_request->getCommitPHID();
-    } elseif ($needs_pick) {
+    } else if ($needs_pick) {
       $releeph_request = head($needs_pick);
       $action = 'pick';
       $commit = $releeph_request->loadPhabricatorRepositoryCommit();
       $commit_id = $commit->getCommitIdentifier();
       $commit_phid = $commit->getPHID();
     } else {
       // Return early if there's nothing to do!
       return array();
     }
 
     // Build the response
     $phids = array();
     $phids[] = $commit_phid;
 
     $diff_phid = null;
     $diff_rev_id = null;
 
     $requested_object = $releeph_request->getRequestedObject();
     if ($requested_object instanceof DifferentialRevision) {
       $diff_rev = $requested_object;
     } else {
       $diff_rev = null;
     }
 
     if ($diff_rev) {
       $diff_phid = $diff_rev->getPHID();
       $phids[] = $diff_phid;
       $diff_rev_id = $diff_rev->getID();
     }
 
     $phids[] = $releeph_request->getPHID();
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $diff_name = null;
     if ($diff_rev) {
       $diff_name = $handles[$diff_phid]->getName();
     }
 
     $new_author_phid = null;
     if ($diff_rev) {
       $new_author_phid = $diff_rev->getAuthorPHID();
     } else {
       $pr_commit = $releeph_request->loadPhabricatorRepositoryCommit();
       if ($pr_commit) {
         $new_author_phid = $pr_commit->getAuthorPHID();
       }
     }
 
     return array(
       'requestID'         => $releeph_request->getID(),
       'requestPHID'       => $releeph_request->getPHID(),
       'requestName'       => $handles[$releeph_request->getPHID()]->getName(),
       'requestorPHID'     => $releeph_request->getRequestUserPHID(),
       'action'            => $action,
       'diffRevID'         => $diff_rev_id,
       'diffName'          => $diff_name,
       'commitIdentifier'  => $commit_id,
       'commitPHID'        => $commit_phid,
       'commitName'        => $handles[$commit_phid]->getName(),
       'needsRevert'       => mpull($needs_revert, 'getID'),
       'needsPick'         => mpull($needs_pick, 'getID'),
       'newAuthorPHID'     => $new_author_phid,
     );
   }
 
   private function sortPicks(array $releeph_requests) {
     $surrogate = array();
     foreach ($releeph_requests as $rq) {
       // TODO: it's likely that relying on the `id` column to provide
       // trunk-commit-order is thoroughly broken.
       $ordinal = (int) $rq->loadPhabricatorRepositoryCommit()->getID();
       $surrogate[$ordinal] = $rq;
     }
     ksort($surrogate);
     return $surrogate;
   }
 
   /**
    * Sort an array of ReleephRequests, that have been picked into a branch, in
    * the order in which they were picked to the branch.
    */
   private function sortReverts(array $releeph_requests) {
     if (!$releeph_requests) {
       return array();
     }
 
     // ReleephRequests, keyed by <branch-commit-id>
     $releeph_requests = mpull($releeph_requests, null, 'getCommitIdentifier');
 
     $commits = id(new PhabricatorRepositoryCommit())
       ->loadAllWhere(
         'commitIdentifier IN (%Ls)',
         mpull($releeph_requests, 'getCommitIdentifier'));
 
     // A map of <branch-commit-id> => <branch-commit-ordinal>
     $surrogate = mpull($commits, 'getID', 'getCommitIdentifier');
 
     $unparsed = array();
     $result = array();
 
     foreach ($releeph_requests as $commit_id => $releeph_request) {
       $ordinal = idx($surrogate, $commit_id);
       if ($ordinal) {
         $result[$ordinal] = $releeph_request;
       } else {
         $unparsed[] = $releeph_request;
       }
     }
 
     // Sort $result in ascending order
     ksort($result);
 
     // Unparsed commits we'll just have to guess, based on time
     $unparsed = msort($unparsed, 'getDateModified');
 
     return array_merge($result, $unparsed);
   }
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
index 61f036294..bea2b28e0 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
@@ -1,75 +1,75 @@
 <?php
 
 final class ConduitAPI_releephwork_record_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   /**
    * Record that a request was committed locally, and is about to be pushed to
    * the remote repository.
    *
    * This lets us mark a ReleephRequest as being in a branch in real time so
    * that no one else tries to pick it.
    *
    * When the daemons discover this commit in the repository with
    * DifferentialReleephRequestFieldSpecification, we'll be able to record the
    * commit's PHID as well.  That process is slow though, and we don't want to
    * wait a whole minute before marking something as cleanly picked or
    * reverted.
    */
   public function getMethodDescription() {
-    return "Record whether we committed a pick or revert ".
-      "to the upstream repository.";
+    return 'Record whether we committed a pick or revert '.
+      'to the upstream repository.';
   }
 
   public function defineParamTypes() {
     $action_const = $this->formatStringConstants(
       array(
         'pick',
         'revert',
       ));
 
     return array(
       'requestPHID'       => 'required string',
       'action'            => 'required '.$action_const,
       'commitIdentifier'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $action = $request->getValue('action');
     $new_commit_id = $request->getValue('commitIdentifier');
 
     $releeph_request = id(new ReleephRequest())
       ->loadOneWhere('phid = %s', $request->getValue('requestPHID'));
 
     $xactions = array();
 
     $xactions[] = id(new ReleephRequestTransaction())
       ->setTransactionType(ReleephRequestTransaction::TYPE_COMMIT)
       ->setMetadataValue('action', $action)
       ->setNewValue($new_commit_id);
 
     $editor = id(new ReleephRequestTransactionalEditor())
       ->setActor($request->getUser())
       ->setContinueOnNoEffect(true)
       ->setContentSource(
         PhabricatorContentSource::newForSource(
           PhabricatorContentSource::SOURCE_CONDUIT,
           array()));
 
     $editor->applyTransactions($releeph_request, $xactions);
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php
index f351fd107..77b794303 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php
@@ -1,83 +1,83 @@
 <?php
 
 final class ConduitAPI_releephwork_recordpickstatus_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
-    return "Record whether a pick or revert was successful or not.";
+    return 'Record whether a pick or revert was successful or not.';
   }
 
   public function defineParamTypes() {
     $action_const = $this->formatStringConstants(
       array(
         'pick',
         'revert',
       ));
 
     return array(
       'requestPHID'       => 'required string',
       'action'            => 'required '.$action_const,
       'ok'                => 'required bool',
       'dryRun'            => 'optional bool',
       'details'           => 'optional dict<string, wild>',
     );
   }
 
   public function defineReturnType() {
     return '';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $action = $request->getValue('action');
     $ok = $request->getValue('ok');
     $dry_run = $request->getValue('dryRun');
     $details = $request->getValue('details', array());
 
     switch ($request->getValue('action')) {
       case 'pick':
         $pick_status = $ok
           ? ReleephRequest::PICK_OK
           : ReleephRequest::PICK_FAILED;
         break;
 
       case 'revert':
         $pick_status = $ok
           ? ReleephRequest::REVERT_OK
           : ReleephRequest::REVERT_FAILED;
         break;
 
       default:
         throw new Exception("Unknown action {$action}!");
     }
 
     $releeph_request = id(new ReleephRequest())
       ->loadOneWhere('phid = %s', $request->getValue('requestPHID'));
 
     $editor = id(new ReleephRequestTransactionalEditor())
       ->setActor($request->getUser())
       ->setContinueOnNoEffect(true)
       ->setContentSource(
         PhabricatorContentSource::newForSource(
           PhabricatorContentSource::SOURCE_CONDUIT,
           array()));
 
     $xactions = array();
 
     $xactions[] = id(new ReleephRequestTransaction())
       ->setTransactionType(ReleephRequestTransaction::TYPE_PICK_STATUS)
       ->setMetadataValue('dryRun', $dry_run)
       ->setMetadataValue('details', $details)
       ->setNewValue($pick_status);
 
     $editor->applyTransactions($releeph_request, $xactions);
   }
 
 }
diff --git a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php b/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
index 316cc5c1b..9054122d2 100644
--- a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
+++ b/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
@@ -1,74 +1,74 @@
 <?php
 
 final class PhabricatorApplicationReleephConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Releeph");
+    return pht('Releeph');
   }
 
   public function getDescription() {
-    return pht("Options for configuring Releeph, the release branch tool.");
+    return pht('Options for configuring Releeph, the release branch tool.');
   }
 
   public function getOptions() {
 
     $default_fields = array(
       new ReleephSummaryFieldSpecification(),
       new ReleephRequestorFieldSpecification(),
       new ReleephSeverityFieldSpecification(),
       new ReleephIntentFieldSpecification(),
       new ReleephReasonFieldSpecification(),
       new ReleephAuthorFieldSpecification(),
       new ReleephRevisionFieldSpecification(),
       new ReleephOriginalCommitFieldSpecification(),
       new ReleephBranchCommitFieldSpecification(),
       new ReleephDiffSizeFieldSpecification(),
       new ReleephDiffChurnFieldSpecification(),
       new ReleephDiffMessageFieldSpecification(),
       new ReleephCommitMessageFieldSpecification(),
     );
 
     $default = array();
     foreach ($default_fields as $default_field) {
       $default[$default_field->getFieldKey()] = true;
     }
 
     foreach ($default as $key => $enabled) {
       $default[$key] = array(
         'disabled' => !$enabled,
       );
     }
 
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     return array(
       $this->newOption('releeph.installed', 'bool', false)
         ->setSummary(pht('Enable the Releeph application.'))
         ->setDescription(
           pht(
-            "Releeph, a tool for managing release branches, will eventually ".
-            "fit in to the Phabricator suite as a general purpose tool. ".
-            "However Releeph is currently unstable in multiple ways that may ".
-            "not migrate properly for you: the code is still in alpha stage ".
-            "of design, the storage format is likely to change in unexpected ".
-            "ways, and the workflows presented are very specific to a core ".
-            "set of alpha testers at Facebook.  For the time being you are ".
-            "strongly discouraged from relying on Releeph being at all ".
-            "stable.")),
+            'Releeph, a tool for managing release branches, will eventually '.
+            'fit in to the Phabricator suite as a general purpose tool. '.
+            'However Releeph is currently unstable in multiple ways that may '.
+            'not migrate properly for you: the code is still in alpha stage '.
+            'of design, the storage format is likely to change in unexpected '.
+            'ways, and the workflows presented are very specific to a core '.
+            'set of alpha testers at Facebook.  For the time being you are '.
+            'strongly discouraged from relying on Releeph being at all '.
+            'stable.')),
       $this->newOption('releeph.fields', $custom_field_type, $default)
         ->setCustomData('ReleephFieldSpecification'),
       $this->newOption(
         'releeph.default-branch-template',
         'string',
         'releases/%P/%p-%Y%m%d-%v')
         ->setDescription(
           pht(
-            "The default branch template for new branches in unconfigured ".
-            "Releeph projects.  This is also configurable on a per-project ".
-            "basis.")),
+            'The default branch template for new branches in unconfigured '.
+            'Releeph projects.  This is also configurable on a per-project '.
+            'basis.')),
     );
   }
 
 
 }
diff --git a/src/applications/releeph/controller/product/ReleephProductEditController.php b/src/applications/releeph/controller/product/ReleephProductEditController.php
index b49ded67d..bd852dcd5 100644
--- a/src/applications/releeph/controller/product/ReleephProductEditController.php
+++ b/src/applications/releeph/controller/product/ReleephProductEditController.php
@@ -1,279 +1,279 @@
 <?php
 
 final class ReleephProductEditController extends ReleephProductController {
 
   private $productID;
 
   public function willProcessRequest(array $data) {
     $this->productID = $data['projectID'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $product = id(new ReleephProductQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->productID))
       ->needArcanistProjects(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$product) {
       return new Aphront404Response();
     }
     $this->setProduct($product);
 
     $e_name = true;
     $e_trunk_branch = true;
     $e_branch_template = false;
     $errors = array();
 
     $product_name = $request->getStr('name', $product->getName());
 
     $trunk_branch = $request->getStr('trunkBranch', $product->getTrunkBranch());
     $branch_template = $request->getStr('branchTemplate');
     if ($branch_template === null) {
       $branch_template = $product->getDetail('branchTemplate');
     }
     $pick_failure_instructions = $request->getStr('pickFailureInstructions',
       $product->getDetail('pick_failure_instructions'));
     $test_paths = $request->getStr('testPaths');
     if ($test_paths !== null) {
       $test_paths = array_filter(explode("\n", $test_paths));
     } else {
       $test_paths = $product->getDetail('testPaths', array());
     }
 
     $arc_project_id = $product->getArcanistProjectID();
 
     if ($request->isFormPost()) {
       $pusher_phids = $request->getArr('pushers');
 
       if (!$product_name) {
         $e_name = pht('Required');
         $errors[] =
           pht('Your releeph product should have a simple descriptive name.');
       }
 
       if (!$trunk_branch) {
         $e_trunk_branch = pht('Required');
         $errors[] =
           pht('You must specify which branch you will be picking from.');
       }
 
       $other_releeph_products = id(new ReleephProject())
         ->loadAllWhere('id != %d', $product->getID());
       $other_releeph_product_names = mpull($other_releeph_products,
         'getName', 'getID');
 
       if (in_array($product_name, $other_releeph_product_names)) {
-        $errors[] = pht("Releeph product name %s is already taken",
+        $errors[] = pht('Releeph product name %s is already taken',
           $product_name);
       }
 
       foreach ($test_paths as $test_path) {
         $result = @preg_match($test_path, '');
         $is_a_valid_regexp = $result !== false;
         if (!$is_a_valid_regexp) {
           $errors[] = pht('Please provide a valid regular expression: '.
             '%s is not valid', $test_path);
         }
       }
 
       $product
         ->setTrunkBranch($trunk_branch)
         ->setDetail('pushers', $pusher_phids)
         ->setDetail('pick_failure_instructions', $pick_failure_instructions)
         ->setDetail('branchTemplate', $branch_template)
         ->setDetail('testPaths', $test_paths);
 
       $fake_commit_handle =
         ReleephBranchTemplate::getFakeCommitHandleFor($arc_project_id);
 
       if ($branch_template) {
         list($branch_name, $template_errors) = id(new ReleephBranchTemplate())
           ->setCommitHandle($fake_commit_handle)
           ->setReleephProjectName($product_name)
           ->interpolate($branch_template);
 
         if ($template_errors) {
           $e_branch_template = pht('Whoopsies!');
           foreach ($template_errors as $template_error) {
             $errors[] = "Template error: {$template_error}";
           }
         }
       }
 
       if (!$errors) {
         $product->save();
 
         return id(new AphrontRedirectResponse())->setURI($product->getURI());
       }
     }
 
     $pusher_phids = $request->getArr(
       'pushers',
       $product->getDetail('pushers', array()));
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($pusher_phids)
       ->execute();
 
     $pusher_handles = array_select_keys($handles, $pusher_phids);
 
     $form = id(new AphrontFormView())
       ->setUser($request->getUser())
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Name'))
           ->setName('name')
           ->setValue($product_name)
           ->setError($e_name)
           ->setCaption(pht('A name like "Thrift" but not "Thrift releases".')))
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Repository'))
           ->setValue(
             $product->getRepository()->getName()))
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Arc Project'))
           ->setValue(
             $product->getArcanistProject()->getName()))
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Releeph Project PHID'))
           ->setValue(
             $product->getPHID()))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Trunk'))
           ->setValue($trunk_branch)
           ->setName('trunkBranch')
           ->setError($e_trunk_branch))
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Pick Instructions'))
           ->setValue($pick_failure_instructions)
           ->setName('pickFailureInstructions')
           ->setCaption(
-            pht("Instructions for pick failures, which will be used " .
-            "in emails generated by failed picks")))
+            pht('Instructions for pick failures, which will be used ' .
+            'in emails generated by failed picks')))
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Tests paths'))
           ->setValue(implode("\n", $test_paths))
           ->setName('testPaths')
           ->setCaption(
             pht('List of strings that all test files contain in their path '.
             'in this project. One string per line. '.
             'Examples: \'__tests__\', \'/javatests/\'...')));
 
     $branch_template_input = id(new AphrontFormTextControl())
       ->setName('branchTemplate')
       ->setValue($branch_template)
       ->setLabel('Branch Template')
       ->setError($e_branch_template)
       ->setCaption(
         pht("Leave this blank to use your installation's default."));
 
     $branch_template_preview = id(new ReleephBranchPreviewView())
       ->setLabel(pht('Preview'))
       ->addControl('template', $branch_template_input)
       ->addStatic('arcProjectID', $arc_project_id)
       ->addStatic('isSymbolic', false)
       ->addStatic('projectName', $product->getName());
 
     $form
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setLabel(pht('Pushers'))
           ->setName('pushers')
           ->setDatasource('/typeahead/common/users/')
           ->setValue($pusher_handles))
       ->appendChild($branch_template_input)
       ->appendChild($branch_template_preview)
       ->appendRemarkupInstructions($this->getBranchHelpText());
 
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton('/releeph/product/')
           ->setValue(pht('Save')));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Edit Releeph Product'))
       ->setFormErrors($errors)
       ->appendChild($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Edit Product'));
 
     return $this->buildStandardPageResponse(
       array(
         $crumbs,
         $box,
       ),
       array(
         'title' => pht('Edit Releeph Product'),
         'device' => true,
       ));
   }
 
   private function getBranchHelpText() {
     return <<<EOTEXT
 
 ==== Interpolations ====
 
 | Code  | Meaning
 | ----- | -------
 | `%P`  | The name of your product, with spaces changed to "-".
 | `%p`  | Like %P, but all lowercase.
 | `%Y`  | The four digit year associated with the branch date.
 | `%m`  | The two digit month.
 | `%d`  | The two digit day.
 | `%v`  | The handle of the commit where the branch was cut ("rXYZa4b3c2d1").
 | `%V`  | The abbreviated commit id where the branch was cut ("a4b3c2d1").
 | `%..` | Any other sequence interpreted by `strftime()`.
 | `%%`  | A literal percent sign.
 
 
 ==== Tips for Branch Templates ====
 
 Use a directory to separate your release branches from other branches:
 
   lang=none
   releases/%Y-%M-%d-%v
   => releases/2012-30-16-rHERGE32cd512a52b7
 
 Include a second hierarchy if you share your repository with other products:
 
   lang=none
   releases/%P/%p-release-%Y%m%d-%V
   => releases/Tintin/tintin-release-20121116-32cd512a52b7
 
 Keep your branch names simple, avoiding strange punctuation, most of which is
 forbidden or escaped anyway:
 
   lang=none, counterexample
   releases//..clown-releases..//`date --iso=seconds`-$(sudo halt)
 
 Include the date early in your template, in an order which sorts properly:
 
   lang=none
   releases/%Y%m%d-%v
   => releases/20121116-rHERGE32cd512a52b7 (good!)
 
   releases/%V-%m.%d.%Y
   => releases/32cd512a52b7-11.16.2012 (awful!)
 
 
 EOTEXT;
   }
 
 }
diff --git a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
index 5c93ab125..e0f3eef1b 100644
--- a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
+++ b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
@@ -1,106 +1,106 @@
 <?php
 
 // TODO: After T2222, this is likely unreachable?
 
 final class ReleephRequestDifferentialCreateController
   extends ReleephController {
 
   private $revisionID;
   private $revision;
 
   public function willProcessRequest(array $data) {
     $this->revisionID = $data['diffRevID'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $diff_rev = id(new DifferentialRevisionQuery())
       ->setViewer($user)
       ->withIDs(array($this->revisionID))
       ->executeOne();
     if (!$diff_rev) {
       return new Aphront404Response();
     }
     $this->revision = $diff_rev;
 
     $arc_project = id(new PhabricatorRepositoryArcanistProject())
       ->loadOneWhere('phid = %s', $this->revision->getArcanistProjectPHID());
 
     $projects = id(new ReleephProject())->loadAllWhere(
       'arcanistProjectID = %d AND isActive = 1',
       $arc_project->getID());
     if (!$projects) {
       throw new Exception(sprintf(
         "D%d belongs to the '%s' Arcanist project, ".
         "which is not part of any Releeph project!",
         $this->revision->getID(),
         $arc_project->getName()));
     }
 
     $branches = id(new ReleephBranch())->loadAllWhere(
       'releephProjectID IN (%Ld) AND isActive = 1',
       mpull($projects, 'getID'));
     if (!$branches) {
       throw new Exception(sprintf(
-        "D%d could be in the Releeph project(s) %s, ".
-        "but this project / none of these projects have open branches.",
+        'D%d could be in the Releeph project(s) %s, '.
+        'but this project / none of these projects have open branches.',
         $this->revision->getID(),
         implode(', ', mpull($projects, 'getName'))));
     }
 
     if (count($branches) === 1) {
       return id(new AphrontRedirectResponse())
         ->setURI($this->buildReleephRequestURI(head($branches)));
     }
 
     $projects = msort(
       mpull($projects, null, 'getID'),
       'getName');
 
     $branch_groups = mgroup($branches, 'getReleephProjectID');
 
     require_celerity_resource('releeph-request-differential-create-dialog');
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Choose Releeph Branch'))
       ->setClass('releeph-request-differential-create-dialog')
       ->addCancelButton('/D'.$request->getStr('D'));
 
     $dialog->appendChild(
-      pht("This differential revision changes code that is associated ".
-      "with multiple Releeph branches.  ".
-      "Please select the branch where you would like this code to be picked."));
+      pht('This differential revision changes code that is associated '.
+      'with multiple Releeph branches.  '.
+      'Please select the branch where you would like this code to be picked.'));
 
     foreach ($branch_groups as $project_id => $branches) {
       $project = idx($projects, $project_id);
       $dialog->appendChild(
         phutil_tag(
           'h1',
           array(),
           $project->getName()));
       $branches = msort($branches, 'getBasename');
       foreach ($branches as $branch) {
         $uri = $this->buildReleephRequestURI($branch);
         $dialog->appendChild(
           phutil_tag(
             'a',
             array(
               'href' => $uri,
             ),
             $branch->getDisplayNameWithDetail()));
       }
     }
 
     return id(new AphrontDialogResponse)
       ->setDialog($dialog);
   }
 
   private function buildReleephRequestURI(ReleephBranch $branch) {
     $uri = $branch->getURI('request/');
     return id(new PhutilURI($uri))
       ->setQueryParam('D', $this->revision->getID());
   }
 
 }
diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php
index e161d9439..608ae8378 100644
--- a/src/applications/releeph/controller/request/ReleephRequestEditController.php
+++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php
@@ -1,313 +1,313 @@
 <?php
 
 final class ReleephRequestEditController extends ReleephBranchController {
 
   private $requestID;
   private $branchID;
 
   public function willProcessRequest(array $data) {
     $this->requestID = idx($data, 'requestID');
     $this->branchID = idx($data, 'branchID');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     if ($this->requestID) {
       $pull = id(new ReleephRequestQuery())
         ->setViewer($viewer)
         ->withIDs(array($this->requestID))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$pull) {
         return new Aphront404Response();
       }
 
       $branch = $pull->getBranch();
 
       $is_edit = true;
     } else {
       $branch = id(new ReleephBranchQuery())
         ->setViewer($viewer)
         ->withIDs(array($this->branchID))
         ->executeOne();
       if (!$branch) {
         return new Aphront404Response();
       }
 
       $pull = id(new ReleephRequest())
         ->setRequestUserPHID($viewer->getPHID())
         ->setBranchID($branch->getID())
         ->setInBranch(0)
         ->attachBranch($branch);
 
       $is_edit = false;
     }
     $this->setBranch($branch);
 
     $product = $branch->getProduct();
 
     $request_identifier = $request->getStr('requestIdentifierRaw');
     $e_request_identifier = true;
 
     // Load all the ReleephFieldSpecifications
     $selector = $branch->getProduct()->getReleephFieldSelector();
     $fields = $selector->getFieldSpecifications();
     foreach ($fields as $field) {
       $field
         ->setReleephProject($product)
         ->setReleephBranch($branch)
         ->setReleephRequest($pull);
     }
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $pull,
       PhabricatorCustomField::ROLE_EDIT);
     foreach ($field_list->getFields() as $field) {
       $field
         ->setReleephProject($product)
         ->setReleephBranch($branch)
         ->setReleephRequest($pull);
     }
     $field_list->readFieldsFromStorage($pull);
 
 
     if ($this->branchID) {
       $cancel_uri = $this->getApplicationURI('branch/'.$this->branchID.'/');
     } else {
       $cancel_uri = '/'.$pull->getMonogram();
     }
 
     // Make edits
     $errors = array();
     if ($request->isFormPost()) {
       $xactions = array();
 
       // The commit-identifier being requested...
       if (!$is_edit) {
         if ($request_identifier ===
           ReleephRequestTypeaheadControl::PLACEHOLDER) {
 
-          $errors[] = "No commit ID was provided.";
+          $errors[] = 'No commit ID was provided.';
           $e_request_identifier = 'Required';
         } else {
           $pr_commit = null;
           $finder = id(new ReleephCommitFinder())
             ->setUser($viewer)
             ->setReleephProject($product);
           try {
             $pr_commit = $finder->fromPartial($request_identifier);
           } catch (Exception $e) {
             $e_request_identifier = 'Invalid';
             $errors[] =
               "Request {$request_identifier} is probably not a valid commit";
             $errors[] = $e->getMessage();
           }
 
           if (!$errors) {
             $object_phid = $finder->getRequestedObjectPHID();
             if (!$object_phid) {
               $object_phid = $pr_commit->getPHID();
             }
 
             $pull->setRequestedObjectPHID($object_phid);
           }
         }
 
         if (!$errors) {
           $existing = id(new ReleephRequest())
             ->loadOneWhere('requestCommitPHID = %s AND branchID = %d',
                 $pr_commit->getPHID(), $branch->getID());
           if ($existing) {
             return id(new AphrontRedirectResponse())
               ->setURI('/releeph/request/edit/'.$existing->getID().
                        '?existing=1');
           }
 
           $xactions[] = id(new ReleephRequestTransaction())
             ->setTransactionType(ReleephRequestTransaction::TYPE_REQUEST)
             ->setNewValue($pr_commit->getPHID());
 
           $xactions[] = id(new ReleephRequestTransaction())
             ->setTransactionType(ReleephRequestTransaction::TYPE_USER_INTENT)
             // To help hide these implicit intents...
             ->setMetadataValue('isRQCreate', true)
             ->setMetadataValue('userPHID', $viewer->getPHID())
             ->setMetadataValue(
               'isAuthoritative',
               $product->isAuthoritative($viewer))
             ->setNewValue(ReleephRequest::INTENT_WANT);
         }
       }
 
       // TODO: This should happen implicitly while building transactions
       // instead.
       foreach ($field_list->getFields() as $field) {
         $field->readValueFromRequest($request);
       }
 
       if (!$errors) {
         foreach ($fields as $field) {
           if ($field->isEditable()) {
             try {
               $data = $request->getRequestData();
               $value = idx($data, $field->getRequiredStorageKey());
               $field->validate($value);
               $xactions[] = id(new ReleephRequestTransaction())
                 ->setTransactionType(ReleephRequestTransaction::TYPE_EDIT_FIELD)
                 ->setMetadataValue('fieldClass', get_class($field))
                 ->setNewValue($value);
             } catch (ReleephFieldParseException $ex) {
               $errors[] = $ex->getMessage();
             }
           }
         }
       }
 
       if (!$errors) {
         $editor = id(new ReleephRequestTransactionalEditor())
           ->setActor($viewer)
           ->setContinueOnNoEffect(true)
           ->setContentSourceFromRequest($request);
         $editor->applyTransactions($pull, $xactions);
         return id(new AphrontRedirectResponse())->setURI($cancel_uri);
       }
     }
 
     $handle_phids = array(
       $pull->getRequestUserPHID(),
       $pull->getRequestCommitPHID(),
     );
     $handle_phids = array_filter($handle_phids);
     if ($handle_phids) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($viewer)
         ->withPHIDs($handle_phids)
         ->execute();
     } else {
       $handles = array();
     }
 
     $age_string = '';
     if ($is_edit) {
       $age_string = phabricator_format_relative_time(
         time() - $pull->getDateCreated()) . ' ago';
     }
 
     // Warn the user if we've been redirected here because we tried to
     // re-request something.
     $notice_view = null;
     if ($request->getInt('existing')) {
       $notice_messages = array(
         'You are editing an existing pick request!',
         hsprintf(
-          "Requested %s by %s",
+          'Requested %s by %s',
           $age_string,
           $handles[$pull->getRequestUserPHID()]->renderLink())
       );
       $notice_view = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
         ->setErrors($notice_messages);
     }
 
     $form = id(new AphrontFormView())
       ->setUser($viewer);
 
     if ($is_edit) {
       $form
         ->appendChild(
           id(new AphrontFormMarkupControl())
             ->setLabel('Original Commit')
             ->setValue(
               $handles[$pull->getRequestCommitPHID()]->renderLink()))
         ->appendChild(
           id(new AphrontFormMarkupControl())
             ->setLabel('Requestor')
             ->setValue(hsprintf(
               '%s %s',
               $handles[$pull->getRequestUserPHID()]->renderLink(),
               $age_string)));
     } else {
       $origin = null;
       $diff_rev_id = $request->getStr('D');
       if ($diff_rev_id) {
         $diff_rev = id(new DifferentialRevisionQuery())
           ->setViewer($viewer)
           ->withIDs(array($diff_rev_id))
           ->executeOne();
         $origin = '/D'.$diff_rev->getID();
         $title = sprintf(
           'D%d: %s',
           $diff_rev_id,
           $diff_rev->getTitle());
         $form
           ->addHiddenInput('requestIdentifierRaw', 'D'.$diff_rev_id)
           ->appendChild(
             id(new AphrontFormStaticControl())
               ->setLabel('Diff')
               ->setValue($title));
       } else {
         $origin = $branch->getURI();
         $repo = $product->getRepository();
         $branch_cut_point = id(new PhabricatorRepositoryCommit())
           ->loadOneWhere(
               'phid = %s',
               $branch->getCutPointCommitPHID());
         $form->appendChild(
           id(new ReleephRequestTypeaheadControl())
             ->setName('requestIdentifierRaw')
             ->setLabel('Commit ID')
             ->setRepo($repo)
             ->setValue($request_identifier)
             ->setError($e_request_identifier)
             ->setStartTime($branch_cut_point->getEpoch())
             ->setCaption(
               'Start typing to autocomplete on commit title, '.
               'or give a Phabricator commit identifier like rFOO1234'));
       }
     }
 
     $field_list->appendFieldsToForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
 
     if ($is_edit) {
       $title = pht('Edit Pull Request');
       $submit_name = pht('Save');
 
       $crumbs->addTextCrumb($pull->getMonogram(), '/'.$pull->getMonogram());
       $crumbs->addTextCrumb(pht('Edit'));
     } else {
       $title = pht('Create Pull Request');
       $submit_name = pht('Create Pull Request');
 
       $crumbs->addTextCrumb(pht('New Pull Request'));
     }
 
     $form->appendChild(
       id(new AphrontFormSubmitControl())
         ->addCancelButton($cancel_uri, 'Cancel')
         ->setValue($submit_name));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->appendChild($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $notice_view,
         $box,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 }
diff --git a/src/applications/releeph/controller/request/ReleephRequestViewController.php b/src/applications/releeph/controller/request/ReleephRequestViewController.php
index 0a39224a5..9644f6f02 100644
--- a/src/applications/releeph/controller/request/ReleephRequestViewController.php
+++ b/src/applications/releeph/controller/request/ReleephRequestViewController.php
@@ -1,106 +1,106 @@
 <?php
 
 final class ReleephRequestViewController
   extends ReleephBranchController {
 
   private $requestID;
 
   public function willProcessRequest(array $data) {
     $this->requestID = $data['requestID'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $pull = id(new ReleephRequestQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->requestID))
       ->executeOne();
     if (!$pull) {
       return new Aphront404Response();
     }
     $this->setBranch($pull->getBranch());
 
     // Redirect older URIs to new "Y" URIs.
     // TODO: Get rid of this eventually.
     $actual_path = $request->getRequestURI()->getPath();
     $expect_path = '/'.$pull->getMonogram();
     if ($actual_path != $expect_path) {
       return id(new AphrontRedirectResponse())->setURI($expect_path);
     }
 
     // TODO: Break this 1:1 stuff?
     $branch = $pull->getBranch();
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $pull,
       PhabricatorCustomField::ROLE_VIEW);
 
     $field_list
       ->setViewer($viewer)
       ->readFieldsFromStorage($pull);
 
     // TODO: This should be more modern and general.
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($viewer);
     foreach ($field_list->getFields() as $field) {
       if ($field->shouldMarkup()) {
         $field->setMarkupEngine($engine);
       }
     }
     $engine->process();
 
     $pull_box = id(new ReleephRequestView())
       ->setUser($viewer)
       ->setCustomFields($field_list)
       ->setPullRequest($pull);
 
     $xactions = id(new ReleephRequestTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($pull->getPHID()))
       ->execute();
 
     $timeline = id(new PhabricatorApplicationTransactionView())
       ->setUser($request->getUser())
       ->setObjectPHID($pull->getPHID())
       ->setTransactions($xactions);
 
     $add_comment_header = pht('Plea or Yield');
 
     $draft = PhabricatorDraft::newFromUserAndKey(
       $viewer,
       $pull->getPHID());
 
     $title = hsprintf(
-      "%s %s",
+      '%s %s',
       $pull->getMonogram(),
       $pull->getSummaryForDisplay());
 
     $add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
       ->setUser($viewer)
       ->setObjectPHID($pull->getPHID())
       ->setDraft($draft)
       ->setHeaderText($add_comment_header)
       ->setAction($this->getApplicationURI(
         '/request/comment/'.$pull->getID().'/'))
       ->setSubmitButtonName(pht('Comment'));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($pull->getMonogram(), '/'.$pull->getMonogram());
 
     return $this->buildStandardPageResponse(
       array(
         $crumbs,
         $pull_box,
         $timeline,
         $add_comment_form,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 
 }
diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
index 5ae00fb4e..d6572a355 100644
--- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
+++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
@@ -1,371 +1,371 @@
 <?php
 
 /**
  * This DifferentialFieldSpecification exists for two reason:
  *
  * 1: To parse "Releeph: picks RQ<nn>" headers in commits created by
  * arc-releeph so that RQs committed by arc-releeph have real
  * PhabricatorRepositoryCommits associated with them (instaed of just the SHA
  * of the commit, as seen by the pusher).
  *
  * 2: If requestors want to commit directly to their release branch, they can
  * use this header to (i) indicate on a differential revision that this
  * differential revision is for the release branch, and (ii) when they land
  * their diff on to the release branch manually, the ReleephRequest is
  * automatically updated (instead of having to use the "Mark Manually Picked"
  * button.)
  *
  */
 final class DifferentialReleephRequestFieldSpecification {
 
   // TODO: This class is essentially dead right now, see T2222.
 
   const ACTION_PICKS    = 'picks';
   const ACTION_REVERTS  = 'reverts';
 
   private $releephAction;
   private $releephPHIDs = array();
 
   public function getStorageKey() {
     return 'releeph:actions';
   }
 
   public function getValueForStorage() {
     return json_encode(array(
       'releephAction' => $this->releephAction,
       'releephPHIDs'  => $this->releephPHIDs,
     ));
   }
 
   public function setValueFromStorage($json) {
     if ($json) {
       $dict = json_decode($json, true);
       $this->releephAction = idx($dict, 'releephAction');
       $this->releephPHIDs = idx($dict, 'releephPHIDs');
     }
     return $this;
   }
 
   public function shouldAppearOnRevisionView() {
     return true;
   }
 
   public function renderLabelForRevisionView() {
     return 'Releeph';
   }
 
   public function getRequiredHandlePHIDs() {
     return mpull($this->loadReleephRequests(), 'getPHID');
   }
 
   public function renderValueForRevisionView() {
     static $tense = array(
       self::ACTION_PICKS => array(
         'future'  => 'Will pick',
         'past'    => 'Picked',
       ),
       self::ACTION_REVERTS => array(
         'future'  => 'Will revert',
         'past'    => 'Reverted',
       ),
     );
 
     $releeph_requests = $this->loadReleephRequests();
     if (!$releeph_requests) {
       return null;
     }
 
     $status = $this->getRevision()->getStatus();
     if ($status == ArcanistDifferentialRevisionStatus::CLOSED) {
       $verb = $tense[$this->releephAction]['past'];
     } else {
       $verb = $tense[$this->releephAction]['future'];
     }
 
     $parts = hsprintf('%s...', $verb);
     foreach ($releeph_requests as $releeph_request) {
       $parts->appendHTML(phutil_tag('br'));
       $parts->appendHTML(
         $this->getHandle($releeph_request->getPHID())->renderLink());
     }
 
     return $parts;
   }
 
   public function shouldAppearOnCommitMessage() {
     return true;
   }
 
   public function getCommitMessageKey() {
     return 'releephActions';
   }
 
   public function setValueFromParsedCommitMessage($dict) {
     $this->releephAction = $dict['releephAction'];
     $this->releephPHIDs = $dict['releephPHIDs'];
     return $this;
   }
 
   public function renderValueForCommitMessage($is_edit) {
     $releeph_requests = $this->loadReleephRequests();
     if (!$releeph_requests) {
       return null;
     }
 
     $parts = array($this->releephAction);
     foreach ($releeph_requests as $releeph_request) {
       $parts[] = 'RQ'.$releeph_request->getID();
     }
 
     return implode(' ', $parts);
   }
 
   /**
    * Releeph fields should look like:
    *
    *   Releeph: picks RQ1 RQ2, RQ3
    *   Releeph: reverts RQ1
    */
   public function parseValueFromCommitMessage($value) {
     /**
      * Releeph commit messages look like this (but with more blank lines,
      * omitted here):
      *
      *   Make CaptainHaddock more reasonable
      *   Releeph: picks RQ1
      *   Requested By: edward
      *   Approved By: edward (requestor)
      *   Request Reason: x
      *   Summary: Make the Haddock implementation more reasonable.
      *   Test Plan: none
      *   Reviewers: user1
      *
      * Some of these fields are recognized by Differential (e.g. "Requested
      * By").  They are folded up into the "Releeph" field, parsed by this
      * class.  As such $value includes more than just the first-line:
      *
      *   "picks RQ1\n\nRequested By: edward\n\nApproved By: edward (requestor)"
      *
      * To hack around this, just consider the first line of $value when
      * determining what Releeph actions the parsed commit is performing.
      */
     $first_line = head(array_filter(explode("\n", $value)));
 
     $tokens = preg_split('/\s*,?\s+/', $first_line);
     $raw_action = array_shift($tokens);
     $action = strtolower($raw_action);
 
     if (!$action) {
       return null;
     }
 
     switch ($action) {
       case self::ACTION_REVERTS:
       case self::ACTION_PICKS:
         break;
 
       default:
         throw new DifferentialFieldParseException(
           "Commit message contains unknown Releeph action '{$raw_action}'!");
         break;
     }
 
     $releeph_requests = array();
     foreach ($tokens as $token) {
       $match = array();
       if (!preg_match('/^(?:RQ)?(\d+)$/i', $token, $match)) {
         $label = $this->renderLabelForCommitMessage();
         throw new DifferentialFieldParseException(
           "Commit message contains unparseable ".
           "Releeph request token '{$token}'!");
       }
 
       $id = (int) $match[1];
       $releeph_request = id(new ReleephRequest())->load($id);
 
       if (!$releeph_request) {
         throw new DifferentialFieldParseException(
           "Commit message references non existent releeph request: {$value}!");
       }
 
       $releeph_requests[] = $releeph_request;
     }
 
     if (count($releeph_requests) > 1) {
       $rqs_seen = array();
       $groups = array();
       foreach ($releeph_requests as $releeph_request) {
         $releeph_branch = $releeph_request->getBranch();
         $branch_name = $releeph_branch->getName();
         $rq_id = 'RQ'.$releeph_request->getID();
 
         if (idx($rqs_seen, $rq_id)) {
           throw new DifferentialFieldParseException(
             "Commit message refers to {$rq_id} multiple times!");
         }
         $rqs_seen[$rq_id] = true;
 
         if (!isset($groups[$branch_name])) {
           $groups[$branch_name] = array();
         }
         $groups[$branch_name][] = $rq_id;
       }
 
       if (count($groups) > 1) {
         $lists = array();
         foreach ($groups as $branch_name => $rq_ids) {
           $lists[] = implode(', ', $rq_ids).' in '.$branch_name;
         }
         throw new DifferentialFieldParseException(
-          "Commit message references multiple Releeph requests, ".
-          "but the requests are in different branches: ".
+          'Commit message references multiple Releeph requests, '.
+          'but the requests are in different branches: '.
           implode('; ', $lists));
       }
     }
 
     $phids = mpull($releeph_requests, 'getPHID');
 
     $data = array(
       'releephAction' => $action,
       'releephPHIDs'  => $phids,
     );
     return $data;
   }
 
   public function renderLabelForCommitMessage() {
     return 'Releeph';
   }
 
   public function shouldAppearOnCommitMessageTemplate() {
     return false;
   }
 
   public function didParseCommit(PhabricatorRepository $repo,
                                  PhabricatorRepositoryCommit $commit,
                                  PhabricatorRepositoryCommitData $data) {
 
     // NOTE: This is currently dead code. See T2222.
 
     $releeph_requests = $this->loadReleephRequests();
 
     if (!$releeph_requests) {
       return;
     }
 
     $releeph_branch = head($releeph_requests)->getBranch();
     if (!$this->isCommitOnBranch($repo, $commit, $releeph_branch)) {
       return;
     }
 
     foreach ($releeph_requests as $releeph_request) {
       if ($this->releephAction === self::ACTION_PICKS) {
         $action = 'pick';
       } else {
         $action = 'revert';
       }
 
       $actor_phid = coalesce(
         $data->getCommitDetail('committerPHID'),
         $data->getCommitDetail('authorPHID'));
 
       $actor = id(new PhabricatorUser())
         ->loadOneWhere('phid = %s', $actor_phid);
 
       $xactions = array();
 
       $xactions[] = id(new ReleephRequestTransaction())
         ->setTransactionType(ReleephRequestTransaction::TYPE_DISCOVERY)
         ->setMetadataValue('action', $action)
         ->setMetadataValue('authorPHID',
           $data->getCommitDetail('authorPHID'))
         ->setMetadataValue('committerPHID',
           $data->getCommitDetail('committerPHID'))
         ->setNewValue($commit->getPHID());
 
       $editor = id(new ReleephRequestTransactionalEditor())
         ->setActor($actor)
         ->setContinueOnNoEffect(true)
         ->setContentSource(
           PhabricatorContentSource::newForSource(
             PhabricatorContentSource::SOURCE_UNKNOWN,
             array()));
 
       $editor->applyTransactions($releeph_request, $xactions);
     }
   }
 
   private function loadReleephRequests() {
     if (!$this->releephPHIDs) {
       return array();
     }
 
     return id(new ReleephRequestQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs($this->releephPHIDs)
       ->execute();
   }
 
   private function isCommitOnBranch(PhabricatorRepository $repo,
                                     PhabricatorRepositoryCommit $commit,
                                     ReleephBranch $releeph_branch) {
 
     switch ($repo->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         list($output) = $repo->execxLocalCommand(
           'branch --all --no-color --contains %s',
           $commit->getCommitIdentifier());
 
         $remote_prefix = 'remotes/origin/';
         $branches = array();
         foreach (array_filter(explode("\n", $output)) as $line) {
           $tokens = explode(' ', $line);
           $ref = last($tokens);
           if (strncmp($ref, $remote_prefix, strlen($remote_prefix)) === 0) {
             $branch = substr($ref, strlen($remote_prefix));
             $branches[$branch] = $branch;
           }
         }
 
         return idx($branches, $releeph_branch->getName());
         break;
 
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
           DiffusionRequest::newFromDictionary(array(
             'user' => $this->getUser(),
             'repository' => $repo,
             'commit' => $commit->getCommitIdentifier(),
           )));
         $path_changes = $change_query->loadChanges();
         $commit_paths = mpull($path_changes, 'getPath');
 
         $branch_path = $releeph_branch->getName();
 
         $in_branch = array();
         $ex_branch = array();
         foreach ($commit_paths as $path) {
           if (strncmp($path, $branch_path, strlen($branch_path)) === 0) {
             $in_branch[] = $path;
           } else {
             $ex_branch[] = $path;
           }
         }
 
         if ($in_branch && $ex_branch) {
           $error = sprintf(
-            "CONFUSION: commit %s in %s contains %d path change(s) that were ".
-            "part of a Releeph branch, but also has %d path change(s) not ".
-            "part of a Releeph branch!",
+            'CONFUSION: commit %s in %s contains %d path change(s) that were '.
+            'part of a Releeph branch, but also has %d path change(s) not '.
+            'part of a Releeph branch!',
             $commit->getCommitIdentifier(),
             $repo->getCallsign(),
             count($in_branch),
             count($ex_branch));
           phlog($error);
         }
 
         return !empty($in_branch);
         break;
     }
   }
 
 }
diff --git a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
index 775766cc9..39df9ea89 100644
--- a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
+++ b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
@@ -1,302 +1,302 @@
 <?php
 
 final class ReleephRequestTransactionalEditor
   extends PhabricatorApplicationTransactionEditor {
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
     $types[] = ReleephRequestTransaction::TYPE_COMMIT;
     $types[] = ReleephRequestTransaction::TYPE_DISCOVERY;
     $types[] = ReleephRequestTransaction::TYPE_EDIT_FIELD;
     $types[] = ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH;
     $types[] = ReleephRequestTransaction::TYPE_PICK_STATUS;
     $types[] = ReleephRequestTransaction::TYPE_REQUEST;
     $types[] = ReleephRequestTransaction::TYPE_USER_INTENT;
 
     return $types;
   }
 
   public function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
         return $object->getRequestCommitPHID();
 
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
         $field = newv($xaction->getMetadataValue('fieldClass'), array());
         $value = $field->setReleephRequest($object)->getValue();
         return $value;
 
       case ReleephRequestTransaction::TYPE_USER_INTENT:
         $user_phid = $xaction->getAuthorPHID();
         return idx($object->getUserIntents(), $user_phid);
 
       case ReleephRequestTransaction::TYPE_PICK_STATUS:
         return (int)$object->getPickStatus();
         break;
 
       case ReleephRequestTransaction::TYPE_COMMIT:
         return $object->getCommitIdentifier();
 
       case ReleephRequestTransaction::TYPE_DISCOVERY:
         return $object->getCommitPHID();
 
       case ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH:
         return $object->getInBranch();
     }
   }
 
   public function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
       case ReleephRequestTransaction::TYPE_USER_INTENT:
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
       case ReleephRequestTransaction::TYPE_PICK_STATUS:
       case ReleephRequestTransaction::TYPE_COMMIT:
       case ReleephRequestTransaction::TYPE_DISCOVERY:
       case ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH:
         return $xaction->getNewValue();
     }
   }
 
   public function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $new = $xaction->getNewValue();
 
     switch ($xaction->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
         $object->setRequestCommitPHID($new);
         break;
 
       case ReleephRequestTransaction::TYPE_USER_INTENT:
         $user_phid = $xaction->getAuthorPHID();
         $intents = $object->getUserIntents();
         $intents[$user_phid] = $new;
         $object->setUserIntents($intents);
         break;
 
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
         $field = newv($xaction->getMetadataValue('fieldClass'), array());
         $field
           ->setReleephRequest($object)
           ->setValue($new);
         break;
 
       case ReleephRequestTransaction::TYPE_PICK_STATUS:
         $object->setPickStatus($new);
         break;
 
       case ReleephRequestTransaction::TYPE_COMMIT:
         $this->setInBranchFromAction($object, $xaction);
         $object->setCommitIdentifier($new);
         break;
 
       case ReleephRequestTransaction::TYPE_DISCOVERY:
         $this->setInBranchFromAction($object, $xaction);
         $object->setCommitPHID($new);
         break;
 
       case ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH:
         $object->setInBranch((int) $new);
         break;
     }
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     return;
   }
 
   protected function filterTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     // Remove TYPE_DISCOVERY xactions that are the result of a reparse.
     $previously_discovered_commits = array();
     $discovery_xactions = idx(
       mgroup($xactions, 'getTransactionType'),
       ReleephRequestTransaction::TYPE_DISCOVERY);
     if ($discovery_xactions) {
       $previous_xactions = id(new ReleephRequestTransactionQuery())
         ->setViewer(PhabricatorUser::getOmnipotentUser())
         ->withObjectPHIDs(array($object->getPHID()))
         ->execute();
 
       foreach ($previous_xactions as $xaction) {
         if ($xaction->getTransactionType() ===
           ReleephRequestTransaction::TYPE_DISCOVERY) {
 
           $commit_phid = $xaction->getNewValue();
           $previously_discovered_commits[$commit_phid] = true;
         }
       }
     }
 
     foreach ($xactions as $key => $xaction) {
       if ($xaction->getTransactionType() ===
         ReleephRequestTransaction::TYPE_DISCOVERY &&
         idx($previously_discovered_commits, $xaction->getNewValue())) {
 
         unset($xactions[$key]);
       }
     }
 
     return parent::filterTransactions($object, $xactions);
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function sendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     // Avoid sending emails that only talk about commit discovery.
     $types = array_unique(mpull($xactions, 'getTransactionType'));
     if ($types === array(ReleephRequestTransaction::TYPE_DISCOVERY)) {
       return null;
     }
 
     // Don't email people when we discover that something picks or reverts OK.
     if ($types === array(ReleephRequestTransaction::TYPE_PICK_STATUS)) {
       if (!mfilter($xactions, 'isBoringPickStatus', true /* negate */)) {
         // If we effectively call "isInterestingPickStatus" and get nothing...
         return null;
       }
     }
 
     return parent::sendMail($object, $xactions);
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new ReleephRequestReplyHandler())
       ->setActor($this->getActor())
       ->setMailReceiver($object);
   }
 
   protected function getMailSubjectPrefix() {
     return '[Releeph]';
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $phid = $object->getPHID();
     $title = $object->getSummaryForDisplay();
     return id(new PhabricatorMetaMTAMail())
       ->setSubject("RQ{$id}: {$title}")
       ->addHeader('Thread-Topic', "RQ{$id}: {$phid}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     $to_phids = array();
 
     $product = $object->getBranch()->getProduct();
     foreach ($product->getPushers() as $phid) {
       $to_phids[] = $phid;
     }
 
     foreach ($object->getUserIntents() as $phid => $intent) {
       $to_phids[] = $phid;
     }
 
     return $to_phids;
   }
 
   protected function getMailCC(PhabricatorLiskDAO $object) {
     return array();
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
 
     $rq = $object;
     $releeph_branch = $rq->getBranch();
     $releeph_project = $releeph_branch->getProduct();
 
     /**
      * If any of the events we are emailing about were about a pick failure
      * (and/or a revert failure?), include pick failure instructions.
      */
     $has_pick_failure = false;
     foreach ($xactions as $xaction) {
       if ($xaction->getTransactionType() ===
         ReleephRequestTransaction::TYPE_PICK_STATUS &&
         $xaction->getNewValue() === ReleephRequest::PICK_FAILED) {
 
         $has_pick_failure = true;
         break;
       }
     }
     if ($has_pick_failure) {
       $instructions = $releeph_project->getDetail('pick_failure_instructions');
       if ($instructions) {
         $body->addTextSection(
           pht('PICK FAILURE INSTRUCTIONS'),
           $instructions);
       }
     }
 
-    $name = sprintf("RQ%s: %s", $rq->getID(), $rq->getSummaryForDisplay());
+    $name = sprintf('RQ%s: %s', $rq->getID(), $rq->getSummaryForDisplay());
     $body->addTextSection(
       pht('RELEEPH REQUEST'),
       $name."\n".
       PhabricatorEnv::getProductionURI('/RQ'.$rq->getID()));
 
     $project_and_branch = sprintf(
       '%s - %s',
       $releeph_project->getName(),
       $releeph_branch->getDisplayNameWithDetail());
 
     $body->addTextSection(
       pht('RELEEPH BRANCH'),
       $project_and_branch."\n".
       PhabricatorEnv::getProductionURI($releeph_branch->getURI()));
 
     return $body;
   }
 
   private function setInBranchFromAction(
     ReleephRequest $rq,
     ReleephRequestTransaction $xaction) {
 
     $action = $xaction->getMetadataValue('action');
     switch ($action) {
       case 'pick':
         $rq->setInBranch(1);
         break;
 
       case 'revert':
         $rq->setInBranch(0);
         break;
 
       default:
         $id = $rq->getID();
         $type = $xaction->getTransactionType();
         $new = $xaction->getNewValue();
         phlog(
           "Unknown discovery action '{$action}' ".
           "for xaction of type {$type} ".
           "with new value {$new} ".
           "mentioning RQ{$id}!");
         break;
     }
   }
 
 }
diff --git a/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php b/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php
index b0e1e44bf..9430c1145 100644
--- a/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php
@@ -1,113 +1,113 @@
 <?php
 
 final class ReleephDiffSizeFieldSpecification
   extends ReleephFieldSpecification {
 
   const LINES_WEIGHT =  1;
   const PATHS_WEIGHT = 30;
   const MAX_POINTS = 1000;
 
   public function getFieldKey() {
     return 'commit:size';
   }
 
   public function getName() {
     return 'Size';
   }
 
   public function renderPropertyViewValue(array $handles) {
     $requested_object = $this->getObject()->getRequestedObject();
     if (!($requested_object instanceof DifferentialRevision)) {
       return null;
     }
     $diff_rev = $requested_object;
 
     $diffs = $diff_rev->loadRelatives(
       new DifferentialDiff(),
       'revisionID',
       'getID',
       'creationMethod <> "commit"');
 
     $all_changesets = array();
     $most_recent_changesets = null;
     foreach ($diffs as $diff) {
       $changesets = $diff->loadRelatives(new DifferentialChangeset(), 'diffID');
       $all_changesets += $changesets;
       $most_recent_changesets = $changesets;
     }
 
     // The score is based on all changesets for all versions of this diff
     $all_changes = $this->countLinesAndPaths($all_changesets);
     $points =
       self::LINES_WEIGHT * $all_changes['code']['lines'] +
       self::PATHS_WEIGHT * count($all_changes['code']['paths']);
 
     // The blurb is just based on the most recent version of the diff
     $mr_changes = $this->countLinesAndPaths($most_recent_changesets);
 
     $test_tag = '';
     if ($mr_changes['tests']['paths']) {
       Javelin::initBehavior('phabricator-tooltips');
       require_celerity_resource('aphront-tooltip-css');
 
       $test_blurb =
         pht('%d line(s)', $mr_changes['tests']['lines']).' and '.
         pht('%d path(s)', count($mr_changes['tests']['paths'])).
         " contain changes to test code:\n";
       foreach ($mr_changes['tests']['paths'] as $mr_test_path) {
         $test_blurb .= pht("%s\n", $mr_test_path);
       }
 
       $test_tag = javelin_tag(
         'span',
         array(
           'sigil' => 'has-tooltip',
           'meta' => array(
             'tip' => $test_blurb,
             'align' => 'E',
             'size' => 'auto'),
           'style' => ''),
         ' + tests');
     }
 
-    $blurb = hsprintf("%s%s.",
+    $blurb = hsprintf('%s%s.',
       pht('%d line(s)', $mr_changes['code']['lines']).' and '.
       pht('%d path(s)', count($mr_changes['code']['paths'])).' over '.
       pht('%d diff(s)', count($diffs)),
       $test_tag);
 
     return id(new AphrontProgressBarView())
       ->setValue($points)
       ->setMax(self::MAX_POINTS)
       ->setCaption($blurb)
       ->render();
   }
 
   private function countLinesAndPaths(array $changesets) {
     assert_instances_of($changesets, 'DifferentialChangeset');
     $lines = 0;
     $paths_touched = array();
     $test_lines = 0;
     $test_paths_touched = array();
 
     foreach ($changesets as $ch) {
       if ($this->getReleephProject()->isTestFile($ch->getFilename())) {
         $test_lines += $ch->getAddLines() + $ch->getDelLines();
         $test_paths_touched[] = $ch->getFilename();
       } else {
         $lines += $ch->getAddLines() + $ch->getDelLines();
         $paths_touched[] = $ch->getFilename();
       }
     }
     return array(
       'code' => array(
         'lines' => $lines,
         'paths' => array_unique($paths_touched),
       ),
       'tests' => array(
         'lines' => $test_lines,
         'paths' => array_unique($test_paths_touched),
       )
     );
   }
 }
diff --git a/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php b/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
index 481454e4e..bae7da14c 100644
--- a/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
@@ -1,142 +1,142 @@
 <?php
 
 final class ReleephIntentFieldSpecification
   extends ReleephFieldSpecification {
 
   public function getFieldKey() {
     return 'intent';
   }
 
   public function getName() {
     return 'Intent';
   }
 
   public function getRequiredHandlePHIDsForPropertyView() {
     $pull = $this->getReleephRequest();
     $intents = $pull->getUserIntents();
     return array_keys($intents);
   }
 
   public function renderPropertyViewValue(array $handles) {
     $pull = $this->getReleephRequest();
 
     $intents = $pull->getUserIntents();
     $product = $this->getReleephProject();
 
     if (!$intents) {
       return null;
     }
 
     $pushers = array();
     $others = array();
 
     foreach ($intents as $phid => $intent) {
       if ($product->isAuthoritativePHID($phid)) {
         $pushers[$phid] = $intent;
       } else {
         $others[$phid] = $intent;
       }
     }
 
     $intents = $pushers + $others;
 
     $view = id(new PHUIStatusListView());
     foreach ($intents as $phid => $intent) {
       switch ($intent) {
         case ReleephRequest::INTENT_WANT:
           $icon = PHUIStatusItemView::ICON_ACCEPT;
           $color = 'green';
           $label = pht('Want');
           break;
         case ReleephRequest::INTENT_PASS:
           $icon = PHUIStatusItemView::ICON_REJECT;
           $color = 'red';
           $label = pht('Pass');
           break;
         default:
           $icon = PHUIStatusItemView::ICON_QUESTION;
           $color = 'bluegrey';
           $label = pht('Unknown Intent (%s)', $intent);
           break;
       }
 
       $target = $handles[$phid]->renderLink();
       if ($product->isAuthoritativePHID($phid)) {
         $target = phutil_tag('strong', array(), $target);
       }
 
       $view->addItem(
         id(new PHUIStatusItemView())
           ->setIcon($icon, $color, $label)
           ->setTarget($target));
     }
 
     return $view;
   }
 
   public function shouldAppearOnCommitMessage() {
     return true;
   }
 
   public function shouldAppearOnRevertMessage() {
     return true;
   }
 
   public function renderLabelForCommitMessage() {
-    return "Approved By";
+    return 'Approved By';
   }
 
   public function renderLabelForRevertMessage() {
-    return "Rejected By";
+    return 'Rejected By';
   }
 
   public function renderValueForCommitMessage() {
     return $this->renderIntentsForCommitMessage(ReleephRequest::INTENT_WANT);
   }
 
   public function renderValueForRevertMessage() {
     return $this->renderIntentsForCommitMessage(ReleephRequest::INTENT_PASS);
   }
 
   private function renderIntentsForCommitMessage($print_intent) {
     $intents = $this->getReleephRequest()->getUserIntents();
 
     $requestor = $this->getReleephRequest()->getRequestUserPHID();
     $pusher_phids = $this->getReleephProject()->getPushers();
 
     $phids = array_unique($pusher_phids + array_keys($intents));
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $tokens = array();
     foreach ($phids as $phid) {
       $intent = idx($intents, $phid);
       if ($intent == $print_intent) {
         $name = $handles[$phid]->getName();
         $is_pusher = in_array($phid, $pusher_phids);
         $is_requestor = $phid == $requestor;
 
         if ($is_pusher) {
           if ($is_requestor) {
             $token = "{$name} (pusher and requestor)";
           } else {
             $token = "{$name} (pusher)";
           }
         } else {
           if ($is_requestor) {
             $token = "{$name} (requestor)";
           } else {
             $token = $name;
           }
         }
 
         $tokens[] = $token;
       }
     }
 
     return implode(', ', $tokens);
   }
 
 }
diff --git a/src/applications/releeph/field/specification/ReleephLevelFieldSpecification.php b/src/applications/releeph/field/specification/ReleephLevelFieldSpecification.php
index 59899641f..70ae446f9 100644
--- a/src/applications/releeph/field/specification/ReleephLevelFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephLevelFieldSpecification.php
@@ -1,132 +1,132 @@
 <?php
 
 /**
  * Provides a convenient field for storing a set of levels that you can use to
  * filter requests on.
  *
  * Levels are rendered with names and descriptions in the edit UI, and are
  * automatically documented via the "arc request" interface.
  *
  * See ReleephSeverityFieldSpecification for an example.
  */
 abstract class ReleephLevelFieldSpecification
   extends ReleephFieldSpecification {
 
   private $error;
 
   abstract public function getLevels();
   abstract public function getDefaultLevel();
   abstract public function getNameForLevel($level);
   abstract public function getDescriptionForLevel($level);
 
   public function getStorageKey() {
     throw new PhabricatorCustomFieldImplementationIncompleteException($this);
   }
 
   public function renderPropertyViewValue(array $handles) {
     return $this->getNameForLevel($this->getValue());
   }
 
   public function renderEditControl(array $handles) {
     $control_name = $this->getRequiredStorageKey();
     $all_levels = $this->getLevels();
 
     $level = $this->getValue();
     if (!$level) {
       $level = $this->getDefaultLevel();
     }
 
     $control = id(new AphrontFormRadioButtonControl())
       ->setLabel('Level')
       ->setName($control_name)
       ->setValue($level);
 
     if ($this->error) {
       $control->setError($this->error);
-    } elseif ($this->getDefaultLevel()) {
+    } else if ($this->getDefaultLevel()) {
       $control->setError(true);
     }
 
     foreach ($all_levels as $level) {
       $name = $this->getNameForLevel($level);
       $description = $this->getDescriptionForLevel($level);
       $control->addButton($level, $name, $description);
     }
 
     return $control;
   }
 
   public function renderHelpForArcanist() {
     $text = '';
     $levels = $this->getLevels();
     $default = $this->getDefaultLevel();
     foreach ($levels as $level) {
       $name = $this->getNameForLevel($level);
       $description = $this->getDescriptionForLevel($level);
       $default_marker = ' ';
       if ($level === $default) {
         $default_marker = '*';
       }
       $text .= "    {$default_marker} **{$name}**\n";
       $text .= phutil_console_wrap($description."\n", 8);
     }
     return $text;
   }
 
   public function validate($value) {
     if ($value === null) {
       $this->error = 'Required';
       $label = $this->getName();
       throw new ReleephFieldParseException(
         $this,
         "You must provide a {$label} level");
     }
 
     $levels = $this->getLevels();
     if (!in_array($value, $levels)) {
       $label = $this->getName();
       throw new ReleephFieldParseException(
         $this,
         "Level '{$value}' is not a valid {$label} level in this project.");
     }
   }
 
   public function setValueFromConduitAPIRequest(ConduitAPIRequest $request) {
     $key = $this->getRequiredStorageKey();
     $label = $this->getName();
     $name = idx($request->getValue('fields', array()), $key);
 
     if (!$name) {
       $level = $this->getDefaultLevel();
       if (!$level) {
         throw new ReleephFieldParseException(
           $this,
           "No value given for {$label}, ".
           "and no default is given for this level!");
       }
     } else {
       $level = $this->getLevelByName($name);
     }
 
     if (!$level) {
       throw new ReleephFieldParseException(
         $this,
         "Unknown {$label} level name '{$name}'");
     }
     $this->setValue($level);
   }
 
   private $nameMap = array();
 
   public function getLevelByName($name) {
     // Build this once
     if (!$this->nameMap) {
       foreach ($this->getLevels() as $level) {
         $level_name = $this->getNameForLevel($level);
         $this->nameMap[$level_name] = $level;
       }
     }
     return idx($this->nameMap, $name);
   }
 
 }
diff --git a/src/applications/releeph/field/specification/ReleephReasonFieldSpecification.php b/src/applications/releeph/field/specification/ReleephReasonFieldSpecification.php
index 32e40c86a..d8312283c 100644
--- a/src/applications/releeph/field/specification/ReleephReasonFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephReasonFieldSpecification.php
@@ -1,86 +1,86 @@
 <?php
 
 final class ReleephReasonFieldSpecification
   extends ReleephFieldSpecification {
 
   public function getFieldKey() {
     return 'reason';
   }
 
   public function getName() {
     return 'Reason';
   }
 
   public function getStorageKey() {
     return 'reason';
   }
 
   public function getStyleForPropertyView() {
     return 'block';
   }
 
   public function getIconForPropertyView() {
     return PHUIPropertyListView::ICON_SUMMARY;
   }
 
   public function renderPropertyViewValue(array $handles) {
     return phutil_tag(
       'div',
       array(
         'class' => 'phabricator-remarkup',
       ),
       $this->getMarkupEngineOutput());
   }
 
   private $error = true;
 
   public function renderEditControl(array $handles) {
     return id(new AphrontFormTextAreaControl())
       ->setLabel('Reason')
       ->setName('reason')
       ->setError($this->error)
       ->setValue($this->getValue());
   }
 
   public function validate($reason) {
     if (!$reason) {
       $this->error = 'Required';
       throw new ReleephFieldParseException(
         $this,
-        "You must give a reason for your request.");
+        'You must give a reason for your request.');
     }
   }
 
   public function renderHelpForArcanist() {
     $text =
       "Fully explain why you are requesting this code be included ".
       "in the next release.\n";
     return phutil_console_wrap($text, 8);
   }
 
   public function shouldAppearOnCommitMessage() {
     return true;
   }
 
   public function renderLabelForCommitMessage() {
     return 'Request Reason';
   }
 
   public function renderValueForCommitMessage() {
     return $this->getValue();
   }
 
   public function shouldMarkup() {
     return true;
   }
 
   public function getMarkupText($field) {
     $reason = $this->getValue();
     if ($reason) {
       return $reason;
     } else {
       return '';
     }
   }
 
 }
diff --git a/src/applications/releeph/field/specification/ReleephRequestorFieldSpecification.php b/src/applications/releeph/field/specification/ReleephRequestorFieldSpecification.php
index abcd9bfb8..03fb88e95 100644
--- a/src/applications/releeph/field/specification/ReleephRequestorFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephRequestorFieldSpecification.php
@@ -1,50 +1,50 @@
 <?php
 
 final class ReleephRequestorFieldSpecification
   extends ReleephFieldSpecification {
 
   public function getFieldKey() {
     return 'requestor';
   }
 
   public function getName() {
     return 'Requestor';
   }
 
   public function getRequiredHandlePHIDsForPropertyView() {
     $phids = array();
 
     $phid = $this->getReleephRequest()->getRequestUserPHID();
     if ($phid) {
       $phids[] = $phid;
     }
 
     return $phids;
   }
 
   public function renderPropertyViewValue(array $handles) {
     return $this->renderHandleList($handles);
   }
 
   public function shouldAppearOnCommitMessage() {
     return true;
   }
 
   public function shouldAppearOnRevertMessage() {
     return true;
   }
 
   public function renderLabelForCommitMessage() {
-    return "Requested By";
+    return 'Requested By';
   }
 
   public function renderValueForCommitMessage() {
     $phid = $this->getReleephRequest()->getRequestUserPHID();
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($this->getUser())
       ->withPHIDs(array($phid))
       ->executeOne();
     return $handle->getName();
   }
 
 }
diff --git a/src/applications/releeph/mail/ReleephRequestReplyHandler.php b/src/applications/releeph/mail/ReleephRequestReplyHandler.php
index f402fa071..ec231b63c 100644
--- a/src/applications/releeph/mail/ReleephRequestReplyHandler.php
+++ b/src/applications/releeph/mail/ReleephRequestReplyHandler.php
@@ -1,55 +1,55 @@
 <?php
 
 final class ReleephRequestReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof ReleephRequest)) {
-      throw new Exception("Mail receiver is not a ReleephRequest!");
+      throw new Exception('Mail receiver is not a ReleephRequest!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'RERQ');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('RERQ');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht('Reply to comment.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $rq = $this->getMailReceiver();
     $user = $this->getActor();
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $editor = id(new ReleephRequestTransactionalEditor())
       ->setActor($user)
       ->setContentSource($content_source)
       ->setParentMessageID($mail->getMessageID());
 
     $body = $mail->getCleanTextBody();
 
     $xactions = array();
     $xactions[] = id(new ReleephRequestTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment($body);
 
     $editor->applyTransactions($rq, $xactions);
 
     return $rq;
   }
 
 }
diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php
index 487f1de7c..07af37534 100644
--- a/src/applications/releeph/storage/ReleephRequest.php
+++ b/src/applications/releeph/storage/ReleephRequest.php
@@ -1,320 +1,320 @@
 <?php
 
 final class ReleephRequest extends ReleephDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorCustomFieldInterface {
 
   protected $branchID;
   protected $requestUserPHID;
   protected $details = array();
   protected $userIntents = array();
   protected $inBranch;
   protected $pickStatus;
   protected $mailKey;
 
   /**
    * The object which is being requested. Normally this is a commit, but it
    * might also be a revision. In the future, it could be a repository branch
    * or an external object (like a GitHub pull request).
    */
   protected $requestedObjectPHID;
 
   // Information about the thing being requested
   protected $requestCommitPHID;
 
   // Information about the last commit to the releeph branch
   protected $commitIdentifier;
   protected $commitPHID;
 
 
   private $customFields = self::ATTACHABLE;
   private $branch = self::ATTACHABLE;
   private $requestedObject = self::ATTACHABLE;
 
 
 /* -(  Constants and helper methods  )--------------------------------------- */
 
   const INTENT_WANT = 'want';
   const INTENT_PASS = 'pass';
 
   const PICK_PENDING  = 1; // old
   const PICK_FAILED   = 2;
   const PICK_OK       = 3;
   const PICK_MANUAL   = 4; // old
   const REVERT_OK     = 5;
   const REVERT_FAILED = 6;
 
   public function shouldBeInBranch() {
     return
       $this->getPusherIntent() == self::INTENT_WANT &&
       /**
        * We use "!= pass" instead of "== want" in case the requestor intent is
        * not present.  In other words, only revert if the requestor explicitly
        * passed.
        */
       $this->getRequestorIntent() != self::INTENT_PASS;
   }
 
   /**
    * Will return INTENT_WANT if any pusher wants this request, and no pusher
    * passes on this request.
    */
   public function getPusherIntent() {
     $product = $this->getBranch()->getProduct();
 
     if (!$product->getPushers()) {
       return self::INTENT_WANT;
     }
 
     $found_pusher_want = false;
     foreach ($this->userIntents as $phid => $intent) {
       if ($product->isAuthoritativePHID($phid)) {
         if ($intent == self::INTENT_PASS) {
           return self::INTENT_PASS;
         }
 
         $found_pusher_want = true;
       }
     }
 
     if ($found_pusher_want) {
       return self::INTENT_WANT;
     } else {
       return null;
     }
   }
 
   public function getRequestorIntent() {
     return idx($this->userIntents, $this->requestUserPHID);
   }
 
   public function getStatus() {
     return $this->calculateStatus();
   }
 
   public function getMonogram() {
     return 'Y'.$this->getID();
   }
 
   public function getBranch() {
     return $this->assertAttached($this->branch);
   }
 
   public function attachBranch(ReleephBranch $branch) {
     $this->branch = $branch;
     return $this;
   }
 
   public function getRequestedObject() {
     return $this->assertAttached($this->requestedObject);
   }
 
   public function attachRequestedObject($object) {
     $this->requestedObject = $object;
     return $this;
   }
 
   private function calculateStatus() {
     if ($this->shouldBeInBranch()) {
       if ($this->getInBranch()) {
         return ReleephRequestStatus::STATUS_PICKED;
       } else {
         return ReleephRequestStatus::STATUS_NEEDS_PICK;
       }
     } else {
       if ($this->getInBranch()) {
         return ReleephRequestStatus::STATUS_NEEDS_REVERT;
       } else {
         $has_been_in_branch = $this->getCommitIdentifier();
         // Regardless of why we reverted something, always say reverted if it
         // was once in the branch.
         if ($has_been_in_branch) {
           return ReleephRequestStatus::STATUS_REVERTED;
-        } elseif ($this->getPusherIntent() === ReleephRequest::INTENT_PASS) {
+        } else if ($this->getPusherIntent() === ReleephRequest::INTENT_PASS) {
           // Otherwise, if it has never been in the branch, explicitly say why:
           return ReleephRequestStatus::STATUS_REJECTED;
-        } elseif ($this->getRequestorIntent() === ReleephRequest::INTENT_WANT) {
+        } else if ($this->getRequestorIntent() === ReleephRequest::INTENT_WANT) {
           return ReleephRequestStatus::STATUS_REQUESTED;
         } else {
           return ReleephRequestStatus::STATUS_ABANDONED;
         }
       }
     }
   }
 
 
 /* -(  Lisk mechanics  )----------------------------------------------------- */
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'details' => self::SERIALIZATION_JSON,
         'userIntents' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       ReleephPHIDTypeRequest::TYPECONST);
   }
 
   public function save() {
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
 
 /* -(  Helpful accessors )--------------------------------------------------- */
 
 
   public function getDetail($key, $default = null) {
     return idx($this->getDetails(), $key, $default);
   }
 
   public function setDetail($key, $value) {
     $this->details[$key] = $value;
     return $this;
   }
 
 
   /**
    * Get the commit PHIDs this request is requesting.
    *
    * NOTE: For now, this always returns one PHID.
    *
    * @return list<phid> Commit PHIDs requested by this request.
    */
   public function getCommitPHIDs() {
     return array(
       $this->requestCommitPHID,
     );
   }
 
   public function getReason() {
     // Backward compatibility: reason used to be called comments
     $reason = $this->getDetail('reason');
     if (!$reason) {
       return $this->getDetail('comments');
     }
     return $reason;
   }
 
   /**
    * Allow a null summary, and fall back to the title of the commit.
    */
   public function getSummaryForDisplay() {
     $summary = $this->getDetail('summary');
 
     if (!strlen($summary)) {
       $commit = $this->loadPhabricatorRepositoryCommit();
       if ($commit) {
         $summary = $commit->getSummary();
       }
     }
 
     if (!strlen($summary)) {
       $summary = pht('None');
     }
 
     return $summary;
   }
 
 /* -(  Loading external objects  )------------------------------------------- */
 
   public function loadPhabricatorRepositoryCommit() {
     return $this->loadOneRelative(
       new PhabricatorRepositoryCommit(),
       'phid',
       'getRequestCommitPHID');
   }
 
   public function loadPhabricatorRepositoryCommitData() {
     $commit = $this->loadPhabricatorRepositoryCommit();
     if ($commit) {
       return $commit->loadOneRelative(
         new PhabricatorRepositoryCommitData(),
         'commitID');
     }
   }
 
 
 /* -(  State change helpers  )----------------------------------------------- */
 
   public function setUserIntent(PhabricatorUser $user, $intent) {
     $this->userIntents[$user->getPHID()] = $intent;
     return $this;
   }
 
 
 /* -(  Migrating to status-less ReleephRequests  )--------------------------- */
 
   protected function didReadData() {
     if ($this->userIntents === null) {
       $this->userIntents = array();
     }
   }
 
   public function setStatus($value) {
     throw new Exception('`status` is now deprecated!');
   }
 
 /* -(  Make magic Lisk methods private  )------------------------------------ */
 
   private function setUserIntents(array $ar) {
     return parent::setUserIntents($ar);
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getBranch()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getBranch()->hasAutomaticCapability($capability, $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'Pull requests have the same policies as the branches they are '.
       'requested against.');
   }
 
 
 
 /* -(  PhabricatorCustomFieldInterface  )------------------------------------ */
 
 
   public function getCustomFieldSpecificationForRole($role) {
     return PhabricatorEnv::getEnvConfig('releeph.fields');
   }
 
   public function getCustomFieldBaseClass() {
     return 'ReleephFieldSpecification';
   }
 
   public function getCustomFields() {
     return $this->assertAttached($this->customFields);
   }
 
   public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
     $this->customFields = $fields;
     return $this;
   }
 
 
 }
diff --git a/src/applications/releeph/storage/ReleephRequestTransaction.php b/src/applications/releeph/storage/ReleephRequestTransaction.php
index 5a7ba969c..63cd21515 100644
--- a/src/applications/releeph/storage/ReleephRequestTransaction.php
+++ b/src/applications/releeph/storage/ReleephRequestTransaction.php
@@ -1,279 +1,279 @@
 <?php
 
 final class ReleephRequestTransaction
   extends PhabricatorApplicationTransaction {
 
   const TYPE_REQUEST          = 'releeph:request';
   const TYPE_USER_INTENT      = 'releeph:user_intent';
   const TYPE_EDIT_FIELD       = 'releeph:edit_field';
   const TYPE_PICK_STATUS      = 'releeph:pick_status';
   const TYPE_COMMIT           = 'releeph:commit';
   const TYPE_DISCOVERY        = 'releeph:discovery';
   const TYPE_MANUAL_IN_BRANCH = 'releeph:manual';
 
   public function getApplicationName() {
     return 'releeph';
   }
 
   public function getApplicationTransactionType() {
     return ReleephPHIDTypeRequest::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
     return new ReleephRequestTransactionComment();
   }
 
   public function hasChangeDetails() {
     switch ($this->getTransactionType()) {
       default;
         break;
     }
     return parent::hasChangeDetails();
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = parent::getRequiredHandlePHIDs();
     $phids[] = $this->getObjectPHID();
 
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
       case ReleephRequestTransaction::TYPE_DISCOVERY:
         $phids[] = $new;
         break;
 
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
         self::searchForPHIDs($this->getOldValue(), $phids);
         self::searchForPHIDs($this->getNewValue(), $phids);
         break;
     }
 
     return $phids;
   }
 
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
     $object_phid = $this->getObjectPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
         return pht(
           '%s requested %s',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($new));
         break;
 
       case ReleephRequestTransaction::TYPE_USER_INTENT:
         return $this->getIntentTitle();
         break;
 
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
         $field = newv($this->getMetadataValue('fieldClass'), array());
         $name = $field->getName();
 
         $markup = $name;
         if ($this->getRenderingTarget() ===
           PhabricatorApplicationTransaction::TARGET_HTML) {
 
           $markup = hsprintf('<em>%s</em>', $name);
         }
 
         return pht(
           '%s changed the %s to "%s"',
           $this->renderHandleLink($author_phid),
           $markup,
           $field->normalizeForTransactionView($this, $new));
         break;
 
       case ReleephRequestTransaction::TYPE_PICK_STATUS:
         switch ($new) {
           case ReleephRequest::PICK_OK:
             return pht('%s found this request picks without error',
               $this->renderHandleLink($author_phid));
 
           case ReleephRequest::REVERT_OK:
             return pht('%s found this request reverts without error',
               $this->renderHandleLink($author_phid));
 
           case ReleephRequest::PICK_FAILED:
             return pht("%s couldn't pick this request",
               $this->renderHandleLink($author_phid));
 
           case ReleephRequest::REVERT_FAILED:
             return pht("%s couldn't revert this request",
               $this->renderHandleLink($author_phid));
         }
         break;
 
       case ReleephRequestTransaction::TYPE_COMMIT:
         $action_type = $this->getMetadataValue('action');
         switch ($action_type) {
           case 'pick':
             return pht(
               '%s picked this request and committed the result upstream',
               $this->renderHandleLink($author_phid));
             break;
 
           case 'revert':
             return pht(
               '%s reverted this request and committed the result upstream',
               $this->renderHandleLink($author_phid));
             break;
         }
         break;
 
       case ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH:
         $action = $new ? pht('picked') : pht('reverted');
         return pht(
           '%s marked this request as manually %s',
           $this->renderHandleLink($author_phid),
           $action);
         break;
 
       case ReleephRequestTransaction::TYPE_DISCOVERY:
         return pht('%s discovered this commit as %s',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($new));
         break;
 
       default:
         return parent::getTitle();
         break;
     }
   }
 
   public function getActionStrength() {
     return parent::getActionStrength();
   }
 
   public function getActionName() {
     switch ($this->getTransactionType()) {
       case self::TYPE_REQUEST:
         return pht('Requested');
 
       case self::TYPE_COMMIT:
         $action_type = $this->getMetadataValue('action');
         switch ($action_type) {
           case 'pick':
             return pht('Picked');
 
           case 'revert':
             return pht('Reverted');
         }
     }
 
     return parent::getActionName();
   }
 
   public function getColor() {
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_USER_INTENT:
         switch ($new) {
           case ReleephRequest::INTENT_WANT:
             return PhabricatorTransactions::COLOR_GREEN;
           case ReleephRequest::INTENT_PASS:
             return PhabricatorTransactions::COLOR_RED;
         }
     }
     return parent::getColor();
   }
 
   private static function searchForPHIDs($thing, array &$phids) {
     /**
      * To implement something like getRequiredHandlePHIDs() in a
      * ReleephFieldSpecification, we'd have to provide the field with its
      * ReleephRequest (so that it could load the PHIDs from the
      * ReleephRequest's storage, and return them.)
      *
      * We don't have fields initialized with their ReleephRequests, but we can
      * make a good guess at what handles will be needed for rendering the field
      * in this transaction by inspecting the old and new values.
      */
     if (!is_array($thing)) {
       $thing = array($thing);
     }
 
     foreach ($thing as $value) {
       if (phid_get_type($value) !==
         PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
 
         $phids[] = $value;
       }
     }
   }
 
   private function getIntentTitle() {
     $author_phid = $this->getAuthorPHID();
     $object_phid = $this->getObjectPHID();
 
     $new = $this->getNewValue();
     $is_pusher = $this->getMetadataValue('isPusher');
 
     switch ($new) {
       case ReleephRequest::INTENT_WANT:
         if ($is_pusher) {
           return pht(
             '%s approved this request',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s wanted this request',
             $this->renderHandleLink($author_phid));
         }
 
       case ReleephRequest::INTENT_PASS:
         if ($is_pusher) {
           return pht(
             '%s rejected this request',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s passed on this request',
             $this->renderHandleLink($author_phid));
         }
     }
   }
 
   public function shouldHide() {
     $type = $this->getTransactionType();
 
     if ($type === ReleephRequestTransaction::TYPE_USER_INTENT &&
         $this->getMetadataValue('isRQCreate')) {
 
       return true;
     }
 
     if ($this->isBoringPickStatus()) {
       return true;
     }
 
     // ReleephSummaryFieldSpecification is usually blank when an RQ is created,
     // creating a transaction change from null to "".  Hide these!
     if ($type === ReleephRequestTransaction::TYPE_EDIT_FIELD) {
-      if ($this->getOldValue() === null && $this->getNewValue() === "") {
+      if ($this->getOldValue() === null && $this->getNewValue() === '') {
         return true;
       }
     }
     return parent::shouldHide();
   }
 
   public function isBoringPickStatus() {
     $type = $this->getTransactionType();
     if ($type === ReleephRequestTransaction::TYPE_PICK_STATUS) {
       $new = $this->getNewValue();
       if ($new === ReleephRequest::PICK_OK ||
           $new === ReleephRequest::REVERT_OK) {
 
         return true;
       }
     }
     return false;
   }
 
 }
diff --git a/src/applications/releeph/view/branch/ReleephBranchTemplate.php b/src/applications/releeph/view/branch/ReleephBranchTemplate.php
index 5cda1bb33..4672fc020 100644
--- a/src/applications/releeph/view/branch/ReleephBranchTemplate.php
+++ b/src/applications/releeph/view/branch/ReleephBranchTemplate.php
@@ -1,188 +1,188 @@
 <?php
 
 final class ReleephBranchTemplate {
 
   const KEY = 'releeph.default-branch-template';
 
   public static function getDefaultTemplate() {
     return PhabricatorEnv::getEnvConfig(self::KEY);
   }
 
   public static function getRequiredDefaultTemplate() {
     $template = self::getDefaultTemplate();
     if (!$template) {
       throw new Exception(sprintf(
         "Config setting '%s' must be set, ".
         "or you must provide a branch-template for each project!",
         self::KEY));
     }
     return $template;
   }
 
   public static function getFakeCommitHandleFor($arc_project_id) {
     $arc_project = id(new PhabricatorRepositoryArcanistProject())
       ->load($arc_project_id);
     if (!$arc_project) {
       throw new Exception(
         "No Arc project found with id '{$arc_project_id}'!");
     }
 
     $repository = $arc_project->loadRepository();
     return id(new PhabricatorObjectHandle())
       ->setName($repository->formatCommitName('100000000000'));
   }
 
   private $commitHandle;
   private $branchDate = null;
   private $projectName;
   private $isSymbolic;
 
   public function setCommitHandle(PhabricatorObjectHandle $handle) {
     $this->commitHandle = $handle;
     return $this;
   }
 
   public function setBranchDate($branch_date) {
     $this->branchDate = $branch_date;
     return $this;
   }
 
   public function setReleephProjectName($project_name) {
     $this->projectName = $project_name;
     return $this;
   }
 
   public function setSymbolic($is_symbolic) {
     $this->isSymbolic = $is_symbolic;
     return $this;
   }
 
   public function interpolate($template) {
     if (!$this->projectName) {
       return array('', array());
     }
 
     list($name, $name_errors) = $this->interpolateInner(
       $template,
       $this->isSymbolic);
 
     if ($this->isSymbolic) {
       return array($name, $name_errors);
     } else {
       $validate_errors = $this->validateAsBranchName($name);
       $errors = array_merge($name_errors, $validate_errors);
       return array($name, $errors);
     }
   }
 
   /*
    * xsprintf() would be useful here, but that's for formatting concrete lists
    * of things in a certain way...
    *
    *    animal_printf('%A %A %A', $dog1, $dog2, $dog3);
    *
    * ...rather than interpolating percent-control-strings like strftime does.
    */
   private function interpolateInner($template, $is_symbolic) {
     $name = $template;
     $errors = array();
 
     $safe_project_name = str_replace(' ', '-', $this->projectName);
     $short_commit_id = last(
       preg_split('/r[A-Z]+/', $this->commitHandle->getName()));
 
     $interpolations = array();
     for ($ii = 0; $ii < strlen($name); $ii++) {
       $char = substr($name, $ii, 1);
       $prev = null;
       if ($ii > 0) {
         $prev = substr($name, $ii - 1, 1);
       }
       $next = substr($name, $ii + 1, 1);
       if ($next && $char == '%' && $prev != '%') {
         $interpolations[$ii] = $next;
       }
     }
 
     $variable_interpolations = array();
 
     $reverse_interpolations = $interpolations;
     krsort($reverse_interpolations);
 
     if ($this->branchDate) {
       $branch_date = $this->branchDate;
     } else {
       $branch_date = $this->commitHandle->getTimestamp();
     }
 
     foreach ($reverse_interpolations as $position => $code) {
       $replacement = null;
       switch ($code) {
         case 'v':
           $replacement = $this->commitHandle->getName();
           $is_variable = true;
           break;
 
         case 'V':
           $replacement = $short_commit_id;
           $is_variable = true;
           break;
 
         case 'P':
           $replacement = $safe_project_name;
           $is_variable = false;
           break;
 
         case 'p':
           $replacement = strtolower($safe_project_name);
           $is_variable = false;
           break;
 
         default:
           // Format anything else using strftime()
           $replacement = strftime("%{$code}", $branch_date);
           $is_variable = true;
           break;
       }
 
       if ($is_variable) {
         $variable_interpolations[] = $code;
       }
       $name = substr_replace($name, $replacement, $position, 2);
     }
 
     if (!$is_symbolic && !$variable_interpolations) {
       $errors[] = "Include additional interpolations that aren't static!";
     }
 
     return array($name, $errors);
   }
 
   private function validateAsBranchName($name) {
     $errors = array();
 
     if (preg_match('{^/}', $name) || preg_match('{/$}', $name)) {
       $errors[] = "Branches cannot begin or end with '/'";
     }
 
     if (preg_match('{//+}', $name)) {
       $errors[] = "Branches cannot contain multiple consective '/'";
     }
 
     $parts = array_filter(explode('/', $name));
     foreach ($parts as $index => $part) {
       $part_error = null;
       if (preg_match('{^\.}', $part) || preg_match('{\.$}', $part)) {
         $errors[] = "Path components cannot begin or end with '.'";
-      } elseif (preg_match('{^(?!\w)}', $part)) {
-        $errors[] = "Path components must begin with an alphanumeric";
-      } elseif (!preg_match('{^\w ([\w-_%\.]* [\w-_%])?$}x', $part)) {
+      } else if (preg_match('{^(?!\w)}', $part)) {
+        $errors[] = 'Path components must begin with an alphanumeric';
+      } else if (!preg_match('{^\w ([\w-_%\.]* [\w-_%])?$}x', $part)) {
         $errors[] =
           "Path components may only contain alphanumerics ".
           "or '-', '_', or '.'";
       }
     }
 
     return $errors;
   }
 }
diff --git a/src/applications/repository/PhabricatorRepositoryConfigOptions.php b/src/applications/repository/PhabricatorRepositoryConfigOptions.php
index cae49f60d..db362ea03 100644
--- a/src/applications/repository/PhabricatorRepositoryConfigOptions.php
+++ b/src/applications/repository/PhabricatorRepositoryConfigOptions.php
@@ -1,32 +1,32 @@
 <?php
 
 /**
  * @group repository
  */
 final class PhabricatorRepositoryConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Repositories');
   }
 
   public function getDescription() {
     return pht('Configure repositories.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('repository.default-local-path', 'string', '/var/repo/')
         ->setLocked(true)
         ->setSummary(
-          pht("Default location to store local copies of repositories."))
+          pht('Default location to store local copies of repositories.'))
         ->setDescription(
           pht(
-            "The default location in which to store working copies and other ".
-            "data about repositories. Phabricator will control and manage ".
-            "data here, so you should **not** choose an existing directory ".
-            "full of data you care about.")),
+            'The default location in which to store working copies and other '.
+            'data about repositories. Phabricator will control and manage '.
+            'data here, so you should **not** choose an existing directory '.
+            'full of data you care about.')),
     );
   }
 
 }
diff --git a/src/applications/repository/application/PhabricatorApplicationRepositories.php b/src/applications/repository/application/PhabricatorApplicationRepositories.php
index e2caea352..7f2463062 100644
--- a/src/applications/repository/application/PhabricatorApplicationRepositories.php
+++ b/src/applications/repository/application/PhabricatorApplicationRepositories.php
@@ -1,40 +1,40 @@
 <?php
 
 /**
  * @group repository
  */
 final class PhabricatorApplicationRepositories extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/repository/';
   }
 
   public function getIconName() {
     return 'repositories';
   }
 
   public function getShortDescription() {
     return pht('(Deprecated)');
   }
 
   public function getTitleGlyph() {
-    return "rX";
+    return 'rX';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function getRoutes() {
     return array(
       '/repository/' => array(
         ''                     => 'PhabricatorRepositoryListController',
         'project/edit/(?P<id>[1-9]\d*)/' =>
           'PhabricatorRepositoryArcanistProjectEditController',
         'project/delete/(?P<id>[1-9]\d*)/' =>
           'PhabricatorRepositoryArcanistProjectDeleteController',
       ),
     );
   }
 
 }
diff --git a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
index 582935180..b18f93592 100644
--- a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
+++ b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
@@ -1,136 +1,136 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_repository_create_Method
   extends ConduitAPI_repository_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodStatusDescription() {
-    return "Repository methods are new and subject to change.";
+    return 'Repository methods are new and subject to change.';
   }
 
   public function getMethodDescription() {
-    return "Create a new repository (Admin Only).";
+    return 'Create a new repository (Admin Only).';
   }
 
   public function defineParamTypes() {
     $vcs_const = $this->formatStringConstants(array('git', 'hg', 'svn'));
 
     return array(
       'name'                => 'required string',
       'vcs'                 => 'required '.$vcs_const,
       'callsign'            => 'required string',
       'description'         => 'optional string',
       'encoding'            => 'optional string',
       'tracking'            => 'optional bool',
       'uri'                 => 'optional string',
       'credentialPHID'      => 'optional string',
       'localPath'           => 'optional string',
       'svnSubpath'          => 'optional string',
       'branchFilter'        => 'optional list<string>',
       'closeCommitsFilter'  => 'optional list<string>',
       'pullFrequency'       => 'optional int',
       'defaultBranch'       => 'optional string',
       'heraldEnabled'       => 'optional bool, default = true',
       'autocloseEnabled'    => 'optional bool, default = true',
       'svnUUID'             => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-PERMISSIONS' =>
         'You do not have the authority to call this method.',
       'ERR-DUPLICATE'   =>
         'Duplicate repository callsign.',
       'ERR-BAD-CALLSIGN' =>
         'Callsign is required and must be ALL UPPERCASE LETTERS.',
       'ERR-UNKNOWN-REPOSITORY-VCS' =>
         'Unknown repository VCS type.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $application = id(new PhabricatorApplicationQuery())
       ->setViewer($request->getUser())
       ->withClasses(array('PhabricatorApplicationDiffusion'))
       ->executeOne();
 
     PhabricatorPolicyFilter::requireCapability(
       $request->getUser(),
       $application,
       DiffusionCapabilityCreateRepositories::CAPABILITY);
 
     // TODO: This has some duplication with (and lacks some of the validation
     // of) the web workflow; refactor things so they can share more code as this
     // stabilizes. Specifically, this should move to transactions since they
     // work properly now.
 
     $repository = PhabricatorRepository::initializeNewRepository(
       $request->getUser());
 
     $repository->setName($request->getValue('name'));
 
     $callsign = $request->getValue('callsign');
     if (!preg_match('/^[A-Z]+\z/', $callsign)) {
       throw new ConduitException('ERR-BAD-CALLSIGN');
     }
     $repository->setCallsign($callsign);
 
     $vcs = $request->getValue('vcs');
 
     $map = array(
       'git' => PhabricatorRepositoryType::REPOSITORY_TYPE_GIT,
       'hg'  => PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL,
       'svn' => PhabricatorRepositoryType::REPOSITORY_TYPE_SVN,
     );
     if (empty($map[$vcs])) {
       throw new ConduitException('ERR-UNKNOWN-REPOSITORY-VCS');
     }
     $repository->setVersionControlSystem($map[$vcs]);
 
     $repository->setCredentialPHID($request->getValue('credentialPHID'));
 
     $details = array(
       'encoding'          => $request->getValue('encoding'),
       'description'       => $request->getValue('description'),
       'tracking-enabled'  => (bool)$request->getValue('tracking', true),
       'remote-uri'        => $request->getValue('uri'),
       'local-path'        => $request->getValue('localPath'),
       'branch-filter'     => array_fill_keys(
         $request->getValue('branchFilter', array()),
         true),
       'close-commits-filter' => array_fill_keys(
         $request->getValue('closeCommitsFilter', array()),
         true),
       'pull-frequency'    => $request->getValue('pullFrequency'),
       'default-branch'    => $request->getValue('defaultBranch'),
       'herald-disabled'   => !$request->getValue('heraldEnabled', true),
       'svn-subpath'       => $request->getValue('svnSubpath'),
       'disable-autoclose' => !$request->getValue('autocloseEnabled', true),
     );
 
     foreach ($details as $key => $value) {
       $repository->setDetail($key, $value);
     }
 
     try {
       $repository->save();
     } catch (AphrontQueryDuplicateKeyException $ex) {
       throw new ConduitException('ERR-DUPLICATE');
     }
 
     return $repository->toDictionary();
   }
 
 
 }
diff --git a/src/applications/repository/conduit/ConduitAPI_repository_query_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_query_Method.php
index 9f17b02c9..456272452 100644
--- a/src/applications/repository/conduit/ConduitAPI_repository_query_Method.php
+++ b/src/applications/repository/conduit/ConduitAPI_repository_query_Method.php
@@ -1,81 +1,81 @@
 <?php
 
 final class ConduitAPI_repository_query_Method
   extends ConduitAPI_repository_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodStatusDescription() {
-    return pht("Repository methods are new and subject to change.");
+    return pht('Repository methods are new and subject to change.');
   }
 
   public function getMethodDescription() {
-    return pht("Query repositories.");
+    return pht('Query repositories.');
   }
 
   public function defineParamTypes() {
     return array(
       'ids' => 'optional list<int>',
       'phids' => 'optional list<phid>',
       'callsigns' => 'optional list<string>',
       'vcsTypes' => 'optional list<string>',
       'remoteURIs' => 'optional list<string>',
       'uuids' => 'optional list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = id(new PhabricatorRepositoryQuery())
       ->setViewer($request->getUser());
 
     $ids = $request->getValue('ids', array());
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $phids = $request->getValue('phids', array());
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $callsigns = $request->getValue('callsigns', array());
     if ($callsigns) {
       $query->withCallsigns($callsigns);
     }
 
     $vcs_types = $request->getValue('vcsTypes', array());
     if ($vcs_types) {
       $query->withTypes($vcs_types);
     }
 
     $remote_uris = $request->getValue('remoteURIs', array());
     if ($remote_uris) {
       $query->withRemoteURIs($remote_uris);
     }
 
     $uuids = $request->getValue('uuids', array());
     if ($uuids) {
       $query->withUUIDs($uuids);
     }
 
     $repositories = $query->execute();
 
     $results = array();
     foreach ($repositories as $repository) {
       $results[] = $repository->toDictionary();
     }
 
     return $results;
   }
 }
diff --git a/src/applications/repository/controller/PhabricatorRepositoryController.php b/src/applications/repository/controller/PhabricatorRepositoryController.php
index 6ba863f39..748ea3713 100644
--- a/src/applications/repository/controller/PhabricatorRepositoryController.php
+++ b/src/applications/repository/controller/PhabricatorRepositoryController.php
@@ -1,24 +1,24 @@
 <?php
 
 abstract class PhabricatorRepositoryController extends PhabricatorController {
 
   public function shouldRequireAdmin() {
     // Most of these controllers are admin-only.
     return true;
   }
 
   public function buildStandardPageResponse($view, array $data) {
     $page = $this->buildStandardPageView();
 
     $page->setApplicationName('Repositories');
     $page->setBaseURI('/repository/');
     $page->setTitle(idx($data, 'title'));
-    $page->setGlyph("rX");
+    $page->setGlyph('rX');
     $page->appendChild($view);
 
 
     $response = new AphrontWebpageResponse();
     return $response->setContent($page->render());
   }
 
 }
diff --git a/src/applications/repository/daemon/PhabricatorGitGraphStream.php b/src/applications/repository/daemon/PhabricatorGitGraphStream.php
index 913398367..911e30cb5 100644
--- a/src/applications/repository/daemon/PhabricatorGitGraphStream.php
+++ b/src/applications/repository/daemon/PhabricatorGitGraphStream.php
@@ -1,86 +1,86 @@
 <?php
 
 final class PhabricatorGitGraphStream
   extends PhabricatorRepositoryGraphStream {
 
   private $repository;
   private $iterator;
 
   private $parents        = array();
   private $dates          = array();
 
   public function __construct(
     PhabricatorRepository $repository,
     $start_commit) {
 
     $this->repository = $repository;
 
     $future = $repository->getLocalCommandFuture(
-      "log --format=%s %s --",
+      'log --format=%s %s --',
       '%H%x01%P%x01%ct',
       $start_commit);
 
     $this->iterator = new LinesOfALargeExecFuture($future);
     $this->iterator->setDelimiter("\n");
     $this->iterator->rewind();
   }
 
   public function getParents($commit) {
     if (!isset($this->parents[$commit])) {
       $this->parseUntil($commit);
     }
     $parents = $this->parents[$commit];
 
     // NOTE: In Git, it is possible for a commit to list the same parent more
     // than once. See T5226. Discard duplicate parents.
 
     return array_unique($parents);
   }
 
   public function getCommitDate($commit) {
     if (!isset($this->dates[$commit])) {
       $this->parseUntil($commit);
     }
     return $this->dates[$commit];
   }
 
   private function parseUntil($commit) {
     if ($this->isParsed($commit)) {
       return;
     }
 
     $gitlog = $this->iterator;
 
     while ($gitlog->valid()) {
       $line = $gitlog->current();
       $gitlog->next();
 
       $line = trim($line);
       if (!strlen($line)) {
         break;
       }
       list($hash, $parents, $epoch) = explode("\1", $line);
 
       if ($parents) {
         $parents = explode(' ', $parents);
       } else {
         // First commit.
         $parents = array();
       }
 
       $this->dates[$hash] = $epoch;
       $this->parents[$hash] = $parents;
 
       if ($this->isParsed($commit)) {
         return;
       }
     }
 
     throw new Exception("No such commit '{$commit}' in repository!");
   }
 
   private function isParsed($commit) {
     return isset($this->dates[$commit]);
   }
 
 }
diff --git a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
index 5b7233ce5..18b54a3c5 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
@@ -1,675 +1,675 @@
 <?php
 
 /**
  * @task discover   Discovering Repositories
  * @task svn        Discovering Subversion Repositories
  * @task git        Discovering Git Repositories
  * @task hg         Discovering Mercurial Repositories
  * @task internal   Internals
  */
 final class PhabricatorRepositoryDiscoveryEngine
   extends PhabricatorRepositoryEngine {
 
   private $repairMode;
   private $commitCache = array();
   private $workingSet = array();
 
   const MAX_COMMIT_CACHE_SIZE = 2048;
 
 
 /* -(  Discovering Repositories  )------------------------------------------- */
 
 
   public function setRepairMode($repair_mode) {
     $this->repairMode = $repair_mode;
     return $this;
   }
 
 
   public function getRepairMode() {
     return $this->repairMode;
   }
 
 
   /**
    * @task discovery
    */
   public function discoverCommits() {
     $repository = $this->getRepository();
 
     $vcs = $repository->getVersionControlSystem();
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $refs = $this->discoverSubversionCommits();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $refs = $this->discoverMercurialCommits();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $refs = $this->discoverGitCommits();
         break;
       default:
         throw new Exception("Unknown VCS '{$vcs}'!");
     }
 
     // Clear the working set cache.
     $this->workingSet = array();
 
     // Record discovered commits and mark them in the cache.
     foreach ($refs as $ref) {
       $this->recordCommit(
         $repository,
         $ref->getIdentifier(),
         $ref->getEpoch(),
         $ref->getCanCloseImmediately(),
         $ref->getParents());
 
       $this->commitCache[$ref->getIdentifier()] = true;
     }
 
     return $refs;
   }
 
 
 /* -(  Discovering Git Repositories  )--------------------------------------- */
 
 
   /**
    * @task git
    */
   private function discoverGitCommits() {
     $repository = $this->getRepository();
 
     if (!$repository->isHosted()) {
       $this->verifyGitOrigin($repository);
     }
 
     $branches = id(new DiffusionLowLevelGitRefQuery())
       ->setRepository($repository)
       ->withIsOriginBranch(true)
       ->execute();
 
     if (!$branches) {
       // This repository has no branches at all, so we don't need to do
       // anything. Generally, this means the repository is empty.
       return array();
     }
 
     $branches = $this->sortBranches($branches);
     $branches = mpull($branches, 'getCommitIdentifier', 'getShortName');
 
     $this->log(
       pht(
         'Discovering commits in repository %s.',
         $repository->getCallsign()));
 
     $this->fillCommitCache(array_values($branches));
 
     $refs = array();
     foreach ($branches as $name => $commit) {
       $this->log(pht('Examining branch "%s", at "%s".', $name, $commit));
 
       if (!$repository->shouldTrackBranch($name)) {
-        $this->log(pht("Skipping, branch is untracked."));
+        $this->log(pht('Skipping, branch is untracked.'));
         continue;
       }
 
       if ($this->isKnownCommit($commit)) {
-        $this->log(pht("Skipping, HEAD is known."));
+        $this->log(pht('Skipping, HEAD is known.'));
         continue;
       }
 
-      $this->log(pht("Looking for new commits."));
+      $this->log(pht('Looking for new commits.'));
 
       $branch_refs = $this->discoverStreamAncestry(
         new PhabricatorGitGraphStream($repository, $commit),
         $commit,
         $repository->shouldAutocloseBranch($name));
 
       $this->didDiscoverRefs($branch_refs);
 
       $refs[] = $branch_refs;
     }
 
     return array_mergev($refs);
   }
 
 
   /**
    * Verify that the "origin" remote exists, and points at the correct URI.
    *
    * This catches or corrects some types of misconfiguration, and also repairs
    * an issue where Git 1.7.1 does not create an "origin" for `--bare` clones.
    * See T4041.
    *
    * @param   PhabricatorRepository Repository to verify.
    * @return  void
    */
   private function verifyGitOrigin(PhabricatorRepository $repository) {
     list($remotes) = $repository->execxLocalCommand(
       'remote show -n origin');
 
     $matches = null;
     if (!preg_match('/^\s*Fetch URL:\s*(.*?)\s*$/m', $remotes, $matches)) {
       throw new Exception(
         "Expected 'Fetch URL' in 'git remote show -n origin'.");
     }
 
     $remote_uri = $matches[1];
     $expect_remote = $repository->getRemoteURI();
 
-    if ($remote_uri == "origin") {
+    if ($remote_uri == 'origin') {
       // If a remote does not exist, git pretends it does and prints out a
       // made up remote where the URI is the same as the remote name. This is
       // definitely not correct.
 
       // Possibly, we should use `git remote --verbose` instead, which does not
       // suffer from this problem (but is a little more complicated to parse).
       $valid = false;
       $exists = false;
     } else {
       $normal_type_git = PhabricatorRepositoryURINormalizer::TYPE_GIT;
 
       $remote_normal = id(new PhabricatorRepositoryURINormalizer(
         $normal_type_git,
         $remote_uri))->getNormalizedPath();
 
       $expect_normal = id(new PhabricatorRepositoryURINormalizer(
         $normal_type_git,
         $expect_remote))->getNormalizedPath();
 
       $valid = ($remote_normal == $expect_normal);
       $exists = true;
     }
 
     if (!$valid) {
       if (!$exists) {
         // If there's no "origin" remote, just create it regardless of how
         // strongly we own the working copy. There is almost no conceivable
         // scenario in which this could do damage.
         $this->log(
           pht(
             'Remote "origin" does not exist. Creating "origin", with '.
             'URI "%s".',
             $expect_remote));
         $repository->execxLocalCommand(
           'remote add origin %P',
           $repository->getRemoteURIEnvelope());
 
         // NOTE: This doesn't fetch the origin (it just creates it), so we won't
         // know about origin branches until the next "pull" happens. That's fine
         // for our purposes, but might impact things in the future.
       } else {
         if ($repository->canDestroyWorkingCopy()) {
           // Bad remote, but we can try to repair it.
           $this->log(
             pht(
               'Remote "origin" exists, but is pointed at the wrong URI, "%s". '.
               'Resetting origin URI to "%s.',
               $remote_uri,
               $expect_remote));
           $repository->execxLocalCommand(
             'remote set-url origin %P',
             $repository->getRemoteURIEnvelope());
         } else {
           // Bad remote and we aren't comfortable repairing it.
           $message = pht(
             'Working copy at "%s" has a mismatched origin URI, "%s". '.
             'The expected origin URI is "%s". Fix your configuration, or '.
             'set the remote URI correctly. To avoid breaking anything, '.
             'Phabricator will not automatically fix this.',
             $repository->getLocalPath(),
             $remote_uri,
             $expect_remote);
           throw new Exception($message);
         }
       }
     }
   }
 
 
 /* -(  Discovering Subversion Repositories  )-------------------------------- */
 
 
   /**
    * @task svn
    */
   private function discoverSubversionCommits() {
     $repository = $this->getRepository();
 
     if (!$repository->isHosted()) {
       $this->verifySubversionRoot($repository);
     }
 
     $upper_bound = null;
     $limit = 1;
     $refs = array();
     do {
       // Find all the unknown commits on this path. Note that we permit
       // importing an SVN subdirectory rather than the entire repository, so
       // commits may be nonsequential.
 
       if ($upper_bound === null) {
         $at_rev = 'HEAD';
       } else {
         $at_rev = ($upper_bound - 1);
       }
 
       try {
         list($xml, $stderr) = $repository->execxRemoteCommand(
           'log --xml --quiet --limit %d %s',
           $limit,
           $repository->getSubversionBaseURI($at_rev));
       } catch (CommandException $ex) {
         $stderr = $ex->getStdErr();
         if (preg_match('/(path|File) not found/', $stderr)) {
           // We've gone all the way back through history and this path was not
           // affected by earlier commits.
           break;
         }
         throw $ex;
       }
 
       $xml = phutil_utf8ize($xml);
       $log = new SimpleXMLElement($xml);
       foreach ($log->logentry as $entry) {
         $identifier = (int)$entry['revision'];
         $epoch = (int)strtotime((string)$entry->date[0]);
         $refs[$identifier] = id(new PhabricatorRepositoryCommitRef())
           ->setIdentifier($identifier)
           ->setEpoch($epoch)
           ->setCanCloseImmediately(true);
 
         if ($upper_bound === null) {
           $upper_bound = $identifier;
         } else {
           $upper_bound = min($upper_bound, $identifier);
         }
       }
 
       // Discover 2, 4, 8, ... 256 logs at a time. This allows us to initially
       // import large repositories fairly quickly, while pulling only as much
       // data as we need in the common case (when we've already imported the
       // repository and are just grabbing one commit at a time).
       $limit = min($limit * 2, 256);
 
     } while ($upper_bound > 1 && !$this->isKnownCommit($upper_bound));
 
     krsort($refs);
     while ($refs && $this->isKnownCommit(last($refs)->getIdentifier())) {
       array_pop($refs);
     }
     $refs = array_reverse($refs);
 
     $this->didDiscoverRefs($refs);
 
     return $refs;
   }
 
 
   private function verifySubversionRoot(PhabricatorRepository $repository) {
     list($xml) = $repository->execxRemoteCommand(
       'info --xml %s',
       $repository->getSubversionPathURI());
 
     $xml = phutil_utf8ize($xml);
     $xml = new SimpleXMLElement($xml);
 
     $remote_root = (string)($xml->entry[0]->repository[0]->root[0]);
     $expect_root = $repository->getSubversionPathURI();
 
     $normal_type_svn = PhabricatorRepositoryURINormalizer::TYPE_SVN;
 
     $remote_normal = id(new PhabricatorRepositoryURINormalizer(
       $normal_type_svn,
       $remote_root))->getNormalizedPath();
 
     $expect_normal = id(new PhabricatorRepositoryURINormalizer(
       $normal_type_svn,
       $expect_root))->getNormalizedPath();
 
     if ($remote_normal != $expect_normal) {
       throw new Exception(
         pht(
           'Repository "%s" does not have a correctly configured remote URI. '.
           'The remote URI for a Subversion repository MUST point at the '.
           'repository root. The root for this repository is "%s", but the '.
           'configured URI is "%s". To resolve this error, set the remote URI '.
           'to point at the repository root. If you want to import only part '.
           'of a Subversion repository, use the "Import Only" option.',
           $repository->getCallsign(),
           $remote_root,
           $expect_root));
     }
   }
 
 
 /* -(  Discovering Mercurial Repositories  )--------------------------------- */
 
 
   /**
    * @task hg
    */
   private function discoverMercurialCommits() {
     $repository = $this->getRepository();
 
     $branches = id(new DiffusionLowLevelMercurialBranchesQuery())
       ->setRepository($repository)
       ->execute();
 
     $this->fillCommitCache(mpull($branches, 'getCommitIdentifier'));
 
     $refs = array();
     foreach ($branches as $branch) {
       // NOTE: Mercurial branches may have multiple heads, so the names may
       // not be unique.
       $name = $branch->getShortName();
       $commit = $branch->getCommitIdentifier();
 
       $this->log(pht('Examining branch "%s" head "%s".', $name, $commit));
       if (!$repository->shouldTrackBranch($name)) {
-        $this->log(pht("Skipping, branch is untracked."));
+        $this->log(pht('Skipping, branch is untracked.'));
         continue;
       }
 
       if ($this->isKnownCommit($commit)) {
-        $this->log(pht("Skipping, this head is a known commit."));
+        $this->log(pht('Skipping, this head is a known commit.'));
         continue;
       }
 
-      $this->log(pht("Looking for new commits."));
+      $this->log(pht('Looking for new commits.'));
 
       $branch_refs = $this->discoverStreamAncestry(
         new PhabricatorMercurialGraphStream($repository, $commit),
         $commit,
         $close_immediately = true);
 
       $this->didDiscoverRefs($branch_refs);
 
       $refs[] = $branch_refs;
     }
 
     return array_mergev($refs);
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   private function discoverStreamAncestry(
     PhabricatorRepositoryGraphStream $stream,
     $commit,
     $close_immediately) {
 
     $discover = array($commit);
     $graph = array();
     $seen = array();
 
     // Find all the reachable, undiscovered commits. Build a graph of the
     // edges.
     while ($discover) {
       $target = array_pop($discover);
 
       if (empty($graph[$target])) {
         $graph[$target] = array();
       }
 
       $parents = $stream->getParents($target);
       foreach ($parents as $parent) {
         if ($this->isKnownCommit($parent)) {
           continue;
         }
 
         $graph[$target][$parent] = true;
 
         if (empty($seen[$parent])) {
           $seen[$parent] = true;
           $discover[] = $parent;
         }
       }
     }
 
     // Now, sort them topographically.
     $commits = $this->reduceGraph($graph);
 
     $refs = array();
     foreach ($commits as $commit) {
       $refs[] = id(new PhabricatorRepositoryCommitRef())
         ->setIdentifier($commit)
         ->setEpoch($stream->getCommitDate($commit))
         ->setCanCloseImmediately($close_immediately)
         ->setParents($stream->getParents($commit));
     }
 
     return $refs;
   }
 
 
   private function reduceGraph(array $edges) {
     foreach ($edges as $commit => $parents) {
       $edges[$commit] = array_keys($parents);
     }
 
     $graph = new PhutilDirectedScalarGraph();
     $graph->addNodes($edges);
 
     $commits = $graph->getTopographicallySortedNodes();
 
     // NOTE: We want the most ancestral nodes first, so we need to reverse the
     // list we get out of AbstractDirectedGraph.
     $commits = array_reverse($commits);
 
     return $commits;
   }
 
 
   private function isKnownCommit($identifier) {
     if (isset($this->commitCache[$identifier])) {
       return true;
     }
 
     if (isset($this->workingSet[$identifier])) {
       return true;
     }
 
     if ($this->repairMode) {
       // In repair mode, rediscover the entire repository, ignoring the
       // database state. We can hit the local cache above, but if we miss it
       // stop the script from going to the database cache.
       return false;
     }
 
     $this->fillCommitCache(array($identifier));
 
     return isset($this->commitCache[$identifier]);
   }
 
   private function fillCommitCache(array $identifiers) {
     if (!$identifiers) {
       return;
     }
 
     $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
       'repositoryID = %d AND commitIdentifier IN (%Ls)',
       $this->getRepository()->getID(),
       $identifiers);
 
     foreach ($commits as $commit) {
       $this->commitCache[$commit->getCommitIdentifier()] = true;
     }
 
     while (count($this->commitCache) > self::MAX_COMMIT_CACHE_SIZE) {
       array_shift($this->commitCache);
     }
   }
 
   /**
    * Sort branches so we process closeable branches first. This makes the
    * whole import process a little cheaper, since we can close these commits
    * the first time through rather than catching them in the refs step.
    *
    * @task internal
    *
    * @param   list<DiffusionRepositoryRef> List of branch heads.
    * @return  list<DiffusionRepositoryRef> Sorted list of branch heads.
    */
   private function sortBranches(array $branches) {
     $repository = $this->getRepository();
 
     $head_branches = array();
     $tail_branches = array();
     foreach ($branches as $branch) {
       $name = $branch->getShortName();
 
       if ($repository->shouldAutocloseBranch($name)) {
         $head_branches[] = $branch;
       } else {
         $tail_branches[] = $branch;
       }
     }
 
     return array_merge($head_branches, $tail_branches);
   }
 
 
   private function recordCommit(
     PhabricatorRepository $repository,
     $commit_identifier,
     $epoch,
     $close_immediately,
     array $parents) {
 
     $commit = new PhabricatorRepositoryCommit();
     $commit->setRepositoryID($repository->getID());
     $commit->setCommitIdentifier($commit_identifier);
     $commit->setEpoch($epoch);
     if ($close_immediately) {
       $commit->setImportStatus(PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE);
     }
 
     $data = new PhabricatorRepositoryCommitData();
 
     $conn_w = $repository->establishConnection('w');
 
     try {
 
       // If this commit has parents, look up their IDs. The parent commits
       // should always exist already.
 
       $parent_ids = array();
       if ($parents) {
         $parent_rows = queryfx_all(
           $conn_w,
           'SELECT id, commitIdentifier FROM %T
             WHERE commitIdentifier IN (%Ls) AND repositoryID = %d',
           $commit->getTableName(),
           $parents,
           $repository->getID());
 
         $parent_map = ipull($parent_rows, 'id', 'commitIdentifier');
 
         foreach ($parents as $parent) {
           if (empty($parent_map[$parent])) {
             throw new Exception(
               pht('Unable to identify parent "%s"!', $parent));
           }
           $parent_ids[] = $parent_map[$parent];
         }
       } else {
         // Write an explicit 0 so we can distinguish between "really no
         // parents" and "data not available".
         if (!$repository->isSVN()) {
           $parent_ids = array(0);
         }
       }
 
       $commit->openTransaction();
         $commit->save();
 
         $data->setCommitID($commit->getID());
         $data->save();
 
         foreach ($parent_ids as $parent_id) {
           queryfx(
             $conn_w,
             'INSERT IGNORE INTO %T (childCommitID, parentCommitID)
               VALUES (%d, %d)',
             PhabricatorRepository::TABLE_PARENTS,
             $commit->getID(),
             $parent_id);
         }
       $commit->saveTransaction();
 
       $this->insertTask($repository, $commit);
 
       queryfx(
         $conn_w,
         'INSERT INTO %T (repositoryID, size, lastCommitID, epoch)
           VALUES (%d, 1, %d, %d)
           ON DUPLICATE KEY UPDATE
             size = size + 1,
             lastCommitID =
               IF(VALUES(epoch) > epoch, VALUES(lastCommitID), lastCommitID),
             epoch = IF(VALUES(epoch) > epoch, VALUES(epoch), epoch)',
         PhabricatorRepository::TABLE_SUMMARY,
         $repository->getID(),
         $commit->getID(),
         $epoch);
 
       if ($this->repairMode) {
         // Normally, the query should throw a duplicate key exception. If we
         // reach this in repair mode, we've actually performed a repair.
         $this->log(pht('Repaired commit "%s".', $commit_identifier));
       }
 
       PhutilEventEngine::dispatchEvent(
         new PhabricatorEvent(
           PhabricatorEventType::TYPE_DIFFUSION_DIDDISCOVERCOMMIT,
           array(
             'repository'  => $repository,
             'commit'      => $commit,
           )));
 
 
 
     } catch (AphrontQueryDuplicateKeyException $ex) {
       $commit->killTransaction();
       // Ignore. This can happen because we discover the same new commit
       // more than once when looking at history, or because of races or
       // data inconsistency or cosmic radiation; in any case, we're still
       // in a good state if we ignore the failure.
     }
   }
 
   private function didDiscoverRefs(array $refs) {
     foreach ($refs as $ref) {
       $this->workingSet[$ref->getIdentifier()] = true;
     }
   }
 
   private function insertTask(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     $data = array()) {
 
     $vcs = $repository->getVersionControlSystem();
     switch ($vcs) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $class = 'PhabricatorRepositoryGitCommitMessageParserWorker';
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $class = 'PhabricatorRepositorySvnCommitMessageParserWorker';
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $class = 'PhabricatorRepositoryMercurialCommitMessageParserWorker';
         break;
       default:
         throw new Exception("Unknown repository type '{$vcs}'!");
     }
 
     $data['commitID'] = $commit->getID();
 
     PhabricatorWorker::scheduleTask($class, $data);
   }
 
 }
diff --git a/src/applications/repository/engine/PhabricatorRepositoryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryEngine.php
index ce8fb183a..307738ef9 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryEngine.php
@@ -1,68 +1,68 @@
 <?php
 
 /**
  * @task config     Configuring Repository Engines
  * @task internal   Internals
  */
 abstract class PhabricatorRepositoryEngine {
 
   private $repository;
   private $verbose;
 
   /**
    * @task config
    */
   public function setRepository(PhabricatorRepository $repository) {
     $this->repository = $repository;
     return $this;
   }
 
 
   /**
    * @task config
    */
   protected function getRepository() {
     if ($this->repository === null) {
-      throw new Exception("Call setRepository() to provide a repository!");
+      throw new Exception('Call setRepository() to provide a repository!');
     }
 
     return $this->repository;
   }
 
 
   /**
    * @task config
    */
   public function setVerbose($verbose) {
     $this->verbose = $verbose;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function getVerbose() {
     return $this->verbose;
   }
 
 
   public function getViewer() {
     return PhabricatorUser::getOmnipotentUser();
   }
 
 
   /**
    * @task internal
    */
   protected function log($pattern /* ... */) {
     if ($this->getVerbose()) {
       $console = PhutilConsole::getConsole();
       $argv = func_get_args();
       array_unshift($argv, "%s\n");
       call_user_func_array(array($console, 'writeOut'), $argv);
     }
     return $this;
   }
 
 }
diff --git a/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php b/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php
index 5cebece39..6039c78e8 100644
--- a/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php
+++ b/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php
@@ -1,409 +1,409 @@
 <?php
 
 /**
  * Given a commit and a path, efficiently determine the most recent ancestor
  * commit where the path was touched.
  *
  * In Git and Mercurial, log operations with a path are relatively slow. For
  * example:
  *
  *    git log -n1 <commit> -- <path>
  *
  * ...routinely takes several hundred milliseconds, and equivalent requests
  * often take longer in Mercurial.
  *
  * Unfortunately, this operation is fundamental to rendering a repository for
  * the web, and essentially everything else that's slow can be reduced to this
  * plus some trivial work afterward. Making this fast is desirable and powerful,
  * and allows us to make other things fast by expressing them in terms of this
  * query.
  *
  * Because the query is fundamentally a graph query, it isn't easy to express
  * in a reasonable way in MySQL, and we can't do round trips to the server to
  * walk the graph without incurring huge performance penalties.
  *
  * However, the total amount of data in the graph is relatively small. By
  * caching it in chunks and keeping it in APC, we can reasonably load and walk
  * the graph in PHP quickly.
  *
  * For more context, see T2683.
  *
  * Structure of the Cache
  * ======================
  *
  * The cache divides commits into buckets (see @{method:getBucketSize}). To
  * walk the graph, we pull a commit's bucket. The bucket is a map from commit
  * IDs to a list of parents and changed paths, separated by `null`. For
  * example, a bucket might look like this:
  *
  *   array(
  *     1 => array(0, null, 17, 18),
  *     2 => array(1, null, 4),
  *     // ...
  *   )
  *
  * This means that commit ID 1 has parent commit 0 (a special value meaning
  * no parents) and affected path IDs 17 and 18. Commit ID 2 has parent commit 1,
  * and affected path 4.
  *
  * This data structure attempts to balance compactness, ease of construction,
  * simplicity of cache semantics, and lookup performance. In the average case,
  * it appears to do a reasonable job at this.
  *
  * @task query Querying the Graph Cache
  * @task cache Cache Internals
  */
 final class PhabricatorRepositoryGraphCache {
 
   private $rebuiltKeys = array();
 
 
 /* -(  Querying the Graph Cache  )------------------------------------------- */
 
 
   /**
    * Search the graph cache for the most modification to a path.
    *
    * @param int     The commit ID to search ancestors of.
    * @param int     The path ID to search for changes to.
    * @param float   Maximum number of seconds to spend trying to satisfy this
    *                query using the graph cache. By default, `0.5` (500ms).
    * @return mixed  Commit ID, or `null` if no ancestors exist, or `false` if
    *                the graph cache was unable to determine the answer.
    * @task query
    */
   public function loadLastModifiedCommitID($commit_id, $path_id, $time = 0.5) {
     $commit_id = (int)$commit_id;
     $path_id = (int)$path_id;
 
     $bucket_data = null;
     $data_key = null;
     $seen = array();
 
     $t_start = microtime(true);
     $iterations = 0;
     while (true) {
       $bucket_key = $this->getBucketKey($commit_id);
 
       if (($data_key != $bucket_key) || $bucket_data === null) {
         $bucket_data = $this->getBucketData($bucket_key);
         $data_key = $bucket_key;
       }
 
       if (empty($bucket_data[$commit_id])) {
         // Rebuild the cache bucket, since the commit might be a very recent
         // one that we'll pick up by rebuilding.
 
         $bucket_data = $this->getBucketData($bucket_key, $bucket_data);
         if (empty($bucket_data[$commit_id])) {
           // A rebuild didn't help. This can occur legitimately if the commit
           // is new and hasn't parsed yet.
           return false;
         }
 
         // Otherwise, the rebuild gave us the data, so we can keep going.
       }
 
       // Sanity check so we can survive and recover from bad data.
       if (isset($seen[$commit_id])) {
         phlog(pht('Unexpected infinite loop in RepositoryGraphCache!'));
         return false;
       } else {
         $seen[$commit_id] = true;
       }
 
       // `$data` is a list: the commit's parent IDs, followed by `null`,
       // followed by the modified paths in ascending order. We figure out the
       // first parent first, then check if the path was touched. If the path
       // was touched, this is the commit we're after. If not, walk backward
       // in the tree.
 
       $items = $bucket_data[$commit_id];
       $size = count($items);
 
       // Walk past the parent information.
       $parent_id = null;
-      for ($ii = 0;            ; ++$ii) {
+      for ($ii = 0;; ++$ii) {
         if ($items[$ii] === null) {
           break;
         }
         if ($parent_id === null) {
           $parent_id = $items[$ii];
         }
       }
 
       // Look for a modification to the path.
       for (; $ii < $size; ++$ii) {
         $item = $items[$ii];
         if ($item > $path_id) {
           break;
         }
         if ($item === $path_id) {
           return $commit_id;
         }
       }
 
       if ($parent_id) {
         $commit_id = $parent_id;
 
         // Periodically check if we've spent too long looking for a result
         // in the cache, and return so we can fall back to a VCS operation. This
         // keeps us from having a degenerate worst case if, e.g., the cache
         // is cold and we need to inspect a very large number of blocks
         // to satisfy the query.
 
         if (((++$iterations) % 64) === 0) {
           $t_end = microtime(true);
           if (($t_end - $t_start) > $time) {
             return false;
           }
         }
         continue;
       }
 
       // If we have an explicit 0, that means this commit really has no parents.
       // Usually, it is the first commit in the repository.
       if ($parent_id === 0) {
         return null;
       }
 
       // If we didn't find a parent, the parent data isn't available. We fail
       // to find an answer in the cache and fall back to querying the VCS.
       return false;
     }
   }
 
 
 /* -(  Cache Internals  )---------------------------------------------------- */
 
 
   /**
    * Get the bucket key for a given commit ID.
    *
    * @param   int   Commit ID.
    * @return  int   Bucket key.
    * @task cache
    */
   private function getBucketKey($commit_id) {
     return (int)floor($commit_id / $this->getBucketSize());
   }
 
 
   /**
    * Get the cache key for a given bucket key (from @{method:getBucketKey}).
    *
    * @param   int     Bucket key.
    * @return  string  Cache key.
    * @task cache
    */
   private function getBucketCacheKey($bucket_key) {
     static $prefix;
 
     if ($prefix === null) {
       $self = get_class($this);
       $size = $this->getBucketSize();
       $prefix = "{$self}:{$size}:2:";
     }
 
     return $prefix.$bucket_key;
   }
 
 
   /**
    * Get the number of items per bucket.
    *
    * @return  int Number of items to store per bucket.
    * @task cache
    */
   private function getBucketSize() {
     return 4096;
   }
 
 
   /**
    * Retrieve or build a graph cache bucket from the cache.
    *
    * Normally, this operates as a readthrough cache call. It can also be used
    * to force a cache update by passing the existing data to `$rebuild_data`.
    *
    * @param   int     Bucket key, from @{method:getBucketKey}.
    * @param   mixed   Current data, to force a cache rebuild of this bucket.
    * @return  array   Data from the cache.
    * @task cache
    */
   private function getBucketData($bucket_key, $rebuild_data = null) {
     $cache_key = $this->getBucketCacheKey($bucket_key);
 
     // TODO: This cache stuff could be handled more gracefully, but the
     // database cache currently requires values to be strings and needs
     // some tweaking to support this as part of a stack. Our cache semantics
     // here are also unusual (not purely readthrough) because this cache is
     // appendable.
 
     $cache_level1 = PhabricatorCaches::getRepositoryGraphL1Cache();
     $cache_level2 = PhabricatorCaches::getRepositoryGraphL2Cache();
     if ($rebuild_data === null) {
       $bucket_data = $cache_level1->getKey($cache_key);
       if ($bucket_data) {
         return $bucket_data;
       }
 
       $bucket_data = $cache_level2->getKey($cache_key);
       if ($bucket_data) {
         $unserialized = @unserialize($bucket_data);
         if ($unserialized) {
           // Fill APC if we got a database hit but missed in APC.
           $cache_level1->setKey($cache_key, $unserialized);
           return $unserialized;
         }
       }
     }
 
     if (!is_array($rebuild_data)) {
       $rebuild_data = array();
     }
 
     $bucket_data = $this->rebuildBucket($bucket_key, $rebuild_data);
 
     // Don't bother writing the data if we didn't update anything.
     if ($bucket_data !== $rebuild_data) {
       $cache_level2->setKey($cache_key, serialize($bucket_data));
       $cache_level1->setKey($cache_key, $bucket_data);
     }
 
     return $bucket_data;
   }
 
 
   /**
    * Rebuild a cache bucket, amending existing data if avialable.
    *
    * @param   int     Bucket key, from @{method:getBucketKey}.
    * @param   array   Existing bucket data.
    * @return  array   Rebuilt bucket data.
    * @task cache
    */
   private function rebuildBucket($bucket_key, array $current_data) {
 
     // First, check if we've already rebuilt this bucket. In some cases (like
     // browsing a repository at some commit) it's common to issue many lookups
     // against one commit. If that commit has been discovered but not yet
     // fully imported, we'll repeatedly attempt to rebuild the bucket. If the
     // first rebuild did not work, subsequent rebuilds are very unlikely to
     // have any effect. We can just skip the rebuild in these cases.
 
     if (isset($this->rebuiltKeys[$bucket_key])) {
       return $current_data;
     } else {
       $this->rebuiltKeys[$bucket_key] = true;
     }
 
     $bucket_min = ($bucket_key * $this->getBucketSize());
     $bucket_max = ($bucket_min + $this->getBucketSize()) - 1;
 
     // We need to reload all of the commits in the bucket because there is
     // no guarantee that they'll get parsed in order, so we can fill large
     // commit IDs before small ones. Later on, we'll ignore the commits we
     // already know about.
 
     $table_commit = new PhabricatorRepositoryCommit();
     $table_repository = new PhabricatorRepository();
     $conn_r = $table_commit->establishConnection('r');
 
     // Find all the Git and Mercurial commits in the block which have completed
     // change import. We can't fill the cache accurately for commits which have
     // not completed change import, so just pretend we don't know about them.
     // In these cases, we will will ultimately fall back to VCS queries.
 
     $commit_rows = queryfx_all(
       $conn_r,
       'SELECT c.id FROM %T c
         JOIN %T r ON c.repositoryID = r.id AND r.versionControlSystem IN (%Ls)
         WHERE c.id BETWEEN %d AND %d
           AND (c.importStatus & %d) = %d',
       $table_commit->getTableName(),
       $table_repository->getTableName(),
       array(
         PhabricatorRepositoryType::REPOSITORY_TYPE_GIT,
         PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL,
       ),
       $bucket_min,
       $bucket_max,
       PhabricatorRepositoryCommit::IMPORTED_CHANGE,
       PhabricatorRepositoryCommit::IMPORTED_CHANGE);
 
     // If we don't have any data, just return the existing data.
     if (!$commit_rows) {
       return $current_data;
     }
 
     // Remove the commits we already have data for. We don't need to rebuild
     // these. If there's nothing left, return the existing data.
 
     $commit_ids = ipull($commit_rows, 'id', 'id');
     $commit_ids = array_diff_key($commit_ids, $current_data);
 
     if (!$commit_ids) {
       return $current_data;
     }
 
     // Find all the path changes for the new commits.
     $path_changes = queryfx_all(
       $conn_r,
       'SELECT commitID, pathID FROM %T
         WHERE commitID IN (%Ld)
         AND (isDirect = 1 OR changeType = %d)',
       PhabricatorRepository::TABLE_PATHCHANGE,
       $commit_ids,
       DifferentialChangeType::TYPE_CHILD);
     $path_changes = igroup($path_changes, 'commitID');
 
     // Find all the parents for the new commits.
     $parents = queryfx_all(
       $conn_r,
       'SELECT childCommitID, parentCommitID FROM %T
         WHERE childCommitID IN (%Ld)
         ORDER BY id ASC',
       PhabricatorRepository::TABLE_PARENTS,
       $commit_ids);
     $parents = igroup($parents, 'childCommitID');
 
     // Build the actual data for the cache.
     foreach ($commit_ids as $commit_id) {
       $parent_ids = array();
       if (!empty($parents[$commit_id])) {
         foreach ($parents[$commit_id] as $row) {
           $parent_ids[] = (int)$row['parentCommitID'];
         }
       } else {
         // We expect all rows to have parents (commits with no parents get
         // an explicit "0" placeholder). If we're in an older repository, the
         // parent information might not have been populated yet. Decline to fill
         // the cache if we don't have the parent information, since the fill
         // will be incorrect.
         continue;
       }
 
       if (isset($path_changes[$commit_id])) {
         $path_ids = $path_changes[$commit_id];
         foreach ($path_ids as $key => $path_id) {
           $path_ids[$key] = (int)$path_id['pathID'];
         }
         sort($path_ids);
       } else {
         $path_ids = array();
       }
 
       $value = $parent_ids;
       $value[] = null;
       foreach ($path_ids as $path_id) {
         $value[] = $path_id;
       }
 
       $current_data[$commit_id] = $value;
     }
 
     return $current_data;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php
index 82de8492e..7888ca824 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php
@@ -1,92 +1,92 @@
 <?php
 
 final class PhabricatorRepositoryManagementCacheWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('cache')
       ->setExamples(
-        "**cache** [__options__] --commit __commit__ --path __path__")
+        '**cache** [__options__] --commit __commit__ --path __path__')
       ->setSynopsis(pht('Manage the repository graph cache.'))
       ->setArguments(
         array(
           array(
             'name'    => 'commit',
             'param'   => 'commit',
             'help'    => pht('Specify a commit to look up.'),
           ),
           array(
             'name'    => 'path',
             'param'   => 'path',
             'help'    => pht('Specify a path to look up.'),
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
 
     $commit_name = $args->getArg('commit');
     if ($commit_name === null) {
       throw new PhutilArgumentUsageException(
         pht('Specify a commit to look up with `--commit`.'));
     }
     $commit = $this->loadNamedCommit($commit_name);
 
     $path_name = $args->getArg('path');
     if ($path_name === null) {
       throw new PhutilArgumentUsageException(
         pht('Specify a path to look up with `--path`.'));
     }
 
     $path_map = id(new DiffusionPathIDQuery(array($path_name)))
       ->loadPathIDs();
     if (empty($path_map[$path_name])) {
       throw new PhutilArgumentUsageException(
         pht('Path "%s" is not known to Phabricator.', $path_name));
     }
     $path_id = $path_map[$path_name];
 
     $graph_cache = new PhabricatorRepositoryGraphCache();
 
     $t_start = microtime(true);
     $cache_result = $graph_cache->loadLastModifiedCommitID(
       $commit->getID(),
       $path_id);
     $t_end = microtime(true);
 
     $console = PhutilConsole::getConsole();
 
     $console->writeOut(
       "%s\n",
       pht('Query took %s ms.', new PhutilNumber(1000 * ($t_end - $t_start))));
 
     if ($cache_result === false) {
       $console->writeOut(
         "%s\n",
         pht('Not found in graph cache.'));
     } else if ($cache_result === null) {
       $console->writeOut(
         "%s\n",
         pht('Path not modified in any ancestor commit.'));
     } else {
       $last = id(new DiffusionCommitQuery())
         ->setViewer($this->getViewer())
         ->withIDs(array($cache_result))
         ->executeOne();
       if (!$last) {
         throw new Exception(pht('Cache returned bogus result!'));
       }
 
       $console->writeOut(
         "%s\n",
         pht(
           'Path was last changed at %s.',
           $commit->getRepository()->formatCommitName(
             $last->getcommitIdentifier())));
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php
index 6fac50554..fbf6873db 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php
@@ -1,53 +1,53 @@
 <?php
 
 final class PhabricatorRepositoryManagementDiscoverWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('discover')
       ->setExamples('**discover** [__options__] __repository__ ...')
       ->setSynopsis('Discover __repository__, named by callsign.')
       ->setArguments(
         array(
           array(
             'name'        => 'verbose',
             'help'        => 'Show additional debugging information.',
           ),
           array(
             'name'        => 'repair',
             'help'        => 'Repair a repository with gaps in commit '.
                              'history.',
           ),
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more repositories to discover, by callsign.");
+        'Specify one or more repositories to discover, by callsign.');
     }
 
     $console = PhutilConsole::getConsole();
     foreach ($repos as $repo) {
       $console->writeOut("Discovering '%s'...\n", $repo->getCallsign());
 
       id(new PhabricatorRepositoryDiscoveryEngine())
         ->setRepository($repo)
         ->setVerbose($args->getArg('verbose'))
         ->setRepairMode($args->getArg('repair'))
         ->discoverCommits();
     }
 
     $console->writeOut("Done.\n");
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php
index 12eec7eec..b3983d2c0 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php
@@ -1,96 +1,96 @@
 <?php
 
 final class PhabricatorRepositoryManagementEditWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('edit')
       ->setExamples('**edit** --as __username__ __repository__ ...')
       ->setSynopsis('Edit __repository__, named by callsign.')
       ->setArguments(
         array(
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
           array(
             'name' => 'as',
             'param' => 'user',
             'help' => 'Edit as user.',
           ),
           array(
             'name' => 'local-path',
             'param' => 'path',
             'help' => 'Edit the local path.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more repositories to edit, by callsign.");
+        'Specify one or more repositories to edit, by callsign.');
     }
 
     $console = PhutilConsole::getConsole();
 
     // TODO: It would be nice to just take this action as "Administrator" or
     // similar, since that would make it easier to use this script, harder to
     // impersonate users, and more clear to viewers what happened. However,
     // the omnipotent user doesn't have a PHID right now, can't be loaded,
     // doesn't have a handle, etc. Adding all of that is fairly involved, and
     // I want to wait for stronger use cases first.
 
     $username = $args->getArg('as');
     if (!$username) {
       throw new PhutilArgumentUsageException(
-        pht("Specify a user to edit as with --as <username>."));
+        pht('Specify a user to edit as with --as <username>.'));
     }
 
     $actor = id(new PhabricatorPeopleQuery())
       ->setViewer($this->getViewer())
       ->withUsernames(array($username))
       ->executeOne();
 
     if (!$actor) {
       throw new PhutilArgumentUsageException(
         pht("No such user '%s'!", $username));
     }
 
     foreach ($repos as $repo) {
       $console->writeOut("Editing '%s'...\n", $repo->getCallsign());
 
       $xactions = array();
 
       $type_local_path = PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH;
 
       if ($args->getArg('local-path')) {
         $xactions[] = id(new PhabricatorRepositoryTransaction())
           ->setTransactionType($type_local_path)
           ->setNewValue($args->getArg('local-path'));
       }
 
       if (!$xactions) {
         throw new PhutilArgumentUsageException(
-          pht("Specify one or more fields to edit!"));
+          pht('Specify one or more fields to edit!'));
       }
 
       $content_source = PhabricatorContentSource::newConsoleSource();
 
       $editor = id(new PhabricatorRepositoryEditor())
         ->setActor($actor)
         ->setContentSource($content_source)
         ->setContinueOnNoEffect(true)
         ->setContinueOnMissingFields(true)
         ->applyTransactions($repo, $xactions);
     }
 
     $console->writeOut("Done.\n");
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php
index 7892ea5b5..47dc47728 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php
@@ -1,87 +1,87 @@
 <?php
 
 final class PhabricatorRepositoryManagementImportingWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('importing')
       ->setExamples('**importing** __repository__ ...')
       ->setSynopsis(
         'Show commits in __repository__, named by callsign, which are still '.
         'importing.')
       ->setArguments(
         array(
           array(
             'name'        => 'simple',
             'help'        => 'Show simpler output.',
           ),
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more repositories to find importing commits for, ".
-        "by callsign.");
+        'Specify one or more repositories to find importing commits for, '.
+        'by callsign.');
     }
 
     $repos = mpull($repos, null, 'getID');
 
     $table = new PhabricatorRepositoryCommit();
     $conn_r = $table->establishConnection('r');
 
     $rows = queryfx_all(
       $conn_r,
       'SELECT repositoryID, commitIdentifier, importStatus FROM %T
         WHERE repositoryID IN (%Ld) AND (importStatus & %d) != %d',
       $table->getTableName(),
       array_keys($repos),
       PhabricatorRepositoryCommit::IMPORTED_ALL,
       PhabricatorRepositoryCommit::IMPORTED_ALL);
 
     $console = PhutilConsole::getConsole();
     if ($rows) {
       foreach ($rows as $row) {
         $repo = $repos[$row['repositoryID']];
         $identifier = $row['commitIdentifier'];
 
-        $console->writeOut("%s", 'r'.$repo->getCallsign().$identifier);
+        $console->writeOut('%s', 'r'.$repo->getCallsign().$identifier);
 
         if (!$args->getArg('simple')) {
           $status = $row['importStatus'];
           $need = array();
           if (!($status & PhabricatorRepositoryCommit::IMPORTED_MESSAGE)) {
             $need[] = 'Message';
           }
           if (!($status & PhabricatorRepositoryCommit::IMPORTED_CHANGE)) {
             $need[] = 'Change';
           }
           if (!($status & PhabricatorRepositoryCommit::IMPORTED_OWNERS)) {
             $need[] = 'Owners';
           }
           if (!($status & PhabricatorRepositoryCommit::IMPORTED_HERALD)) {
             $need[] = 'Herald';
           }
 
-          $console->writeOut(" %s", implode(', ', $need));
+          $console->writeOut(' %s', implode(', ', $need));
         }
 
         $console->writeOut("\n");
       }
     } else {
       $console->writeErr(
         "%s\n",
         pht('No importing commits found.'));
     }
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php
index 82fb82b3e..dc2781ea0 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php
@@ -1,97 +1,97 @@
 <?php
 
 final class PhabricatorRepositoryManagementLookupUsersWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('lookup-users')
       ->setExamples('**lookup-users** __commit__ ...')
       ->setSynopsis('Resolve user accounts for users attached to __commit__.')
       ->setArguments(
         array(
           array(
             'name'        => 'commits',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $commits = $this->loadCommits($args, 'commits');
     if (!$commits) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more commits to resolve users for.");
+        'Specify one or more commits to resolve users for.');
     }
 
     $console = PhutilConsole::getConsole();
     foreach ($commits as $commit) {
       $repo = $commit->getRepository();
       $name =  $repo->formatCommitName($commit->getCommitIdentifier());
 
       $console->writeOut(
         "%s\n",
-        pht("Examining commit %s...", $name));
+        pht('Examining commit %s...', $name));
 
       $ref = id(new DiffusionLowLevelCommitQuery())
         ->setRepository($repo)
         ->withIdentifier($commit->getCommitIdentifier())
         ->execute();
 
       $author = $ref->getAuthor();
       $console->writeOut(
         "%s\n",
         pht('Raw author string: %s', coalesce($author, 'null')));
 
       if ($author !== null) {
         $handle = $this->resolveUser($commit, $author);
         if ($handle) {
           $console->writeOut(
             "%s\n",
             pht('Phabricator user: %s', $handle->getFullName()));
         } else {
           $console->writeOut(
             "%s\n",
             pht('Unable to resolve a corresponding Phabricator user.'));
         }
       }
 
       $committer = $ref->getCommitter();
       $console->writeOut(
         "%s\n",
         pht('Raw committer string: %s', coalesce($committer, 'null')));
 
       if ($committer !== null) {
         $handle = $this->resolveUser($commit, $committer);
         if ($handle) {
           $console->writeOut(
             "%s\n",
             pht('Phabricator user: %s', $handle->getFullName()));
         } else {
           $console->writeOut(
             "%s\n",
             pht('Unable to resolve a corresponding Phabricator user.'));
         }
       }
     }
 
     return 0;
   }
 
   private function resolveUser(PhabricatorRepositoryCommit $commit, $name) {
     $phid = id(new DiffusionResolveUserQuery())
       ->withCommit($commit)
       ->withName($name)
       ->execute();
 
     if (!$phid) {
       return null;
     }
 
     return id(new PhabricatorHandleQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs(array($phid))
       ->executeOne();
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php
index 7c8d5fb82..d90e0e501 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php
@@ -1,67 +1,67 @@
 <?php
 
 final class PhabricatorRepositoryManagementMarkImportedWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('mark-imported')
       ->setExamples('**mark-imported** __repository__ ...')
       ->setSynopsis('Mark __repository__, named by callsign, as imported.')
       ->setArguments(
         array(
           array(
             'name'        => 'mark-not-imported',
             'help'        => 'Instead, mark repositories as NOT imported.',
           ),
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more repositories to mark imported, by callsign.");
+        'Specify one or more repositories to mark imported, by callsign.');
     }
 
     $new_importing_value = (bool)$args->getArg('mark-not-imported');
 
     $console = PhutilConsole::getConsole();
     foreach ($repos as $repo) {
       $callsign = $repo->getCallsign();
 
       if ($repo->isImporting() && $new_importing_value) {
         $console->writeOut(
           "%s\n",
           pht("Repository '%s' is already importing.", $callsign));
       } else if (!$repo->isImporting() && !$new_importing_value) {
         $console->writeOut(
           "%s\n",
           pht("Repository '%s' is already imported.", $callsign));
       } else {
         if ($new_importing_value) {
           $console->writeOut(
             "%s\n",
             pht("Marking repository '%s' as importing.", $callsign));
         } else {
           $console->writeOut(
             "%s\n",
             pht("Marking repository '%s' as imported.", $callsign));
         }
 
         $repo->setDetail('importing', $new_importing_value);
         $repo->save();
       }
     }
 
     $console->writeOut("Done.\n");
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementMirrorWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementMirrorWorkflow.php
index 16c72effe..5aab451c5 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementMirrorWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementMirrorWorkflow.php
@@ -1,52 +1,52 @@
 <?php
 
 final class PhabricatorRepositoryManagementMirrorWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('mirror')
       ->setExamples('**mirror** [__options__] __repository__ ...')
       ->setSynopsis(
         pht('Push __repository__, named by callsign, to mirrors.'))
       ->setArguments(
         array(
           array(
             'name'        => 'verbose',
             'help'        => pht('Show additional debugging information.'),
           ),
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Specify one or more repositories to push to mirrors, by ".
-          "callsign."));
+          'Specify one or more repositories to push to mirrors, by '.
+          'callsign.'));
     }
 
     $console = PhutilConsole::getConsole();
     foreach ($repos as $repo) {
       $console->writeOut(
         "%s\n",
         pht('Pushing "%s" to mirrors...', $repo->getCallsign()));
 
       $engine = id(new PhabricatorRepositoryMirrorEngine())
         ->setRepository($repo)
         ->setVerbose($args->getArg('verbose'))
         ->pushToMirrors();
     }
 
     $console->writeOut("Done.\n");
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php
index 5945e4c35..ada90352a 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php
@@ -1,47 +1,47 @@
 <?php
 
 final class PhabricatorRepositoryManagementPullWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('pull')
       ->setExamples('**pull** __repository__ ...')
       ->setSynopsis('Pull __repository__, named by callsign.')
       ->setArguments(
         array(
           array(
             'name'        => 'verbose',
             'help'        => 'Show additional debugging information.',
           ),
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
-        "Specify one or more repositories to pull, by callsign.");
+        'Specify one or more repositories to pull, by callsign.');
     }
 
     $console = PhutilConsole::getConsole();
     foreach ($repos as $repo) {
       $console->writeOut("Pulling '%s'...\n", $repo->getCallsign());
 
       id(new PhabricatorRepositoryPullEngine())
         ->setRepository($repo)
         ->setVerbose($args->getArg('verbose'))
         ->pullRepository();
     }
 
     $console->writeOut("Done.\n");
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php
index 380a5d153..3d3b2040c 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php
@@ -1,49 +1,49 @@
 <?php
 
 final class PhabricatorRepositoryManagementRefsWorkflow
   extends PhabricatorRepositoryManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('refs')
       ->setExamples('**refs** [__options__] __repository__ ...')
       ->setSynopsis('Update refs in __repository__, named by callsign.')
       ->setArguments(
         array(
           array(
             'name'        => 'verbose',
             'help'        => 'Show additional debugging information.',
           ),
           array(
             'name'        => 'repos',
             'wildcard'    => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $repos = $this->loadRepositories($args, 'repos');
 
     if (!$repos) {
       throw new PhutilArgumentUsageException(
         pht(
-          "Specify one or more repositories to update refs for, ".
-          "by callsign."));
+          'Specify one or more repositories to update refs for, '.
+          'by callsign.'));
     }
 
     $console = PhutilConsole::getConsole();
     foreach ($repos as $repo) {
       $console->writeOut("Updating refs in '%s'...\n", $repo->getCallsign());
 
       $engine = id(new PhabricatorRepositoryRefEngine())
         ->setRepository($repo)
         ->setVerbose($args->getArg('verbose'))
         ->updateRefs();
     }
 
     $console->writeOut("Done.\n");
 
     return 0;
   }
 
 }
diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php
index 4cae9981c..8dcf103dc 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php
@@ -1,42 +1,42 @@
 <?php
 
 final class PhabricatorRepositoryPHIDTypeMirror
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'RMIR';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Repository Mirror');
   }
 
   public function newObject() {
     return new PhabricatorRepositoryMirror();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorRepositoryMirrorQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $mirror = $objects[$phid];
 
       $handle->setName(
         pht('Mirror %d %s', $mirror->getID(), $mirror->getRemoteURI()));
-      $handle->setURI("/diffusion/mirror/".$mirror->getID()."/");
+      $handle->setURI('/diffusion/mirror/'.$mirror->getID().'/');
     }
   }
 
 }
diff --git a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
index 8e7b50f48..4e9f622d8 100644
--- a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
+++ b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
@@ -1,93 +1,93 @@
 <?php
 
 final class PhabricatorRepositoryCommitSearchIndexer
   extends PhabricatorSearchDocumentIndexer {
 
   public function getIndexableObject() {
     return new PhabricatorRepositoryCommit();
   }
 
   protected function buildAbstractDocumentByPHID($phid) {
     $commit = $this->loadDocumentByPHID($phid);
 
     $commit_data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
       'commitID = %d',
       $commit->getID());
     $date_created = $commit->getEpoch();
     $commit_message = $commit_data->getCommitMessage();
     $author_phid = $commit_data->getCommitDetail('authorPHID');
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($this->getViewer())
       ->withIDs(array($commit->getRepositoryID()))
       ->executeOne();
     if (!$repository) {
-      throw new Exception("No such repository!");
+      throw new Exception('No such repository!');
     }
 
     $title = 'r'.$repository->getCallsign().$commit->getCommitIdentifier().
-      " ".$commit_data->getSummary();
+      ' '.$commit_data->getSummary();
 
     $doc = new PhabricatorSearchAbstractDocument();
     $doc->setPHID($commit->getPHID());
     $doc->setDocumentType(PhabricatorRepositoryPHIDTypeCommit::TYPECONST);
     $doc->setDocumentCreated($date_created);
     $doc->setDocumentModified($date_created);
     $doc->setDocumentTitle($title);
 
     $doc->addField(
       PhabricatorSearchField::FIELD_BODY,
       $commit_message);
 
     if ($author_phid) {
       $doc->addRelationship(
         PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
         $author_phid,
         PhabricatorPeoplePHIDTypeUser::TYPECONST,
         $date_created);
     }
 
     $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $commit->getPHID(),
       PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT);
     if ($project_phids) {
       foreach ($project_phids as $project_phid) {
         $doc->addRelationship(
           PhabricatorSearchRelationship::RELATIONSHIP_PROJECT,
           $project_phid,
           PhabricatorProjectPHIDTypeProject::TYPECONST,
           $date_created);
       }
     }
 
     $doc->addRelationship(
       PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
       $repository->getPHID(),
       PhabricatorRepositoryPHIDTypeRepository::TYPECONST,
       $date_created);
 
     $comments = id(new PhabricatorAuditComment())->loadAllWhere(
       'targetPHID = %s',
       $commit->getPHID());
     foreach ($comments as $comment) {
       if (strlen($comment->getContent())) {
         $doc->addField(
           PhabricatorSearchField::FIELD_COMMENT,
           $comment->getContent());
       }
     }
 
     $inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
       'commitPHID = %s AND (auditCommentID IS NOT NULL)',
       $commit->getPHID());
     foreach ($inlines as $inline) {
       if (strlen($inline->getContent())) {
         $doc->addField(
           PhabricatorSearchField::FIELD_COMMENT,
           $inline->getContent());
       }
     }
 
     return $doc;
   }
 }
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index f04f3ad1d..4ac35afe7 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1,1337 +1,1337 @@
 <?php
 
 /**
  * @task uri Repository URI Management
  */
 final class PhabricatorRepository extends PhabricatorRepositoryDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorFlaggableInterface,
     PhabricatorMarkupInterface,
     PhabricatorDestructableInterface {
 
   /**
    * Shortest hash we'll recognize in raw "a829f32" form.
    */
   const MINIMUM_UNQUALIFIED_HASH = 7;
 
   /**
    * Shortest hash we'll recognize in qualified "rXab7ef2f8" form.
    */
   const MINIMUM_QUALIFIED_HASH = 5;
 
   const TABLE_PATH = 'repository_path';
   const TABLE_PATHCHANGE = 'repository_pathchange';
   const TABLE_FILESYSTEM = 'repository_filesystem';
   const TABLE_SUMMARY = 'repository_summary';
   const TABLE_BADCOMMIT = 'repository_badcommit';
   const TABLE_LINTMESSAGE = 'repository_lintmessage';
   const TABLE_PARENTS = 'repository_parents';
 
   const SERVE_OFF = 'off';
   const SERVE_READONLY = 'readonly';
   const SERVE_READWRITE = 'readwrite';
 
   protected $name;
   protected $callsign;
   protected $uuid;
   protected $viewPolicy;
   protected $editPolicy;
   protected $pushPolicy;
 
   protected $versionControlSystem;
   protected $details = array();
   protected $credentialPHID;
 
   private $commitCount = self::ATTACHABLE;
   private $mostRecentCommit = self::ATTACHABLE;
   private $projectPHIDs = self::ATTACHABLE;
 
   public static function initializeNewRepository(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
       ->withClasses(array('PhabricatorApplicationDiffusion'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(DiffusionCapabilityDefaultView::CAPABILITY);
     $edit_policy = $app->getPolicy(DiffusionCapabilityDefaultEdit::CAPABILITY);
     $push_policy = $app->getPolicy(DiffusionCapabilityDefaultPush::CAPABILITY);
 
     return id(new PhabricatorRepository())
       ->setViewPolicy($view_policy)
       ->setEditPolicy($edit_policy)
       ->setPushPolicy($push_policy);
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'details' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorRepositoryPHIDTypeRepository::TYPECONST);
   }
 
   public function toDictionary() {
     return array(
       'id'          => $this->getID(),
       'name'        => $this->getName(),
       'phid'        => $this->getPHID(),
       'callsign'    => $this->getCallsign(),
       'monogram'    => $this->getMonogram(),
       'vcs'         => $this->getVersionControlSystem(),
       'uri'         => PhabricatorEnv::getProductionURI($this->getURI()),
       'remoteURI'   => (string)$this->getRemoteURI(),
       'description' => $this->getDetail('description'),
       'isActive'    => $this->isTracked(),
       'isHosted'    => $this->isHosted(),
       'isImporting' => $this->isImporting(),
     );
   }
 
   public function getMonogram() {
     return 'r'.$this->getCallsign();
   }
 
   public function getDetail($key, $default = null) {
     return idx($this->details, $key, $default);
   }
 
   public function getHumanReadableDetail($key, $default = null) {
     $value = $this->getDetail($key, $default);
 
     switch ($key) {
       case 'branch-filter':
       case 'close-commits-filter':
         $value = array_keys($value);
         $value = implode(', ', $value);
         break;
     }
 
     return $value;
   }
 
   public function setDetail($key, $value) {
     $this->details[$key] = $value;
     return $this;
   }
 
   public function attachCommitCount($count) {
     $this->commitCount = $count;
     return $this;
   }
 
   public function getCommitCount() {
     return $this->assertAttached($this->commitCount);
   }
 
   public function attachMostRecentCommit(
     PhabricatorRepositoryCommit $commit = null) {
     $this->mostRecentCommit = $commit;
     return $this;
   }
 
   public function getMostRecentCommit() {
     return $this->assertAttached($this->mostRecentCommit);
   }
 
   public function getDiffusionBrowseURIForPath(
     PhabricatorUser $user,
     $path,
     $line = null,
     $branch = null) {
 
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => $user,
         'repository' => $this,
         'path' => $path,
         'branch' => $branch,
       ));
 
     return $drequest->generateURI(
       array(
         'action' => 'browse',
         'line'   => $line,
       ));
   }
 
   public function getLocalPath() {
     return $this->getDetail('local-path');
   }
 
   public function getSubversionBaseURI($commit = null) {
     $subpath = $this->getDetail('svn-subpath');
     if (!strlen($subpath)) {
       $subpath = null;
     }
     return $this->getSubversionPathURI($subpath, $commit);
   }
 
   public function getSubversionPathURI($path = null, $commit = null) {
     $vcs = $this->getVersionControlSystem();
     if ($vcs != PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) {
-      throw new Exception("Not a subversion repository!");
+      throw new Exception('Not a subversion repository!');
     }
 
     if ($this->isHosted()) {
       $uri = 'file://'.$this->getLocalPath();
     } else {
       $uri = $this->getDetail('remote-uri');
     }
 
     $uri = rtrim($uri, '/');
 
     if (strlen($path)) {
       $path = rawurlencode($path);
       $path = str_replace('%2F', '/', $path);
       $uri = $uri.'/'.ltrim($path, '/');
     }
 
     if ($path !== null || $commit !== null) {
       $uri .= '@';
     }
 
     if ($commit !== null) {
       $uri .= $commit;
     }
 
     return $uri;
   }
 
   public function attachProjectPHIDs(array $project_phids) {
     $this->projectPHIDs = $project_phids;
     return $this;
   }
 
   public function getProjectPHIDs() {
     return $this->assertAttached($this->projectPHIDs);
   }
 
 
   /**
    * Get the name of the directory this repository should clone or checkout
    * into. For example, if the repository name is "Example Repository", a
    * reasonable name might be "example-repository". This is used to help users
    * get reasonable results when cloning repositories, since they generally do
    * not want to clone into directories called "X/" or "Example Repository/".
    *
    * @return string
    */
   public function getCloneName() {
     $name = $this->getDetail('clone-name');
 
     // Make some reasonable effort to produce reasonable default directory
     // names from repository names.
     if (!strlen($name)) {
       $name = $this->getName();
       $name = phutil_utf8_strtolower($name);
       $name = preg_replace('@[/ -:]+@', '-', $name);
       $name = trim($name, '-');
       if (!strlen($name)) {
         $name = $this->getCallsign();
       }
     }
 
     return $name;
   }
 
 
 /* -(  Remote Command Execution  )------------------------------------------- */
 
 
   public function execRemoteCommand($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newRemoteCommandFuture($args)->resolve();
   }
 
   public function execxRemoteCommand($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newRemoteCommandFuture($args)->resolvex();
   }
 
   public function getRemoteCommandFuture($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newRemoteCommandFuture($args);
   }
 
   public function passthruRemoteCommand($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newRemoteCommandPassthru($args)->execute();
   }
 
   private function newRemoteCommandFuture(array $argv) {
     $argv = $this->formatRemoteCommand($argv);
     $future = newv('ExecFuture', $argv);
     $future->setEnv($this->getRemoteCommandEnvironment());
     return $future;
   }
 
   private function newRemoteCommandPassthru(array $argv) {
     $argv = $this->formatRemoteCommand($argv);
     $passthru = newv('PhutilExecPassthru', $argv);
     $passthru->setEnv($this->getRemoteCommandEnvironment());
     return $passthru;
   }
 
 
 /* -(  Local Command Execution  )-------------------------------------------- */
 
 
   public function execLocalCommand($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newLocalCommandFuture($args)->resolve();
   }
 
   public function execxLocalCommand($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newLocalCommandFuture($args)->resolvex();
   }
 
   public function getLocalCommandFuture($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newLocalCommandFuture($args);
   }
 
   public function passthruLocalCommand($pattern /* , $arg, ... */) {
     $args = func_get_args();
     return $this->newLocalCommandPassthru($args)->execute();
   }
 
   private function newLocalCommandFuture(array $argv) {
     $this->assertLocalExists();
 
     $argv = $this->formatLocalCommand($argv);
     $future = newv('ExecFuture', $argv);
     $future->setEnv($this->getLocalCommandEnvironment());
 
     if ($this->usesLocalWorkingCopy()) {
       $future->setCWD($this->getLocalPath());
     }
 
     return $future;
   }
 
   private function newLocalCommandPassthru(array $argv) {
     $this->assertLocalExists();
 
     $argv = $this->formatLocalCommand($argv);
     $future = newv('PhutilExecPassthru', $argv);
     $future->setEnv($this->getLocalCommandEnvironment());
 
     if ($this->usesLocalWorkingCopy()) {
       $future->setCWD($this->getLocalPath());
     }
 
     return $future;
   }
 
 
 /* -(  Command Infrastructure  )--------------------------------------------- */
 
 
   private function getSSHWrapper() {
     $root = dirname(phutil_get_library_root('phabricator'));
     return $root.'/bin/ssh-connect';
   }
 
   private function getCommonCommandEnvironment() {
     $env = array(
       // NOTE: Force the language to "en_US.UTF-8", which overrides locale
       // settings. This makes stuff print in English instead of, e.g., French,
       // so we can parse the output of some commands, error messages, etc.
       'LANG' => 'en_US.UTF-8',
 
       // Propagate PHABRICATOR_ENV explicitly. For discussion, see T4155.
       'PHABRICATOR_ENV' => PhabricatorEnv::getSelectedEnvironmentName(),
     );
 
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         // NOTE: See T2965. Some time after Git 1.7.5.4, Git started fataling if
         // it can not read $HOME. For many users, $HOME points at /root (this
         // seems to be a default result of Apache setup). Instead, explicitly
         // point $HOME at a readable, empty directory so that Git looks for the
         // config file it's after, fails to locate it, and moves on. This is
         // really silly, but seems like the least damaging approach to
         // mitigating the issue.
 
         $root = dirname(phutil_get_library_root('phabricator'));
         $env['HOME'] = $root.'/support/empty/';
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         // NOTE: This overrides certain configuration, extensions, and settings
         // which make Mercurial commands do random unusual things.
         $env['HGPLAIN'] = 1;
         break;
       default:
-        throw new Exception("Unrecognized version control system.");
+        throw new Exception('Unrecognized version control system.');
     }
 
     return $env;
   }
 
   private function getLocalCommandEnvironment() {
     return $this->getCommonCommandEnvironment();
   }
 
   private function getRemoteCommandEnvironment() {
     $env = $this->getCommonCommandEnvironment();
 
     if ($this->shouldUseSSH()) {
       // NOTE: This is read by `bin/ssh-connect`, and tells it which credentials
       // to use.
       $env['PHABRICATOR_CREDENTIAL'] = $this->getCredentialPHID();
       switch ($this->getVersionControlSystem()) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
           // Force SVN to use `bin/ssh-connect`.
           $env['SVN_SSH'] = $this->getSSHWrapper();
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
           // Force Git to use `bin/ssh-connect`.
           $env['GIT_SSH'] = $this->getSSHWrapper();
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
           // We force Mercurial through `bin/ssh-connect` too, but it uses a
           // command-line flag instead of an environmental variable.
           break;
         default:
-          throw new Exception("Unrecognized version control system.");
+          throw new Exception('Unrecognized version control system.');
       }
     }
 
     return $env;
   }
 
   private function formatRemoteCommand(array $args) {
     $pattern = $args[0];
     $args = array_slice($args, 1);
 
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         if ($this->shouldUseHTTP() || $this->shouldUseSVNProtocol()) {
           $flags = array();
           $flag_args = array();
           $flags[] = '--non-interactive';
           $flags[] = '--no-auth-cache';
           if ($this->shouldUseHTTP()) {
             $flags[] = '--trust-server-cert';
           }
 
           $credential_phid = $this->getCredentialPHID();
           if ($credential_phid) {
             $key = PassphrasePasswordKey::loadFromPHID(
               $credential_phid,
               PhabricatorUser::getOmnipotentUser());
             $flags[] = '--username %P';
             $flags[] = '--password %P';
             $flag_args[] = $key->getUsernameEnvelope();
             $flag_args[] = $key->getPasswordEnvelope();
           }
 
           $flags = implode(' ', $flags);
           $pattern = "svn {$flags} {$pattern}";
           $args = array_mergev(array($flag_args, $args));
         } else {
           $pattern = "svn --non-interactive {$pattern}";
         }
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $pattern = "git {$pattern}";
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         if ($this->shouldUseSSH()) {
           $pattern = "hg --config ui.ssh=%s {$pattern}";
           array_unshift(
             $args,
             $this->getSSHWrapper());
         } else {
           $pattern = "hg {$pattern}";
         }
         break;
       default:
-        throw new Exception("Unrecognized version control system.");
+        throw new Exception('Unrecognized version control system.');
     }
 
     array_unshift($args, $pattern);
 
     return $args;
   }
 
   private function formatLocalCommand(array $args) {
     $pattern = $args[0];
     $args = array_slice($args, 1);
 
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $pattern = "svn --non-interactive {$pattern}";
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $pattern = "git {$pattern}";
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $pattern = "hg {$pattern}";
         break;
       default:
-        throw new Exception("Unrecognized version control system.");
+        throw new Exception('Unrecognized version control system.');
     }
 
     array_unshift($args, $pattern);
 
     return $args;
   }
 
   /**
    * Sanitize output of an `hg` command invoked with the `--debug` flag to make
    * it usable.
    *
    * @param string Output from `hg --debug ...`
    * @return string Usable output.
    */
   public static function filterMercurialDebugOutput($stdout) {
     // When hg commands are run with `--debug` and some config file isn't
     // trusted, Mercurial prints out a warning to stdout, twice, after Feb 2011.
     //
     // http://selenic.com/pipermail/mercurial-devel/2011-February/028541.html
 
     $lines = preg_split('/(?<=\n)/', $stdout);
     $regex = '/ignoring untrusted configuration option .*\n$/';
 
     foreach ($lines as $key => $line) {
       $lines[$key] = preg_replace($regex, '', $line);
     }
 
     return implode('', $lines);
   }
 
   public function getURI() {
     return '/diffusion/'.$this->getCallsign().'/';
   }
 
   public function getNormalizedPath() {
     $uri = (string)$this->getCloneURIObject();
 
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $normalized_uri = new PhabricatorRepositoryURINormalizer(
           PhabricatorRepositoryURINormalizer::TYPE_GIT,
           $uri);
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $normalized_uri = new PhabricatorRepositoryURINormalizer(
           PhabricatorRepositoryURINormalizer::TYPE_SVN,
           $uri);
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $normalized_uri = new PhabricatorRepositoryURINormalizer(
           PhabricatorRepositoryURINormalizer::TYPE_MERCURIAL,
           $uri);
         break;
       default:
-        throw new Exception("Unrecognized version control system.");
+        throw new Exception('Unrecognized version control system.');
     }
 
     return $normalized_uri->getNormalizedPath();
   }
 
   public function isTracked() {
     return $this->getDetail('tracking-enabled', false);
   }
 
   public function getDefaultBranch() {
     $default = $this->getDetail('default-branch');
     if (strlen($default)) {
       return $default;
     }
 
     $default_branches = array(
       PhabricatorRepositoryType::REPOSITORY_TYPE_GIT        => 'master',
       PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL  => 'default',
     );
 
     return idx($default_branches, $this->getVersionControlSystem());
   }
 
   public function getDefaultArcanistBranch() {
     return coalesce($this->getDefaultBranch(), 'svn');
   }
 
   private function isBranchInFilter($branch, $filter_key) {
     $vcs = $this->getVersionControlSystem();
 
     $is_git = ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT);
 
     $use_filter = ($is_git);
 
     if ($use_filter) {
       $filter = $this->getDetail($filter_key, array());
       if ($filter && empty($filter[$branch])) {
         return false;
       }
     }
 
     // By default, all branches pass.
     return true;
   }
 
   public function shouldTrackBranch($branch) {
     return $this->isBranchInFilter($branch, 'branch-filter');
   }
 
   public function shouldAutocloseBranch($branch) {
     if ($this->isImporting()) {
       return false;
     }
 
     if ($this->getDetail('disable-autoclose', false)) {
       return false;
     }
 
     if (!$this->shouldTrackBranch($branch)) {
       return false;
     }
 
     return $this->isBranchInFilter($branch, 'close-commits-filter');
   }
 
   public function shouldAutocloseCommit(
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepositoryCommitData $data) {
 
     if ($this->getDetail('disable-autoclose', false)) {
       return false;
     }
 
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         return true;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return true;
       default:
-        throw new Exception("Unrecognized version control system.");
+        throw new Exception('Unrecognized version control system.');
     }
 
     $closeable_flag = PhabricatorRepositoryCommit::IMPORTED_CLOSEABLE;
     if ($commit->isPartiallyImported($closeable_flag)) {
       return true;
     }
 
     // TODO: Remove this eventually, it's no longer written to by the import
     // pipeline (however, old tasks may still be queued which don't reflect
     // the new data format).
     $branches = $data->getCommitDetail('seenOnBranches', array());
     foreach ($branches as $branch) {
       if ($this->shouldAutocloseBranch($branch)) {
         return true;
       }
     }
 
     return false;
   }
 
   public function formatCommitName($commit_identifier) {
     $vcs = $this->getVersionControlSystem();
 
     $type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
     $type_hg = PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL;
 
     $is_git = ($vcs == $type_git);
     $is_hg = ($vcs == $type_hg);
     if ($is_git || $is_hg) {
       $short_identifier = substr($commit_identifier, 0, 12);
     } else {
       $short_identifier = $commit_identifier;
     }
 
     return 'r'.$this->getCallsign().$short_identifier;
   }
 
   public function isImporting() {
     return (bool)$this->getDetail('importing', false);
   }
 
 
 /* -(  Repository URI Management  )------------------------------------------ */
 
 
   /**
    * Get the remote URI for this repository.
    *
    * @return string
    * @task uri
    */
   public function getRemoteURI() {
     return (string)$this->getRemoteURIObject();
   }
 
 
   /**
    * Get the remote URI for this repository, including credentials if they're
    * used by this repository.
    *
    * @return PhutilOpaqueEnvelope URI, possibly including credentials.
    * @task uri
    */
   public function getRemoteURIEnvelope() {
     $uri = $this->getRemoteURIObject();
 
     $remote_protocol = $this->getRemoteProtocol();
     if ($remote_protocol == 'http' || $remote_protocol == 'https') {
       // For SVN, we use `--username` and `--password` flags separately, so
       // don't add any credentials here.
       if (!$this->isSVN()) {
         $credential_phid = $this->getCredentialPHID();
         if ($credential_phid) {
           $key = PassphrasePasswordKey::loadFromPHID(
             $credential_phid,
             PhabricatorUser::getOmnipotentUser());
 
           $uri->setUser($key->getUsernameEnvelope()->openEnvelope());
           $uri->setPass($key->getPasswordEnvelope()->openEnvelope());
         }
       }
     }
 
     return new PhutilOpaqueEnvelope((string)$uri);
   }
 
 
   /**
    * Get the clone (or checkout) URI for this repository, without authentication
    * information.
    *
    * @return string Repository URI.
    * @task uri
    */
   public function getPublicCloneURI() {
     $uri = $this->getCloneURIObject();
 
     // Make sure we don't leak anything if this repo is using HTTP Basic Auth
     // with the credentials in the URI or something zany like that.
 
     // If repository is not accessed over SSH we remove both username and
     // password.
     if (!$this->isHosted()) {
       if (!$this->shouldUseSSH()) {
         $uri->setUser(null);
 
         // This might be a Git URI or a normal URI. If it's Git, there's no
         // password support.
         if ($uri instanceof PhutilURI) {
           $uri->setPass(null);
         }
       }
     }
 
     return (string)$uri;
   }
 
 
   /**
    * Get the protocol for the repository's remote.
    *
    * @return string Protocol, like "ssh" or "git".
    * @task uri
    */
   public function getRemoteProtocol() {
     $uri = $this->getRemoteURIObject();
 
     if ($uri instanceof PhutilGitURI) {
       return 'ssh';
     } else {
       return $uri->getProtocol();
     }
   }
 
 
   /**
    * Get a parsed object representation of the repository's remote URI. This
    * may be a normal URI (returned as a @{class@libphutil:PhutilURI}) or a git
    * URI (returned as a @{class@libphutil:PhutilGitURI}).
    *
    * @return wild A @{class@libphutil:PhutilURI} or
    *              @{class@libphutil:PhutilGitURI}.
    * @task uri
    */
   public function getRemoteURIObject() {
     $raw_uri = $this->getDetail('remote-uri');
     if (!$raw_uri) {
       return new PhutilURI('');
     }
 
     if (!strncmp($raw_uri, '/', 1)) {
       return new PhutilURI('file://'.$raw_uri);
     }
 
     $uri = new PhutilURI($raw_uri);
     if ($uri->getProtocol()) {
       return $uri;
     }
 
     $uri = new PhutilGitURI($raw_uri);
     if ($uri->getDomain()) {
       return $uri;
     }
 
     throw new Exception("Remote URI '{$raw_uri}' could not be parsed!");
   }
 
 
   /**
    * Get the "best" clone/checkout URI for this repository, on any protocol.
    */
   public function getCloneURIObject() {
     if (!$this->isHosted()) {
       if ($this->isSVN()) {
         // Make sure we pick up the "Import Only" path for Subversion, so
         // the user clones the repository starting at the correct path, not
         // from the root.
         $base_uri = $this->getSubversionBaseURI();
         $base_uri = new PhutilURI($base_uri);
         $path = $base_uri->getPath();
         if (!$path) {
           $path = '/';
         }
 
         // If the trailing "@" is not required to escape the URI, strip it for
         // readability.
         if (!preg_match('/@.*@/', $path)) {
           $path = rtrim($path, '@');
         }
 
         $base_uri->setPath($path);
         return $base_uri;
       } else {
         return $this->getRemoteURIObject();
       }
     }
 
     // Choose the best URI: pick a read/write URI over a URI which is not
     // read/write, and SSH over HTTP.
 
     $serve_ssh = $this->getServeOverSSH();
     $serve_http = $this->getServeOverHTTP();
 
     if ($serve_ssh === self::SERVE_READWRITE) {
       return $this->getSSHCloneURIObject();
     } else if ($serve_http === self::SERVE_READWRITE) {
       return $this->getHTTPCloneURIObject();
     } else if ($serve_ssh !== self::SERVE_OFF) {
       return $this->getSSHCloneURIObject();
     } else if ($serve_http !== self::SERVE_OFF) {
       return $this->getHTTPCloneURIObject();
     } else {
       return null;
     }
   }
 
 
   /**
    * Get the repository's SSH clone/checkout URI, if one exists.
    */
   public function getSSHCloneURIObject() {
     if (!$this->isHosted()) {
       if ($this->shouldUseSSH()) {
         return $this->getRemoteURIObject();
       } else {
         return null;
       }
     }
 
     $serve_ssh = $this->getServeOverSSH();
     if ($serve_ssh === self::SERVE_OFF) {
       return null;
     }
 
     $uri = new PhutilURI(PhabricatorEnv::getProductionURI($this->getURI()));
 
     if ($this->isSVN()) {
       $uri->setProtocol('svn+ssh');
     } else {
       $uri->setProtocol('ssh');
     }
 
     if ($this->isGit()) {
       $uri->setPath($uri->getPath().$this->getCloneName().'.git');
     } else if ($this->isHg()) {
       $uri->setPath($uri->getPath().$this->getCloneName().'/');
     }
 
     $ssh_user = PhabricatorEnv::getEnvConfig('diffusion.ssh-user');
     if ($ssh_user) {
       $uri->setUser($ssh_user);
     }
 
     $uri->setPort(PhabricatorEnv::getEnvConfig('diffusion.ssh-port'));
 
     return $uri;
   }
 
 
   /**
    * Get the repository's HTTP clone/checkout URI, if one exists.
    */
   public function getHTTPCloneURIObject() {
     if (!$this->isHosted()) {
       if ($this->shouldUseHTTP()) {
         return $this->getRemoteURIObject();
       } else {
         return null;
       }
     }
 
     $serve_http = $this->getServeOverHTTP();
     if ($serve_http === self::SERVE_OFF) {
       return null;
     }
 
     $uri = PhabricatorEnv::getProductionURI($this->getURI());
     $uri = new PhutilURI($uri);
 
     if ($this->isGit()) {
       $uri->setPath($uri->getPath().$this->getCloneName().'.git');
     } else if ($this->isHg()) {
       $uri->setPath($uri->getPath().$this->getCloneName().'/');
     }
 
     return $uri;
   }
 
 
   /**
    * Determine if we should connect to the remote using SSH flags and
    * credentials.
    *
    * @return bool True to use the SSH protocol.
    * @task uri
    */
   private function shouldUseSSH() {
     if ($this->isHosted()) {
       return false;
     }
 
     $protocol = $this->getRemoteProtocol();
     if ($this->isSSHProtocol($protocol)) {
       return true;
     }
 
     return false;
   }
 
 
   /**
    * Determine if we should connect to the remote using HTTP flags and
    * credentials.
    *
    * @return bool True to use the HTTP protocol.
    * @task uri
    */
   private function shouldUseHTTP() {
     if ($this->isHosted()) {
       return false;
     }
 
     $protocol = $this->getRemoteProtocol();
     return ($protocol == 'http' || $protocol == 'https');
   }
 
 
   /**
    * Determine if we should connect to the remote using SVN flags and
    * credentials.
    *
    * @return bool True to use the SVN protocol.
    * @task uri
    */
   private function shouldUseSVNProtocol() {
     if ($this->isHosted()) {
       return false;
     }
 
     $protocol = $this->getRemoteProtocol();
     return ($protocol == 'svn');
   }
 
 
   /**
    * Determine if a protocol is SSH or SSH-like.
    *
    * @param string A protocol string, like "http" or "ssh".
    * @return bool True if the protocol is SSH-like.
    * @task uri
    */
   private function isSSHProtocol($protocol) {
     return ($protocol == 'ssh' || $protocol == 'svn+ssh');
   }
 
   public function delete() {
     $this->openTransaction();
 
       $paths = id(new PhabricatorOwnersPath())
         ->loadAllWhere('repositoryPHID = %s', $this->getPHID());
       foreach ($paths as $path) {
         $path->delete();
       }
 
       $projects = id(new PhabricatorRepositoryArcanistProject())
         ->loadAllWhere('repositoryID = %d', $this->getID());
       foreach ($projects as $project) {
         // note each project deletes its PhabricatorRepositorySymbols
         $project->delete();
       }
 
       $commits = id(new PhabricatorRepositoryCommit())
         ->loadAllWhere('repositoryID = %d', $this->getID());
       foreach ($commits as $commit) {
         // note PhabricatorRepositoryAuditRequests and
         // PhabricatorRepositoryCommitData are deleted here too.
         $commit->delete();
       }
 
       $mirrors = id(new PhabricatorRepositoryMirror())
         ->loadAllWhere('repositoryPHID = %s', $this->getPHID());
       foreach ($mirrors as $mirror) {
         $mirror->delete();
       }
 
       $ref_cursors = id(new PhabricatorRepositoryRefCursor())
         ->loadAllWhere('repositoryPHID = %s', $this->getPHID());
       foreach ($ref_cursors as $cursor) {
         $cursor->delete();
       }
 
       $conn_w = $this->establishConnection('w');
 
       queryfx(
         $conn_w,
         'DELETE FROM %T WHERE repositoryID = %d',
         self::TABLE_FILESYSTEM,
         $this->getID());
 
       queryfx(
         $conn_w,
         'DELETE FROM %T WHERE repositoryID = %d',
         self::TABLE_PATHCHANGE,
         $this->getID());
 
       queryfx(
         $conn_w,
         'DELETE FROM %T WHERE repositoryID = %d',
         self::TABLE_SUMMARY,
         $this->getID());
 
       $result = parent::delete();
 
     $this->saveTransaction();
     return $result;
   }
 
   public function isGit() {
     $vcs = $this->getVersionControlSystem();
     return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT);
   }
 
   public function isSVN() {
     $vcs = $this->getVersionControlSystem();
     return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_SVN);
   }
 
   public function isHg() {
     $vcs = $this->getVersionControlSystem();
     return ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL);
   }
 
   public function isHosted() {
     return (bool)$this->getDetail('hosting-enabled', false);
   }
 
   public function setHosted($enabled) {
     return $this->setDetail('hosting-enabled', $enabled);
   }
 
   public function getServeOverHTTP() {
     if ($this->isSVN()) {
       return self::SERVE_OFF;
     }
     $serve = $this->getDetail('serve-over-http', self::SERVE_OFF);
     return $this->normalizeServeConfigSetting($serve);
   }
 
   public function setServeOverHTTP($mode) {
     return $this->setDetail('serve-over-http', $mode);
   }
 
   public function getServeOverSSH() {
     $serve = $this->getDetail('serve-over-ssh', self::SERVE_OFF);
     return $this->normalizeServeConfigSetting($serve);
   }
 
   public function setServeOverSSH($mode) {
     return $this->setDetail('serve-over-ssh', $mode);
   }
 
   public static function getProtocolAvailabilityName($constant) {
     switch ($constant) {
       case self::SERVE_OFF:
         return pht('Off');
       case self::SERVE_READONLY:
         return pht('Read Only');
       case self::SERVE_READWRITE:
         return pht('Read/Write');
       default:
         return pht('Unknown');
     }
   }
 
   private function normalizeServeConfigSetting($value) {
     switch ($value) {
       case self::SERVE_OFF:
       case self::SERVE_READONLY:
         return $value;
       case self::SERVE_READWRITE:
         if ($this->isHosted()) {
           return self::SERVE_READWRITE;
         } else {
           return self::SERVE_READONLY;
         }
       default:
         return self::SERVE_OFF;
     }
   }
 
 
   /**
    * Raise more useful errors when there are basic filesystem problems.
    */
   private function assertLocalExists() {
     if (!$this->usesLocalWorkingCopy()) {
       return;
     }
 
     $local = $this->getLocalPath();
     Filesystem::assertExists($local);
     Filesystem::assertIsDirectory($local);
     Filesystem::assertReadable($local);
   }
 
   /**
    * Determine if the working copy is bare or not. In Git, this corresponds
    * to `--bare`. In Mercurial, `--noupdate`.
    */
   public function isWorkingCopyBare() {
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return false;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $local = $this->getLocalPath();
         if (Filesystem::pathExists($local.'/.git')) {
           return false;
         } else {
           return true;
         }
     }
   }
 
   public function usesLocalWorkingCopy() {
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         return $this->isHosted();
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         return true;
     }
   }
 
   public function getHookDirectories() {
     $directories = array();
     if (!$this->isHosted()) {
       return $directories;
     }
 
     $root = $this->getLocalPath();
 
     switch ($this->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         if ($this->isWorkingCopyBare()) {
           $directories[] = $root.'/hooks/pre-receive-phabricator.d/';
         } else {
           $directories[] = $root.'/.git/hooks/pre-receive-phabricator.d/';
         }
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $directories[] = $root.'/hooks/pre-commit-phabricator.d/';
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         // NOTE: We don't support custom Mercurial hooks for now because they're
         // messy and we can't easily just drop a `hooks.d/` directory next to
         // the hooks.
         break;
     }
 
     return $directories;
   }
 
   public function canDestroyWorkingCopy() {
     if ($this->isHosted()) {
       // Never destroy hosted working copies.
       return false;
     }
 
     $default_path = PhabricatorEnv::getEnvConfig(
       'repository.default-local-path');
     return Filesystem::isDescendant($this->getLocalPath(), $default_path);
   }
 
   public function canUsePathTree() {
     return !$this->isSVN();
   }
 
   public function canMirror() {
     if ($this->isGit() || $this->isHg()) {
       return true;
     }
 
     return false;
   }
 
   public function canAllowDangerousChanges() {
     if (!$this->isHosted()) {
       return false;
     }
 
     if ($this->isGit() || $this->isHg()) {
       return true;
     }
 
     return false;
   }
 
   public function shouldAllowDangerousChanges() {
     return (bool)$this->getDetail('allow-dangerous-changes');
   }
 
   public function writeStatusMessage(
     $status_type,
     $status_code,
     array $parameters = array()) {
 
     $table = new PhabricatorRepositoryStatusMessage();
     $conn_w = $table->establishConnection('w');
     $table_name = $table->getTableName();
 
     if ($status_code === null) {
       queryfx(
         $conn_w,
         'DELETE FROM %T WHERE repositoryID = %d AND statusType = %s',
         $table_name,
         $this->getID(),
         $status_type);
     } else {
       queryfx(
         $conn_w,
         'INSERT INTO %T
           (repositoryID, statusType, statusCode, parameters, epoch)
           VALUES (%d, %s, %s, %s, %d)
           ON DUPLICATE KEY UPDATE
             statusCode = VALUES(statusCode),
             parameters = VALUES(parameters),
             epoch = VALUES(epoch)',
         $table_name,
         $this->getID(),
         $status_type,
         $status_code,
         json_encode($parameters),
         time());
     }
 
     return $this;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
       DiffusionCapabilityPush::CAPABILITY,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
       case DiffusionCapabilityPush::CAPABILITY:
         return $this->getPushPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 
 
 /* -(  PhabricatorMarkupInterface  )----------------------------------------- */
 
 
   public function getMarkupFieldKey($field) {
     $hash = PhabricatorHash::digestForIndex($this->getMarkupText($field));
     return "repo:{$hash}";
   }
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newMarkupEngine(array());
   }
 
   public function getMarkupText($field) {
     return $this->getDetail('description');
   }
 
   public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine) {
     require_celerity_resource('phabricator-remarkup-css');
     return phutil_tag(
       'div',
       array(
         'class' => 'phabricator-remarkup',
       ),
       $output);
   }
 
   public function shouldUseMarkupCache($field) {
     return true;
   }
 
 
 /* -(  PhabricatorDestructableInterface  )----------------------------------- */
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
     $this->delete();
     $this->saveTransaction();
   }
 
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php b/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php
index 9230bd591..f3ba35028 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php
@@ -1,46 +1,46 @@
 <?php
 
 final class PhabricatorRepositoryVCSPassword extends PhabricatorRepositoryDAO {
 
   protected $id;
   protected $userPHID;
   protected $passwordHash;
 
   public function setPassword(
     PhutilOpaqueEnvelope $password,
     PhabricatorUser $user) {
     $hash_envelope = $this->hashPassword($password, $user);
     return $this->setPasswordHash($hash_envelope->openEnvelope());
   }
 
   public function comparePassword(
     PhutilOpaqueEnvelope $password,
     PhabricatorUser $user) {
 
     return PhabricatorPasswordHasher::comparePassword(
       $this->getPasswordHashInput($password, $user),
       new PhutilOpaqueEnvelope($this->getPasswordHash()));
   }
 
   private function getPasswordHashInput(
     PhutilOpaqueEnvelope $password,
     PhabricatorUser $user) {
     if ($user->getPHID() != $this->getUserPHID()) {
-      throw new Exception("User does not match password user PHID!");
+      throw new Exception('User does not match password user PHID!');
     }
 
     $raw_input = PhabricatorHash::digestPassword($password, $user->getPHID());
     return new PhutilOpaqueEnvelope($raw_input);
   }
 
   private function hashPassword(
     PhutilOpaqueEnvelope $password,
     PhabricatorUser $user) {
 
     $input_envelope = $this->getPasswordHashInput($password, $user);
 
     $best_hasher = PhabricatorPasswordHasher::getBestHasher();
     return $best_hasher->getPasswordHashForStorage($input_envelope);
   }
 
 }
diff --git a/src/applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php b/src/applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php
index 2ab824abf..8e308ed60 100644
--- a/src/applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php
+++ b/src/applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php
@@ -1,155 +1,155 @@
 <?php
 
 final class PhabricatorRepositoryTestCase
   extends PhabricatorTestCase {
 
   public function testRepositoryURIProtocols() {
     $tests = array(
       '/path/to/repo'               => 'file',
       'file:///path/to/repo'        => 'file',
       'ssh://user@domain.com/path'  => 'ssh',
       'git@example.com:path'        => 'ssh',
       'git://git@example.com/path'  => 'git',
       'svn+ssh://example.com/path'  => 'svn+ssh',
       'https://example.com/repo/'   => 'https',
       'http://example.com/'         => 'http',
       'https://user@example.com/'   => 'https',
     );
 
     foreach ($tests as $uri => $expect) {
       $repository = new PhabricatorRepository();
       $repository->setDetail('remote-uri', $uri);
 
       $this->assertEqual(
         $expect,
         $repository->getRemoteProtocol(),
         "Protocol for '{$uri}'.");
     }
   }
 
   public function testBranchFilter() {
     $git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
 
     $repo = new PhabricatorRepository();
     $repo->setVersionControlSystem($git);
 
     $this->assertTrue(
       $repo->shouldTrackBranch('imaginary'),
       'Track all branches by default.');
 
     $repo->setDetail(
       'branch-filter',
       array(
         'master' => true,
       ));
 
     $this->assertTrue(
       $repo->shouldTrackBranch('master'),
       'Track listed branches.');
 
     $this->assertFalse(
       $repo->shouldTrackBranch('imaginary'),
       'Do not track unlisted branches.');
   }
 
   public function testSubversionPathInfo() {
     $svn = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN;
 
     $repo = new PhabricatorRepository();
     $repo->setVersionControlSystem($svn);
 
     $repo->setDetail('remote-uri', 'http://svn.example.com/repo');
     $this->assertEqual(
       'http://svn.example.com/repo',
       $repo->getSubversionPathURI());
 
     $repo->setDetail('remote-uri', 'http://svn.example.com/repo/');
     $this->assertEqual(
       'http://svn.example.com/repo',
       $repo->getSubversionPathURI());
 
     $repo->setDetail('hosting-enabled', true);
 
     $repo->setDetail('local-path', '/var/repo/SVN');
     $this->assertEqual(
       'file:///var/repo/SVN',
       $repo->getSubversionPathURI());
 
     $repo->setDetail('local-path', '/var/repo/SVN/');
     $this->assertEqual(
       'file:///var/repo/SVN',
       $repo->getSubversionPathURI());
 
     $this->assertEqual(
       'file:///var/repo/SVN/a@',
       $repo->getSubversionPathURI('a'));
 
     $this->assertEqual(
       'file:///var/repo/SVN/a@1',
       $repo->getSubversionPathURI('a', 1));
 
     $this->assertEqual(
       'file:///var/repo/SVN/%3F@22',
       $repo->getSubversionPathURI('?', 22));
 
     $repo->setDetail('svn-subpath', 'quack/trunk/');
 
     $this->assertEqual(
       'file:///var/repo/SVN/quack/trunk/@',
       $repo->getSubversionBaseURI());
 
     $this->assertEqual(
       'file:///var/repo/SVN/quack/trunk/@HEAD',
       $repo->getSubversionBaseURI('HEAD'));
 
   }
 
   public function testFilterMercurialDebugOutput() {
     $map = array(
-      "" => "",
+      '' => '',
 
       "quack\n" => "quack\n",
 
       "ignoring untrusted configuration option x.y = z\nquack\n" =>
         "quack\n",
 
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n".
       "quack\n" =>
         "quack\n",
 
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n".
       "quack\n" =>
         "quack\n",
 
       "quack\n".
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n" =>
         "quack\n",
 
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n".
       "duck\n".
       "ignoring untrusted configuration option x.y = z\n".
       "ignoring untrusted configuration option x.y = z\n".
       "bread\n".
       "ignoring untrusted configuration option x.y = z\n".
       "quack\n" =>
         "duck\nbread\nquack\n",
 
       "ignoring untrusted configuration option x.y = z\n".
       "duckignoring untrusted configuration option x.y = z\n".
       "quack" =>
-        "duckquack",
+        'duckquack',
     );
 
     foreach ($map as $input => $expect) {
       $actual = PhabricatorRepository::filterMercurialDebugOutput($input);
       $this->assertEqual($expect, $actual, $input);
     }
   }
 
 }
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
index 70b537375..e86ca9955 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
@@ -1,482 +1,482 @@
 <?php
 
 final class PhabricatorRepositoryCommitHeraldWorker
   extends PhabricatorRepositoryCommitParserWorker {
 
   const MAX_FILES_SHOWN_IN_EMAIL = 1000;
 
   public function getRequiredLeaseTime() {
     // Herald rules may take a long time to process.
     return phutil_units('4 hours in seconds');
   }
 
   public function parseCommit(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $result = $this->applyHeraldRules($repository, $commit);
 
     $commit->writeImportStatusFlag(
       PhabricatorRepositoryCommit::IMPORTED_HERALD);
 
     return $result;
   }
 
   private function applyHeraldRules(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $commit->attachRepository($repository);
 
     // Don't take any actions on an importing repository. Principally, this
     // avoids generating thousands of audits or emails when you import an
     // established repository on an existing install.
     if ($repository->isImporting()) {
       return;
     }
 
     if ($repository->getDetail('herald-disabled')) {
       return;
     }
 
     $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
       'commitID = %d',
       $commit->getID());
 
     if (!$data) {
       throw new PhabricatorWorkerPermanentFailureException(
         pht(
           'Unable to load commit data. The data for this task is invalid '.
           'or no longer exists.'));
     }
 
     $adapter = id(new HeraldCommitAdapter())
       ->setCommit($commit);
 
     $rules = id(new HeraldRuleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withContentTypes(array($adapter->getAdapterContentType()))
       ->withDisabled(false)
       ->needConditionsAndActions(true)
       ->needAppliedToPHIDs(array($adapter->getPHID()))
       ->needValidateAuthors(true)
       ->execute();
 
     $engine = new HeraldEngine();
 
     $effects = $engine->applyRules($rules, $adapter);
     $engine->applyEffects($effects, $adapter, $rules);
     $xscript = $engine->getTranscript();
 
     $audit_phids = $adapter->getAuditMap();
     $cc_phids = $adapter->getAddCCMap();
     if ($audit_phids || $cc_phids) {
       $this->createAudits($commit, $audit_phids, $cc_phids, $rules);
     }
 
     HarbormasterBuildable::applyBuildPlans(
       $commit->getPHID(),
       $repository->getPHID(),
       $adapter->getBuildPlans());
 
     $explicit_auditors = $this->createAuditsFromCommitMessage($commit, $data);
 
     $this->publishFeedStory($repository, $commit, $data);
 
     $herald_targets = $adapter->getEmailPHIDs();
 
     $email_phids = array_unique(
       array_merge(
         $explicit_auditors,
         array_keys($cc_phids),
         $herald_targets));
     if (!$email_phids) {
       return;
     }
 
     $revision = $adapter->loadDifferentialRevision();
     if ($revision) {
       $name = $revision->getTitle();
     } else {
       $name = $data->getSummary();
     }
 
     $author_phid = $data->getCommitDetail('authorPHID');
     $reviewer_phid = $data->getCommitDetail('reviewerPHID');
 
     $phids = array_filter(
       array(
         $author_phid,
         $reviewer_phid,
         $commit->getPHID(),
       ));
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs($phids)
       ->execute();
 
     $commit_handle = $handles[$commit->getPHID()];
     $commit_name = $commit_handle->getName();
 
     if ($author_phid) {
       $author_name = $handles[$author_phid]->getName();
     } else {
       $author_name = $data->getAuthorName();
     }
 
     if ($reviewer_phid) {
       $reviewer_name = $handles[$reviewer_phid]->getName();
     } else {
       $reviewer_name = null;
     }
 
     $who = implode(', ', array_filter(array($author_name, $reviewer_name)));
 
     $description = $data->getCommitMessage();
 
     $commit_uri = PhabricatorEnv::getProductionURI($commit_handle->getURI());
     $differential = $revision
       ? PhabricatorEnv::getProductionURI('/D'.$revision->getID())
       : 'No revision.';
 
     $limit = self::MAX_FILES_SHOWN_IN_EMAIL;
     $files = $adapter->loadAffectedPaths();
     sort($files);
     if (count($files) > $limit) {
       array_splice($files, $limit);
       $files[] = '(This commit affected more than '.$limit.' files. '.
         'Only '.$limit.' are shown here and additional ones are truncated.)';
     }
     $files = implode("\n", $files);
 
     $xscript_id = $xscript->getID();
 
     $why_uri = '/herald/transcript/'.$xscript_id.'/';
 
     $reply_handler = PhabricatorAuditCommentEditor::newReplyHandlerForCommit(
       $commit);
 
     $template = new PhabricatorMetaMTAMail();
 
     $inline_patch_text = $this->buildPatch($template, $repository, $commit);
 
     $body = new PhabricatorMetaMTAMailBody();
     $body->addRawSection($description);
     $body->addTextSection(pht('DETAILS'), $commit_uri);
 
     // TODO: This should be integrated properly once we move to
     // ApplicationTransactions.
     $field_list = PhabricatorCustomField::getObjectFields(
       $commit,
       PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS);
     $field_list
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->readFieldsFromStorage($commit);
     foreach ($field_list->getFields() as $field) {
       try {
         $field->buildApplicationTransactionMailBody(
           new DifferentialTransaction(), // Bogus object to satisfy typehint.
           $body);
       } catch (Exception $ex) {
         // Log the exception and continue.
         phlog($ex);
       }
     }
 
     $body->addTextSection(pht('DIFFERENTIAL REVISION'), $differential);
     $body->addTextSection(pht('AFFECTED FILES'), $files);
     $body->addReplySection($reply_handler->getReplyHandlerInstructions());
     $body->addHeraldSection($why_uri);
     $body->addRawSection($inline_patch_text);
     $body = $body->render();
 
     $prefix = PhabricatorEnv::getEnvConfig('metamta.diffusion.subject-prefix');
 
     $threading = PhabricatorAuditCommentEditor::getMailThreading(
       $repository,
       $commit);
     list($thread_id, $thread_topic) = $threading;
 
     $template->setRelatedPHID($commit->getPHID());
     $template->setSubject("{$commit_name}: {$name}");
     $template->setSubjectPrefix($prefix);
-    $template->setVarySubjectPrefix("[Commit]");
+    $template->setVarySubjectPrefix('[Commit]');
     $template->setBody($body);
     $template->setThreadID($thread_id, $is_new = true);
     $template->addHeader('Thread-Topic', $thread_topic);
     $template->setIsBulk(true);
 
     $template->addHeader('X-Herald-Rules', $xscript->getXHeraldRulesHeader());
     if ($author_phid) {
       $template->setFrom($author_phid);
     }
 
     // TODO: We should verify that each recipient can actually see the
     // commit before sending them email (T603).
 
     $mails = $reply_handler->multiplexMail(
       $template,
       id(new PhabricatorHandleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs($email_phids)
       ->execute(),
       array());
 
     foreach ($mails as $mail) {
       $mail->saveAndSend();
     }
   }
 
   private function createAudits(
     PhabricatorRepositoryCommit $commit,
     array $map,
     array $ccmap,
     array $rules) {
     assert_instances_of($rules, 'HeraldRule');
 
     $requests = id(new PhabricatorRepositoryAuditRequest())->loadAllWhere(
       'commitPHID = %s',
       $commit->getPHID());
     $requests = mpull($requests, null, 'getAuditorPHID');
 
     $rules = mpull($rules, null, 'getID');
 
     $maps = array(
       PhabricatorAuditStatusConstants::AUDIT_REQUIRED => $map,
       PhabricatorAuditStatusConstants::CC => $ccmap,
     );
 
     foreach ($maps as $status => $map) {
       foreach ($map as $phid => $rule_ids) {
         $request = idx($requests, $phid);
         if ($request) {
           continue;
         }
         $reasons = array();
         foreach ($rule_ids as $id) {
           $rule_name = '?';
           if ($rules[$id]) {
             $rule_name = $rules[$id]->getName();
           }
           if ($status == PhabricatorAuditStatusConstants::AUDIT_REQUIRED) {
             $reasons[] = pht(
               '%s Triggered Audit',
               "H{$id} {$rule_name}");
           } else {
             $reasons[] = pht(
               '%s Triggered CC',
               "H{$id} {$rule_name}");
           }
         }
 
         $request = new PhabricatorRepositoryAuditRequest();
         $request->setCommitPHID($commit->getPHID());
         $request->setAuditorPHID($phid);
         $request->setAuditStatus($status);
         $request->setAuditReasons($reasons);
         $request->save();
       }
     }
 
     $commit->updateAuditStatus($requests);
     $commit->save();
   }
 
 
   /**
    * Find audit requests in the "Auditors" field if it is present and trigger
    * explicit audit requests.
    */
   private function createAuditsFromCommitMessage(
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepositoryCommitData $data) {
 
     $message = $data->getCommitMessage();
 
     $matches = null;
     if (!preg_match('/^Auditors:\s*(.*)$/im', $message, $matches)) {
       return array();
     }
 
     $phids = id(new PhabricatorObjectListQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->setAllowPartialResults(true)
       ->setAllowedTypes(
         array(
           PhabricatorPeoplePHIDTypeUser::TYPECONST,
           PhabricatorProjectPHIDTypeProject::TYPECONST,
         ))
       ->setObjectList($matches[1])
       ->execute();
 
     if (!$phids) {
       return array();
     }
 
     $requests = id(new PhabricatorRepositoryAuditRequest())->loadAllWhere(
       'commitPHID = %s',
       $commit->getPHID());
     $requests = mpull($requests, null, 'getAuditorPHID');
 
     foreach ($phids as $phid) {
       if (isset($requests[$phid])) {
         continue;
       }
 
       $request = new PhabricatorRepositoryAuditRequest();
       $request->setCommitPHID($commit->getPHID());
       $request->setAuditorPHID($phid);
       $request->setAuditStatus(
         PhabricatorAuditStatusConstants::AUDIT_REQUESTED);
       $request->setAuditReasons(
         array(
           'Requested by Author',
         ));
       $request->save();
 
       $requests[$phid] = $request;
     }
 
     $commit->updateAuditStatus($requests);
     $commit->save();
 
     return $phids;
   }
 
   private function publishFeedStory(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepositoryCommitData $data) {
 
     if (time() > $commit->getEpoch() + (24 * 60 * 60)) {
       // Don't publish stories that are more than 24 hours old, to avoid
       // ridiculous levels of feed spam if a repository is imported without
       // disabling feed publishing.
       return;
     }
 
     $author_phid = $commit->getAuthorPHID();
     $committer_phid = $data->getCommitDetail('committerPHID');
 
     $publisher = new PhabricatorFeedStoryPublisher();
     $publisher->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_COMMIT);
     $publisher->setStoryData(
       array(
         'commitPHID'    => $commit->getPHID(),
         'summary'       => $data->getSummary(),
         'authorName'    => $data->getAuthorName(),
         'authorPHID'    => $author_phid,
         'committerName' => $data->getCommitDetail('committer'),
         'committerPHID' => $committer_phid,
       ));
     $publisher->setStoryTime($commit->getEpoch());
     $publisher->setRelatedPHIDs(
       array_filter(
         array(
           $author_phid,
           $committer_phid,
         )));
     if ($author_phid) {
       $publisher->setStoryAuthorPHID($author_phid);
     }
     $publisher->publish();
   }
 
   private function buildPatch(
     PhabricatorMetaMTAMail $template,
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $attach_key = 'metamta.diffusion.attach-patches';
     $inline_key = 'metamta.diffusion.inline-patches';
 
     $attach_patches = PhabricatorEnv::getEnvConfig($attach_key);
     $inline_patches = PhabricatorEnv::getEnvConfig($inline_key);
 
     if (!$attach_patches && !$inline_patches) {
       return;
     }
 
     $encoding = $repository->getDetail('encoding', 'UTF-8');
 
     $result = null;
     $patch_error = null;
 
     try {
       $raw_patch = $this->loadRawPatchText($repository, $commit);
       if ($attach_patches) {
         $commit_name = $repository->formatCommitName(
           $commit->getCommitIdentifier());
 
         $template->addAttachment(
           new PhabricatorMetaMTAAttachment(
             $raw_patch,
             $commit_name.'.patch',
             'text/x-patch; charset='.$encoding));
       }
     } catch (Exception $ex) {
       phlog($ex);
       $patch_error = 'Unable to generate: '.$ex->getMessage();
     }
 
     if ($patch_error) {
       $result = $patch_error;
     } else if ($inline_patches) {
       $len = substr_count($raw_patch, "\n");
       if ($len <= $inline_patches) {
         // We send email as utf8, so we need to convert the text to utf8 if
         // we can.
         if ($encoding) {
           $raw_patch = phutil_utf8_convert($raw_patch, 'UTF-8', $encoding);
         }
         $result = phutil_utf8ize($raw_patch);
       }
     }
 
     if ($result) {
       $result = "PATCH\n\n{$result}\n";
     }
 
     return $result;
   }
 
   private function loadRawPatchText(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => PhabricatorUser::getOmnipotentUser(),
         'initFromConduit' => false,
         'repository' => $repository,
         'commit' => $commit->getCommitIdentifier(),
       ));
 
     $raw_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest);
     $raw_query->setLinesOfContext(3);
 
     $time_key = 'metamta.diffusion.time-limit';
     $byte_key = 'metamta.diffusion.byte-limit';
     $time_limit = PhabricatorEnv::getEnvConfig($time_key);
     $byte_limit = PhabricatorEnv::getEnvConfig($byte_key);
 
     if ($time_limit) {
       $raw_query->setTimeout($time_limit);
     }
 
     $raw_diff = $raw_query->loadRawDiff();
 
     $size = strlen($raw_diff);
     if ($byte_limit && $size > $byte_limit) {
       $pretty_size = phabricator_format_bytes($size);
       $pretty_limit = phabricator_format_bytes($byte_limit);
       throw new Exception(
         "Patch size of {$pretty_size} exceeds configured byte size limit of ".
         "{$pretty_limit}.");
     }
 
     return $raw_diff;
   }
 
 }
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
index 9a9428147..0d6db546e 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
@@ -1,138 +1,138 @@
 <?php
 
 final class PhabricatorRepositoryCommitOwnersWorker
   extends PhabricatorRepositoryCommitParserWorker {
 
   protected function parseCommit(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $this->triggerOwnerAudits($repository, $commit);
 
     $commit->writeImportStatusFlag(
       PhabricatorRepositoryCommit::IMPORTED_OWNERS);
 
     if ($this->shouldQueueFollowupTasks()) {
       $this->queueTask(
         'PhabricatorRepositoryCommitHeraldWorker',
         array(
           'commitID' => $commit->getID(),
         ));
     }
   }
 
   private function triggerOwnerAudits(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     if ($repository->getDetail('herald-disabled')) {
       return;
     }
 
     $affected_paths = PhabricatorOwnerPathQuery::loadAffectedPaths(
       $repository,
       $commit,
       PhabricatorUser::getOmnipotentUser());
     $affected_packages = PhabricatorOwnersPackage::loadAffectedPackages(
       $repository,
       $affected_paths);
 
     if ($affected_packages) {
       $requests = id(new PhabricatorRepositoryAuditRequest())
         ->loadAllWhere(
           'commitPHID = %s',
           $commit->getPHID());
       $requests = mpull($requests, null, 'getAuditorPHID');
 
       foreach ($affected_packages as $package) {
         $request = idx($requests, $package->getPHID());
         if ($request) {
           // Don't update request if it exists already.
           continue;
         }
 
         if ($package->getAuditingEnabled()) {
           $reasons = $this->checkAuditReasons($commit, $package);
           if ($reasons) {
             $audit_status =
               PhabricatorAuditStatusConstants::AUDIT_REQUIRED;
           } else {
             $audit_status =
               PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED;
           }
         } else {
           $reasons = array();
           $audit_status = PhabricatorAuditStatusConstants::NONE;
         }
 
         $relationship = new PhabricatorRepositoryAuditRequest();
         $relationship->setAuditorPHID($package->getPHID());
         $relationship->setCommitPHID($commit->getPHID());
         $relationship->setAuditReasons($reasons);
         $relationship->setAuditStatus($audit_status);
 
         $relationship->save();
 
         $requests[$package->getPHID()] = $relationship;
       }
 
       $commit->updateAuditStatus($requests);
       $commit->save();
     }
   }
 
   private function checkAuditReasons(
     PhabricatorRepositoryCommit $commit,
     PhabricatorOwnersPackage $package) {
 
     $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
       'commitID = %d',
       $commit->getID());
 
     $reasons = array();
 
     if ($data->getCommitDetail('vsDiff')) {
-      $reasons[] = "Changed After Revision Was Accepted";
+      $reasons[] = 'Changed After Revision Was Accepted';
     }
 
     $commit_author_phid = $data->getCommitDetail('authorPHID');
     if (!$commit_author_phid) {
-      $reasons[] = "Commit Author Not Recognized";
+      $reasons[] = 'Commit Author Not Recognized';
     }
 
     $revision_id = $data->getCommitDetail('differential.revisionID');
 
     $revision_author_phid = null;
     $commit_reviewedby_phid = null;
 
     if ($revision_id) {
       // TODO: (T603) This is probably safe to use an omnipotent user on,
       // but check things more closely.
       $revision = id(new DifferentialRevision())->load($revision_id);
       if ($revision) {
         $revision_author_phid = $revision->getAuthorPHID();
         $commit_reviewedby_phid = $data->getCommitDetail('reviewerPHID');
         if ($revision_author_phid !== $commit_author_phid) {
-          $reasons[] = "Author Not Matching with Revision";
+          $reasons[] = 'Author Not Matching with Revision';
         }
       } else {
-        $reasons[] = "Revision Not Found";
+        $reasons[] = 'Revision Not Found';
       }
 
     } else {
-      $reasons[] = "No Revision Specified";
+      $reasons[] = 'No Revision Specified';
     }
 
     $owners_phids = PhabricatorOwnersOwner::loadAffiliatedUserPHIDs(
       array($package->getID()));
 
     if (!($commit_author_phid && in_array($commit_author_phid, $owners_phids) ||
         $commit_reviewedby_phid && in_array($commit_reviewedby_phid,
           $owners_phids))) {
-      $reasons[] = "Owners Not Involved";
+      $reasons[] = 'Owners Not Involved';
     }
 
     return $reasons;
   }
 
 }
diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php b/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
index 43f50217c..7269c74ab 100644
--- a/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php
@@ -1,99 +1,99 @@
 <?php
 
 final class PhabricatorOwnersPackagePathValidator {
 
   /*
    * If a file/directory was moved the paths in owners package become stale.
    * This method updates the stale paths in the owners packages to their new
    * paths.
    */
   public static function updateOwnersPackagePaths(
     PhabricatorRepositoryCommit $commit) {
     $changes = self::loadDiffusionChangesForCommit($commit);
 
     if (!$changes) {
       return;
     }
 
     // TODO: (T603) This should be policy-aware.
     $repository =
       id(new PhabricatorRepository())->load($commit->getRepositoryID());
     $move_map = array();
     foreach ($changes as $change) {
       if ($change->getChangeType() == DifferentialChangeType::TYPE_MOVE_HERE) {
-        $from_path = "/".$change->getTargetPath();
-        $to_path = "/".$change->getPath();
+        $from_path = '/'.$change->getTargetPath();
+        $to_path = '/'.$change->getPath();
         if ($change->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
-          $to_path = $to_path."/";
-          $from_path = $from_path."/";
+          $to_path = $to_path.'/';
+          $from_path = $from_path.'/';
         }
         $move_map[$from_path] = $to_path;
       }
     }
 
     if ($move_map) {
       self::updateAffectedPackages($repository, $move_map);
     }
   }
 
   private static function updateAffectedPackages($repository, array $move_map) {
     $paths = array_keys($move_map);
     if ($paths) {
       $packages = PhabricatorOwnersPackage::loadAffectedPackages($repository,
         $paths);
       foreach ($packages as $package) {
         self::updatePackagePaths($package, $move_map);
       }
     }
   }
 
   private static function updatePackagePaths($package, array $move_map) {
     $paths = array_keys($move_map);
     $pkg_paths = $package->loadPaths();
     $new_paths = array();
     foreach ($pkg_paths as $pkg_path) {
       $path_changed = false;
 
       foreach ($paths as $old_path) {
         if (strncmp($pkg_path->getPath(), $old_path, strlen($old_path)) === 0) {
           $new_paths[] = array (
             'packageID' => $package->getID(),
             'repositoryPHID' => $pkg_path->getRepositoryPHID(),
             'path' => str_replace($pkg_path->getPath(), $old_path,
                                     $move_map[$old_path])
           );
           $path_changed = true;
         }
       }
 
       if (!$path_changed) {
         $new_paths[] = array (
           'packageID' => $package->getID(),
           'repositoryPHID' => $pkg_path->getRepositoryPHID(),
           'path' => $pkg_path->getPath(),
         );
       }
     }
 
     if ($new_paths) {
       $package->attachOldPrimaryOwnerPHID($package->getPrimaryOwnerPHID());
       $package->attachUnsavedPaths($new_paths);
       $package->save(); // save the changes and notify the owners.
     }
   }
 
   private static function loadDiffusionChangesForCommit($commit) {
     $repository =
       id(new PhabricatorRepository())->load($commit->getRepositoryID());
     $data = array(
       'user' => PhabricatorUser::getOmnipotentUser(),
       'initFromConduit' => false,
       'repository' => $repository,
       'commit' => $commit->getCommitIdentifier()
     );
     $drequest = DiffusionRequest::newFromDictionary($data);
     $change_query =
       DiffusionPathChangeQuery::newFromDiffusionRequest($drequest);
     return $change_query->loadChanges();
   }
 }
diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
index 69ed92d75..5aedbf74d 100644
--- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
@@ -1,157 +1,157 @@
 <?php
 
 abstract class PhabricatorRepositoryCommitChangeParserWorker
   extends PhabricatorRepositoryCommitParserWorker {
 
   public function getRequiredLeaseTime() {
     // It can take a very long time to parse commits; some commits in the
     // Facebook repository affect many millions of paths. Acquire 24h leases.
     return phutil_units('24 hours in seconds');
   }
 
   abstract protected function parseCommitChanges(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit);
 
   protected function parseCommit(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $identifier = $commit->getCommitIdentifier();
     $callsign = $repository->getCallsign();
     $full_name = 'r'.$callsign.$identifier;
 
     $this->log("Parsing %s...\n", $full_name);
     if ($this->isBadCommit($full_name)) {
-      $this->log("This commit is marked bad!");
+      $this->log('This commit is marked bad!');
       return;
     }
 
     $results = $this->parseCommitChanges($repository, $commit);
     if ($results) {
       $this->writeCommitChanges($repository, $commit, $results);
     }
 
     $this->finishParse();
   }
 
   public function parseChangesForUnitTest(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
     return $this->parseCommitChanges($repository, $commit);
   }
 
   public static function lookupOrCreatePaths(array $paths) {
     $repository = new PhabricatorRepository();
     $conn_w = $repository->establishConnection('w');
 
     $result_map = self::lookupPaths($paths);
 
     $missing_paths = array_fill_keys($paths, true);
     $missing_paths = array_diff_key($missing_paths, $result_map);
     $missing_paths = array_keys($missing_paths);
 
     if ($missing_paths) {
       foreach (array_chunk($missing_paths, 128) as $path_chunk) {
         $sql = array();
         foreach ($path_chunk as $path) {
           $sql[] = qsprintf($conn_w, '(%s, %s)', $path, md5($path));
         }
         queryfx(
           $conn_w,
           'INSERT IGNORE INTO %T (path, pathHash) VALUES %Q',
           PhabricatorRepository::TABLE_PATH,
           implode(', ', $sql));
       }
       $result_map += self::lookupPaths($missing_paths);
     }
 
     return $result_map;
   }
 
   private static function lookupPaths(array $paths) {
     $repository = new PhabricatorRepository();
     $conn_w = $repository->establishConnection('w');
 
     $result_map = array();
     foreach (array_chunk($paths, 128) as $path_chunk) {
       $chunk_map = queryfx_all(
         $conn_w,
         'SELECT path, id FROM %T WHERE pathHash IN (%Ls)',
         PhabricatorRepository::TABLE_PATH,
         array_map('md5', $path_chunk));
       foreach ($chunk_map as $row) {
         $result_map[$row['path']] = $row['id'];
       }
     }
     return $result_map;
   }
 
   protected function finishParse() {
     $commit = $this->commit;
 
     $commit->writeImportStatusFlag(
       PhabricatorRepositoryCommit::IMPORTED_CHANGE);
 
     id(new PhabricatorSearchIndexer())
       ->queueDocumentForIndexing($commit->getPHID());
 
     PhabricatorOwnersPackagePathValidator::updateOwnersPackagePaths($commit);
     if ($this->shouldQueueFollowupTasks()) {
       $this->queueTask(
         'PhabricatorRepositoryCommitOwnersWorker',
         array(
           'commitID' => $commit->getID(),
         ));
     }
   }
 
   private function writeCommitChanges(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     array $changes) {
 
     $repository_id = (int)$repository->getID();
     $commit_id = (int)$commit->getID();
 
     // NOTE: This SQL is being built manually instead of with qsprintf()
     // because some SVN changes affect an enormous number of paths (millions)
     // and this showed up as significantly slow on a profile at some point.
 
     $changes_sql = array();
     foreach ($changes as $change) {
       $values = array(
         $repository_id,
         (int)$change->getPathID(),
         $commit_id,
         nonempty((int)$change->getTargetPathID(), 'null'),
         nonempty((int)$change->getTargetCommitID(), 'null'),
         (int)$change->getChangeType(),
         (int)$change->getFileType(),
         (int)$change->getIsDirect(),
         (int)$change->getCommitSequence(),
       );
       $changes_sql[] = '('.implode(', ', $values).')';
     }
 
     $conn_w = $repository->establishConnection('w');
 
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE commitID = %d',
       PhabricatorRepository::TABLE_PATHCHANGE,
       $commit_id);
 
     foreach (PhabricatorLiskDAO::chunkSQL($changes_sql) as $chunk) {
       queryfx(
         $conn_w,
         'INSERT INTO %T
           (repositoryID, pathID, commitID, targetPathID, targetCommitID,
             changeType, fileType, isDirect, commitSequence)
           VALUES %Q',
         PhabricatorRepository::TABLE_PATHCHANGE,
         $chunk);
     }
   }
 
 }
diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php
index 524f01a99..e65905b98 100644
--- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php
+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php
@@ -1,786 +1,786 @@
 <?php
 
 final class PhabricatorRepositorySvnCommitChangeParserWorker
   extends PhabricatorRepositoryCommitChangeParserWorker {
 
   protected function parseCommitChanges(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     // PREAMBLE: This class is absurdly complicated because it is very difficult
     // to get the information we need out of SVN. The actual data we need is:
     //
     //  1. Recursively, what were the affected paths?
     //  2. For each affected path, is it a file or a directory?
     //  3. How was each path affected (e.g. add, delete, move, copy)?
     //
     // We spend nearly all of our effort figuring out (1) and (2) because
     // "svn log" is not recursive and does not give us file/directory
     // information (that is, it will report a directory move as a single move,
     // even if many thousands of paths are affected).
     //
     // Instead, we have to "svn ls -R" the location of each path in its previous
     // life to figure out whether it is a file or a directory and exactly which
     // recursive paths were affected if it was moved or copied. This is very
     // complicated and has many special cases.
 
     $uri = $repository->getSubversionPathURI();
     $svn_commit = $commit->getCommitIdentifier();
 
     // Pull the top-level path changes out of "svn log". This is pretty
     // straightforward; just parse the XML log.
     $log = $this->getSVNLogXMLObject($repository, $uri, $svn_commit);
 
     $entry = $log->logentry[0];
 
     if (!$entry->paths) {
       // TODO: Explicitly mark this commit as broken elsewhere? This isn't
       // supposed to happen but we have some cases like rE27 and rG935 in the
       // Facebook repositories where things got all clowned up.
       return array();
     }
 
     $raw_paths = array();
     foreach ($entry->paths->path as $path) {
       $name = trim((string)$path);
       $raw_paths[$name] = array(
         'rawPath'         => $name,
         'rawTargetPath'   => (string)$path['copyfrom-path'],
         'rawChangeType'   => (string)$path['action'],
         'rawTargetCommit' => (string)$path['copyfrom-rev'],
       );
     }
 
     $copied_or_moved_map = array();
     $deleted_paths = array();
     $add_paths = array();
 
     foreach ($raw_paths as $path => $raw_info) {
       if ($raw_info['rawTargetPath']) {
         $copied_or_moved_map[$raw_info['rawTargetPath']][] = $raw_info;
       }
       switch ($raw_info['rawChangeType']) {
         case 'D':
           $deleted_paths[$path] = $raw_info;
           break;
         case 'A':
         case 'R':
           $add_paths[$path] = $raw_info;
           break;
       }
     }
 
     // If a path was deleted, we need to look in the repository history to
     // figure out where the former valid location for it is so we can figure out
     // if it was a directory or not, among other things.
     $lookup_here = array();
     foreach ($raw_paths as $path => $raw_info) {
       if ($raw_info['rawChangeType'] != 'D') {
         continue;
       }
 
       // If a change copies a directory and then deletes something from it,
       // we need to look at the old location for information about the path, not
       // the new location. This workflow is pretty ridiculous -- so much so that
       // Trac gets it wrong. See Facebook rO6 for an example, if you happen to
       // work at Facebook.
       $parents = $this->expandAllParentPaths($path, $include_self = true);
       foreach ($parents as $parent) {
         if (isset($add_paths[$parent])) {
           $relative_path = substr($path, strlen($parent));
           $lookup_here[$path] = array(
             'rawPath'   => $add_paths[$parent]['rawTargetPath'].$relative_path,
             'rawCommit' => $add_paths[$parent]['rawTargetCommit'],
           );
           continue 2;
         }
       }
 
       // Otherwise we can just look at the previous revision.
       $lookup_here[$path] = array(
         'rawPath'   => $path,
         'rawCommit' => $svn_commit - 1,
       );
     }
 
     $lookup = array();
     foreach ($raw_paths as $path => $raw_info) {
       if ($raw_info['rawChangeType'] == 'D') {
         $lookup[$path] = $lookup_here[$path];
       } else {
         // For everything that wasn't deleted, we can just look it up directly.
         $lookup[$path] = array(
           'rawPath'   => $path,
           'rawCommit' => $svn_commit,
         );
       }
     }
 
     $effects = array();
 
     $path_file_types = $this->lookupPathFileTypes($repository, $lookup);
     foreach ($raw_paths as $path => $raw_info) {
       if ($raw_info['rawChangeType'] == 'D' &&
           $path_file_types[$path] == DifferentialChangeType::FILE_DIRECTORY) {
 
         // Bad. Child paths aren't enumerated in "svn log" so we need
         // to go fishing.
         $list = $this->lookupRecursiveFileList(
           $repository,
           $lookup[$path]);
 
         foreach ($list as $deleted_path => $path_file_type) {
           $deleted_path = rtrim($path.'/'.$deleted_path, '/');
           if (!empty($raw_paths[$deleted_path])) {
             // We somehow learned about this deletion explicitly?
             // TODO: Unclear how this is possible.
             continue;
           }
           $effect_type = DifferentialChangeType::TYPE_DELETE;
           $effect_target_path = null;
           if (isset($copied_or_moved_map[$deleted_path])) {
             $effect_target_path = $path;
             if (count($copied_or_moved_map[$deleted_path]) > 1) {
               $effect_type = DifferentialChangeType::TYPE_MULTICOPY;
             } else {
               $effect_type = DifferentialChangeType::TYPE_MOVE_AWAY;
             }
           }
           $effects[$deleted_path] = array(
             'rawPath'         => $deleted_path,
             'rawTargetPath'   => $effect_target_path,
             'rawTargetCommit' => null,
             'rawDirect'       => true,
             'changeType'      => $effect_type,
             'fileType'        => $path_file_type,
           );
           $deleted_paths[$deleted_path] = $effects[$deleted_path];
         }
       }
     }
 
     $resolved_types = array();
     $supplemental = array();
     foreach ($raw_paths as $path => $raw_info) {
       if (isset($resolved_types[$path])) {
         $type = $resolved_types[$path];
       } else {
         switch ($raw_info['rawChangeType']) {
           case 'D':
             if (isset($copied_or_moved_map[$path])) {
               if (count($copied_or_moved_map[$path]) > 1) {
                 $type = DifferentialChangeType::TYPE_MULTICOPY;
               } else {
                 $type = DifferentialChangeType::TYPE_MOVE_AWAY;
               }
             } else {
               $type = DifferentialChangeType::TYPE_DELETE;
             }
             break;
           case 'A':
             $copy_from = $raw_info['rawTargetPath'];
             $copy_rev = $raw_info['rawTargetCommit'];
             if (!strlen($copy_from)) {
               $type = DifferentialChangeType::TYPE_ADD;
             } else {
               if (isset($deleted_paths[$copy_from])) {
                 $type = DifferentialChangeType::TYPE_MOVE_HERE;
                 $other_type = DifferentialChangeType::TYPE_MOVE_AWAY;
               } else {
                 $type = DifferentialChangeType::TYPE_COPY_HERE;
                 $other_type = DifferentialChangeType::TYPE_COPY_AWAY;
               }
 
               $source_file_type = $this->lookupPathFileType(
                 $repository,
                 $copy_from,
                 array(
                   'rawPath'   => $copy_from,
                   'rawCommit' => $copy_rev,
                 ));
 
               if ($source_file_type == DifferentialChangeType::FILE_DELETED) {
                 throw new Exception(
-                  "Something is wrong; source of a copy must exist.");
+                  'Something is wrong; source of a copy must exist.');
               }
 
               if ($source_file_type != DifferentialChangeType::FILE_DIRECTORY) {
                 if (isset($raw_paths[$copy_from]) ||
                     isset($effects[$copy_from])) {
                   break;
                 }
                 $effects[$copy_from] = array(
                   'rawPath'           => $copy_from,
                   'rawTargetPath'     => null,
                   'rawTargetCommit'   => null,
                   'rawDirect'         => false,
 
                   'changeType'        => $other_type,
                   'fileType'          => $source_file_type,
                 );
               } else {
                 // ULTRADISASTER. We've added a directory which was copied
                 // or moved from somewhere else. This is the most complex and
                 // ridiculous case.
 
                 $list = $this->lookupRecursiveFileList(
                   $repository,
                   array(
                     'rawPath'   => $copy_from,
                     'rawCommit' => $copy_rev,
                   ));
 
                 foreach ($list as $from_path => $from_file_type) {
                   $full_from = rtrim($copy_from.'/'.$from_path, '/');
                   $full_to = rtrim($path.'/'.$from_path, '/');
 
                   if (empty($raw_paths[$full_to])) {
                     $effects[$full_to] = array(
                       'rawPath'         => $full_to,
                       'rawTargetPath'   => $full_from,
                       'rawTargetCommit' => $copy_rev,
                       'rawDirect'       => true,
 
                       'changeType'      => $type,
                       'fileType'        => $from_file_type,
                     );
                   } else {
                     // This means we picked the file up explicitly elsewhere.
                     // If the file as modified, SVN will drop the copy
                     // information. We need to restore it.
                     $supplemental[$full_to]['rawTargetPath'] = $full_from;
                     $supplemental[$full_to]['rawTargetCommit'] = $copy_rev;
                     if ($raw_paths[$full_to]['rawChangeType'] == 'M') {
                       $resolved_types[$full_to] = $type;
                     }
                   }
 
                   if (empty($raw_paths[$full_from]) &&
                       empty($effects[$full_from])) {
                     if ($other_type == DifferentialChangeType::TYPE_COPY_AWAY) {
                       // Add an indirect effect for the copied file, if we
                       // don't already have an entry for it (e.g., a separate
                       // change).
                       $effects[$full_from] = array(
                         'rawPath'         => $full_from,
                         'rawTargetPath'   => null,
                         'rawTargetCommit' => null,
                         'rawDirect'       => false,
 
                         'changeType'      => $other_type,
                         'fileType'        => $from_file_type,
                       );
                     }
                   }
                 }
               }
             }
             break;
           // This is "replaced", caused by "svn rm"-ing a file, putting another
           // in its place, and then "svn add"-ing it. We do not distinguish
           // between this and "M".
           case 'R':
           case 'M':
             if (isset($copied_or_moved_map[$path])) {
               $type = DifferentialChangeType::TYPE_COPY_AWAY;
             } else {
               $type = DifferentialChangeType::TYPE_CHANGE;
             }
             break;
         }
       }
       $resolved_types[$path] = $type;
     }
 
     foreach ($raw_paths as $path => $raw_info) {
       $raw_paths[$path]['changeType'] = $resolved_types[$path];
       if (isset($supplemental[$path])) {
         foreach ($supplemental[$path] as $key => $value) {
           $raw_paths[$path][$key] = $value;
         }
       }
     }
 
     foreach ($raw_paths as $path => $raw_info) {
       $effects[$path] = array(
         'rawPath'         => $path,
         'rawTargetPath'   => $raw_info['rawTargetPath'],
         'rawTargetCommit' => $raw_info['rawTargetCommit'],
         'rawDirect'       => true,
 
         'changeType'      => $raw_info['changeType'],
         'fileType'        => $path_file_types[$path],
       );
     }
 
     $parents = array();
     foreach ($effects as $path => $effect) {
       foreach ($this->expandAllParentPaths($path) as $parent_path) {
         $parents[$parent_path] = true;
       }
     }
     $parents = array_keys($parents);
 
     foreach ($parents as $parent) {
       if (isset($effects[$parent])) {
         continue;
       }
 
       $effects[$parent] = array(
         'rawPath' => $parent,
         'rawTargetPath' => null,
         'rawTargetCommit' => null,
         'rawDirect' => false,
 
         'changeType' => DifferentialChangeType::TYPE_CHILD,
         'fileType'   => DifferentialChangeType::FILE_DIRECTORY,
       );
     }
 
     $lookup_paths = array();
     foreach ($effects as $effect) {
       $lookup_paths[$effect['rawPath']] = true;
       if ($effect['rawTargetPath']) {
         $lookup_paths[$effect['rawTargetPath']] = true;
       }
     }
     $lookup_paths = array_keys($lookup_paths);
 
     $lookup_commits = array();
     foreach ($effects as $effect) {
       if ($effect['rawTargetCommit']) {
         $lookup_commits[$effect['rawTargetCommit']] = true;
       }
     }
     $lookup_commits = array_keys($lookup_commits);
 
     $path_map = $this->lookupOrCreatePaths($lookup_paths);
     $commit_map = $this->lookupSvnCommits($repository, $lookup_commits);
 
     $this->writeBrowse($repository, $commit, $effects, $path_map);
 
     return $this->buildChanges(
       $repository,
       $commit,
       $effects,
       $path_map,
       $commit_map);
   }
 
   private function buildChanges(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     array $effects,
     array $path_map,
     array $commit_map) {
 
     $results = array();
     foreach ($effects as $effect) {
       $path_id = $path_map[$effect['rawPath']];
 
       $target_path_id = null;
       if ($effect['rawTargetPath']) {
         $target_path_id = $path_map[$effect['rawTargetPath']];
       }
 
       $target_commit_id = null;
       if ($effect['rawTargetCommit']) {
         $target_commit_id = $commit_map[$effect['rawTargetCommit']];
       }
 
       $result = id(new PhabricatorRepositoryParsedChange())
         ->setPathID($path_id)
         ->setTargetPathID($target_path_id)
         ->setTargetCommitID($target_commit_id)
         ->setChangeType($effect['changeType'])
         ->setFileType($effect['fileType'])
         ->setIsDirect($effect['rawDirect'])
         ->setCommitSequence($commit->getCommitIdentifier());
 
       $results[] = $result;
     }
 
     return $results;
   }
 
   private function writeBrowse(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     array $effects,
     array $path_map) {
 
     $conn_w = $repository->establishConnection('w');
 
     $sql = array();
     foreach ($effects as $effect) {
       $type = $effect['changeType'];
 
       if (!$effect['rawDirect']) {
         if ($type == DifferentialChangeType::TYPE_COPY_AWAY) {
           // Don't write COPY_AWAY to the filesystem table if it isn't a direct
           // event.
           continue;
         }
         if ($type == DifferentialChangeType::TYPE_CHILD) {
           // Don't write CHILD to the filesystem table. Although doing these
           // writes has the nice property of letting you see when a directory's
           // contents were last changed, it explodes the table tremendously
           // and makes Diffusion far slower.
           continue;
         }
       }
 
       if ($effect['rawPath'] == '/') {
         // Don't write any events on '/' to the filesystem table; in
         // particular, it doesn't have a meaningful parentID.
         continue;
       }
 
       $existed = !DifferentialChangeType::isDeleteChangeType($type);
 
       $sql[] = qsprintf(
         $conn_w,
         '(%d, %d, %d, %d, %d, %d)',
         $repository->getID(),
         $path_map[$this->getParentPath($effect['rawPath'])],
         $commit->getCommitIdentifier(),
         $path_map[$effect['rawPath']],
         $existed
           ? 1
           : 0,
         $effect['fileType']);
     }
 
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE repositoryID = %d AND svnCommit = %d',
       PhabricatorRepository::TABLE_FILESYSTEM,
       $repository->getID(),
       $commit->getCommitIdentifier());
 
     foreach (array_chunk($sql, 512) as $sql_chunk) {
       queryfx(
         $conn_w,
         'INSERT INTO %T
           (repositoryID, parentID, svnCommit, pathID, existed, fileType)
           VALUES %Q',
         PhabricatorRepository::TABLE_FILESYSTEM,
         implode(', ', $sql_chunk));
     }
 
   }
 
   private function lookupSvnCommits(
     PhabricatorRepository $repository,
     array $commits) {
 
     if (!$commits) {
       return array();
     }
 
     $commit_table = new PhabricatorRepositoryCommit();
     $commit_data = queryfx_all(
       $commit_table->establishConnection('w'),
       'SELECT id, commitIdentifier FROM %T
         WHERE repositoryID = %d AND commitIdentifier in (%Ls)',
       $commit_table->getTableName(),
       $repository->getID(),
       $commits);
 
     $commit_map = ipull($commit_data, 'id', 'commitIdentifier');
 
     $need = array();
     foreach ($commits as $commit) {
       if (empty($commit_map[$commit])) {
         $need[] = $commit;
       }
     }
 
     // If we are parsing a Subversion repository and have been configured to
     // import only some subdirectory of it, we may find commits which reference
     // other foreign commits outside of the directory (for instance, because of
     // a move or copy). Rather than trying to execute full parses on them, just
     // create stub commits and identify the stubs as foreign commits.
     if ($need) {
       $subpath = $repository->getDetail('svn-subpath');
       if (!$subpath) {
         $commits = implode(', ', $need);
         throw new Exception(
           "Missing commits ({$need}) in a SVN repository which is not ".
           "configured for subdirectory-only parsing!");
       }
 
       foreach ($need as $foreign_commit) {
         $commit = new PhabricatorRepositoryCommit();
         $commit->setRepositoryID($repository->getID());
         $commit->setCommitIdentifier($foreign_commit);
         $commit->setEpoch(0);
         // Mark this commit as imported so it doesn't prevent the repository
         // from transitioning into the "Imported" state.
         $commit->setImportStatus(PhabricatorRepositoryCommit::IMPORTED_ALL);
         $commit->save();
 
         $data = new PhabricatorRepositoryCommitData();
         $data->setCommitID($commit->getID());
         $data->setAuthorName('');
         $data->setCommitMessage('');
         $data->setCommitDetails(
           array(
             'foreign-svn-stub'  => true,
             // Denormalize this to make it easier to debug cases where someone
             // did half a parse and then changed the subdirectory or something
             // like that.
             'svn-subpath'       => $subpath,
           ));
         $data->save();
         $commit_map[$foreign_commit] = $commit->getID();
       }
     }
 
     return $commit_map;
   }
 
   private function lookupPathFileType(
     PhabricatorRepository $repository,
     $path,
     array $path_info) {
 
     $result = $this->lookupPathFileTypes(
       $repository,
       array(
         $path => $path_info,
       ));
 
     return $result[$path];
   }
 
   private function lookupPathFileTypes(
     PhabricatorRepository $repository,
     array $paths) {
 
     $result_map = array();
     $repository_uri = $repository->getSubversionPathURI();
 
     if (isset($paths['/'])) {
       $result_map['/'] = DifferentialChangeType::FILE_DIRECTORY;
       unset($paths['/']);
     }
 
     $parents = array();
     $path_mapping = array();
     foreach ($paths as $path => $lookup) {
       $parent = dirname($lookup['rawPath']);
       $parent = $repository->getSubversionPathURI(
         $parent,
         $lookup['rawCommit']);
 
       $parent = escapeshellarg($parent);
       $parents[$parent] = true;
       $path_mapping[$parent][] = dirname($path);
     }
 
     // Reverse this list so we can pop $path_mapping, as that's more efficient
     // than shifting it. We need to associate these maps positionally because
     // a change can copy the same source path from multiple revisions via
     // "svn cp path@1 a; svn cp path@2 b;" and the XML output gives us no way
     // to distinguish which revision we're looking at except based on its
     // position in the document.
     $all_paths = array_reverse(array_keys($parents));
     foreach (array_chunk($all_paths, 64) as $path_chunk) {
       list($raw_xml) = $repository->execxRemoteCommand(
          '--xml ls %C',
          implode(' ', $path_chunk));
       $xml = new SimpleXMLElement($raw_xml);
       foreach ($xml->list as $list) {
         $list_path = (string)$list['path'];
 
         // SVN is a big mess. See Facebook rG8 (a revision which adds files
         // with spaces in their names) for an example.
         $list_path = rawurldecode($list_path);
 
         if ($list_path == $repository_uri) {
           $base = '/';
         } else {
           $base = substr($list_path, strlen($repository_uri));
         }
 
         $mapping = array_pop($path_mapping);
         foreach ($list->entry as $entry) {
           $val = $this->getFileTypeFromSVNKind($entry['kind']);
           foreach ($mapping as $base_path) {
             // rtrim() causes us to handle top-level directories correctly.
             $key = rtrim($base_path, '/').'/'.$entry->name;
             $result_map[$key] = $val;
           }
         }
       }
     }
 
     foreach ($paths as $path => $lookup) {
       if (empty($result_map[$path])) {
         $result_map[$path] = DifferentialChangeType::FILE_DELETED;
       }
     }
 
     return $result_map;
   }
 
   private function getFileTypeFromSVNKind($kind) {
     $kind = (string)$kind;
     switch ($kind) {
       case 'dir':   return DifferentialChangeType::FILE_DIRECTORY;
       case 'file':  return DifferentialChangeType::FILE_NORMAL;
       default:
         throw new Exception("Unknown SVN file kind '{$kind}'.");
     }
   }
 
   private function lookupRecursiveFileList(
     PhabricatorRepository $repository,
     array $info) {
 
     $path = $info['rawPath'];
     $rev  = $info['rawCommit'];
 
     $path_uri = $repository->getSubversionPathURI($path, $rev);
     $hashkey = md5($path_uri);
 
     // This method is quite horrible. The underlying challenge is that some
     // commits in the Facebook repository are enormous, taking multiple hours
     // to 'ls -R' out of the repository and producing XML files >1GB in size.
 
     // If we try to SimpleXML them, the object exhausts available memory on a
     // 64G machine. Instead, cache the XML output and then parse it line by line
     // to limit space requirements.
 
     $cache_loc = sys_get_temp_dir().'/diffusion.'.$hashkey.'.svnls';
     if (!Filesystem::pathExists($cache_loc)) {
       $tmp = new TempFile();
       $repository->execxRemoteCommand(
         '--xml ls -R %s > %s',
         $path_uri,
         $tmp);
       execx(
         'mv %s %s',
         $tmp,
         $cache_loc);
     }
 
     $map = $this->parseRecursiveListFileData($cache_loc);
     Filesystem::remove($cache_loc);
 
     return $map;
   }
 
   private function parseRecursiveListFileData($file_path) {
     $map   = array();
     $mode  = 'xml';
     $done  = false;
     $entry = null;
     foreach (new LinesOfALargeFile($file_path) as $lno => $line) {
       switch ($mode) {
         case 'entry':
           if ($line == '</entry>') {
             $entry = implode('', $entry);
             $pattern = '@^\s+kind="(file|dir)">'.
                        '<name>(.*?)</name>'.
                        '(<size>(.*?)</size>)?@';
             $matches = null;
             if (!preg_match($pattern, $entry, $matches)) {
-              throw new Exception("Unable to parse entry!");
+              throw new Exception('Unable to parse entry!');
             }
             $map[html_entity_decode($matches[2])] =
               $this->getFileTypeFromSVNKind($matches[1]);
             $mode = 'entry-or-end';
           } else {
             $entry[] = $line;
           }
           break;
         case 'entry-or-end':
           if ($line == '</list>') {
             $done = true;
             break 2;
           } else if ($line == '<entry') {
             $mode = 'entry';
             $entry = array();
           } else {
             throw new Exception("Expected </list> or <entry, got {$line}.");
           }
           break;
         case 'xml':
           $expect = '/<?xml version="1.0".*?>/';
           if (!preg_match($expect, $line)) {
             throw new Exception("Expected '{$expect}', got {$line}.");
           }
           $mode = 'list';
           break;
         case 'list':
           $expect = '<lists>';
           if ($line !== $expect) {
             throw new Exception("Expected '{$expect}', got {$line}.");
           }
           $mode = 'list1';
           break;
         case 'list1':
           $expect = '<list';
           if ($line !== $expect) {
             throw new Exception("Expected '{$expect}', got {$line}.");
           }
           $mode = 'list2';
           break;
         case 'list2':
           if (!preg_match('/^\s+path="/', $line)) {
             throw new Exception("Expected '   path=...', got {$line}.");
           }
           $mode = 'entry-or-end';
           break;
       }
     }
     if (!$done) {
-      throw new Exception("Unexpected end of file.");
+      throw new Exception('Unexpected end of file.');
     }
 
     return $map;
   }
 
   // TODO: Replace with DiffusionPathIDQuery::getParentPath().
   private function getParentPath($path) {
     $path = rtrim($path, '/');
     $path = dirname($path);
     if (!$path) {
       $path = '/';
     }
     return $path;
   }
 
   // TODO: Replace with DiffusionPathIDQuery::expandPathToRoot().
   private function expandAllParentPaths($path, $include_self = false) {
     $parents = array();
     if ($include_self) {
       $parents[] = '/'.rtrim($path, '/');
     }
     $parts = explode('/', trim($path, '/'));
     while (count($parts) >= 1) {
       array_pop($parts);
       $parents[] = '/'.implode('/', $parts);
     }
     return $parents;
   }
 
   private function getSVNLogXMLObject(
     PhabricatorRepository $repository,
     $uri,
     $revision) {
     list($xml) = $repository->execxRemoteCommand(
       'log --xml --verbose --limit 1 %s@%d',
       $uri,
       $revision);
 
     // Subversion may send us back commit messages which won't parse because
     // they have non UTF-8 garbage in them. Slam them into valid UTF-8.
     $xml = phutil_utf8ize($xml);
 
     return new SimpleXMLElement($xml);
   }
 
 }
diff --git a/src/applications/search/config/PhabricatorSearchConfigOptions.php b/src/applications/search/config/PhabricatorSearchConfigOptions.php
index 71d3f262d..7b1f5b707 100644
--- a/src/applications/search/config/PhabricatorSearchConfigOptions.php
+++ b/src/applications/search/config/PhabricatorSearchConfigOptions.php
@@ -1,38 +1,38 @@
 <?php
 
 final class PhabricatorSearchConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
-    return pht("Search");
+    return pht('Search');
   }
 
   public function getDescription() {
-    return pht("Options relating to Search.");
+    return pht('Options relating to Search.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'search.engine-selector',
         'class',
         'PhabricatorDefaultSearchEngineSelector')
         ->setBaseClass('PhabricatorSearchEngineSelector')
-        ->setSummary(pht("Search engine selector."))
+        ->setSummary(pht('Search engine selector.'))
         ->setDescription(
           pht(
-            "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.")),
+            '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.')),
       $this->newOption('search.elastic.host', 'string', null)
         ->setLocked(true)
-        ->setDescription(pht("Elastic Search host."))
+        ->setDescription(pht('Elastic Search host.'))
         ->addExample('http://elastic.example.com:9200/', pht('Valid Setting')),
     );
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 8518822b4..cbb9da48e 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -1,360 +1,360 @@
 <?php
 
 final class PhabricatorApplicationSearchController
   extends PhabricatorSearchBaseController {
 
   private $searchEngine;
   private $navigation;
   private $queryKey;
   private $preface;
 
   public function setPreface($preface) {
     $this->preface = $preface;
     return $this;
   }
 
   public function getPreface() {
     return $this->preface;
   }
 
   public function setQueryKey($query_key) {
     $this->queryKey = $query_key;
     return $this;
   }
 
   protected function getQueryKey() {
     return $this->queryKey;
   }
 
   public function setNavigation(AphrontSideNavFilterView $navigation) {
     $this->navigation = $navigation;
     return $this;
   }
 
   protected function getNavigation() {
     return $this->navigation;
   }
 
   public function setSearchEngine(
     PhabricatorApplicationSearchEngine $search_engine) {
     $this->searchEngine = $search_engine;
     return $this;
   }
 
   protected function getSearchEngine() {
     return $this->searchEngine;
   }
 
   protected function validateDelegatingController() {
     $parent = $this->getDelegatingController();
 
     if (!$parent) {
       throw new Exception(
-        "You must delegate to this controller, not invoke it directly.");
+        'You must delegate to this controller, not invoke it directly.');
     }
 
     $engine = $this->getSearchEngine();
     if (!$engine) {
       throw new Exception(
-        "Call setEngine() before delegating to this controller!");
+        'Call setEngine() before delegating to this controller!');
     }
 
     $nav = $this->getNavigation();
     if (!$nav) {
       throw new Exception(
-        "Call setNavigation() before delegating to this controller!");
+        'Call setNavigation() before delegating to this controller!');
     }
 
     $engine->setViewer($this->getRequest()->getUser());
 
     $parent = $this->getDelegatingController();
   }
 
   public function processRequest() {
     $this->validateDelegatingController();
 
     $key = $this->getQueryKey();
     if ($key == 'edit') {
       return $this->processEditRequest();
     } else {
       return $this->processSearchRequest();
     }
   }
 
   private function processSearchRequest() {
     $parent = $this->getDelegatingController();
     $request = $this->getRequest();
     $user = $request->getUser();
     $engine = $this->getSearchEngine();
     $nav = $this->getNavigation();
 
     if ($request->isFormPost()) {
       $saved_query = $engine->buildSavedQueryFromRequest($request);
       $engine->saveQuery($saved_query);
       return id(new AphrontRedirectResponse())->setURI(
         $engine->getQueryResultsPageURI($saved_query->getQueryKey()).'#R');
     }
 
     $named_query = null;
     $run_query = true;
     $query_key = $this->queryKey;
     if ($this->queryKey == 'advanced') {
       $run_query = false;
       $query_key = $request->getStr('query');
     } else if (!strlen($this->queryKey)) {
       $found_query_data = false;
 
       if ($request->isHTTPGet()) {
         // If this is a GET request and it has some query data, don't
         // do anything unless it's only before= or after=. We'll build and
         // execute a query from it below. This allows external tools to build
         // URIs like "/query/?users=a,b".
         $pt_data = $request->getPassthroughRequestData();
 
         foreach ($pt_data as $pt_key => $pt_value) {
           if ($pt_key != 'before' && $pt_key != 'after') {
             $found_query_data = true;
             break;
           }
         }
       }
 
       if (!$found_query_data) {
         // Otherwise, there's no query data so just run the user's default
         // query for this application.
         $query_key = head_key($engine->loadEnabledNamedQueries());
       }
     }
 
     if ($engine->isBuiltinQuery($query_key)) {
       $saved_query = $engine->buildSavedQueryFromBuiltin($query_key);
       $named_query = idx($engine->loadEnabledNamedQueries(), $query_key);
     } else if ($query_key) {
       $saved_query = id(new PhabricatorSavedQueryQuery())
         ->setViewer($user)
         ->withQueryKeys(array($query_key))
         ->executeOne();
 
       if (!$saved_query) {
         return new Aphront404Response();
       }
 
       $named_query = idx($engine->loadEnabledNamedQueries(), $query_key);
     } else {
       $saved_query = $engine->buildSavedQueryFromRequest($request);
 
       // Save the query to generate a query key, so "Save Custom Query..." and
       // other features like Maniphest's "Export..." work correctly.
       $engine->saveQuery($saved_query);
     }
 
     $nav->selectFilter(
       'query/'.$saved_query->getQueryKey(),
       'query/advanced');
 
     $form = id(new AphrontFormView())
       ->setUser($user);
 
     $engine->buildSearchForm($form, $saved_query);
 
     $errors = $engine->getErrors();
     if ($errors) {
       $run_query = false;
       $errors = id(new AphrontErrorView())
         ->setTitle(pht('Query Errors'))
         ->setErrors($errors);
     }
 
     $submit = id(new AphrontFormSubmitControl())
       ->setValue(pht('Execute Query'));
 
     if ($run_query && !$named_query && $user->isLoggedIn()) {
       $submit->addCancelButton(
         '/search/edit/'.$saved_query->getQueryKey().'/',
         pht('Save Custom Query...'));
     }
 
     $form->appendChild($submit);
     $filter_view = id(new AphrontListFilterView())->appendChild($form);
 
     if ($run_query && $named_query) {
       if ($named_query->getIsBuiltin()) {
         $description = pht(
           'Showing results for query "%s".',
           $named_query->getQueryName());
       } else {
         $description = pht(
           'Showing results for saved query "%s".',
           $named_query->getQueryName());
       }
 
       $filter_view->setCollapsed(
         pht('Edit Query...'),
         pht('Hide Query'),
         $description,
         $this->getApplicationURI('query/advanced/?query='.$query_key));
     }
 
     if ($this->getPreface()) {
       $nav->appendChild($this->getPreface());
     }
 
     $nav->appendChild($filter_view);
 
     if ($run_query) {
       $nav->appendChild(
         $anchor = id(new PhabricatorAnchorView())
           ->setAnchorName('R'));
 
       $query = $engine->buildQueryFromSavedQuery($saved_query);
 
       $pager = $engine->newPagerForSavedQuery($saved_query);
       $pager->readFromRequest($request);
 
       $objects = $engine->executeQuery($query, $pager);
 
       // TODO: To support Dashboard panels, rendering is moving into
       // SearchEngines. Move it all the way in and then get rid of this.
 
       $interface = 'PhabricatorApplicationSearchResultsControllerInterface';
       if ($parent instanceof $interface) {
         $list = $parent->renderResultsList($objects, $saved_query);
       } else {
         $engine->setRequest($request);
 
         $list = $engine->renderResults(
           $objects,
           $saved_query);
       }
 
       $nav->appendChild($list);
 
       // TODO: This is a bit hacky.
       if ($list instanceof PHUIObjectItemListView) {
-        $list->setNoDataString(pht("No results found for this query."));
+        $list->setNoDataString(pht('No results found for this query.'));
         $list->setPager($pager);
       } else {
         if ($pager->willShowPagingControls()) {
           $pager_box = id(new PHUIBoxView())
             ->addPadding(PHUI::PADDING_MEDIUM)
             ->addMargin(PHUI::MARGIN_LARGE)
             ->setBorder(true)
             ->appendChild($pager);
           $nav->appendChild($pager_box);
         }
       }
     }
 
     if ($errors) {
       $nav->appendChild($errors);
     }
 
     if ($named_query) {
       $title = pht('Query: %s', $named_query->getQueryName());
     } else {
       $title = pht('Advanced Search');
     }
 
     $crumbs = $parent
       ->buildApplicationCrumbs()
       ->addTextCrumb($title);
 
     $nav->setCrumbs($crumbs);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
   private function processEditRequest() {
     $parent = $this->getDelegatingController();
     $request = $this->getRequest();
     $user = $request->getUser();
     $engine = $this->getSearchEngine();
     $nav = $this->getNavigation();
 
     $named_queries = $engine->loadAllNamedQueries();
 
     $list_id = celerity_generate_unique_node_id();
 
     $list = new PHUIObjectItemListView();
     $list->setUser($user);
     $list->setID($list_id);
 
     Javelin::initBehavior(
       'search-reorder-queries',
       array(
         'listID' => $list_id,
         'orderURI' => '/search/order/'.get_class($engine).'/',
       ));
 
     foreach ($named_queries as $named_query) {
       $class = get_class($engine);
       $key = $named_query->getQueryKey();
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($named_query->getQueryName())
         ->setHref($engine->getQueryResultsPageURI($key));
 
       if ($named_query->getIsBuiltin() && $named_query->getIsDisabled()) {
         $icon = 'fa-plus';
       } else {
         $icon = 'fa-times';
       }
 
       $item->addAction(
         id(new PHUIListItemView())
           ->setIcon($icon)
           ->setHref('/search/delete/'.$key.'/'.$class.'/')
           ->setWorkflow(true));
 
       if ($named_query->getIsBuiltin()) {
         if ($named_query->getIsDisabled()) {
           $item->addIcon('fa-times lightgreytext', pht('Disabled'));
           $item->setDisabled(true);
         } else {
           $item->addIcon('fa-lock lightgreytext', pht('Builtin'));
         }
       } else {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-pencil')
             ->setHref('/search/edit/'.$key.'/'));
       }
 
       $item->setGrippable(true);
       $item->addSigil('named-query');
       $item->setMetadata(
         array(
           'queryKey' => $named_query->getQueryKey(),
         ));
 
       $list->addItem($item);
     }
 
     $list->setNoDataString(pht('No saved queries.'));
 
     $crumbs = $parent
       ->buildApplicationCrumbs()
-      ->addTextCrumb(pht("Saved Queries"), $engine->getQueryManagementURI());
+      ->addTextCrumb(pht('Saved Queries'), $engine->getQueryManagementURI());
 
     $nav->selectFilter('query/edit');
     $nav->setCrumbs($crumbs);
     $nav->appendChild($list);
 
     return $parent->buildApplicationPage(
       $nav,
       array(
-        'title' => pht("Saved Queries"),
+        'title' => pht('Saved Queries'),
         'device' => true,
       ));
   }
 
   protected function buildApplicationMenu() {
     return $this->getDelegatingController()->buildApplicationMenu();
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php
index 2218ee566..2c36ee49d 100644
--- a/src/applications/search/controller/PhabricatorSearchAttachController.php
+++ b/src/applications/search/controller/PhabricatorSearchAttachController.php
@@ -1,347 +1,347 @@
 <?php
 
 /**
  * @group search
  */
 final class PhabricatorSearchAttachController
   extends PhabricatorSearchBaseController {
 
   private $phid;
   private $type;
   private $action;
 
   const ACTION_ATTACH       = 'attach';
   const ACTION_MERGE        = 'merge';
   const ACTION_DEPENDENCIES = 'dependencies';
   const ACTION_BLOCKS       = 'blocks';
   const ACTION_EDGE         = 'edge';
 
   public function willProcessRequest(array $data) {
     $this->phid = $data['phid'];
     $this->type = $data['type'];
     $this->action = idx($data, 'action', self::ACTION_ATTACH);
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($this->phid))
       ->executeOne();
 
     $object_type = $handle->getType();
     $attach_type = $this->type;
 
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($user)
       ->withPHIDs(array($this->phid))
       ->executeOne();
 
     if (!$object) {
       return new Aphront404Response();
     }
 
     $edge_type = null;
     switch ($this->action) {
       case self::ACTION_EDGE:
       case self::ACTION_DEPENDENCIES:
       case self::ACTION_BLOCKS:
       case self::ACTION_ATTACH:
         $edge_type = $this->getEdgeType($object_type, $attach_type);
         break;
     }
 
     if ($request->isFormPost()) {
       $phids = explode(';', $request->getStr('phids'));
       $phids = array_filter($phids);
       $phids = array_values($phids);
 
       if ($edge_type) {
         $do_txn = $object instanceof PhabricatorApplicationTransactionInterface;
         $old_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
           $this->phid,
           $edge_type);
         $add_phids = $phids;
         $rem_phids = array_diff($old_phids, $add_phids);
 
         if ($do_txn) {
 
           $txn_editor = $object->getApplicationTransactionEditor()
             ->setActor($user)
             ->setContentSourceFromRequest($request);
           $txn_template = $object->getApplicationTransactionTemplate()
             ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
             ->setMetadataValue('edge:type', $edge_type)
             ->setNewValue(array(
               '+' => array_fuse($add_phids),
               '-' => array_fuse($rem_phids)));
           $txn_editor->applyTransactions(
             $object->getApplicationTransactionObject(),
             array($txn_template));
 
         } else {
 
           $editor = id(new PhabricatorEdgeEditor());
           $editor->setActor($user);
           foreach ($add_phids as $phid) {
             $editor->addEdge($this->phid, $edge_type, $phid);
           }
           foreach ($rem_phids as $phid) {
             $editor->removeEdge($this->phid, $edge_type, $phid);
           }
 
           try {
             $editor->save();
           } catch (PhabricatorEdgeCycleException $ex) {
             $this->raiseGraphCycleException($ex);
           }
         }
 
         return id(new AphrontReloadResponse())->setURI($handle->getURI());
       } else {
         return $this->performMerge($object, $handle, $phids);
       }
     } else {
       if ($edge_type) {
         $phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
           $this->phid,
           $edge_type);
       } else {
         // This is a merge.
         $phids = array();
       }
     }
 
     $strings = $this->getStrings();
 
     $handles = $this->loadViewerHandles($phids);
 
     $obj_dialog = new PhabricatorObjectSelectorDialog();
     $obj_dialog
       ->setUser($user)
       ->setHandles($handles)
       ->setFilters($this->getFilters($strings))
       ->setSelectedFilter($strings['selected'])
       ->setExcluded($this->phid)
       ->setCancelURI($handle->getURI())
       ->setSearchURI('/search/select/'.$attach_type.'/')
       ->setTitle($strings['title'])
       ->setHeader($strings['header'])
       ->setButtonText($strings['button'])
       ->setInstructions($strings['instructions']);
 
     $dialog = $obj_dialog->buildDialog();
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function performMerge(
     ManiphestTask $task,
     PhabricatorObjectHandle $handle,
     array $phids) {
 
     $user = $this->getRequest()->getUser();
     $response = id(new AphrontReloadResponse())->setURI($handle->getURI());
 
     $phids = array_fill_keys($phids, true);
     unset($phids[$task->getPHID()]); // Prevent merging a task into itself.
 
     if (!$phids) {
       return $response;
     }
 
     $targets = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withPHIDs(array_keys($phids))
       ->execute();
 
     if (empty($targets)) {
       return $response;
     }
 
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($user)
       ->setContentSourceFromRequest($this->getRequest())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true);
 
     $task_names = array();
 
     $merge_into_name = 'T'.$task->getID();
 
     $cc_vector = array();
     $cc_vector[] = $task->getCCPHIDs();
     foreach ($targets as $target) {
       $cc_vector[] = $target->getCCPHIDs();
       $cc_vector[] = array(
         $target->getAuthorPHID(),
         $target->getOwnerPHID());
 
       $close_task = id(new ManiphestTransaction())
         ->setTransactionType(ManiphestTransaction::TYPE_STATUS)
         ->setNewValue(ManiphestTaskStatus::getDuplicateStatus());
 
       $merge_comment = id(new ManiphestTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new ManiphestTransactionComment())
             ->setContent("\xE2\x9C\x98 Merged into {$merge_into_name}."));
 
       $editor->applyTransactions(
         $target,
         array(
           $close_task,
           $merge_comment,
         ));
 
       $task_names[] = 'T'.$target->getID();
     }
     $all_ccs = array_mergev($cc_vector);
     $all_ccs = array_filter($all_ccs);
     $all_ccs = array_unique($all_ccs);
 
     $task_names = implode(', ', $task_names);
 
     $add_ccs = id(new ManiphestTransaction())
       ->setTransactionType(ManiphestTransaction::TYPE_CCS)
       ->setNewValue($all_ccs);
 
     $merged_comment = id(new ManiphestTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new ManiphestTransactionComment())
           ->setContent("\xE2\x97\x80 Merged tasks: {$task_names}."));
 
     $editor->applyTransactions($task, array($add_ccs, $merged_comment));
 
     return $response;
   }
 
   private function getStrings() {
     switch ($this->type) {
       case DifferentialPHIDTypeRevision::TYPECONST:
         $noun = 'Revisions';
         $selected = 'created';
         break;
       case ManiphestPHIDTypeTask::TYPECONST:
         $noun = 'Tasks';
         $selected = 'assigned';
         break;
       case PhabricatorRepositoryPHIDTypeCommit::TYPECONST:
         $noun = 'Commits';
         $selected = 'created';
         break;
       case PholioPHIDTypeMock::TYPECONST:
         $noun = 'Mocks';
         $selected = 'created';
         break;
     }
 
     switch ($this->action) {
       case self::ACTION_EDGE:
       case self::ACTION_ATTACH:
         $dialog_title = "Manage Attached {$noun}";
         $header_text = "Currently Attached {$noun}";
         $button_text = "Save {$noun}";
         $instructions = null;
         break;
       case self::ACTION_MERGE:
-        $dialog_title = "Merge Duplicate Tasks";
-        $header_text = "Tasks To Merge";
+        $dialog_title = 'Merge Duplicate Tasks';
+        $header_text = 'Tasks To Merge';
         $button_text = "Merge {$noun}";
         $instructions =
-          "These tasks will be merged into the current task and then closed. ".
-          "The current task will grow stronger.";
+          'These tasks will be merged into the current task and then closed. '.
+          'The current task will grow stronger.';
         break;
       case self::ACTION_DEPENDENCIES:
-        $dialog_title = "Edit Dependencies";
-        $header_text = "Current Dependencies";
-        $button_text = "Save Dependencies";
+        $dialog_title = 'Edit Dependencies';
+        $header_text = 'Current Dependencies';
+        $button_text = 'Save Dependencies';
         $instructions = null;
         break;
       case self::ACTION_BLOCKS:
         $dialog_title = pht('Edit Blocking Tasks');
         $header_text = pht('Current Blocking Tasks');
         $button_text = pht('Save Blocking Tasks');
         $instructions = null;
         break;
     }
 
     return array(
       'target_plural_noun'    => $noun,
       'selected'              => $selected,
       'title'                 => $dialog_title,
       'header'                => $header_text,
       'button'                => $button_text,
       'instructions'          => $instructions,
     );
   }
 
   private function getFilters(array $strings) {
     if ($this->type == PholioPHIDTypeMock::TYPECONST) {
       $filters = array(
         'created' => 'Created By Me',
         'all' => 'All '.$strings['target_plural_noun'],
       );
     } else {
       $filters = array(
         'assigned' => 'Assigned to Me',
         'created' => 'Created By Me',
         'open' => 'All Open '.$strings['target_plural_noun'],
         'all' => 'All '.$strings['target_plural_noun'],
       );
     }
 
     return $filters;
   }
 
   private function getEdgeType($src_type, $dst_type) {
     $t_cmit = PhabricatorRepositoryPHIDTypeCommit::TYPECONST;
     $t_task = ManiphestPHIDTypeTask::TYPECONST;
     $t_drev = DifferentialPHIDTypeRevision::TYPECONST;
     $t_mock = PholioPHIDTypeMock::TYPECONST;
 
     $map = array(
       $t_cmit => array(
         $t_task => PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK,
       ),
       $t_task => array(
         $t_cmit => PhabricatorEdgeConfig::TYPE_TASK_HAS_COMMIT,
         $t_task => PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK,
         $t_drev => PhabricatorEdgeConfig::TYPE_TASK_HAS_RELATED_DREV,
         $t_mock => PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK,
       ),
       $t_drev => array(
         $t_drev => PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV,
         $t_task => PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK,
       ),
       $t_mock => array(
         $t_task => PhabricatorEdgeConfig::TYPE_MOCK_HAS_TASK,
       ),
     );
 
     if (empty($map[$src_type][$dst_type])) {
       return null;
     }
 
     return $map[$src_type][$dst_type];
   }
 
   private function raiseGraphCycleException(PhabricatorEdgeCycleException $ex) {
     $cycle = $ex->getCycle();
 
     $handles = $this->loadViewerHandles($cycle);
     $names = array();
     foreach ($cycle as $cycle_phid) {
       $names[] = $handles[$cycle_phid]->getFullName();
     }
     $names = implode(" \xE2\x86\x92 ", $names);
     throw new Exception(
       "You can not create that dependency, because it would create a ".
       "circular dependency: {$names}.");
   }
 
 }
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 2bed70537..1626a1d91 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1,800 +1,800 @@
 <?php
 
 /**
  * Represents an abstract search engine for an application. It supports
  * creating and storing saved queries.
  *
  * @task construct  Constructing Engines
  * @task app        Applications
  * @task builtin    Builtin Queries
  * @task uri        Query URIs
  * @task dates      Date Filters
  * @task read       Reading Utilities
  * @task exec       Paging and Executing Queries
  * @task render     Rendering Results
  *
  * @group search
  */
 abstract class PhabricatorApplicationSearchEngine {
 
   private $application;
   private $viewer;
   private $errors = array();
   private $customFields = false;
   private $request;
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
   protected function requireViewer() {
     if (!$this->viewer) {
-      throw new Exception("Call setViewer() before using an engine!");
+      throw new Exception('Call setViewer() before using an engine!');
     }
     return $this->viewer;
   }
 
   public function saveQuery(PhabricatorSavedQuery $query) {
     $query->setEngineClassName(get_class($this));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     try {
       $query->save();
     } catch (AphrontQueryDuplicateKeyException $ex) {
       // Ignore, this is just a repeated search.
     }
     unset($unguarded);
   }
 
   /**
    * Create a saved query object from the request.
    *
    * @param AphrontRequest The search request.
    * @return PhabricatorSavedQuery
    */
   abstract public function buildSavedQueryFromRequest(
     AphrontRequest $request);
 
   /**
    * Executes the saved query.
    *
    * @param PhabricatorSavedQuery The saved query to operate on.
    * @return The result of the query.
    */
   abstract public function buildQueryFromSavedQuery(
     PhabricatorSavedQuery $saved);
 
   /**
    * Builds the search form using the request.
    *
    * @param AphrontFormView       Form to populate.
    * @param PhabricatorSavedQuery The query from which to build the form.
    * @return void
    */
   abstract public function buildSearchForm(
     AphrontFormView $form,
     PhabricatorSavedQuery $query);
 
   public function getErrors() {
     return $this->errors;
   }
 
   public function addError($error) {
     $this->errors[] = $error;
     return $this;
   }
 
   /**
    * Return an application URI corresponding to the results page of a query.
    * Normally, this is something like `/application/query/QUERYKEY/`.
    *
    * @param   string  The query key to build a URI for.
    * @return  string  URI where the query can be executed.
    * @task uri
    */
   public function getQueryResultsPageURI($query_key) {
     return $this->getURI('query/'.$query_key.'/');
   }
 
 
   /**
    * Return an application URI for query management. This is used when, e.g.,
    * a query deletion operation is cancelled.
    *
    * @return  string  URI where queries can be managed.
    * @task uri
    */
   public function getQueryManagementURI() {
     return $this->getURI('query/edit/');
   }
 
 
   /**
    * Return the URI to a path within the application. Used to construct default
    * URIs for management and results.
    *
    * @return string URI to path.
    * @task uri
    */
   abstract protected function getURI($path);
 
 
   public function newSavedQuery() {
     return id(new PhabricatorSavedQuery())
       ->setEngineClassName(get_class($this));
   }
 
   public function addNavigationItems(PHUIListView $menu) {
     $viewer = $this->requireViewer();
 
     $menu->newLabel(pht('Queries'));
 
     $named_queries = $this->loadEnabledNamedQueries();
 
     foreach ($named_queries as $query) {
       $key = $query->getQueryKey();
       $uri = $this->getQueryResultsPageURI($key);
       $menu->newLink($query->getQueryName(), $uri, 'query/'.$key);
     }
 
     if ($viewer->isLoggedIn()) {
       $manage_uri = $this->getQueryManagementURI();
       $menu->newLink(pht('Edit Queries...'), $manage_uri, 'query/edit');
     }
 
     $menu->newLabel(pht('Search'));
     $advanced_uri = $this->getQueryResultsPageURI('advanced');
     $menu->newLink(pht('Advanced Search'), $advanced_uri, 'query/advanced');
 
     return $this;
   }
 
   public function loadAllNamedQueries() {
     $viewer = $this->requireViewer();
 
     $named_queries = id(new PhabricatorNamedQueryQuery())
       ->setViewer($viewer)
       ->withUserPHIDs(array($viewer->getPHID()))
       ->withEngineClassNames(array(get_class($this)))
       ->execute();
     $named_queries = mpull($named_queries, null, 'getQueryKey');
 
     $builtin = $this->getBuiltinQueries($viewer);
     $builtin = mpull($builtin, null, 'getQueryKey');
 
     foreach ($named_queries as $key => $named_query) {
       if ($named_query->getIsBuiltin()) {
         if (isset($builtin[$key])) {
           $named_queries[$key]->setQueryName($builtin[$key]->getQueryName());
           unset($builtin[$key]);
         } else {
           unset($named_queries[$key]);
         }
       }
 
       unset($builtin[$key]);
     }
 
     $named_queries = msort($named_queries, 'getSortKey');
 
     return $named_queries + $builtin;
   }
 
   public function loadEnabledNamedQueries() {
     $named_queries = $this->loadAllNamedQueries();
     foreach ($named_queries as $key => $named_query) {
       if ($named_query->getIsBuiltin() && $named_query->getIsDisabled()) {
         unset($named_queries[$key]);
       }
     }
     return $named_queries;
   }
 
 
 /* -(  Applications  )------------------------------------------------------- */
 
 
   protected function getApplicationURI($path = '') {
     return $this->getApplication()->getApplicationURI($path);
   }
 
   protected function getApplication() {
     if (!$this->application) {
       $class = $this->getApplicationClassName();
 
       $this->application = id(new PhabricatorApplicationQuery())
         ->setViewer($this->requireViewer())
         ->withClasses(array($class))
         ->withInstalled(true)
         ->executeOne();
 
       if (!$this->application) {
         throw new Exception(
           pht(
             'Application "%s" is not installed!',
             $class));
       }
     }
 
     return $this->application;
   }
 
   protected function getApplicationClassName() {
     throw new Exception(pht('Not implemented for this SearchEngine yet!'));
   }
 
 
 /* -(  Constructing Engines  )----------------------------------------------- */
 
 
   /**
    * Load all available application search engines.
    *
    * @return list<PhabricatorApplicationSearchEngine> All available engines.
    * @task construct
    */
   public static function getAllEngines() {
     $engines = id(new PhutilSymbolLoader())
       ->setAncestorClass(__CLASS__)
       ->loadObjects();
 
     return $engines;
   }
 
 
   /**
    * Get an engine by class name, if it exists.
    *
    * @return PhabricatorApplicationSearchEngine|null Engine, or null if it does
    *   not exist.
    * @task construct
    */
   public static function getEngineByClassName($class_name) {
     return idx(self::getAllEngines(), $class_name);
   }
 
 
 /* -(  Builtin Queries  )---------------------------------------------------- */
 
 
   /**
    * @task builtin
    */
   public function getBuiltinQueries() {
     $names = $this->getBuiltinQueryNames();
 
     $queries = array();
     $sequence = 0;
     foreach ($names as $key => $name) {
       $queries[$key] = id(new PhabricatorNamedQuery())
         ->setUserPHID($this->requireViewer()->getPHID())
         ->setEngineClassName(get_class($this))
         ->setQueryName($name)
         ->setQueryKey($key)
         ->setSequence((1 << 24) + $sequence++)
         ->setIsBuiltin(true);
     }
 
     return $queries;
   }
 
 
   /**
    * @task builtin
    */
   public function getBuiltinQuery($query_key) {
     if (!$this->isBuiltinQuery($query_key)) {
       throw new Exception("'{$query_key}' is not a builtin!");
     }
     return idx($this->getBuiltinQueries(), $query_key);
   }
 
 
   /**
    * @task builtin
    */
   protected function getBuiltinQueryNames() {
     return array();
   }
 
 
   /**
    * @task builtin
    */
   public function isBuiltinQuery($query_key) {
     $builtins = $this->getBuiltinQueries();
     return isset($builtins[$query_key]);
   }
 
 
   /**
    * @task builtin
    */
   public function buildSavedQueryFromBuiltin($query_key) {
     throw new Exception("Builtin '{$query_key}' is not supported!");
   }
 
 
 /* -(  Reading Utilities )--------------------------------------------------- */
 
 
   /**
    * Read a list of user PHIDs from a request in a flexible way. This method
    * supports either of these forms:
    *
    *   users[]=alincoln&users[]=htaft
    *   users=alincoln,htaft
    *
    * Additionally, users can be specified either by PHID or by name.
    *
    * The main goal of this flexibility is to allow external programs to generate
    * links to pages (like "alincoln's open revisions") without needing to make
    * API calls.
    *
    * @param AphrontRequest  Request to read user PHIDs from.
    * @param string          Key to read in the request.
    * @param list<const>     Other permitted PHID types.
    * @return list<phid>     List of user PHIDs.
    *
    * @task read
    */
   protected function readUsersFromRequest(
     AphrontRequest $request,
     $key,
     array $allow_types = array()) {
 
     $list = $this->readListFromRequest($request, $key);
 
     $phids = array();
     $names = array();
     $allow_types = array_fuse($allow_types);
     $user_type = PhabricatorPHIDConstants::PHID_TYPE_USER;
     foreach ($list as $item) {
       $type = phid_get_type($item);
       if ($type == $user_type) {
         $phids[] = $item;
       } else if (isset($allow_types[$type])) {
         $phids[] = $item;
       } else {
         $names[] = $item;
       }
     }
 
     if ($names) {
       $users = id(new PhabricatorPeopleQuery())
         ->setViewer($this->requireViewer())
         ->withUsernames($names)
         ->execute();
       foreach ($users as $user) {
         $phids[] = $user->getPHID();
       }
       $phids = array_unique($phids);
     }
 
     return $phids;
   }
 
 
   /**
    * Read a list of generic PHIDs from a request in a flexible way. Like
    * @{method:readUsersFromRequest}, this method supports either array or
    * comma-delimited forms. Objects can be specified either by PHID or by
    * object name.
    *
    * @param AphrontRequest  Request to read PHIDs from.
    * @param string          Key to read in the request.
    * @param list<const>     Optional, list of permitted PHID types.
    * @return list<phid>     List of object PHIDs.
    *
    * @task read
    */
   protected function readPHIDsFromRequest(
     AphrontRequest $request,
     $key,
     array $allow_types = array()) {
 
     $list = $this->readListFromRequest($request, $key);
 
     $objects = id(new PhabricatorObjectQuery())
       ->setViewer($this->requireViewer())
       ->withNames($list)
       ->execute();
     $list = mpull($objects, 'getPHID');
 
     if (!$list) {
       return array();
     }
 
     // If only certain PHID types are allowed, filter out all the others.
     if ($allow_types) {
       $allow_types = array_fuse($allow_types);
       foreach ($list as $key => $phid) {
         if (empty($allow_types[phid_get_type($phid)])) {
           unset($list[$key]);
         }
       }
     }
 
     return $list;
   }
 
 
   /**
    * Read a list of items from the request, in either array format or string
    * format:
    *
    *   list[]=item1&list[]=item2
    *   list=item1,item2
    *
    * This provides flexibility when constructing URIs, especially from external
    * sources.
    *
    * @param AphrontRequest  Request to read strings from.
    * @param string          Key to read in the request.
    * @return list<string>   List of values.
    */
   protected function readListFromRequest(
     AphrontRequest $request,
     $key) {
     $list = $request->getArr($key, null);
     if ($list === null) {
       $list = $request->getStrList($key);
     }
 
     if (!$list) {
       return array();
     }
 
     return $list;
   }
 
   protected function readDateFromRequest(
     AphrontRequest $request,
     $key) {
 
     return id(new AphrontFormDateControl())
       ->setUser($this->requireViewer())
       ->setName($key)
       ->setAllowNull(true)
       ->readValueFromRequest($request);
   }
 
   protected function readBoolFromRequest(
     AphrontRequest $request,
     $key) {
     if (!strlen($request->getStr($key))) {
       return null;
     }
     return $request->getBool($key);
   }
 
 
   protected function getBoolFromQuery(PhabricatorSavedQuery $query, $key) {
     $value = $query->getParameter($key);
     if ($value === null) {
       return $value;
     }
     return $value ? 'true' : 'false';
   }
 
 
 /* -(  Dates  )-------------------------------------------------------------- */
 
 
   /**
    * @task dates
    */
   protected function parseDateTime($date_time) {
     if (!strlen($date_time)) {
       return null;
     }
 
     return PhabricatorTime::parseLocalTime($date_time, $this->requireViewer());
   }
 
 
   /**
    * @task dates
    */
   protected function buildDateRange(
     AphrontFormView $form,
     PhabricatorSavedQuery $saved_query,
     $start_key,
     $start_name,
     $end_key,
     $end_name) {
 
     $start_str = $saved_query->getParameter($start_key);
     $start = null;
     if (strlen($start_str)) {
       $start = $this->parseDateTime($start_str);
       if (!$start) {
         $this->addError(
           pht(
             '"%s" date can not be parsed.',
             $start_name));
       }
     }
 
 
     $end_str = $saved_query->getParameter($end_key);
     $end = null;
     if (strlen($end_str)) {
       $end = $this->parseDateTime($end_str);
       if (!$end) {
         $this->addError(
           pht(
             '"%s" date can not be parsed.',
             $end_name));
       }
     }
 
     if ($start && $end && ($start >= $end)) {
       $this->addError(
         pht(
           '"%s" must be a date before "%s".',
           $start_name,
           $end_name));
     }
 
     $form
       ->appendChild(
         id(new PHUIFormFreeformDateControl())
           ->setName($start_key)
           ->setLabel($start_name)
           ->setValue($start_str))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setName($end_key)
           ->setLabel($end_name)
           ->setValue($end_str));
   }
 
 
 /* -(  Paging and Executing Queries  )--------------------------------------- */
 
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
     return $saved->getParameter('limit', 100);
   }
 
 
   public function shouldUseOffsetPaging() {
     return false;
   }
 
 
   public function newPagerForSavedQuery(PhabricatorSavedQuery $saved) {
     if ($this->shouldUseOffsetPaging()) {
       $pager = new AphrontPagerView();
     } else {
       $pager = new AphrontCursorPagerView();
     }
 
     $page_size = $this->getPageSize($saved);
     if (is_finite($page_size)) {
       $pager->setPageSize($page_size);
     } else {
       // Consider an INF pagesize to mean a large finite pagesize.
 
       // TODO: It would be nice to handle this more gracefully, but math
       // with INF seems to vary across PHP versions, systems, and runtimes.
       $pager->setPageSize(0xFFFF);
     }
 
     return $pager;
   }
 
 
   public function executeQuery(
     PhabricatorPolicyAwareQuery $query,
     AphrontView $pager) {
 
     $query->setViewer($this->requireViewer());
 
     if ($this->shouldUseOffsetPaging()) {
       $objects = $query->executeWithOffsetPager($pager);
     } else {
       $objects = $query->executeWithCursorPager($pager);
     }
 
     return $objects;
   }
 
 
 /* -(  Rendering  )---------------------------------------------------------- */
 
 
   public function setRequest(AphrontRequest $request) {
     $this->request = $request;
     return $this;
   }
 
   public function getRequest() {
     return $this->request;
   }
 
   public function renderResults(
     array $objects,
     PhabricatorSavedQuery $query) {
 
     $phids = $this->getRequiredHandlePHIDsForResultList($objects, $query);
 
     if ($phids) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($this->requireViewer())
         ->witHPHIDs($phids)
         ->execute();
     } else {
       $handles = array();
     }
 
     return $this->renderResultList($objects, $query, $handles);
   }
 
   protected function getRequiredHandlePHIDsForResultList(
     array $objects,
     PhabricatorSavedQuery $query) {
     return array();
   }
 
   protected function renderResultList(
     array $objects,
     PhabricatorSavedQuery $query,
     array $handles) {
     throw new Exception(pht('Not supported here yet!'));
   }
 
 
 /* -(  Application Search  )------------------------------------------------- */
 
 
   /**
    * Retrieve an object to use to define custom fields for this search.
    *
    * To integrate with custom fields, subclasses should override this method
    * and return an instance of the application object which implements
    * @{interface:PhabricatorCustomFieldInterface}.
    *
    * @return PhabricatorCustomFieldInterface|null Object with custom fields.
    * @task appsearch
    */
   public function getCustomFieldObject() {
     return null;
   }
 
 
   /**
    * Get the custom fields for this search.
    *
    * @return PhabricatorCustomFieldList|null Custom fields, if this search
    *   supports custom fields.
    * @task appsearch
    */
   public function getCustomFieldList() {
     if ($this->customFields === false) {
       $object = $this->getCustomFieldObject();
       if ($object) {
         $fields = PhabricatorCustomField::getObjectFields(
           $object,
           PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
         $fields->setViewer($this->requireViewer());
       } else {
         $fields = null;
       }
       $this->customFields = $fields;
     }
     return $this->customFields;
   }
 
 
   /**
    * Moves data from the request into a saved query.
    *
    * @param AphrontRequest Request to read.
    * @param PhabricatorSavedQuery Query to write to.
    * @return void
    * @task appsearch
    */
   protected function readCustomFieldsFromRequest(
     AphrontRequest $request,
     PhabricatorSavedQuery $saved) {
 
     $list = $this->getCustomFieldList();
     if (!$list) {
       return;
     }
 
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $field->readApplicationSearchValueFromRequest(
         $this,
         $request);
       $saved->setParameter($key, $value);
     }
   }
 
 
   /**
    * Applies data from a saved query to an executable query.
    *
    * @param PhabricatorCursorPagedPolicyAwareQuery Query to constrain.
    * @param PhabricatorSavedQuery Saved query to read.
    * @return void
    */
   protected function applyCustomFieldsToQuery(
     PhabricatorCursorPagedPolicyAwareQuery $query,
     PhabricatorSavedQuery $saved) {
 
     $list = $this->getCustomFieldList();
     if (!$list) {
       return;
     }
 
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $field->applyApplicationSearchConstraintToQuery(
         $this,
         $query,
         $saved->getParameter($key));
     }
   }
 
 
   /**
    * Get a unique key identifying a field.
    *
    * @param PhabricatorCustomField Field to identify.
    * @return string Unique identifier, suitable for use as an input name.
    */
   public function getKeyForCustomField(PhabricatorCustomField $field) {
     return 'custom:'.$field->getFieldIndex();
   }
 
 
   /**
    * Add inputs to an application search form so the user can query on custom
    * fields.
    *
    * @param AphrontFormView Form to update.
    * @param PhabricatorSavedQuery Values to prefill.
    * @return void
    */
   protected function appendCustomFieldsToForm(
     AphrontFormView $form,
     PhabricatorSavedQuery $saved) {
 
     $list = $this->getCustomFieldList();
     if (!$list) {
       return;
     }
 
     $phids = array();
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $saved->getParameter($key);
       $phids[$key] = $field->getRequiredHandlePHIDsForApplicationSearch($value);
     }
     $all_phids = array_mergev($phids);
 
     $handles = array();
     if ($all_phids) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($this->requireViewer())
         ->withPHIDs($all_phids)
         ->execute();
     }
 
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $saved->getParameter($key);
       $field->appendToApplicationSearchForm(
         $this,
         $form,
         $value,
         array_select_keys($handles, $phids[$key]));
     }
   }
 
 }
diff --git a/src/applications/search/engine/PhabricatorSearchEngineElastic.php b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
index 82e03cf35..59bb2af0d 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineElastic.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
@@ -1,263 +1,263 @@
 <?php
 
 final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
   private $uri;
   private $timeout;
 
   public function __construct($uri) {
     $this->uri = $uri;
   }
 
   public function setTimeout($timeout) {
     $this->timeout = $timeout;
     return $this;
   }
 
   public function getTimeout() {
     return $this->timeout;
   }
 
   public function reindexAbstractDocument(
     PhabricatorSearchAbstractDocument $doc) {
 
     $type = $doc->getDocumentType();
     $phid = $doc->getPHID();
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($phid))
       ->executeOne();
 
     // URL is not used internally but it can be useful externally.
     $spec = array(
       'title'         => $doc->getDocumentTitle(),
       'url'           => PhabricatorEnv::getProductionURI($handle->getURI()),
       'dateCreated'   => $doc->getDocumentCreated(),
       '_timestamp'    => $doc->getDocumentModified(),
       'field'         => array(),
       'relationship'  => array(),
     );
 
     foreach ($doc->getFieldData() as $field) {
       $spec['field'][] = array_combine(array('type', 'corpus', 'aux'), $field);
     }
 
     foreach ($doc->getRelationshipData() as $relationship) {
       list($rtype, $to_phid, $to_type, $time) = $relationship;
       $spec['relationship'][$rtype][] = array(
         'phid'      => $to_phid,
         'phidType'  => $to_type,
         'when'      => $time,
       );
     }
 
     $this->executeRequest(
       "/phabricator/{$type}/{$phid}/",
       $spec,
       $is_write = true);
   }
 
   public function reconstructDocument($phid) {
     $type = phid_get_type($phid);
 
     $response = $this->executeRequest("/phabricator/{$type}/{$phid}", array());
 
     if (empty($response['exists'])) {
       return null;
     }
 
     $hit = $response['_source'];
 
     $doc = new PhabricatorSearchAbstractDocument();
     $doc->setPHID($phid);
     $doc->setDocumentType($response['_type']);
     $doc->setDocumentTitle($hit['title']);
     $doc->setDocumentCreated($hit['dateCreated']);
     $doc->setDocumentModified($hit['_timestamp']);
 
     foreach ($hit['field'] as $fdef) {
       $doc->addField($fdef['type'], $fdef['corpus'], $fdef['aux']);
     }
 
     foreach ($hit['relationship'] as $rtype => $rships) {
       foreach ($rships as $rship) {
         $doc->addRelationship(
           $rtype,
           $rship['phid'],
           $rship['phidType'],
           $rship['when']);
       }
     }
 
     return $doc;
   }
 
   private function buildSpec(PhabricatorSavedQuery $query) {
     $spec = array();
     $filter = array();
 
     if (strlen($query->getParameter('query'))) {
       $spec[] = array(
         'term' => array(
           'field.corpus' => $query->getParameter('query'),
         ),
       );
     }
 
     $exclude = $query->getParameter('exclude');
     if ($exclude) {
       $filter[] = array(
         'not' => array(
           'ids' => array(
             'values' => array($exclude),
           ),
         ),
       );
     }
 
     $relationship_map = array(
       PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR =>
         $query->getParameter('authorPHIDs', array()),
       PhabricatorSearchRelationship::RELATIONSHIP_OWNER =>
         $query->getParameter('ownerPHIDs', array()),
       PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER =>
         $query->getParameter('subscriberPHIDs', array()),
       PhabricatorSearchRelationship::RELATIONSHIP_PROJECT =>
         $query->getParameter('projectPHIDs', array()),
       PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY =>
         $query->getParameter('repositoryPHIDs', array()),
     );
 
     $statuses = $query->getParameter('statuses', array());
     $statuses = array_fuse($statuses);
 
     $rel_open = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
     $rel_closed = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
     $rel_unowned = PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED;
 
     $include_open = !empty($statuses[$rel_open]);
     $include_closed = !empty($statuses[$rel_closed]);
 
     if ($include_open && !$include_closed) {
       $relationship_map[$rel_open] = true;
     } else if (!$include_open && $include_closed) {
       $relationship_map[$rel_closed] = true;
     }
 
     if ($query->getParameter('withUnowned')) {
       $relationship_map[$rel_unowned] = true;
     }
 
     foreach ($relationship_map as $field => $param) {
       if (is_array($param) && $param) {
         $should = array();
         foreach ($param as $val) {
           $should[] = array(
             'text' => array(
               "relationship.{$field}.phid" => array(
                 'query' => $val,
                 'type' => 'phrase',
               ),
             ),
           );
         }
         // We couldn't solve it by minimum_number_should_match because it can
         // match multiple owners without matching author.
         $spec[] = array('bool' => array('should' => $should));
       } else if ($param) {
         $filter[] = array(
           'exists' => array(
             'field' => "relationship.{$field}.phid",
           ),
         );
       }
     }
 
     if ($spec) {
       $spec = array('query' => array('bool' => array('must' => $spec)));
     }
 
     if ($filter) {
       $filter = array('filter' => array('and' => $filter));
       if (!$spec) {
         $spec = array('query' => array('match_all' => new stdClass()));
       }
       $spec = array(
         'query' => array(
           'filtered' => $spec + $filter,
         ),
       );
     }
 
     if (!$query->getParameter('query')) {
       $spec['sort'] = array(
         array('dateCreated' => 'desc'),
       );
     }
 
     $spec['from'] = (int)$query->getParameter('offset', 0);
     $spec['size'] = (int)$query->getParameter('limit', 25);
 
     return $spec;
   }
 
   public function executeSearch(PhabricatorSavedQuery $query) {
     $types = $query->getParameter('types');
     if (!$types) {
       $types = array_keys(
         PhabricatorSearchApplicationSearchEngine::getIndexableDocumentTypes());
     }
 
     // Don't use '/phabricator/_search' for the case that there is something
     // else in the index (for example if 'phabricator' is only an alias to
     // some bigger index).
     $uri = '/phabricator/'.implode(',', $types).'/_search';
 
     try {
       $response = $this->executeRequest($uri, $this->buildSpec($query));
     } catch (HTTPFutureResponseStatusHTTP $ex) {
       // elasticsearch probably uses Lucene query syntax:
       // http://lucene.apache.org/core/3_6_1/queryparsersyntax.html
       // Try literal search if operator search fails.
       if (!strlen($query->getParameter('query'))) {
         throw $ex;
       }
       $query = clone $query;
       $query->setParameter(
         'query',
         addcslashes(
           $query->getParameter('query'), '+-&|!(){}[]^"~*?:\\'));
       $response = $this->executeRequest($uri, $this->buildSpec($query));
     }
 
     $phids = ipull($response['hits']['hits'], '_id');
     return $phids;
   }
 
   private function executeRequest($path, array $data, $is_write = false) {
     $uri = new PhutilURI($this->uri);
     $data = json_encode($data);
 
     $uri->setPath($path);
 
     $future = new HTTPSFuture($uri, $data);
     if ($is_write) {
       $future->setMethod('PUT');
     }
     if ($this->getTimeout()) {
       $future->setTimeout($this->getTimeout());
     }
     list($body) = $future->resolvex();
 
     if ($is_write) {
       return null;
     }
 
     $body = json_decode($body, true);
     if (!is_array($body)) {
-      throw new Exception("elasticsearch server returned invalid JSON!");
+      throw new Exception('elasticsearch server returned invalid JSON!');
     }
 
     return $body;
   }
 
 }
diff --git a/src/applications/search/engine/PhabricatorSearchEngineMySQL.php b/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
index 91603749b..704fedce8 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
@@ -1,339 +1,339 @@
 <?php
 
 /**
  * @group search
  */
 final class PhabricatorSearchEngineMySQL extends PhabricatorSearchEngine {
 
   public function reindexAbstractDocument(
     PhabricatorSearchAbstractDocument $doc) {
 
     $phid = $doc->getPHID();
     if (!$phid) {
-      throw new Exception("Document has no PHID!");
+      throw new Exception('Document has no PHID!');
     }
 
     $store = new PhabricatorSearchDocument();
     $store->setPHID($doc->getPHID());
     $store->setDocumentType($doc->getDocumentType());
     $store->setDocumentTitle($doc->getDocumentTitle());
     $store->setDocumentCreated($doc->getDocumentCreated());
     $store->setDocumentModified($doc->getDocumentModified());
     $store->replace();
 
     $conn_w = $store->establishConnection('w');
 
     $field_dao = new PhabricatorSearchDocumentField();
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE phid = %s',
       $field_dao->getTableName(),
       $phid);
     foreach ($doc->getFieldData() as $field) {
       list($ftype, $corpus, $aux_phid) = $field;
       queryfx(
         $conn_w,
         'INSERT INTO %T (phid, phidType, field, auxPHID, corpus) '.
         ' VALUES (%s, %s, %s, %ns, %s)',
         $field_dao->getTableName(),
         $phid,
         $doc->getDocumentType(),
         $ftype,
         $aux_phid,
         $corpus);
     }
 
 
     $sql = array();
     foreach ($doc->getRelationshipData() as $relationship) {
       list($rtype, $to_phid, $to_type, $time) = $relationship;
       $sql[] = qsprintf(
         $conn_w,
         '(%s, %s, %s, %s, %d)',
         $phid,
         $to_phid,
         $rtype,
         $to_type,
         $time);
     }
 
     $rship_dao = new PhabricatorSearchDocumentRelationship();
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE phid = %s',
       $rship_dao->getTableName(),
       $phid);
     if ($sql) {
       queryfx(
         $conn_w,
         'INSERT INTO %T'.
         ' (phid, relatedPHID, relation, relatedType, relatedTime) '.
         ' VALUES %Q',
         $rship_dao->getTableName(),
         implode(', ', $sql));
     }
 
   }
 
   /**
    * Rebuild the PhabricatorSearchAbstractDocument that was used to index
    * an object out of the index itself. This is primarily useful for debugging,
    * as it allows you to inspect the search index representation of a
    * document.
    *
    * @param  phid PHID of a document which exists in the search index.
    * @return null|PhabricatorSearchAbstractDocument Abstract document object
    *           which corresponds to the original abstract document used to
    *           build the document index.
    */
   public function reconstructDocument($phid) {
     $dao_doc = new PhabricatorSearchDocument();
     $dao_field = new PhabricatorSearchDocumentField();
     $dao_relationship = new PhabricatorSearchDocumentRelationship();
 
     $t_doc = $dao_doc->getTableName();
     $t_field = $dao_field->getTableName();
     $t_relationship = $dao_relationship->getTableName();
 
     $doc = queryfx_one(
       $dao_doc->establishConnection('r'),
       'SELECT * FROM %T WHERE phid = %s',
       $t_doc,
       $phid);
 
     if (!$doc) {
       return null;
     }
 
     $fields = queryfx_all(
       $dao_field->establishConnection('r'),
       'SELECT * FROM %T WHERE phid = %s',
       $t_field,
       $phid);
 
     $relationships = queryfx_all(
       $dao_relationship->establishConnection('r'),
       'SELECT * FROM %T WHERE phid = %s',
       $t_relationship,
       $phid);
 
     $adoc = id(new PhabricatorSearchAbstractDocument())
       ->setPHID($phid)
       ->setDocumentType($doc['documentType'])
       ->setDocumentTitle($doc['documentTitle'])
       ->setDocumentCreated($doc['documentCreated'])
       ->setDocumentModified($doc['documentModified']);
 
     foreach ($fields as $field) {
       $adoc->addField(
         $field['field'],
         $field['corpus'],
         $field['auxPHID']);
     }
 
     foreach ($relationships as $relationship) {
       $adoc->addRelationship(
         $relationship['relation'],
         $relationship['relatedPHID'],
         $relationship['relatedType'],
         $relationship['relatedTime']);
     }
 
     return $adoc;
   }
 
   public function executeSearch(PhabricatorSavedQuery $query) {
 
     $where = array();
     $join  = array();
     $order = 'ORDER BY documentCreated DESC';
 
     $dao_doc = new PhabricatorSearchDocument();
     $dao_field = new PhabricatorSearchDocumentField();
 
     $t_doc   = $dao_doc->getTableName();
     $t_field = $dao_field->getTableName();
 
     $conn_r = $dao_doc->establishConnection('r');
 
     $q = $query->getParameter('query');
 
     if (strlen($q)) {
      $join[] = qsprintf(
         $conn_r,
         '%T field ON field.phid = document.phid',
         $t_field);
       $where[] = qsprintf(
         $conn_r,
         'MATCH(corpus) AGAINST (%s IN BOOLEAN MODE)',
         $q);
 
       // When searching for a string, promote user listings above other
       // listings.
       $order = qsprintf(
         $conn_r,
         'ORDER BY
           IF(documentType = %s, 0, 1) ASC,
           MAX(MATCH(corpus) AGAINST (%s)) DESC',
         'USER',
         $q);
 
       $field = $query->getParameter('field');
       if ($field) {
         $where[] = qsprintf(
           $conn_r,
           'field.field = %s',
           $field);
       }
     }
 
     $exclude = $query->getParameter('exclude');
     if ($exclude) {
       $where[] = qsprintf($conn_r, 'document.phid != %s', $exclude);
     }
 
     $types = $query->getParameter('types');
     if ($types) {
       if (strlen($q)) {
         $where[] = qsprintf(
           $conn_r,
           'field.phidType IN (%Ls)',
           $types);
       }
       $where[] = qsprintf(
         $conn_r,
         'document.documentType IN (%Ls)',
         $types);
     }
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'authorPHIDs',
       PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR);
 
     $statuses = $query->getParameter('statuses', array());
     $statuses = array_fuse($statuses);
     $open_rel = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
     $closed_rel = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
     $include_open = !empty($statuses[$open_rel]);
     $include_closed = !empty($statuses[$closed_rel]);
 
     if ($include_open && !$include_closed) {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'statuses',
         $open_rel,
         true);
     } else if ($include_closed && !$include_open) {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'statuses',
         $closed_rel,
         true);
     }
 
     if ($query->getParameter('withUnowned')) {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'withUnowned',
         PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
         true);
     } else {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'ownerPHIDs',
         PhabricatorSearchRelationship::RELATIONSHIP_OWNER);
     }
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'subscriberPHIDs',
       PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER);
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'projectPHIDs',
       PhabricatorSearchRelationship::RELATIONSHIP_PROJECT);
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'repository',
       PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY);
 
     $join = array_filter($join);
 
     foreach ($join as $key => $clause) {
       $join[$key] = ' JOIN '.$clause;
     }
     $join = implode(' ', $join);
 
     if ($where) {
       $where = 'WHERE '.implode(' AND ', $where);
     } else {
       $where = '';
     }
 
     $offset = (int)$query->getParameter('offset', 0);
     $limit  = (int)$query->getParameter('limit', 25);
 
     $hits = queryfx_all(
       $conn_r,
       'SELECT
         document.phid
         FROM %T document
           %Q
           %Q
         GROUP BY document.phid
           %Q
         LIMIT %d, %d',
       $t_doc,
       $join,
       $where,
       $order,
       $offset,
       $limit);
 
     return ipull($hits, 'phid');
   }
 
   protected function joinRelationship(
     AphrontDatabaseConnection $conn,
     PhabricatorSavedQuery $query,
     $field,
     $type,
     $is_existence = false) {
 
     $sql = qsprintf(
       $conn,
       '%T AS %C ON %C.phid = document.phid AND %C.relation = %s',
       id(new PhabricatorSearchDocumentRelationship())->getTableName(),
       $field,
       $field,
       $field,
       $type);
 
     if (!$is_existence) {
       $phids = $query->getParameter($field, array());
       if (!$phids) {
         return null;
       }
       $sql .= qsprintf(
         $conn,
         ' AND %C.relatedPHID in (%Ls)',
         $field,
         $phids);
     }
 
     return $sql;
   }
 
 
 }
diff --git a/src/applications/search/storage/PhabricatorSavedQuery.php b/src/applications/search/storage/PhabricatorSavedQuery.php
index 0fc1296c8..910b7d458 100644
--- a/src/applications/search/storage/PhabricatorSavedQuery.php
+++ b/src/applications/search/storage/PhabricatorSavedQuery.php
@@ -1,70 +1,70 @@
 <?php
 
 /**
  * @group search
  */
 final class PhabricatorSavedQuery extends PhabricatorSearchDAO
   implements PhabricatorPolicyInterface {
 
   protected $parameters = array();
   protected $queryKey;
   protected $engineClassName;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(
         'parameters' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function setParameter($key, $value) {
     $this->parameters[$key] = $value;
     return $this;
   }
 
   public function getParameter($key, $default = null) {
     return idx($this->parameters, $key, $default);
   }
 
   public function save() {
     if ($this->getEngineClassName() === null) {
-      throw new Exception(pht("Engine class is null."));
+      throw new Exception(pht('Engine class is null.'));
     }
 
     // Instantiate the engine to make sure it's valid.
     $this->newEngine();
 
     $serial = $this->getEngineClassName().serialize($this->parameters);
     $this->queryKey = PhabricatorHash::digestForIndex($serial);
 
     return parent::save();
   }
 
   public function newEngine() {
     return newv($this->getEngineClassName(), array());
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_PUBLIC;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
index 2384fef44..576459ac3 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
@@ -1,140 +1,140 @@
 <?php
 
 final class PhabricatorSettingsPanelAccount
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'account';
   }
 
   public function getPanelName() {
     return pht('Account');
   }
 
   public function getPanelGroup() {
     return pht('Account Information');
   }
 
   public function processRequest(AphrontRequest $request) {
     $user = $request->getUser();
     $username = $user->getUsername();
 
     $pref_time = PhabricatorUserPreferences::PREFERENCE_TIME_FORMAT;
     $preferences = $user->loadPreferences();
 
     $errors = array();
     if ($request->isFormPost()) {
       $new_timezone = $request->getStr('timezone');
       if (in_array($new_timezone, DateTimeZone::listIdentifiers(), true)) {
         $user->setTimezoneIdentifier($new_timezone);
       } else {
         $errors[] = pht('The selected timezone is not a valid timezone.');
       }
 
       $sex = $request->getStr('sex');
       $sexes = array(PhutilPerson::SEX_MALE, PhutilPerson::SEX_FEMALE);
       if (in_array($sex, $sexes)) {
         $user->setSex($sex);
       } else {
         $user->setSex(null);
       }
 
       // Checked in runtime.
       $user->setTranslation($request->getStr('translation'));
 
       $preferences->setPreference($pref_time, $request->getStr($pref_time));
 
       if (!$errors) {
         $preferences->save();
         $user->save();
         return id(new AphrontRedirectResponse())
           ->setURI($this->getPanelURI('?saved=true'));
       }
     }
 
     $timezone_ids = DateTimeZone::listIdentifiers();
     $timezone_id_map = array_fuse($timezone_ids);
 
     $label_unknown = pht('%s updated their profile', $username);
     $label_her = pht('%s updated her profile', $username);
     $label_his = pht('%s updated his profile', $username);
 
     $sexes = array(
       PhutilPerson::SEX_UNKNOWN => $label_unknown,
       PhutilPerson::SEX_MALE => $label_his,
       PhutilPerson::SEX_FEMALE => $label_her,
     );
 
     $translations = array();
     $symbols = id(new PhutilSymbolLoader())
       ->setType('class')
       ->setAncestorClass('PhabricatorTranslation')
       ->setConcreteOnly(true)
       ->selectAndLoadSymbols();
     foreach ($symbols as $symbol) {
       $class = $symbol['name'];
       $translations[$class] = newv($class, array())->getName();
     }
     asort($translations);
     $default = PhabricatorEnv::newObjectFromConfig('translation.provider');
     $translations = array(
       '' => pht('Server Default (%s)', $default->getName()),
     ) + $translations;
 
     $form = new AphrontFormView();
     $form
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Timezone'))
           ->setName('timezone')
           ->setOptions($timezone_id_map)
           ->setValue($user->getTimezoneIdentifier()))
-      ->appendRemarkupInstructions(pht("**Choose the pronoun you prefer:**"))
+      ->appendRemarkupInstructions(pht('**Choose the pronoun you prefer:**'))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setOptions($sexes)
           ->setLabel(pht('Pronoun'))
           ->setName('sex')
           ->setValue($user->getSex()))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setOptions($translations)
           ->setLabel(pht('Translation'))
           ->setName('translation')
           ->setValue($user->getTranslation()))
       ->appendRemarkupInstructions(
         pht(
           "**Custom Date and Time Formats**\n\n".
           "You can specify custom formats which will be used when ".
           "rendering dates and times of day. Examples:\n\n".
           "| Format  | Example  | Notes |\n".
           "| ------  | -------- | ----- |\n".
           "| `g:i A` | 2:34 PM  | Default 12-hour time. |\n".
           "| `G.i a` | 02.34 pm | Alternate 12-hour time. |\n".
           "| `H:i`   | 14:34    | 24-hour time. |\n".
           "\n\n".
           "You can find a [[%s | full reference in the PHP manual]].",
-          "http://www.php.net/manual/en/function.date.php"))
+          'http://www.php.net/manual/en/function.date.php'))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Time-of-Day Format'))
           ->setName($pref_time)
           ->setCaption(
             pht('Format used when rendering a time of day.'))
           ->setValue($preferences->getPreference($pref_time)))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Account Settings')));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Account Settings'))
       ->setFormSaved($request->getStr('saved'))
       ->setFormErrors($errors)
       ->setForm($form);
 
     return array(
       $form_box,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
index 16ba31bd3..b31350074 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
@@ -1,70 +1,70 @@
 <?php
 
 final class PhabricatorSettingsPanelDiffPreferences
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'diff';
   }
 
   public function getPanelName() {
     return pht('Diff Preferences');
   }
 
   public function getPanelGroup() {
     return pht('Application Settings');
   }
 
   public function processRequest(AphrontRequest $request) {
     $user = $request->getUser();
     $preferences = $user->loadPreferences();
 
     $pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
 
     if ($request->isFormPost()) {
       $filetree = $request->getInt($pref_filetree);
 
       if ($filetree && !$preferences->getPreference($pref_filetree)) {
         $preferences->setPreference(
           PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED,
           false);
       }
 
       $preferences->setPreference($pref_filetree, $filetree);
 
       $preferences->save();
       return id(new AphrontRedirectResponse())
         ->setURI($this->getPanelURI('?saved=true'));
     }
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Show Filetree'))
           ->setName($pref_filetree)
           ->setValue($preferences->getPreference($pref_filetree))
           ->setOptions(
             array(
               0 => pht('Disable Filetree'),
               1 => pht('Enable Filetree'),
             ))
           ->setCaption(
-            pht("When looking at a revision or commit, enable a sidebar ".
-                "showing affected files. You can press %s to show or hide ".
-                "the sidebar.",
+            pht('When looking at a revision or commit, enable a sidebar '.
+                'showing affected files. You can press %s to show or hide '.
+                'the sidebar.',
                 phutil_tag('tt', array(), 'f'))))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Preferences')));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Diff Preferences'))
       ->setFormSaved($request->getBool('saved'))
       ->setForm($form);
 
     return array(
       $form_box,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
index 4205d246d..50ff17e3e 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
@@ -1,372 +1,372 @@
 <?php
 
 final class PhabricatorSettingsPanelEmailAddresses
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'email';
   }
 
   public function getPanelName() {
     return pht('Email Addresses');
   }
 
   public function getPanelGroup() {
     return pht('Email');
   }
 
   public function processRequest(AphrontRequest $request) {
     $user = $request->getUser();
     $editable = PhabricatorEnv::getEnvConfig('account.editable');
 
     $uri = $request->getRequestURI();
     $uri->setQueryParams(array());
 
     if ($editable) {
       $new = $request->getStr('new');
       if ($new) {
         return $this->returnNewAddressResponse($request, $uri, $new);
       }
 
       $delete = $request->getInt('delete');
       if ($delete) {
         return $this->returnDeleteAddressResponse($request, $uri, $delete);
       }
     }
 
     $verify = $request->getInt('verify');
     if ($verify) {
       return $this->returnVerifyAddressResponse($request, $uri, $verify);
     }
 
     $primary = $request->getInt('primary');
     if ($primary) {
       return $this->returnPrimaryAddressResponse($request, $uri, $primary);
     }
 
     $emails = id(new PhabricatorUserEmail())->loadAllWhere(
       'userPHID = %s ORDER BY address',
       $user->getPHID());
 
     $rowc = array();
     $rows = array();
     foreach ($emails as $email) {
 
       $button_verify = javelin_tag(
         'a',
         array(
           'class' => 'button small grey',
           'href'  => $uri->alter('verify', $email->getID()),
           'sigil' => 'workflow',
         ),
         pht('Verify'));
 
       $button_make_primary = javelin_tag(
         'a',
         array(
           'class' => 'button small grey',
           'href'  => $uri->alter('primary', $email->getID()),
           'sigil' => 'workflow',
         ),
         pht('Make Primary'));
 
       $button_remove = javelin_tag(
         'a',
         array(
           'class'   => 'button small grey',
           'href'    => $uri->alter('delete', $email->getID()),
           'sigil'   => 'workflow'
         ),
         pht('Remove'));
 
       $button_primary = phutil_tag(
         'a',
         array(
           'class' => 'button small disabled',
         ),
         pht('Primary'));
 
       if (!$email->getIsVerified()) {
         $action = $button_verify;
       } else if ($email->getIsPrimary()) {
         $action = $button_primary;
       } else {
         $action = $button_make_primary;
       }
 
       if ($email->getIsPrimary()) {
         $remove = $button_primary;
         $rowc[] = 'highlighted';
       } else {
         $remove = $button_remove;
         $rowc[] = null;
       }
 
       $rows[] = array(
         $email->getAddress(),
         $action,
         $remove,
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setHeaders(
       array(
         pht('Email'),
         pht('Status'),
         pht('Remove'),
       ));
     $table->setColumnClasses(
       array(
         'wide',
         'action',
         'action',
       ));
     $table->setRowClasses($rowc);
     $table->setColumnVisibility(
       array(
         true,
         true,
         $editable,
       ));
 
     $view = new PHUIObjectBoxView();
     $header = new PHUIHeaderView();
     $header->setHeader(pht('Email Addresses'));
 
     if ($editable) {
       $icon = id(new PHUIIconView())
         ->setIconFont('fa-plus');
 
       $button = new PHUIButtonView();
       $button->setText(pht('Add New Address'));
       $button->setTag('a');
       $button->setHref($uri->alter('new', 'true'));
       $button->setIcon($icon);
       $button->addSigil('workflow');
       $header->addActionLink($button);
     }
     $view->setHeader($header);
     $view->appendChild($table);
 
     return $view;
   }
 
   private function returnNewAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $new) {
 
     $user = $request->getUser();
 
     $e_email = true;
     $email   = null;
     $errors  = array();
     if ($request->isDialogFormPost()) {
       $email = trim($request->getStr('email'));
 
       if ($new == 'verify') {
         // The user clicked "Done" from the "an email has been sent" dialog.
         return id(new AphrontReloadResponse())->setURI($uri);
       }
 
       PhabricatorSystemActionEngine::willTakeAction(
         array($user->getPHID()),
         new PhabricatorSettingsAddEmailAction(),
         1);
 
       if (!strlen($email)) {
         $e_email = pht('Required');
         $errors[] = pht('Email is required.');
       } else if (!PhabricatorUserEmail::isValidAddress($email)) {
         $e_email = pht('Invalid');
         $errors[] = PhabricatorUserEmail::describeValidAddresses();
       } else if (!PhabricatorUserEmail::isAllowedAddress($email)) {
         $e_email = pht('Disallowed');
         $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
       }
 
       if (!$errors) {
         $object = id(new PhabricatorUserEmail())
           ->setAddress($email)
           ->setIsVerified(0);
 
         try {
 
           id(new PhabricatorUserEditor())
             ->setActor($user)
             ->addEmail($user, $object);
 
           $object->sendVerificationEmail($user);
 
           $dialog = id(new AphrontDialogView())
             ->setUser($user)
             ->addHiddenInput('new',  'verify')
             ->setTitle(pht('Verification Email Sent'))
             ->appendChild(phutil_tag('p', array(), pht(
               'A verification email has been sent. Click the link in the '.
               'email to verify your address.')))
             ->setSubmitURI($uri)
             ->addSubmitButton(pht('Done'));
 
           return id(new AphrontDialogResponse())->setDialog($dialog);
         } catch (AphrontQueryDuplicateKeyException $ex) {
           $email = pht('Duplicate');
           $errors[] = pht('Another user already has this email.');
         }
       }
     }
 
     if ($errors) {
       $errors = id(new AphrontErrorView())
         ->setErrors($errors);
     }
 
     $form = id(new PHUIFormLayoutView())
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Email'))
           ->setName('email')
           ->setValue($email)
           ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
           ->setError($e_email));
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->addHiddenInput('new', 'true')
       ->setTitle(pht('New Address'))
       ->appendChild($errors)
       ->appendChild($form)
       ->addSubmitButton(pht('Save'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function returnDeleteAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $email_id) {
 
     $user = $request->getUser();
 
     // NOTE: You can only delete your own email addresses, and you can not
     // delete your primary address.
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'id = %d AND userPHID = %s AND isPrimary = 0',
       $email_id,
       $user->getPHID());
 
     if (!$email) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
 
       id(new PhabricatorUserEditor())
         ->setActor($user)
         ->removeEmail($user, $email);
 
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $address = $email->getAddress();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->addHiddenInput('delete', $email_id)
       ->setTitle(pht("Really delete address '%s'?", $address))
       ->appendChild(phutil_tag('p', array(), pht(
         'Are you sure you want to delete this address? You will no '.
         'longer be able to use it to login.')))
       ->addSubmitButton(pht('Delete'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function returnVerifyAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $email_id) {
 
     $user = $request->getUser();
 
     // NOTE: You can only send more email for your unverified addresses.
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'id = %d AND userPHID = %s AND isVerified = 0',
       $email_id,
       $user->getPHID());
 
     if (!$email) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       $email->sendVerificationEmail($user);
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $address = $email->getAddress();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->addHiddenInput('verify', $email_id)
-      ->setTitle(pht("Send Another Verification Email?"))
+      ->setTitle(pht('Send Another Verification Email?'))
       ->appendChild(phutil_tag('p', array(), pht(
         'Send another copy of the verification email to %s?',
         $address)))
       ->addSubmitButton(pht('Send Email'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function returnPrimaryAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $email_id) {
 
     $user = $request->getUser();
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $user,
       $request,
       $this->getPanelURI());
 
     // NOTE: You can only make your own verified addresses primary.
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'id = %d AND userPHID = %s AND isVerified = 1 AND isPrimary = 0',
       $email_id,
       $user->getPHID());
 
     if (!$email) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
 
       id(new PhabricatorUserEditor())
         ->setActor($user)
         ->changePrimaryEmail($user, $email);
 
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $address = $email->getAddress();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->addHiddenInput('primary', $email_id)
-      ->setTitle(pht("Change primary email address?"))
+      ->setTitle(pht('Change primary email address?'))
       ->appendChild(phutil_tag('p', array(), pht(
         'If you change your primary address, Phabricator will send'.
           ' all email to %s.',
         $address)))
       ->addSubmitButton(pht('Change Primary Address'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
index f38d6c0cb..39082285d 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
@@ -1,295 +1,295 @@
 <?php
 
 final class PhabricatorSettingsPanelEmailPreferences
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'emailpreferences';
   }
 
   public function getPanelName() {
     return pht('Email Preferences');
   }
 
   public function getPanelGroup() {
     return pht('Email');
   }
 
   public function processRequest(AphrontRequest $request) {
     $user = $request->getUser();
 
     $preferences = $user->loadPreferences();
 
     $pref_re_prefix = PhabricatorUserPreferences::PREFERENCE_RE_PREFIX;
     $pref_vary = PhabricatorUserPreferences::PREFERENCE_VARY_SUBJECT;
     $pref_no_self_mail = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;
 
     $errors = array();
     if ($request->isFormPost()) {
 
       if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
         if ($request->getStr($pref_re_prefix) == 'default') {
           $preferences->unsetPreference($pref_re_prefix);
         } else {
           $preferences->setPreference(
             $pref_re_prefix,
             $request->getBool($pref_re_prefix));
         }
 
         if ($request->getStr($pref_vary) == 'default') {
           $preferences->unsetPreference($pref_vary);
         } else {
           $preferences->setPreference(
             $pref_vary,
             $request->getBool($pref_vary));
         }
       }
 
       $preferences->setPreference(
         $pref_no_self_mail,
         $request->getStr($pref_no_self_mail));
 
       $new_tags = $request->getArr('mailtags');
       $mailtags = $preferences->getPreference('mailtags', array());
       $all_tags = $this->getMailTags();
 
       $maniphest = 'PhabricatorApplicationManiphest';
       if (!PhabricatorApplication::isClassInstalled($maniphest)) {
         $all_tags = array_diff_key($all_tags, $this->getManiphestMailTags());
       }
 
       foreach ($all_tags as $key => $label) {
         $mailtags[$key] = (bool)idx($new_tags, $key, false);
       }
       $preferences->setPreference('mailtags', $mailtags);
 
       $preferences->save();
 
       return id(new AphrontRedirectResponse())
         ->setURI($this->getPanelURI('?saved=true'));
     }
 
     $re_prefix_default = PhabricatorEnv::getEnvConfig('metamta.re-prefix')
       ? pht('Enabled')
       : pht('Disabled');
 
     $vary_default = PhabricatorEnv::getEnvConfig('metamta.vary-subjects')
       ? pht('Vary')
       : pht('Do Not Vary');
 
     $re_prefix_value = $preferences->getPreference($pref_re_prefix);
     if ($re_prefix_value === null) {
       $re_prefix_value = 'default';
     } else {
       $re_prefix_value = $re_prefix_value
         ? 'true'
         : 'false';
     }
 
     $vary_value = $preferences->getPreference($pref_vary);
     if ($vary_value === null) {
       $vary_value = 'default';
     } else {
       $vary_value = $vary_value
         ? 'true'
         : 'false';
     }
 
     $form = new AphrontFormView();
     $form
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Self Actions'))
           ->setName($pref_no_self_mail)
           ->setOptions(
             array(
               '0' => pht('Send me an email when I take an action'),
               '1' => pht('Do not send me an email when I take an action'),
             ))
           ->setCaption(pht('You can disable email about your own actions.'))
           ->setValue($preferences->getPreference($pref_no_self_mail, 0)));
 
     if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
       $re_control = id(new AphrontFormSelectControl())
         ->setName($pref_re_prefix)
         ->setOptions(
           array(
             'default'   => pht('Use Server Default (%s)', $re_prefix_default),
             'true'      => pht('Enable "Re:" prefix'),
             'false'     => pht('Disable "Re:" prefix'),
           ))
         ->setValue($re_prefix_value);
 
       $vary_control = id(new AphrontFormSelectControl())
         ->setName($pref_vary)
         ->setOptions(
           array(
             'default'   => pht('Use Server Default (%s)', $vary_default),
             'true'      => pht('Vary Subjects'),
             'false'     => pht('Do Not Vary Subjects'),
           ))
         ->setValue($vary_value);
     } else {
       $re_control = id(new AphrontFormStaticControl())
         ->setValue('Server Default ('.$re_prefix_default.')');
 
       $vary_control = id(new AphrontFormStaticControl())
         ->setValue('Server Default ('.$vary_default.')');
     }
 
     $form
       ->appendChild(
         $re_control
           ->setLabel(pht('Add "Re:" Prefix'))
           ->setCaption(
             pht('Enable this option to fix threading in Mail.app on OS X Lion,'.
             ' or if you like "Re:" in your email subjects.')))
       ->appendChild(
         $vary_control
           ->setLabel(pht('Vary Subjects'))
           ->setCaption(
             pht('This option adds more information to email subjects, but may '.
             'break threading in some clients.')));
 
     $mailtags = $preferences->getPreference('mailtags', array());
 
     $form->appendChild(
       id(new PHUIFormDividerControl()));
 
     $form->appendRemarkupInstructions(
       pht(
         'You can customize which kinds of events you receive email for '.
         'here. If you turn off email for a certain type of event, you '.
         'will receive an unread notification in Phabricator instead.'.
         "\n\n".
         'Phabricator notifications (shown in the menu bar) which you receive '.
         'an email for are marked read by default in Phabricator. If you turn '.
         'off email for a certain type of event, the corresponding '.
         'notification will not be marked read.'.
         "\n\n".
         'Note that if an update makes several changes (like adding CCs to a '.
         'task, closing it, and adding a comment) you will still receive '.
         'an email as long as at least one of the changes is set to notify '.
         'you.'.
         "\n\n".
         'These preferences **only** apply to objects you are connected to '.
         '(for example, Revisions where you are a reviewer or tasks you are '.
         'CC\'d on). To receive email alerts when other objects are created, '.
         'configure [[ /herald/ | Herald Rules ]].'.
         "\n\n".
         '**Phabricator will send an email to your primary account when:**'));
 
     $form
       ->appendChild(
         $this->buildMailTagCheckboxes(
           $this->getDifferentialMailTags(),
           $mailtags)
           ->setLabel(pht('Differential')));
 
     $maniphest = 'PhabricatorApplicationManiphest';
     if (PhabricatorApplication::isClassInstalled($maniphest)) {
       $form->appendChild(
         $this->buildMailTagCheckboxes(
           $this->getManiphestMailTags(),
           $mailtags)
           ->setLabel(pht('Maniphest')));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Preferences')));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Email Preferences'))
       ->setFormSaved($request->getStr('saved'))
       ->setFormErrors($errors)
       ->setForm($form);
 
     return id(new AphrontNullView())
       ->appendChild(
         array(
           $form_box,
         ));
   }
 
   private function getMailTags() {
     return array(
       MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEW_REQUEST =>
-        pht("A revision is created."),
+        pht('A revision is created.'),
       MetaMTANotificationType::TYPE_DIFFERENTIAL_UPDATED =>
-        pht("A revision is updated."),
+        pht('A revision is updated.'),
       MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT =>
-        pht("Someone comments on a revision."),
+        pht('Someone comments on a revision.'),
       MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS =>
         pht("A revision's reviewers change."),
       MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED =>
-        pht("A revision is closed."),
+        pht('A revision is closed.'),
       MetaMTANotificationType::TYPE_DIFFERENTIAL_CC =>
         pht("A revision's CCs change."),
       MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER =>
-        pht("Other revision activity not listed above occurs."),
+        pht('Other revision activity not listed above occurs.'),
       MetaMTANotificationType::TYPE_MANIPHEST_STATUS =>
         pht("A task's status changes."),
       MetaMTANotificationType::TYPE_MANIPHEST_OWNER =>
         pht("A task's owner changes."),
       MetaMTANotificationType::TYPE_MANIPHEST_COMMENT =>
-        pht("Someone comments on a task."),
+        pht('Someone comments on a task.'),
       MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY =>
         pht("A task's priority changes."),
       MetaMTANotificationType::TYPE_MANIPHEST_CC =>
         pht("A task's CCs change."),
       MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS =>
         pht("A task's associated projects change."),
       MetaMTANotificationType::TYPE_MANIPHEST_OTHER =>
-        pht("Other task activity not listed above occurs."),
+        pht('Other task activity not listed above occurs.'),
 
     );
   }
 
   private function getManiphestMailTags() {
     return array_select_keys(
       $this->getMailTags(),
       array(
         MetaMTANotificationType::TYPE_MANIPHEST_STATUS,
         MetaMTANotificationType::TYPE_MANIPHEST_OWNER,
         MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY,
         MetaMTANotificationType::TYPE_MANIPHEST_CC,
         MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS,
         MetaMTANotificationType::TYPE_MANIPHEST_COMMENT,
         MetaMTANotificationType::TYPE_MANIPHEST_OTHER,
       ));
   }
 
   private function getDifferentialMailTags() {
     return array_select_keys(
       $this->getMailTags(),
       array(
         MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEW_REQUEST,
         MetaMTANotificationType::TYPE_DIFFERENTIAL_UPDATED,
         MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT,
         MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED,
         MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS,
         MetaMTANotificationType::TYPE_DIFFERENTIAL_CC,
         MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER,
       ));
   }
 
   private function buildMailTagCheckboxes(
     array $tags,
     array $prefs) {
 
     $control = new AphrontFormCheckboxControl();
     foreach ($tags as $key => $label) {
       $control->addCheckbox(
         'mailtags['.$key.']',
         1,
         $label,
         idx($prefs, $key, 1));
     }
 
     return $control;
   }
 
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
index e78fdc4ae..bfa7c3a07 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
@@ -1,422 +1,422 @@
 <?php
 
 final class PhabricatorSettingsPanelSSHKeys
   extends PhabricatorSettingsPanel {
 
   public function isEditableByAdministrators() {
     return true;
   }
 
   public function getPanelKey() {
     return 'ssh';
   }
 
   public function getPanelName() {
     return pht('SSH Public Keys');
   }
 
   public function getPanelGroup() {
     return pht('Authentication');
   }
 
   public function isEnabled() {
     return true;
   }
 
   public function processRequest(AphrontRequest $request) {
     $viewer = $request->getUser();
     $user = $this->getUser();
 
     $generate = $request->getStr('generate');
     if ($generate) {
       return $this->processGenerate($request);
     }
 
     $edit = $request->getStr('edit');
     $delete = $request->getStr('delete');
     if (!$edit && !$delete) {
       return $this->renderKeyListView($request);
     }
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $viewer,
       $request,
       $this->getPanelURI());
 
     $id = nonempty($edit, $delete);
 
     if ($id && is_numeric($id)) {
       // NOTE: This prevents editing/deleting of keys not owned by the user.
       $key = id(new PhabricatorUserSSHKey())->loadOneWhere(
         'userPHID = %s AND id = %d',
         $user->getPHID(),
         (int)$id);
       if (!$key) {
         return new Aphront404Response();
       }
     } else {
       $key = new PhabricatorUserSSHKey();
       $key->setUserPHID($user->getPHID());
     }
 
     if ($delete) {
       return $this->processDelete($request, $key);
     }
 
     $e_name = true;
     $e_key = true;
     $errors = array();
     $entire_key = $key->getEntireKey();
     if ($request->isFormPost()) {
       $key->setName($request->getStr('name'));
       $entire_key = $request->getStr('key');
 
       if (!strlen($entire_key)) {
         $errors[] = pht('You must provide an SSH Public Key.');
         $e_key = pht('Required');
       } else {
 
         try {
           list($type, $body, $comment) = self::parsePublicKey($entire_key);
 
           $key->setKeyType($type);
           $key->setKeyBody($body);
           $key->setKeyHash(md5($body));
           $key->setKeyComment($comment);
 
           $e_key = null;
         } catch (Exception $ex) {
           $e_key = pht('Invalid');
           $errors[] = $ex->getMessage();
         }
       }
 
       if (!strlen($key->getName())) {
         $errors[] = pht('You must name this public key.');
         $e_name = pht('Required');
       } else {
         $e_name = null;
       }
 
       if (!$errors) {
         try {
           $key->save();
           return id(new AphrontRedirectResponse())
             ->setURI($this->getPanelURI());
         } catch (AphrontQueryDuplicateKeyException $ex) {
           $e_key = pht('Duplicate');
           $errors[] = pht('This public key is already associated with a user '.
                       'account.');
         }
       }
     }
 
     $is_new = !$key->getID();
 
     if ($is_new) {
       $header = pht('Add New SSH Public Key');
       $save = pht('Add Key');
     } else {
       $header = pht('Edit SSH Public Key');
       $save   = pht('Save Changes');
     }
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->addHiddenInput('edit', $is_new ? 'true' : $key->getID())
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Name'))
           ->setName('name')
           ->setValue($key->getName())
           ->setError($e_name))
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Public Key'))
           ->setName('key')
           ->setValue($entire_key)
           ->setError($e_key))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($this->getPanelURI())
           ->setValue($save));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($header)
       ->setFormErrors($errors)
       ->setForm($form);
 
     return $form_box;
   }
 
   private function renderKeyListView(AphrontRequest $request) {
     $user = $this->getUser();
     $viewer = $request->getUser();
 
     $keys = id(new PhabricatorUserSSHKey())->loadAllWhere(
       'userPHID = %s',
       $user->getPHID());
 
     $rows = array();
     foreach ($keys as $key) {
       $rows[] = array(
         phutil_tag(
           'a',
           array(
             'href' => $this->getPanelURI('?edit='.$key->getID()),
           ),
           $key->getName()),
         $key->getKeyComment(),
         $key->getKeyType(),
         phabricator_date($key->getDateCreated(), $viewer),
         phabricator_time($key->getDateCreated(), $viewer),
         javelin_tag(
           'a',
           array(
             'href' => $this->getPanelURI('?delete='.$key->getID()),
             'class' => 'small grey button',
             'sigil' => 'workflow',
           ),
           pht('Delete')),
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setNoDataString(pht("You haven't added any SSH Public Keys."));
     $table->setHeaders(
       array(
         pht('Name'),
         pht('Comment'),
         pht('Type'),
         pht('Created'),
         pht('Time'),
         '',
       ));
     $table->setColumnClasses(
       array(
         'wide pri',
         '',
         '',
         '',
         'right',
         'action',
       ));
 
     $panel = new PHUIObjectBoxView();
     $header = new PHUIHeaderView();
 
     $upload_icon = id(new PHUIIconView())
       ->setIconFont('fa-upload');
     $upload_button = id(new PHUIButtonView())
       ->setText(pht('Upload Public Key'))
       ->setHref($this->getPanelURI('?edit=true'))
       ->setTag('a')
       ->setIcon($upload_icon);
 
     try {
       PhabricatorSSHKeyGenerator::assertCanGenerateKeypair();
       $can_generate = true;
     } catch (Exception $ex) {
       $can_generate = false;
     }
 
     $generate_icon = id(new PHUIIconView())
       ->setIconFont('fa-lock');
     $generate_button = id(new PHUIButtonView())
       ->setText(pht('Generate Keypair'))
       ->setHref($this->getPanelURI('?generate=true'))
       ->setTag('a')
       ->setWorkflow(true)
       ->setDisabled(!$can_generate)
       ->setIcon($generate_icon);
 
     $header->setHeader(pht('SSH Public Keys'));
     $header->addActionLink($generate_button);
     $header->addActionLink($upload_button);
 
     $panel->setHeader($header);
     $panel->appendChild($table);
 
     return $panel;
   }
 
   private function processDelete(
     AphrontRequest $request,
     PhabricatorUserSSHKey $key) {
 
     $viewer = $request->getUser();
     $user = $this->getUser();
 
     $name = phutil_tag('strong', array(), $key->getName());
 
     if ($request->isDialogFormPost()) {
       $key->delete();
       return id(new AphrontReloadResponse())
         ->setURI($this->getPanelURI());
     }
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->addHiddenInput('delete', $key->getID())
       ->setTitle(pht('Really delete SSH Public Key?'))
       ->appendChild(phutil_tag('p', array(), pht(
         'The key "%s" will be permanently deleted, and you will not longer be '.
           'able to use the corresponding private key to authenticate.',
         $name)))
       ->addSubmitButton(pht('Delete Public Key'))
       ->addCancelButton($this->getPanelURI());
 
     return id(new AphrontDialogResponse())
       ->setDialog($dialog);
   }
 
   private function processGenerate(AphrontRequest $request) {
     $user = $this->getUser();
     $viewer = $request->getUser();
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $viewer,
       $request,
       $this->getPanelURI());
 
 
     $is_self = ($user->getPHID() == $viewer->getPHID());
 
     if ($request->isFormPost()) {
       $keys = PhabricatorSSHKeyGenerator::generateKeypair();
       list($public_key, $private_key) = $keys;
 
       $file = PhabricatorFile::buildFromFileDataOrHash(
         $private_key,
         array(
           'name' => 'id_rsa_phabricator.key',
           'ttl' => time() + (60 * 10),
           'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
         ));
 
       list($type, $body, $comment) = self::parsePublicKey($public_key);
 
       $key = id(new PhabricatorUserSSHKey())
         ->setUserPHID($user->getPHID())
         ->setName('id_rsa_phabricator')
         ->setKeyType($type)
         ->setKeyBody($body)
         ->setKeyHash(md5($body))
         ->setKeyComment(pht('Generated'))
         ->save();
 
       // NOTE: We're disabling workflow on submit so the download works. We're
       // disabling workflow on cancel so the page reloads, showing the new
       // key.
 
       if ($is_self) {
         $what_happened = pht(
           'The public key has been associated with your Phabricator '.
           'account. Use the button below to download the private key.');
       } else {
         $what_happened = pht(
           'The public key has been associated with the %s account. '.
           'Use the button below to download the private key.',
           phutil_tag('strong', array(), $user->getUsername()));
       }
 
       $dialog = id(new AphrontDialogView())
         ->setTitle(pht('Download Private Key'))
         ->setUser($viewer)
         ->setDisableWorkflowOnCancel(true)
         ->setDisableWorkflowOnSubmit(true)
         ->setSubmitURI($file->getDownloadURI())
         ->appendParagraph(
           pht(
             'Successfully generated a new keypair.'))
         ->appendParagraph($what_happened)
         ->appendParagraph(
           pht(
             'After you download the private key, it will be destroyed. '.
             'You will not be able to retrieve it if you lose your copy.'))
         ->addSubmitButton(pht('Download Private Key'))
         ->addCancelButton($this->getPanelURI(), pht('Done'));
 
       return id(new AphrontDialogResponse())
         ->setDialog($dialog);
     }
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->addCancelButton($this->getPanelURI());
 
     try {
       PhabricatorSSHKeyGenerator::assertCanGenerateKeypair();
 
       if ($is_self) {
         $explain = pht(
           'This will generate an SSH keypair, associate the public key '.
           'with your account, and let you download the private key.');
       } else {
         $explain = pht(
           'This will generate an SSH keypair, associate the public key with '.
           'the %s account, and let you download the private key.',
           phutil_tag('strong', array(), $user->getUsername()));
       }
 
       $dialog
         ->addHiddenInput('generate', true)
         ->setTitle(pht('Generate New Keypair'))
         ->appendParagraph($explain)
         ->appendParagraph(
           pht(
-            "Phabricator will not retain a copy of the private key."))
+            'Phabricator will not retain a copy of the private key.'))
         ->addSubmitButton(pht('Generate Keypair'));
     } catch (Exception $ex) {
       $dialog
         ->setTitle(pht('Unable to Generate Keys'))
         ->appendParagraph($ex->getMessage());
     }
 
     return id(new AphrontDialogResponse())
       ->setDialog($dialog);
   }
 
   private static function parsePublicKey($entire_key) {
     $parts = str_replace("\n", '', trim($entire_key));
     $parts = preg_split('/\s+/', $parts);
 
     if (count($parts) == 2) {
       $parts[] = ''; // Add an empty comment part.
     } else if (count($parts) == 3) {
       // This is the expected case.
     } else {
       if (preg_match('/private\s*key/i', $entire_key)) {
         // Try to give the user a better error message if it looks like
         // they uploaded a private key.
         throw new Exception(
           pht('Provide your public key, not your private key!'));
       } else {
         throw new Exception(
           pht('Provided public key is not properly formatted.'));
       }
     }
 
     list($type, $body, $comment) = $parts;
 
     $recognized_keys = array(
       'ssh-dsa',
       'ssh-dss',
       'ssh-rsa',
       'ecdsa-sha2-nistp256',
       'ecdsa-sha2-nistp384',
       'ecdsa-sha2-nistp521',
     );
 
     if (!in_array($type, $recognized_keys)) {
       $type_list = implode(', ', $recognized_keys);
       throw new Exception(
         pht(
           'Public key type should be one of: %s',
           $type_list));
     }
 
     return array($type, $body, $comment);
   }
 
 }
diff --git a/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php b/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
index 0102cff9c..4874f56a0 100644
--- a/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
+++ b/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
@@ -1,47 +1,47 @@
 <?php
 
 /**
  * @group conduit
  */
 final class ConduitAPI_slowvote_info_Method
   extends ConduitAPI_slowvote_Method {
 
   public function getMethodDescription() {
-    return "Retrieve an array of information about a poll.";
+    return 'Retrieve an array of information about a poll.';
   }
 
   public function defineParamTypes() {
     return array(
       'poll_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_POLL' => 'No such poll exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $poll_id = $request->getValue('poll_id');
     $poll = id(new PhabricatorSlowvotePoll())->load($poll_id);
     if (!$poll) {
       throw new ConduitException('ERR_BAD_POLL');
     }
 
     $result = array(
       'id'          => $poll->getID(),
       'phid'        => $poll->getPHID(),
       'authorPHID'  => $poll->getAuthorPHID(),
       'question'    => $poll->getQuestion(),
       'uri'         => PhabricatorEnv::getProductionURI('/V'.$poll->getID()),
     );
 
     return $result;
   }
 
 }
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
index 4154fa302..9d7482a76 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
@@ -1,258 +1,258 @@
 <?php
 
 /**
  * @group slowvote
  */
 final class PhabricatorSlowvoteEditController
   extends PhabricatorSlowvoteController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($this->id) {
       $poll = id(new PhabricatorSlowvoteQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$poll) {
         return new Aphront404Response();
       }
       $is_new = false;
     } else {
       $poll = PhabricatorSlowvotePoll::initializeNewPoll($user);
       $is_new = true;
     }
 
     $e_question = true;
     $e_response = true;
     $errors = array();
 
     $v_question = $poll->getQuestion();
     $v_description = $poll->getDescription();
     $v_responses = $poll->getResponseVisibility();
     $v_shuffle = $poll->getShuffle();
 
     $responses = $request->getArr('response');
     if ($request->isFormPost()) {
       $v_question = $request->getStr('question');
       $v_description = $request->getStr('description');
       $v_responses = (int)$request->getInt('responses');
       $v_shuffle = (int)$request->getBool('shuffle');
       $v_view_policy = $request->getStr('viewPolicy');
 
       if ($is_new) {
         $poll->setMethod($request->getInt('method'));
       }
 
       if (!strlen($v_question)) {
         $e_question = pht('Required');
         $errors[] = pht('You must ask a poll question.');
       } else {
         $e_question = null;
       }
 
       if ($is_new) {
         $responses = array_filter($responses);
         if (empty($responses)) {
           $errors[] = pht('You must offer at least one response.');
           $e_response = pht('Required');
         } else {
           $e_response = null;
         }
       }
 
       $xactions = array();
       $template = id(new PhabricatorSlowvoteTransaction());
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_QUESTION)
         ->setNewValue($v_question);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_DESCRIPTION)
         ->setNewValue($v_description);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_RESPONSES)
         ->setNewValue($v_responses);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_SHUFFLE)
         ->setNewValue($v_shuffle);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
         ->setNewValue($v_view_policy);
 
       if (empty($errors)) {
         $editor = id(new PhabricatorSlowvoteEditor())
           ->setActor($user)
           ->setContinueOnNoEffect(true)
           ->setContentSourceFromRequest($request);
 
         $xactions = $editor->applyTransactions($poll, $xactions);
 
         if ($is_new) {
           $poll->save();
 
           foreach ($responses as $response) {
             $option = new PhabricatorSlowvoteOption();
             $option->setName($response);
             $option->setPollID($poll->getID());
             $option->save();
           }
         }
 
         return id(new AphrontRedirectResponse())
           ->setURI('/V'.$poll->getID());
       } else {
         $poll->setViewPolicy($v_view_policy);
       }
     }
 
     $instructions =
       phutil_tag(
         'p',
         array(
           'class' => 'aphront-form-instructions',
         ),
         pht('Resolve issues and build consensus through '.
           'protracted deliberation.'));
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild($instructions)
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
           ->setLabel(pht('Question'))
           ->setName('question')
           ->setValue($v_question)
           ->setError($e_question))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setLabel(pht('Description'))
           ->setName('description')
           ->setValue($v_description));
 
     if ($is_new) {
       for ($ii = 0; $ii < 10; $ii++) {
         $n = ($ii + 1);
         $response = id(new AphrontFormTextControl())
-          ->setLabel(pht("Response %d", $n))
+          ->setLabel(pht('Response %d', $n))
           ->setName('response[]')
           ->setValue(idx($responses, $ii, ''));
 
         if ($ii == 0) {
           $response->setError($e_response);
         }
 
         $form->appendChild($response);
       }
     }
 
     $poll_type_options = array(
       PhabricatorSlowvotePoll::METHOD_PLURALITY =>
         pht('Plurality (Single Choice)'),
       PhabricatorSlowvotePoll::METHOD_APPROVAL  =>
         pht('Approval (Multiple Choice)'),
     );
 
     $response_type_options = array(
       PhabricatorSlowvotePoll::RESPONSES_VISIBLE
         => pht('Allow anyone to see the responses'),
       PhabricatorSlowvotePoll::RESPONSES_VOTERS
         => pht('Require a vote to see the responses'),
       PhabricatorSlowvotePoll::RESPONSES_OWNER
         => pht('Only I can see the responses'),
     );
 
     if ($is_new) {
       $form->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Vote Type'))
           ->setName('method')
           ->setValue($poll->getMethod())
           ->setOptions($poll_type_options));
     } else {
       $form->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Vote Type'))
           ->setValue(idx($poll_type_options, $poll->getMethod())));
     }
 
     if ($is_new) {
       $title = pht('Create Slowvote');
       $button = pht('Create');
       $cancel_uri = $this->getApplicationURI();
     } else {
       $title = pht('Edit %s', 'V'.$poll->getID());
       $button = pht('Save Changes');
       $cancel_uri = '/V'.$poll->getID();
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($user)
       ->setObject($poll)
       ->execute();
 
     $form
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Responses'))
           ->setName('responses')
           ->setValue($v_responses)
           ->setOptions($response_type_options))
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->setLabel(pht('Shuffle'))
           ->addCheckbox(
             'shuffle',
             1,
             pht('Show choices in random order.'),
             $v_shuffle))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($user)
           ->setName('viewPolicy')
           ->setPolicyObject($poll)
           ->setPolicies($policies)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue($button)
           ->addCancelButton($cancel_uri));
 
     $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
     $crumbs->addTextCrumb($title);
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
         'device' => true,
       ));
   }
 
 }
diff --git a/src/applications/slowvote/view/SlowvoteEmbedView.php b/src/applications/slowvote/view/SlowvoteEmbedView.php
index 057428805..6e18e4b3c 100644
--- a/src/applications/slowvote/view/SlowvoteEmbedView.php
+++ b/src/applications/slowvote/view/SlowvoteEmbedView.php
@@ -1,362 +1,362 @@
 <?php
 
 /**
  * @group slowvote
  */
 final class SlowvoteEmbedView extends AphrontView {
 
   private $poll;
   private $handles;
   private $headless;
 
   public function setHeadless($headless) {
     $this->headless = $headless;
     return $this;
   }
 
   public function setPoll(PhabricatorSlowvotePoll $poll) {
     $this->poll = $poll;
     return $this;
   }
 
   public function getPoll() {
     return $this->poll;
   }
 
   public function render() {
     if (!$this->poll) {
-      throw new Exception("Call setPoll() before render()!");
+      throw new Exception('Call setPoll() before render()!');
     }
 
     $poll = $this->poll;
 
     $phids = array();
     foreach ($poll->getChoices() as $choice) {
       $phids[] = $choice->getAuthorPHID();
     }
     $phids[] = $poll->getAuthorPHID();
 
     $this->handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $options = $poll->getOptions();
 
     if ($poll->getShuffle()) {
       shuffle($options);
     }
 
     require_celerity_resource('phabricator-slowvote-css');
     require_celerity_resource('javelin-behavior-slowvote-embed');
 
     $config = array(
       'pollID' => $poll->getID());
     Javelin::initBehavior('slowvote-embed', $config);
 
     $user_choices = $poll->getViewerChoices($this->getUser());
     $user_choices = mpull($user_choices, 'getOptionID', 'getOptionID');
 
     $out = array();
     foreach ($options as $option) {
       $is_selected = isset($user_choices[$option->getID()]);
       $out[] = $this->renderLabel($option, $is_selected);
     }
 
     $link_to_slowvote = phutil_tag(
       'a',
       array(
         'href' => '/V'.$poll->getID()
       ),
       $poll->getQuestion());
 
     if ($this->headless) {
       $header = null;
     } else {
       $header = phutil_tag(
         'div',
         array(
           'class' => 'slowvote-header',
         ),
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-header-content',
           ),
           array(
             'V'.$poll->getID(),
             ' ',
             $link_to_slowvote)));
 
       $description = null;
       if ($poll->getDescription()) {
         $description = PhabricatorMarkupEngine::renderOneObject(
           id(new PhabricatorMarkupOneOff())->setContent(
             $poll->getDescription()),
           'default',
           $this->getUser());
         $description = phutil_tag(
           'div',
           array(
             'class' => 'slowvote-description',
           ),
           $description);
       }
 
       $header = array(
         $header,
         $description);
     }
 
     $vis = $poll->getResponseVisibility();
     if ($this->areResultsVisible()) {
       if ($vis == PhabricatorSlowvotePoll::RESPONSES_OWNER) {
         $quip = pht('Only you can see the results.');
       } else {
         $quip = pht('Voting improves cardiovascular endurance.');
       }
     } else if ($vis == PhabricatorSlowvotePoll::RESPONSES_VOTERS) {
       $quip = pht('You must vote to see the results.');
     } else if ($vis == PhabricatorSlowvotePoll::RESPONSES_OWNER) {
       $quip = pht('Only the author can see the results.');
     }
 
     $hint = phutil_tag(
       'span',
       array(
         'class' => 'slowvote-hint',
       ),
       $quip);
 
     if ($poll->getIsClosed()) {
       $submit = null;
     } else {
       $submit = phutil_tag(
         'div',
         array(
           'class' => 'slowvote-footer',
         ),
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-footer-content',
           ),
           array(
             $hint,
             phutil_tag(
               'button',
               array(
               ),
               pht('Engage in Deliberations')),
           )));
     }
 
     $body = phabricator_form(
       $this->getUser(),
       array(
         'action'  => '/vote/'.$poll->getID().'/',
         'method'  => 'POST',
         'class'   => 'slowvote-body',
       ),
       array(
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-body-content',
           ),
           $out),
         $submit,
       ));
 
     return javelin_tag(
       'div',
       array(
         'class' => 'slowvote-embed',
         'sigil' => 'slowvote-embed',
         'meta' => array(
           'pollID' => $poll->getID()
         )
       ),
       array($header, $body));
   }
 
   private function renderLabel(PhabricatorSlowvoteOption $option, $selected) {
     $classes = array();
     $classes[] = 'slowvote-option-label';
 
     $status = $this->renderStatus($option);
     $voters = $this->renderVoters($option);
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-option-label-group',
       ),
       array(
         phutil_tag(
           'label',
           array(
             'class' => implode(' ', $classes),
           ),
           array(
             phutil_tag(
               'div',
               array(
                 'class' => 'slowvote-control-offset',
               ),
               $option->getName()),
             $this->renderBar($option),
             phutil_tag(
               'div',
               array(
                 'class' => 'slowvote-above-the-bar',
               ),
               array(
                 $this->renderControl($option, $selected),
               )),
           )),
         $status,
         $voters,
       ));
   }
 
   private function renderBar(PhabricatorSlowvoteOption $option) {
     if (!$this->areResultsVisible()) {
       return null;
     }
 
     $poll = $this->getPoll();
 
     $choices = mgroup($poll->getChoices(), 'getOptionID');
     $choices = count(idx($choices, $option->getID(), array()));
     $count = count(mgroup($poll->getChoices(), 'getAuthorPHID'));
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-bar',
         'style' => sprintf(
           'width: %.1f%%;',
           $count ? 100 * ($choices / $count) : 0),
       ),
       array(
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-control-offset',
           ),
           $option->getName()),
       ));
   }
 
   private function renderControl(PhabricatorSlowvoteOption $option, $selected) {
     $types = array(
       PhabricatorSlowvotePoll::METHOD_PLURALITY => 'radio',
       PhabricatorSlowvotePoll::METHOD_APPROVAL => 'checkbox',
     );
 
     $closed = $this->getPoll()->getIsClosed();
 
     return phutil_tag(
       'input',
       array(
         'type' => idx($types, $this->getPoll()->getMethod()),
         'name' => 'vote[]',
         'value' => $option->getID(),
         'checked' => ($selected ? 'checked' : null),
         'disabled' => ($closed ? 'disabled' : null),
       ));
   }
 
   private function renderVoters(PhabricatorSlowvoteOption $option) {
     if (!$this->areResultsVisible()) {
       return null;
     }
 
     $poll = $this->getPoll();
 
     $choices = mgroup($poll->getChoices(), 'getOptionID');
     $choices = idx($choices, $option->getID(), array());
 
     if (!$choices) {
       return null;
     }
 
     $handles = $this->handles;
     $authors = mpull($choices, 'getAuthorPHID', 'getAuthorPHID');
 
     $viewer_phid = $this->getUser()->getPHID();
 
     // Put the viewer first if they've voted for this option.
     $authors = array_select_keys($authors, array($viewer_phid))
              + $authors;
 
     $voters = array();
     foreach ($authors as $author_phid) {
       $handle = $handles[$author_phid];
 
       $voters[] = javelin_tag(
         'div',
         array(
           'class' => 'slowvote-voter',
           'style' => 'background-image: url('.$handle->getImageURI().')',
           'sigil' => 'has-tooltip',
           'meta' => array(
             'tip' => $handle->getName(),
           ),
         ));
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-voters',
       ),
       $voters);
   }
 
   private function renderStatus(PhabricatorSlowvoteOption $option) {
     if (!$this->areResultsVisible()) {
       return null;
     }
 
     $poll = $this->getPoll();
 
     $choices = mgroup($poll->getChoices(), 'getOptionID');
     $choices = count(idx($choices, $option->getID(), array()));
     $count = count(mgroup($poll->getChoices(), 'getAuthorPHID'));
 
     $percent = sprintf('%d%%', $count ? 100 * $choices / $count : 0);
 
     switch ($poll->getMethod()) {
       case PhabricatorSlowvotePoll::METHOD_PLURALITY:
         $status = pht('%s (%d / %d)', $percent, $choices, $count);
         break;
       case PhabricatorSlowvotePoll::METHOD_APPROVAL:
         $status = pht('%s Approval (%d / %d)', $percent, $choices, $count);
         break;
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-status',
       ),
       $status);
   }
 
   private function areResultsVisible() {
     $poll = $this->getPoll();
 
     $vis = $poll->getResponseVisibility();
     if ($vis == PhabricatorSlowvotePoll::RESPONSES_VISIBLE) {
       return true;
     } else if ($vis == PhabricatorSlowvotePoll::RESPONSES_OWNER) {
       return ($poll->getAuthorPHID() == $this->getUser()->getPHID());
     } else {
       $choices = mgroup($poll->getChoices(), 'getAuthorPHID');
       return (bool)idx($choices, $this->getUser()->getPHID());
     }
   }
 
 }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php
index 76797adc5..7b8cbd07d 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php
@@ -1,110 +1,110 @@
 <?php
 
 final class PhabricatorApplicationTransactionCommentEditor
   extends PhabricatorEditor {
 
   private $contentSource;
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source;
     return $this;
   }
 
   public function getContentSource() {
     return $this->contentSource;
   }
 
   /**
    * Edit a transaction's comment. This method effects the required create,
    * update or delete to set the transaction's comment to the provided comment.
    */
   public function applyEdit(
     PhabricatorApplicationTransaction $xaction,
     PhabricatorApplicationTransactionComment $comment) {
 
     $this->validateEdit($xaction, $comment);
 
     $actor = $this->requireActor();
 
     $comment->setContentSource($this->getContentSource());
     $comment->setAuthorPHID($actor->getPHID());
 
     // TODO: This needs to be more sophisticated once we have meta-policies.
     $comment->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC);
     $comment->setEditPolicy($actor->getPHID());
 
     $xaction->openTransaction();
       $xaction->beginReadLocking();
         if ($xaction->getID()) {
           $xaction->reload();
         }
 
         $new_version = $xaction->getCommentVersion() + 1;
 
         $comment->setCommentVersion($new_version);
         $comment->setTransactionPHID($xaction->getPHID());
         $comment->save();
 
         $xaction->setCommentVersion($new_version);
         $xaction->setCommentPHID($comment->getPHID());
         $xaction->setViewPolicy($comment->getViewPolicy());
         $xaction->setEditPolicy($comment->getEditPolicy());
         $xaction->save();
 
       $xaction->endReadLocking();
     $xaction->saveTransaction();
 
     $xaction->attachComment($comment);
 
     // TODO: Emit an event for notifications/feed? Can we handle them
     // generically?
 
     return $this;
   }
 
   /**
    * Validate that the edit is permissible, and the actor has permission to
    * perform it.
    */
   private function validateEdit(
     PhabricatorApplicationTransaction $xaction,
     PhabricatorApplicationTransactionComment $comment) {
 
     if (!$xaction->getPHID()) {
       throw new Exception(
-        "Transaction must have a PHID before calling applyEdit()!");
+        'Transaction must have a PHID before calling applyEdit()!');
     }
 
     $type_comment = PhabricatorTransactions::TYPE_COMMENT;
     if ($xaction->getTransactionType() == $type_comment) {
       if ($comment->getPHID()) {
         throw new Exception(
-        "Transaction comment must not yet have a PHID!");
+        'Transaction comment must not yet have a PHID!');
       }
     }
 
     if (!$this->getContentSource()) {
       throw new Exception(
-        "Call setContentSource() before applyEdit()!");
+        'Call setContentSource() before applyEdit()!');
     }
 
     $actor = $this->requireActor();
 
     PhabricatorPolicyFilter::requireCapability(
       $actor,
       $xaction,
       PhabricatorPolicyCapability::CAN_VIEW);
 
     if ($comment->getIsRemoved() && $actor->getIsAdmin()) {
       // NOTE: Administrators can remove comments by any user, and don't need
       // to pass the edit check.
     } else {
       PhabricatorPolicyFilter::requireCapability(
         $actor,
         $xaction,
         PhabricatorPolicyCapability::CAN_EDIT);
     }
   }
 
 
 }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index b5c998d15..258720fbb 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1,2335 +1,2335 @@
 <?php
 
 /**
  * @task mail   Sending Mail
  * @task feed   Publishing Feed Stories
  * @task search Search Index
  * @task files  Integration with Files
  */
 abstract class PhabricatorApplicationTransactionEditor
   extends PhabricatorEditor {
 
   private $contentSource;
   private $object;
   private $xactions;
 
   private $isNewObject;
   private $mentionedPHIDs;
   private $continueOnNoEffect;
   private $continueOnMissingFields;
   private $parentMessageID;
   private $heraldAdapter;
   private $heraldTranscript;
   private $subscribers;
 
   private $isPreview;
   private $isHeraldEditor;
   private $actingAsPHID;
   private $disableEmail;
 
   public function setActingAsPHID($acting_as_phid) {
     $this->actingAsPHID = $acting_as_phid;
     return $this;
   }
 
   public function getActingAsPHID() {
     if ($this->actingAsPHID) {
       return $this->actingAsPHID;
     }
     return $this->getActor()->getPHID();
   }
 
   /**
    * When the editor tries to apply transactions that have no effect, should
    * it raise an exception (default) or drop them and continue?
    *
    * Generally, you will set this flag for edits coming from "Edit" interfaces,
    * and leave it cleared for edits coming from "Comment" interfaces, so the
    * user will get a useful error if they try to submit a comment that does
    * nothing (e.g., empty comment with a status change that has already been
    * performed by another user).
    *
    * @param bool  True to drop transactions without effect and continue.
    * @return this
    */
   public function setContinueOnNoEffect($continue) {
     $this->continueOnNoEffect = $continue;
     return $this;
   }
 
   public function getContinueOnNoEffect() {
     return $this->continueOnNoEffect;
   }
 
 
   /**
    * When the editor tries to apply transactions which don't populate all of
    * an object's required fields, should it raise an exception (default) or
    * drop them and continue?
    *
    * For example, if a user adds a new required custom field (like "Severity")
    * to a task, all existing tasks won't have it populated. When users
    * manually edit existing tasks, it's usually desirable to have them provide
    * a severity. However, other operations (like batch editing just the
    * owner of a task) will fail by default.
    *
    * By setting this flag for edit operations which apply to specific fields
    * (like the priority, batch, and merge editors in Maniphest), these
    * operations can continue to function even if an object is outdated.
    *
    * @param bool  True to continue when transactions don't completely satisfy
    *              all required fields.
    * @return this
    */
   public function setContinueOnMissingFields($continue_on_missing_fields) {
     $this->continueOnMissingFields = $continue_on_missing_fields;
     return $this;
   }
 
   public function getContinueOnMissingFields() {
     return $this->continueOnMissingFields;
   }
 
 
   /**
    * Not strictly necessary, but reply handlers ideally set this value to
    * make email threading work better.
    */
   public function setParentMessageID($parent_message_id) {
     $this->parentMessageID = $parent_message_id;
     return $this;
   }
   public function getParentMessageID() {
     return $this->parentMessageID;
   }
 
   public function getIsNewObject() {
     return $this->isNewObject;
   }
 
   protected function getMentionedPHIDs() {
     return $this->mentionedPHIDs;
   }
 
   public function setIsPreview($is_preview) {
     $this->isPreview = $is_preview;
     return $this;
   }
 
   public function getIsPreview() {
     return $this->isPreview;
   }
 
   public function setIsHeraldEditor($is_herald_editor) {
     $this->isHeraldEditor = $is_herald_editor;
     return $this;
   }
 
   public function getIsHeraldEditor() {
     return $this->isHeraldEditor;
   }
 
   /**
    * Prevent this editor from generating email when applying transactions.
    *
    * @param bool  True to disable email.
    * @return this
    */
   public function setDisableEmail($disable_email) {
     $this->disableEmail = $disable_email;
     return $this;
   }
 
   public function getDisableEmail() {
     return $this->disableEmail;
   }
 
   public function getTransactionTypes() {
     $types = array();
 
     if ($this->object instanceof PhabricatorSubscribableInterface) {
       $types[] = PhabricatorTransactions::TYPE_SUBSCRIBERS;
     }
 
     if ($this->object instanceof PhabricatorCustomFieldInterface) {
       $types[] = PhabricatorTransactions::TYPE_CUSTOMFIELD;
     }
 
     if ($this->object instanceof HarbormasterBuildableInterface) {
       $types[] = PhabricatorTransactions::TYPE_BUILDABLE;
     }
 
     if ($this->object instanceof PhabricatorTokenReceiverInterface) {
       $types[] = PhabricatorTransactions::TYPE_TOKEN;
     }
 
     if ($this->object instanceof PhabricatorProjectInterface) {
       $types[] = PhabricatorTransactions::TYPE_EDGE;
     }
 
     return $types;
   }
 
   private function adjustTransactionValues(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     if ($xaction->shouldGenerateOldValue()) {
       $old = $this->getTransactionOldValue($object, $xaction);
       $xaction->setOldValue($old);
     }
 
     $new = $this->getTransactionNewValue($object, $xaction);
     $xaction->setNewValue($new);
   }
 
   private function getTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return array_values($this->subscribers);
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         return $object->getViewPolicy();
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         return $object->getEditPolicy();
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         return $object->getJoinPolicy();
       case PhabricatorTransactions::TYPE_EDGE:
         $edge_type = $xaction->getMetadataValue('edge:type');
         if (!$edge_type) {
           throw new Exception("Edge transaction has no 'edge:type'!");
         }
 
         $old_edges = array();
         if ($object->getPHID()) {
           $edge_src = $object->getPHID();
 
           $old_edges = id(new PhabricatorEdgeQuery())
             ->withSourcePHIDs(array($edge_src))
             ->withEdgeTypes(array($edge_type))
             ->needEdgeData(true)
             ->execute();
 
           $old_edges = $old_edges[$edge_src][$edge_type];
         }
         return $old_edges;
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         // NOTE: Custom fields have their old value pre-populated when they are
         // built by PhabricatorCustomFieldList.
         return $xaction->getOldValue();
       case PhabricatorTransactions::TYPE_COMMENT:
         return null;
       default:
         return $this->getCustomTransactionOldValue($object, $xaction);
     }
   }
 
   private function getTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return $this->getPHIDTransactionNewValue($xaction);
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
       case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
         return $xaction->getNewValue();
       case PhabricatorTransactions::TYPE_EDGE:
         return $this->getEdgeTransactionNewValue($xaction);
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getCustomFieldForTransaction($object, $xaction);
         return $field->getNewValueFromApplicationTransactions($xaction);
       case PhabricatorTransactions::TYPE_COMMENT:
         return null;
       default:
         return $this->getCustomTransactionNewValue($object, $xaction);
     }
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
-    throw new Exception("Capability not supported!");
+    throw new Exception('Capability not supported!');
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
-    throw new Exception("Capability not supported!");
+    throw new Exception('Capability not supported!');
   }
 
   protected function transactionHasEffect(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         return $xaction->hasComment();
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getCustomFieldForTransaction($object, $xaction);
         return $field->getApplicationTransactionHasEffect($xaction);
       case PhabricatorTransactions::TYPE_EDGE:
         // A straight value comparison here doesn't always get the right
         // result, because newly added edges aren't fully populated. Instead,
         // compare the changes in a more granular way.
         $old = $xaction->getOldValue();
         $new = $xaction->getNewValue();
 
         $old_dst = array_keys($old);
         $new_dst = array_keys($new);
 
         // NOTE: For now, we don't consider edge reordering to be a change.
         // We have very few order-dependent edges and effectively no order
         // oriented UI. This might change in the future.
         sort($old_dst);
         sort($new_dst);
 
         if ($old_dst !== $new_dst) {
           // We've added or removed edges, so this transaction definitely
           // has an effect.
           return true;
         }
 
         // We haven't added or removed edges, but we might have changed
         // edge data.
         foreach ($old as $key => $old_value) {
           $new_value = $new[$key];
           if ($old_value['data'] !== $new_value['data']) {
             return true;
           }
         }
 
         return false;
     }
 
     return ($xaction->getOldValue() !== $xaction->getNewValue());
   }
 
   protected function shouldApplyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return false;
   }
 
   protected function applyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
     throw new Exception('Not implemented.');
   }
 
   private function applyInternalEffects(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
         return;
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         $object->setViewPolicy($xaction->getNewValue());
         break;
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         $object->setEditPolicy($xaction->getNewValue());
         break;
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getCustomFieldForTransaction($object, $xaction);
         return $field->applyApplicationTransactionInternalEffects($xaction);
     }
 
     return $this->applyCustomInternalTransaction($object, $xaction);
   }
 
   private function applyExternalEffects(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
         return;
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         $subeditor = id(new PhabricatorSubscriptionsEditor())
           ->setObject($object)
           ->setActor($this->requireActor());
 
         $old_map = array_fuse($xaction->getOldValue());
         $new_map = array_fuse($xaction->getNewValue());
 
         $subeditor->unsubscribe(
           array_keys(
             array_diff_key($old_map, $new_map)));
 
         $subeditor->subscribeExplicit(
           array_keys(
             array_diff_key($new_map, $old_map)));
 
         $subeditor->save();
 
         // for the rest of these edits, subscribers should include those just
         // added as well as those just removed.
         $subscribers = array_unique(array_merge(
           $this->subscribers,
           $xaction->getOldValue(),
           $xaction->getNewValue()));
         $this->subscribers = $subscribers;
 
         break;
       case PhabricatorTransactions::TYPE_EDGE:
         $old = $xaction->getOldValue();
         $new = $xaction->getNewValue();
         $src = $object->getPHID();
         $type = $xaction->getMetadataValue('edge:type');
 
         foreach ($new as $dst_phid => $edge) {
           $new[$dst_phid]['src'] = $src;
         }
 
         $editor = id(new PhabricatorEdgeEditor())
           ->setActor($this->getActor());
 
         foreach ($old as $dst_phid => $edge) {
           if (!empty($new[$dst_phid])) {
             if ($old[$dst_phid]['data'] === $new[$dst_phid]['data']) {
               continue;
             }
           }
           $editor->removeEdge($src, $type, $dst_phid);
         }
 
         foreach ($new as $dst_phid => $edge) {
           if (!empty($old[$dst_phid])) {
             if ($old[$dst_phid]['data'] === $new[$dst_phid]['data']) {
               continue;
             }
           }
 
           $data = array(
             'data' => $edge['data'],
           );
 
           $editor->addEdge($src, $type, $dst_phid, $data);
         }
 
         $editor->save();
         break;
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getCustomFieldForTransaction($object, $xaction);
         return $field->applyApplicationTransactionExternalEffects($xaction);
     }
 
     return $this->applyCustomExternalTransaction($object, $xaction);
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     $type = $xaction->getTransactionType();
     throw new Exception(
       "Transaction type '{$type}' is missing an internal apply ".
       "implementation!");
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     $type = $xaction->getTransactionType();
     throw new Exception(
       "Transaction type '{$type}' is missing an external apply ".
       "implementation!");
   }
 
   /**
    * Fill in a transaction's common values, like author and content source.
    */
   protected function populateTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $actor = $this->getActor();
 
     // TODO: This needs to be more sophisticated once we have meta-policies.
     $xaction->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC);
 
     if ($actor->isOmnipotent()) {
       $xaction->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
     } else {
       $xaction->setEditPolicy($actor->getPHID());
     }
 
     $xaction->setAuthorPHID($this->getActingAsPHID());
     $xaction->setContentSource($this->getContentSource());
     $xaction->attachViewer($actor);
     $xaction->attachObject($object);
 
     if ($object->getPHID()) {
       $xaction->setObjectPHID($object->getPHID());
     }
 
     return $xaction;
   }
 
 
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return $xactions;
   }
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source;
     return $this;
   }
 
   public function setContentSourceFromRequest(AphrontRequest $request) {
     return $this->setContentSource(
       PhabricatorContentSource::newFromRequest($request));
   }
 
   public function setContentSourceFromConduitRequest(
     ConduitAPIRequest $request) {
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_CONDUIT,
       array());
 
     return $this->setContentSource($content_source);
   }
 
   public function getContentSource() {
     return $this->contentSource;
   }
 
   final public function applyTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $this->object = $object;
     $this->xactions = $xactions;
     $this->isNewObject = ($object->getPHID() === null);
 
     $this->validateEditParameters($object, $xactions);
 
     $actor = $this->requireActor();
 
     // NOTE: Some transaction expansion requires that the edited object be
     // attached.
     foreach ($xactions as $xaction) {
       $xaction->attachObject($object);
       $xaction->attachViewer($actor);
     }
 
     $xactions = $this->expandTransactions($object, $xactions);
     $xactions = $this->expandSupportTransactions($object, $xactions);
     $xactions = $this->combineTransactions($xactions);
 
     foreach ($xactions as $xaction) {
       $xaction = $this->populateTransaction($object, $xaction);
     }
 
     $is_preview = $this->getIsPreview();
     $read_locking = false;
     $transaction_open = false;
 
     if (!$is_preview) {
       $errors = array();
       $type_map = mgroup($xactions, 'getTransactionType');
       foreach ($this->getTransactionTypes() as $type) {
         $type_xactions = idx($type_map, $type, array());
         $errors[] = $this->validateTransaction($object, $type, $type_xactions);
       }
 
       $errors = array_mergev($errors);
 
       $continue_on_missing = $this->getContinueOnMissingFields();
       foreach ($errors as $key => $error) {
         if ($continue_on_missing && $error->getIsMissingFieldError()) {
           unset($errors[$key]);
         }
       }
 
       if ($errors) {
         throw new PhabricatorApplicationTransactionValidationException($errors);
       }
 
       $file_phids = $this->extractFilePHIDs($object, $xactions);
 
       if ($object->getID()) {
         foreach ($xactions as $xaction) {
 
           // If any of the transactions require a read lock, hold one and
           // reload the object. We need to do this fairly early so that the
           // call to `adjustTransactionValues()` (which populates old values)
           // is based on the synchronized state of the object, which may differ
           // from the state when it was originally loaded.
 
           if ($this->shouldReadLock($object, $xaction)) {
             $object->openTransaction();
             $object->beginReadLocking();
             $transaction_open = true;
             $read_locking = true;
             $object->reload();
             break;
           }
         }
       }
 
       if ($this->shouldApplyInitialEffects($object, $xactions)) {
         if (!$transaction_open) {
           $object->openTransaction();
           $transaction_open = true;
         }
       }
     }
 
     if ($this->shouldApplyInitialEffects($object, $xactions)) {
       $this->applyInitialEffects($object, $xactions);
     }
 
     foreach ($xactions as $xaction) {
       $this->adjustTransactionValues($object, $xaction);
     }
 
     $xactions = $this->filterTransactions($object, $xactions);
 
     if (!$xactions) {
       if ($read_locking) {
         $object->endReadLocking();
         $read_locking = false;
       }
       if ($transaction_open) {
         $object->killTransaction();
         $transaction_open = false;
       }
       return array();
     }
 
     // Now that we've merged, filtered, and combined transactions, check for
     // required capabilities.
     foreach ($xactions as $xaction) {
       $this->requireCapabilities($object, $xaction);
     }
 
     $xactions = $this->sortTransactions($xactions);
 
     if ($is_preview) {
       $this->loadHandles($xactions);
       return $xactions;
     }
 
     $comment_editor = id(new PhabricatorApplicationTransactionCommentEditor())
       ->setActor($actor)
       ->setContentSource($this->getContentSource());
 
     if (!$transaction_open) {
       $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();
         }
       }
 
       if ($file_phids) {
         $this->attachFiles($object, $file_phids);
       }
 
       foreach ($xactions as $xaction) {
         $this->applyExternalEffects($object, $xaction);
       }
 
       $xactions = $this->applyFinalEffects($object, $xactions);
 
       if ($read_locking) {
         $object->endReadLocking();
         $read_locking = false;
       }
 
     $object->saveTransaction();
 
     // Now that we've completely applied the core transaction set, try to apply
     // Herald rules. Herald rules are allowed to either take direct actions on
     // the database (like writing flags), or take indirect actions (like saving
     // some targets for CC when we generate mail a little later), or return
     // transactions which we'll apply normally using another Editor.
 
     // First, check if *this* is a sub-editor which is itself applying Herald
     // rules: if it is, stop working and return so we don't descend into
     // madness.
 
     // Otherwise, we're not a Herald editor, so process Herald rules (possibly
     // using a Herald editor to apply resulting transactions) and then send out
     // mail, notifications, and feed updates about everything.
 
     if ($this->getIsHeraldEditor()) {
       // We are the Herald editor, so stop work here and return the updated
       // transactions.
       return $xactions;
     } else if ($this->shouldApplyHeraldRules($object, $xactions)) {
       // We are not the Herald editor, so try to apply Herald rules.
       $herald_xactions = $this->applyHeraldRules($object, $xactions);
 
       if ($herald_xactions) {
         $xscript_id = $this->getHeraldTranscript()->getID();
         foreach ($herald_xactions as $herald_xaction) {
           $herald_xaction->setMetadataValue('herald:transcriptID', $xscript_id);
         }
 
         // NOTE: We're acting as the omnipotent user because rules deal with
         // their own policy issues. We use a synthetic author PHID (the
         // Herald application) as the author of record, so that transactions
         // will render in a reasonable way ("Herald assigned this task ...").
         $herald_actor = PhabricatorUser::getOmnipotentUser();
         $herald_phid = id(new PhabricatorApplicationHerald())->getPHID();
 
         // TODO: It would be nice to give transactions a more specific source
         // which points at the rule which generated them. You can figure this
         // out from transcripts, but it would be cleaner if you didn't have to.
 
         $herald_source = PhabricatorContentSource::newForSource(
           PhabricatorContentSource::SOURCE_HERALD,
           array());
 
         $herald_editor = newv(get_class($this), array())
           ->setContinueOnNoEffect(true)
           ->setContinueOnMissingFields(true)
           ->setParentMessageID($this->getParentMessageID())
           ->setIsHeraldEditor(true)
           ->setActor($herald_actor)
           ->setActingAsPHID($herald_phid)
           ->setContentSource($herald_source);
 
         $herald_xactions = $herald_editor->applyTransactions(
           $object,
           $herald_xactions);
 
         // Merge the new transactions into the transaction list: we want to
         // send email and publish feed stories about them, too.
         $xactions = array_merge($xactions, $herald_xactions);
       }
     }
 
     // Before sending mail or publishing feed stories, reload the object
     // subscribers to pick up changes caused by Herald (or by other side effects
     // in various transaction phases).
     $this->loadSubscribers($object);
 
     $this->loadHandles($xactions);
 
     $mail = null;
     if (!$this->getDisableEmail()) {
       if ($this->shouldSendMail($object, $xactions)) {
         $mail = $this->sendMail($object, $xactions);
       }
     }
 
     if ($this->supportsSearch()) {
       id(new PhabricatorSearchIndexer())
         ->queueDocumentForIndexing($object->getPHID());
     }
 
     if ($this->shouldPublishFeedStory($object, $xactions)) {
       $mailed = array();
       if ($mail) {
         $mailed = $mail->buildRecipientList();
       }
       $this->publishFeedStory(
         $object,
         $xactions,
         $mailed);
     }
 
     $this->didApplyTransactions($xactions);
 
     if ($object instanceof PhabricatorCustomFieldInterface) {
       // Maybe this makes more sense to move into the search index itself? For
       // now I'm putting it here since I think we might end up with things that
       // need it to be up to date once the next page loads, but if we don't go
       // there we we could move it into search once search moves to the daemons.
 
       // It now happens in the search indexer as well, but the search indexer is
       // always daemonized, so the logic above still potentially holds. We could
       // possibly get rid of this. The major motivation for putting it in the
       // indexer was to enable reindexing to work.
 
       $fields = PhabricatorCustomField::getObjectFields(
         $object,
         PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
       $fields->readFieldsFromStorage($object);
       $fields->rebuildIndexes($object);
     }
 
     return $xactions;
   }
 
   protected function didApplyTransactions(array $xactions) {
     // Hook for subclasses.
     return;
   }
 
 
   /**
    * Determine if the editor should hold a read lock on the object while
    * applying a transaction.
    *
    * If the editor does not hold a lock, two editors may read an object at the
    * same time, then apply their changes without any synchronization. For most
    * transactions, this does not matter much. However, it is important for some
    * transactions. For example, if an object has a transaction count on it, both
    * editors may read the object with `count = 23`, then independently update it
    * and save the object with `count = 24` twice. This will produce the wrong
    * state: the object really has 25 transactions, but the count is only 24.
    *
    * Generally, transactions fall into one of four buckets:
    *
    *   - Append operations: Actions like adding a comment to an object purely
    *     add information to its state, and do not depend on the current object
    *     state in any way. These transactions never need to hold locks.
    *   - Overwrite operations: Actions like changing the title or description
    *     of an object replace the current value with a new value, so the end
    *     state is consistent without a lock. We currently do not lock these
    *     transactions, although we may in the future.
    *   - Edge operations: Edge and subscription operations have internal
    *     synchronization which limits the damage race conditions can cause.
    *     We do not currently lock these transactions, although we may in the
    *     future.
    *   - Update operations: Actions like incrementing a count on an object.
    *     These operations generally should use locks, unless it is not
    *     important that the state remain consistent in the presence of races.
    *
    * @param   PhabricatorLiskDAO  Object being updated.
    * @param   PhabricatorApplicationTransaction Transaction being applied.
    * @return  bool                True to synchronize the edit with a lock.
    */
   protected function shouldReadLock(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     return false;
   }
 
   private function loadHandles(array $xactions) {
     $phids = array();
     foreach ($xactions as $key => $xaction) {
       $phids[$key] = $xaction->getRequiredHandlePHIDs();
     }
     $handles = array();
     $merged = array_mergev($phids);
     if ($merged) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($this->requireActor())
         ->withPHIDs($merged)
         ->execute();
     }
     foreach ($xactions as $key => $xaction) {
       $xaction->setHandles(array_select_keys($handles, $phids[$key]));
     }
   }
 
   private function loadSubscribers(PhabricatorLiskDAO $object) {
     if ($object->getPHID() &&
         ($object instanceof PhabricatorSubscribableInterface)) {
       $subs = PhabricatorSubscribersQuery::loadSubscribersForPHID(
         $object->getPHID());
       $this->subscribers = array_fuse($subs);
     } else {
       $this->subscribers = array();
     }
   }
 
   private function validateEditParameters(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     if (!$this->getContentSource()) {
       throw new Exception(
-        "Call setContentSource() before applyTransactions()!");
+        '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 PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
-            "You can not apply transactions which already have IDs/PHIDs!"));
+            'You can not apply transactions which already have IDs/PHIDs!'));
       }
       if ($xaction->getObjectPHID()) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
-            "You can not apply transactions which already have objectPHIDs!"));
+            'You can not apply transactions which already have objectPHIDs!'));
       }
       if ($xaction->getAuthorPHID()) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
             'You can not apply transactions which already have authorPHIDs!'));
       }
       if ($xaction->getCommentPHID()) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
             'You can not apply transactions which already have '.
             'commentPHIDs!'));
       }
       if ($xaction->getCommentVersion() !== 0) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
             'You can not apply transactions which already have '.
             'commentVersions!'));
       }
 
       $expect_value = !$xaction->shouldGenerateOldValue();
       $has_value = $xaction->hasOldValue();
 
       if ($expect_value && !$has_value) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
             'This transaction is supposed to have an oldValue set, but '.
             'it does not!'));
       }
 
       if ($has_value && !$expect_value) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
             'This transaction should generate its oldValue automatically, '.
             'but has already had one set!'));
       }
 
       $type = $xaction->getTransactionType();
       if (empty($types[$type])) {
         throw new PhabricatorApplicationTransactionStructureException(
           $xaction,
           pht(
             'Transaction has type "%s", but that transaction type is not '.
             'supported by this editor (%s).',
             $type,
             get_class($this)));
       }
     }
   }
 
   protected function requireCapabilities(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     if ($this->getIsNewObject()) {
       return;
     }
 
     $actor = $this->requireActor();
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         PhabricatorPolicyFilter::requireCapability(
           $actor,
           $object,
           PhabricatorPolicyCapability::CAN_VIEW);
         break;
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         PhabricatorPolicyFilter::requireCapability(
           $actor,
           $object,
           PhabricatorPolicyCapability::CAN_EDIT);
         break;
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         PhabricatorPolicyFilter::requireCapability(
           $actor,
           $object,
           PhabricatorPolicyCapability::CAN_EDIT);
         break;
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         PhabricatorPolicyFilter::requireCapability(
           $actor,
           $object,
           PhabricatorPolicyCapability::CAN_EDIT);
         break;
     }
   }
 
   private function buildMentionTransaction(
     PhabricatorLiskDAO $object,
     array $xactions,
     array $blocks) {
 
     if (!($object instanceof PhabricatorSubscribableInterface)) {
       return null;
     }
 
     $texts = array_mergev($blocks);
     $phids = PhabricatorMarkupEngine::extractPHIDsFromMentions(
       $this->getActor(),
       $texts);
 
     $this->mentionedPHIDs = $phids;
 
     if ($object->getPHID()) {
       // Don't try to subscribe already-subscribed mentions: we want to generate
       // a dialog about an action having no effect if the user explicitly adds
       // existing CCs, but not if they merely mention existing subscribers.
       $phids = array_diff($phids, $this->subscribers);
     }
 
     foreach ($phids as $key => $phid) {
       if ($object->isAutomaticallySubscribed($phid)) {
         unset($phids[$key]);
       }
     }
     $phids = array_values($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 getRemarkupBlocksFromTransaction(
     PhabricatorApplicationTransaction $transaction) {
     return $transaction->getRemarkupBlocks();
   }
 
   protected function mergeTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     $type = $u->getTransactionType();
 
     switch ($type) {
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return $this->mergePHIDOrEdgeTransactions($u, $v);
       case PhabricatorTransactions::TYPE_EDGE:
         $u_type = $u->getMetadataValue('edge:type');
         $v_type = $v->getMetadataValue('edge:type');
         if ($u_type == $v_type) {
           return $this->mergePHIDOrEdgeTransactions($u, $v);
         }
         return null;
     }
 
     // By default, do not merge the transactions.
     return null;
   }
 
   /**
    * Optionally expand transactions which imply other effects. For example,
    * resigning from a revision in Differential implies removing yourself as
    * a reviewer.
    */
   private function expandTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $results = array();
     foreach ($xactions as $xaction) {
       foreach ($this->expandTransaction($object, $xaction) as $expanded) {
         $results[] = $expanded;
       }
     }
 
     return $results;
   }
 
   protected function expandTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     return array($xaction);
   }
 
 
   private function expandSupportTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
     $this->loadSubscribers($object);
 
     $xactions = $this->applyImplicitCC($object, $xactions);
 
     $blocks = array();
     foreach ($xactions as $key => $xaction) {
       $blocks[$key] = $this->getRemarkupBlocksFromTransaction($xaction);
     }
 
     $mention_xaction = $this->buildMentionTransaction(
       $object,
       $xactions,
       $blocks);
     if ($mention_xaction) {
       $xactions[] = $mention_xaction;
     }
 
     // TODO: For now, this is just a placeholder.
     $engine = PhabricatorMarkupEngine::getEngine('extract');
     $engine->setConfig('viewer', $this->requireActor());
 
     $block_xactions = $this->expandRemarkupBlockTransactions(
       $object,
       $xactions,
       $blocks,
       $engine);
 
     foreach ($block_xactions as $xaction) {
       $xactions[] = $xaction;
     }
 
     return $xactions;
   }
 
   private function expandRemarkupBlockTransactions(
     PhabricatorLiskDAO $object,
     array $xactions,
     $blocks,
     PhutilMarkupEngine $engine) {
 
     $block_xactions = $this->expandCustomRemarkupBlockTransactions(
       $object,
       $xactions,
       $blocks,
       $engine);
 
     if ($object instanceof PhabricatorProjectInterface) {
       $phids = array();
       foreach ($blocks as $key => $xaction_blocks) {
         foreach ($xaction_blocks as $block) {
           $engine->markupText($block);
           $phids += $engine->getTextMetadata(
             PhabricatorRemarkupRuleObject::KEY_MENTIONED_OBJECTS,
             array());
         }
       }
 
       $project_type = PhabricatorProjectPHIDTypeProject::TYPECONST;
       foreach ($phids as $key => $phid) {
         if (phid_get_type($phid) != $project_type) {
           unset($phids[$key]);
         }
       }
 
       if ($phids) {
         $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT;
         $block_xactions[] = newv(get_class(head($xactions)), array())
           ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
           ->setMetadataValue('edge:type', $edge_type)
           ->setNewValue(array('+' => $phids));
       }
     }
 
     return $block_xactions;
   }
 
   protected function expandCustomRemarkupBlockTransactions(
     PhabricatorLiskDAO $object,
     array $xactions,
     $blocks,
     PhutilMarkupEngine $engine) {
     return array();
   }
 
 
   /**
    * Attempt to combine similar transactions into a smaller number of total
    * transactions. For example, two transactions which edit the title of an
    * object can be merged into a single edit.
    */
   private function combineTransactions(array $xactions) {
     $stray_comments = array();
 
     $result = array();
     $types = array();
     foreach ($xactions as $key => $xaction) {
       $type = $xaction->getTransactionType();
       if (isset($types[$type])) {
         foreach ($types[$type] as $other_key) {
           $merged = $this->mergeTransactions($result[$other_key], $xaction);
           if ($merged) {
             $result[$other_key] = $merged;
 
             if ($xaction->getComment() &&
                 ($xaction->getComment() !== $merged->getComment())) {
               $stray_comments[] = $xaction->getComment();
             }
 
             if ($result[$other_key]->getComment() &&
                 ($result[$other_key]->getComment() !== $merged->getComment())) {
               $stray_comments[] = $result[$other_key]->getComment();
             }
 
             // Move on to the next transaction.
             continue 2;
           }
         }
       }
       $result[$key] = $xaction;
       $types[$type][] = $key;
     }
 
     // If we merged any comments away, restore them.
     foreach ($stray_comments as $comment) {
       $xaction = newv(get_class(head($result)), array());
       $xaction->setTransactionType(PhabricatorTransactions::TYPE_COMMENT);
       $xaction->setComment($comment);
       $result[] = $xaction;
     }
 
     return array_values($result);
   }
 
   protected function mergePHIDOrEdgeTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     $result = $u->getNewValue();
     foreach ($v->getNewValue() as $key => $value) {
       if ($u->getTransactionType() == PhabricatorTransactions::TYPE_EDGE) {
         if (empty($result[$key])) {
           $result[$key] = $value;
         } else {
           // We're merging two lists of edge adds, sets, or removes. Merge
           // them by merging individual PHIDs within them.
           $merged = $result[$key];
 
           foreach ($value as $dst => $v_spec) {
             if (empty($merged[$dst])) {
               $merged[$dst] = $v_spec;
             } else {
               // Two transactions are trying to perform the same operation on
               // the same edge. Normalize the edge data and then merge it. This
               // allows transactions to specify how data merges execute in a
               // precise way.
 
               $u_spec = $merged[$dst];
 
               if (!is_array($u_spec)) {
                 $u_spec = array('dst' => $u_spec);
               }
               if (!is_array($v_spec)) {
                 $v_spec = array('dst' => $v_spec);
               }
 
               $ux_data = idx($u_spec, 'data', array());
               $vx_data = idx($v_spec, 'data', array());
 
               $merged_data = $this->mergeEdgeData(
                 $u->getMetadataValue('edge:type'),
                 $ux_data,
                 $vx_data);
 
               $u_spec['data'] = $merged_data;
               $merged[$dst] = $u_spec;
             }
           }
 
           $result[$key] = $merged;
         }
       } else {
         $result[$key] = array_merge($value, idx($result, $key, array()));
       }
     }
     $u->setNewValue($result);
 
     // When combining an "ignore" transaction with a normal transaction, make
     // sure we don't propagate the "ignore" flag.
     if (!$v->getIgnoreOnNoEffect()) {
       $u->setIgnoreOnNoEffect(false);
     }
 
     return $u;
   }
 
   protected function mergeEdgeData($type, array $u, array $v) {
     return $v + $u;
   }
 
   protected function getPHIDTransactionNewValue(
     PhabricatorApplicationTransaction $xaction) {
 
     $old = array_fuse($xaction->getOldValue());
 
     $new = $xaction->getNewValue();
     $new_add = idx($new, '+', array());
     unset($new['+']);
     $new_rem = idx($new, '-', array());
     unset($new['-']);
     $new_set = idx($new, '=', null);
     if ($new_set !== null) {
       $new_set = array_fuse($new_set);
     }
     unset($new['=']);
 
     if ($new) {
       throw new Exception(
         "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 getEdgeTransactionNewValue(
     PhabricatorApplicationTransaction $xaction) {
 
     $new = $xaction->getNewValue();
     $new_add = idx($new, '+', array());
     unset($new['+']);
     $new_rem = idx($new, '-', array());
     unset($new['-']);
     $new_set = idx($new, '=', null);
     unset($new['=']);
 
     if ($new) {
       throw new Exception(
         "Invalid 'new' value for Edge transaction. Value should contain only ".
         "keys '+' (add edges), '-' (remove edges) and '=' (set edges).");
     }
 
     $old = $xaction->getOldValue();
 
     $lists = array($new_set, $new_add, $new_rem);
     foreach ($lists as $list) {
       $this->checkEdgeList($list);
     }
 
     $result = array();
     foreach ($old as $dst_phid => $edge) {
       if ($new_set !== null && empty($new_set[$dst_phid])) {
         continue;
       }
       $result[$dst_phid] = $this->normalizeEdgeTransactionValue(
         $xaction,
         $edge,
         $dst_phid);
     }
 
     if ($new_set !== null) {
       foreach ($new_set as $dst_phid => $edge) {
         $result[$dst_phid] = $this->normalizeEdgeTransactionValue(
           $xaction,
           $edge,
           $dst_phid);
       }
     }
 
     foreach ($new_add as $dst_phid => $edge) {
       $result[$dst_phid] = $this->normalizeEdgeTransactionValue(
         $xaction,
         $edge,
         $dst_phid);
     }
 
     foreach ($new_rem as $dst_phid => $edge) {
       unset($result[$dst_phid]);
     }
 
     return $result;
   }
 
   private function checkEdgeList($list) {
     if (!$list) {
       return;
     }
     foreach ($list as $key => $item) {
       if (phid_get_type($key) === PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
         throw new Exception(
           "Edge transactions must have destination PHIDs as in edge ".
           "lists (found key '{$key}').");
       }
       if (!is_array($item) && $item !== $key) {
         throw new Exception(
           "Edge transactions must have PHIDs or edge specs as values ".
           "(found value '{$item}').");
       }
     }
   }
 
   private function normalizeEdgeTransactionValue(
     PhabricatorApplicationTransaction $xaction,
     $edge,
     $dst_phid) {
 
     if (!is_array($edge)) {
       if ($edge != $dst_phid) {
         throw new Exception(
           pht(
             'Transaction edge data must either be the edge PHID or an edge '.
             'specification dictionary.'));
       }
       $edge = array();
     } else {
       foreach ($edge as $key => $value) {
         switch ($key) {
           case 'src':
           case 'dst':
           case 'type':
           case 'data':
           case 'dateCreated':
           case 'dateModified':
           case 'seq':
           case 'dataID':
             break;
           default:
             throw new Exception(
               pht(
                 'Transaction edge specification contains unexpected key '.
                 '"%s".',
                 $key));
         }
       }
     }
 
     $edge['dst'] = $dst_phid;
 
     $edge_type = $xaction->getMetadataValue('edge:type');
     if (empty($edge['type'])) {
       $edge['type'] = $edge_type;
     } else {
       if ($edge['type'] != $edge_type) {
         $this_type = $edge['type'];
         throw new Exception(
           "Edge transaction includes edge of type '{$this_type}', but ".
           "transaction is of type '{$edge_type}'. Each edge transaction must ".
           "alter edges of only one type.");
       }
     }
 
     if (!isset($edge['data'])) {
       $edge['data'] = array();
     }
 
     return $edge;
   }
 
   protected function sortTransactions(array $xactions) {
     $head = array();
     $tail = array();
 
     // Move bare comments to the end, so the actions precede them.
     foreach ($xactions as $xaction) {
       $type = $xaction->getTransactionType();
       if ($type == PhabricatorTransactions::TYPE_COMMENT) {
         $tail[] = $xaction;
       } else {
         $head[] = $xaction;
       }
     }
 
     return array_values(array_merge($head, $tail));
   }
 
 
   protected function filterTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $type_comment = PhabricatorTransactions::TYPE_COMMENT;
 
     $no_effect = array();
     $has_comment = false;
     $any_effect = false;
     foreach ($xactions as $key => $xaction) {
       if ($this->transactionHasEffect($object, $xaction)) {
         if ($xaction->getTransactionType() != $type_comment) {
           $any_effect = true;
         }
       } else if ($xaction->getIgnoreOnNoEffect()) {
         unset($xactions[$key]);
       } else {
         $no_effect[$key] = $xaction;
       }
       if ($xaction->hasComment()) {
         $has_comment = true;
       }
     }
 
     if (!$no_effect) {
       return $xactions;
     }
 
     if (!$this->getContinueOnNoEffect() && !$this->getIsPreview()) {
       throw new PhabricatorApplicationTransactionNoEffectException(
         $no_effect,
         $any_effect,
         $has_comment);
     }
 
     if (!$any_effect && !$has_comment) {
       // If we only have empty comment transactions, just drop them all.
       return array();
     }
 
     foreach ($no_effect as $key => $xaction) {
       if ($xaction->getComment()) {
         $xaction->setTransactionType($type_comment);
         $xaction->setOldValue(null);
         $xaction->setNewValue(null);
       } else {
         unset($xactions[$key]);
       }
     }
 
     return $xactions;
   }
 
 
   /**
    * Hook for validating transactions. This callback will be invoked for each
    * available transaction type, even if an edit does not apply any transactions
    * of that type. This allows you to raise exceptions when required fields are
    * missing, by detecting that the object has no field value and there is no
    * transaction which sets one.
    *
    * @param PhabricatorLiskDAO Object being edited.
    * @param string Transaction type to validate.
    * @param list<PhabricatorApplicationTransaction> Transactions of given type,
    *   which may be empty if the edit does not apply any transactions of the
    *   given type.
    * @return list<PhabricatorApplicationTransactionValidationError> List of
    *   validation errors.
    */
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
     $type,
     array $xactions) {
 
     $errors = array();
     switch ($type) {
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         $errors[] = $this->validatePolicyTransaction(
           $object,
           $xactions,
           $type,
           PhabricatorPolicyCapability::CAN_VIEW);
         break;
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         $errors[] = $this->validatePolicyTransaction(
           $object,
           $xactions,
           $type,
           PhabricatorPolicyCapability::CAN_EDIT);
         break;
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $groups = array();
         foreach ($xactions as $xaction) {
           $groups[$xaction->getMetadataValue('customfield:key')][] = $xaction;
         }
 
         $field_list = PhabricatorCustomField::getObjectFields(
           $object,
           PhabricatorCustomField::ROLE_EDIT);
         $field_list->setViewer($this->getActor());
 
         $role_xactions = PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS;
         foreach ($field_list->getFields() as $field) {
           if (!$field->shouldEnableForRole($role_xactions)) {
             continue;
           }
           $errors[] = $field->validateApplicationTransactions(
             $this,
             $type,
             idx($groups, $field->getFieldKey(), array()));
         }
         break;
     }
 
     return array_mergev($errors);
   }
 
   private function validatePolicyTransaction(
     PhabricatorLiskDAO $object,
     array $xactions,
     $transaction_type,
     $capability) {
 
     $actor = $this->requireActor();
     $errors = array();
     // Note $this->xactions is necessary; $xactions is $this->xactions of
     // $transaction_type
     $policy_object = $this->adjustObjectForPolicyChecks(
       $object,
       $this->xactions);
 
     // Make sure the user isn't editing away their ability to $capability this
     // object.
     foreach ($xactions as $xaction) {
       try {
         PhabricatorPolicyFilter::requireCapabilityWithForcedPolicy(
           $actor,
           $policy_object,
           $capability,
           $xaction->getNewValue());
       } catch (PhabricatorPolicyException $ex) {
         $errors[] = new PhabricatorApplicationTransactionValidationError(
           $transaction_type,
           pht('Invalid'),
           pht(
             'You can not select this %s policy, because you would no longer '.
             'be able to %s the object.',
             $capability,
             $capability),
           $xaction);
       }
     }
 
     if ($this->getIsNewObject()) {
       if (!$xactions) {
         $has_capability = PhabricatorPolicyFilter::hasCapability(
           $actor,
           $policy_object,
           $capability);
         if (!$has_capability) {
           $errors[] = new PhabricatorApplicationTransactionValidationError(
             $transaction_type,
             pht('Invalid'),
             pht('The selected %s policy excludes you. Choose a %s policy '.
                 'which allows you to %s the object.',
             $capability,
             $capability,
             $capability));
         }
       }
     }
 
     return $errors;
   }
 
   protected function adjustObjectForPolicyChecks(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     return clone $object;
   }
 
   /**
    * Check for a missing text field.
    *
    * A text field is missing if the object has no value and there are no
    * transactions which set a value, or if the transactions remove the value.
    * This method is intended to make implementing @{method:validateTransaction}
    * more convenient:
    *
    *   $missing = $this->validateIsEmptyTextField(
    *     $object->getName(),
    *     $xactions);
    *
    * This will return `true` if the net effect of the object and transactions
    * is an empty field.
    *
    * @param wild Current field value.
    * @param list<PhabricatorApplicationTransaction> Transactions editing the
    *          field.
    * @return bool True if the field will be an empty text field after edits.
    */
   protected function validateIsEmptyTextField($field_value, array $xactions) {
     if (strlen($field_value) && empty($xactions)) {
       return false;
     }
 
     if ($xactions && strlen(last($xactions)->getNewValue())) {
       return false;
     }
 
     return true;
   }
 
 
 /* -(  Implicit CCs  )------------------------------------------------------- */
 
 
   /**
    * When a user interacts with an object, we might want to add them to CC.
    */
   final public function applyImplicitCC(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     if (!($object instanceof PhabricatorSubscribableInterface)) {
       // If the object isn't subscribable, we can't CC them.
       return $xactions;
     }
 
     $actor_phid = $this->requireActor()->getPHID();
     if ($object->isAutomaticallySubscribed($actor_phid)) {
       // If they're auto-subscribed, don't CC them.
       return $xactions;
     }
 
     $should_cc = false;
     foreach ($xactions as $xaction) {
       if ($this->shouldImplyCC($object, $xaction)) {
         $should_cc = true;
         break;
       }
     }
 
     if (!$should_cc) {
       // Only some types of actions imply a CC (like adding a comment).
       return $xactions;
     }
 
     if ($object->getPHID()) {
       if (isset($this->subscribers[$actor_phid])) {
         // If the user is already subscribed, don't implicitly CC them.
         return $xactions;
       }
 
       $unsub = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $object->getPHID(),
         PhabricatorEdgeConfig::TYPE_OBJECT_HAS_UNSUBSCRIBER);
       $unsub = array_fuse($unsub);
       if (isset($unsub[$actor_phid])) {
         // If the user has previously unsubscribed from this object explicitly,
         // don't implicitly CC them.
         return $xactions;
       }
     }
 
     $xaction = newv(get_class(head($xactions)), array());
     $xaction->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS);
     $xaction->setNewValue(array('+' => array($actor_phid)));
 
     array_unshift($xactions, $xaction);
 
     return $xactions;
   }
 
   protected function shouldImplyCC(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     return $xaction->isCommentTransaction();
   }
 
 
 /* -(  Sending Mail  )------------------------------------------------------- */
 
 
   /**
    * @task mail
    */
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return false;
   }
 
 
   /**
    * @task mail
    */
   protected function sendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     // Check if any of the transactions are visible. If we don't have any
     // visible transactions, don't send the mail.
 
     $any_visible = false;
     foreach ($xactions as $xaction) {
       if (!$xaction->shouldHideForMail($xactions)) {
         $any_visible = true;
         break;
       }
     }
 
     if (!$any_visible) {
       return;
     }
 
     $email_to = array_filter(array_unique($this->getMailTo($object)));
     $email_cc = array_filter(array_unique($this->getMailCC($object)));
 
     $phids = array_merge($email_to, $email_cc);
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->requireActor())
       ->withPHIDs($phids)
       ->execute();
 
     $template = $this->buildMailTemplate($object);
     $body = $this->buildMailBody($object, $xactions);
 
     $mail_tags = $this->getMailTags($object, $xactions);
     $action = $this->getMailAction($object, $xactions);
 
     $reply_handler = $this->buildReplyHandler($object);
     $reply_section = $reply_handler->getReplyHandlerInstructions();
     if ($reply_section !== null) {
       $body->addReplySection($reply_section);
     }
 
     $template
       ->setFrom($this->requireActor()->getPHID())
       ->setSubjectPrefix($this->getMailSubjectPrefix())
       ->setVarySubjectPrefix('['.$action.']')
       ->setThreadID($this->getMailThreadID($object), $this->getIsNewObject())
       ->setRelatedPHID($object->getPHID())
       ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
       ->setMailTags($mail_tags)
       ->setIsBulk(true)
       ->setBody($body->render());
 
     foreach ($body->getAttachments() as $attachment) {
       $template->addAttachment($attachment);
     }
 
     $herald_xscript = $this->getHeraldTranscript();
     if ($herald_xscript) {
       $herald_header = $herald_xscript->getXHeraldRulesHeader();
       $herald_header = HeraldTranscript::saveXHeraldRulesHeader(
         $object->getPHID(),
         $herald_header);
     } else {
       $herald_header = HeraldTranscript::loadXHeraldRulesHeader(
         $object->getPHID());
     }
 
     if ($herald_header) {
       $template->addHeader('X-Herald-Rules', $herald_header);
     }
 
     if ($this->getParentMessageID()) {
       $template->setParentMessageID($this->getParentMessageID());
     }
 
     $mails = $reply_handler->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;
   }
 
   protected function getMailThreadID(PhabricatorLiskDAO $object) {
     return $object->getPHID();
   }
 
 
   /**
    * @task mail
    */
   protected function getStrongestAction(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return last(msort($xactions, 'getActionStrength'));
   }
 
 
   /**
    * @task mail
    */
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
-    throw new Exception("Capability not supported.");
+    throw new Exception('Capability not supported.');
   }
 
 
   /**
    * @task mail
    */
   protected function getMailSubjectPrefix() {
-    throw new Exception("Capability not supported.");
+    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 getMailAction(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return $this->getStrongestAction($object, $xactions)->getActionName();
   }
 
 
   /**
    * @task mail
    */
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    throw new Exception("Capability not supported.");
+    throw new Exception('Capability not supported.');
   }
 
 
   /**
    * @task mail
    */
   protected function getMailTo(PhabricatorLiskDAO $object) {
-    throw new Exception("Capability not supported.");
+    throw new Exception('Capability not supported.');
   }
 
 
   /**
    * @task mail
    */
   protected function getMailCC(PhabricatorLiskDAO $object) {
     $phids = array();
     $has_support = false;
 
     if ($object instanceof PhabricatorSubscribableInterface) {
       $phids[] = $this->subscribers;
       $has_support = true;
     }
 
     // TODO: The Maniphest legacy stuff should get cleaned up here.
 
     if (($object instanceof ManiphestTask) ||
         ($object instanceof PhabricatorProjectInterface)) {
 
       if ($object instanceof PhabricatorProjectInterface) {
         $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
           $object->getPHID(),
           PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT);
       } else {
         $project_phids = $object->getProjectPHIDs();
       }
 
       if ($project_phids) {
         $watcher_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_WATCHER;
 
         $query = id(new PhabricatorEdgeQuery())
           ->withSourcePHIDs($project_phids)
           ->withEdgeTypes(array($watcher_type));
         $query->execute();
 
         $watcher_phids = $query->getDestinationPHIDs();
         if ($watcher_phids) {
           // We need to do a visibility check for all the watchers, as
           // watching a project is not a guarantee that you can see objects
           // associated with it.
           $users = id(new PhabricatorPeopleQuery())
             ->setViewer($this->requireActor())
             ->withPHIDs($watcher_phids)
             ->execute();
 
           $watchers = array();
           foreach ($users as $user) {
             $can_see = PhabricatorPolicyFilter::hasCapability(
               $user,
               $object,
               PhabricatorPolicyCapability::CAN_VIEW);
             if ($can_see) {
               $watchers[] = $user->getPHID();
             }
           }
           $phids[] = $watchers;
         }
       }
 
       $has_support = true;
     }
 
     if (!$has_support) {
       throw new Exception('Capability not supported.');
     }
 
     return array_mergev($phids);
   }
 
 
   /**
    * @task mail
    */
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $headers = array();
     $comments = array();
 
     foreach ($xactions as $xaction) {
       if ($xaction->shouldHideForMail($xactions)) {
         continue;
       }
 
       $header = $xaction->getTitleForMail();
       if ($header !== null) {
         $headers[] = $header;
       }
 
       $comment = $xaction->getBodyForMail();
       if ($comment !== null) {
         $comments[] = $comment;
       }
     }
 
     $body = new PhabricatorMetaMTAMailBody();
     $body->addRawSection(implode("\n", $headers));
 
     foreach ($comments as $comment) {
       $body->addRawSection($comment);
     }
 
     if ($object instanceof PhabricatorCustomFieldInterface) {
       $field_list = PhabricatorCustomField::getObjectFields(
         $object,
         PhabricatorCustomField::ROLE_TRANSACTIONMAIL);
       $field_list->setViewer($this->getActor());
       $field_list->readFieldsFromStorage($object);
 
       foreach ($field_list->getFields() as $field) {
         $field->updateTransactionMailBody(
           $body,
           $this,
           $xactions);
       }
     }
 
     return $body;
   }
 
 
 /* -(  Publishing Feed Stories  )-------------------------------------------- */
 
 
   /**
    * @task feed
    */
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return false;
   }
 
 
   /**
    * @task feed
    */
   protected function getFeedStoryType() {
     return 'PhabricatorApplicationTransactionFeedStory';
   }
 
 
   /**
    * @task feed
    */
   protected function getFeedRelatedPHIDs(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     return array(
       $object->getPHID(),
       $this->requireActor()->getPHID(),
     );
   }
 
 
   /**
    * @task feed
    */
   protected function getFeedNotifyPHIDs(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     return array_unique(array_merge(
       $this->getMailTo($object),
       $this->getMailCC($object)));
   }
 
 
   /**
    * @task feed
    */
   protected function getFeedStoryData(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $xactions = msort($xactions, 'getActionStrength');
     $xactions = array_reverse($xactions);
 
     return array(
       'objectPHID'        => $object->getPHID(),
       'transactionPHIDs'  => mpull($xactions, 'getPHID'),
     );
   }
 
 
   /**
    * @task feed
    */
   protected function publishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions,
     array $mailed_phids) {
 
     $xactions = mfilter($xactions, 'shouldHideForFeed', true);
 
     if (!$xactions) {
       return;
     }
 
     $related_phids = $this->getFeedRelatedPHIDs($object, $xactions);
     $subscribed_phids = $this->getFeedNotifyPHIDs($object, $xactions);
 
     $story_type = $this->getFeedStoryType();
     $story_data = $this->getFeedStoryData($object, $xactions);
 
     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();
   }
 
 
 /* -(  Search Index  )------------------------------------------------------- */
 
 
   /**
    * @task search
    */
   protected function supportsSearch() {
     return false;
   }
 
 
 /* -(  Herald Integration )-------------------------------------------------- */
 
 
   protected function shouldApplyHeraldRules(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return false;
   }
 
   protected function buildHeraldAdapter(
     PhabricatorLiskDAO $object,
     array $xactions) {
     throw new Exception('No herald adapter specified.');
   }
 
   private function setHeraldAdapter(HeraldAdapter $adapter) {
     $this->heraldAdapter = $adapter;
     return $this;
   }
 
   protected function getHeraldAdapter() {
     return $this->heraldAdapter;
   }
 
   private function setHeraldTranscript(HeraldTranscript $transcript) {
     $this->heraldTranscript = $transcript;
     return $this;
   }
 
   protected function getHeraldTranscript() {
     return $this->heraldTranscript;
   }
 
   private function applyHeraldRules(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $adapter = $this->buildHeraldAdapter($object, $xactions);
     $adapter->setContentSource($this->getContentSource());
     $adapter->setIsNewObject($this->getIsNewObject());
     $xscript = HeraldEngine::loadAndApplyRules($adapter);
 
     $this->setHeraldAdapter($adapter);
     $this->setHeraldTranscript($xscript);
 
     return $this->didApplyHeraldRules($object, $adapter, $xscript);
   }
 
   protected function didApplyHeraldRules(
     PhabricatorLiskDAO $object,
     HeraldAdapter $adapter,
     HeraldTranscript $transcript) {
     return array();
   }
 
 
 /* -(  Custom Fields  )------------------------------------------------------ */
 
 
   /**
    * @task customfield
    */
   private function getCustomFieldForTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $field_key = $xaction->getMetadataValue('customfield:key');
     if (!$field_key) {
       throw new Exception(
         "Custom field transaction has no 'customfield:key'!");
     }
 
     $field = PhabricatorCustomField::getObjectField(
       $object,
       PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS,
       $field_key);
 
     if (!$field) {
       throw new Exception(
         "Custom field transaction has invalid 'customfield:key'; field ".
         "'{$field_key}' is disabled or does not exist.");
     }
 
     if (!$field->shouldAppearInApplicationTransactions()) {
       throw new Exception(
         "Custom field transaction '{$field_key}' does not implement ".
         "integration for ApplicationTransactions.");
     }
 
     $field->setViewer($this->getActor());
 
     return $field;
   }
 
 
 /* -(  Files  )-------------------------------------------------------------- */
 
 
   /**
    * Extract the PHIDs of any files which these transactions attach.
    *
    * @task files
    */
   private function extractFilePHIDs(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $blocks = array();
     foreach ($xactions as $xaction) {
       $blocks[] = $this->getRemarkupBlocksFromTransaction($xaction);
     }
     $blocks = array_mergev($blocks);
 
     $phids = array();
     if ($blocks) {
       $phids[] = PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles(
         $this->getActor(),
         $blocks);
     }
 
     foreach ($xactions as $xaction) {
       $phids[] = $this->extractFilePHIDsFromCustomTransaction(
         $object,
         $xaction);
     }
 
     $phids = array_unique(array_filter(array_mergev($phids)));
     if (!$phids) {
       return array();
     }
 
     // Only let a user attach files they can actually see, since this would
     // otherwise let you access any file by attaching it to an object you have
     // view permission on.
 
     $files = id(new PhabricatorFileQuery())
       ->setViewer($this->getActor())
       ->withPHIDs($phids)
       ->execute();
 
     return mpull($files, 'getPHID');
   }
 
   /**
    * @task files
    */
   protected function extractFilePHIDsFromCustomTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     return array();
   }
 
 
   /**
    * @task files
    */
   private function attachFiles(
     PhabricatorLiskDAO $object,
     array $file_phids) {
 
     if (!$file_phids) {
       return;
     }
 
     $editor = id(new PhabricatorEdgeEditor())
       ->setActor($this->getActor());
 
     // TODO: Edge-based events were almost certainly a terrible idea. If we
     // don't suppress this event, the Maniphest listener reenters and adds
     // more transactions. Just suppress it until that can get cleaned up.
     $editor->setSuppressEvents(true);
 
     $src = $object->getPHID();
     $type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE;
     foreach ($file_phids as $dst) {
       $editor->addEdge($src, $type, $dst);
     }
 
     $editor->save();
   }
 
 }
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index a0cac01c8..630dbb60e 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -1,1030 +1,1030 @@
 <?php
 
 abstract class PhabricatorApplicationTransaction
   extends PhabricatorLiskDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorDestructableInterface {
 
   const TARGET_TEXT = 'text';
   const TARGET_HTML = 'html';
 
   protected $phid;
   protected $objectPHID;
   protected $authorPHID;
   protected $viewPolicy;
   protected $editPolicy;
 
   protected $commentPHID;
   protected $commentVersion = 0;
   protected $transactionType;
   protected $oldValue;
   protected $newValue;
   protected $metadata = array();
 
   protected $contentSource;
 
   private $comment;
   private $commentNotLoaded;
 
   private $handles;
   private $renderingTarget = self::TARGET_HTML;
   private $transactionGroup = array();
   private $viewer = self::ATTACHABLE;
   private $object = self::ATTACHABLE;
   private $oldValueHasBeenSet = false;
 
   private $ignoreOnNoEffect;
 
 
   /**
    * Flag this transaction as a pure side-effect which should be ignored when
    * applying transactions if it has no effect, even if transaction application
    * would normally fail. This both provides users with better error messages
    * and allows transactions to perform optional side effects.
    */
   public function setIgnoreOnNoEffect($ignore) {
     $this->ignoreOnNoEffect = $ignore;
     return $this;
   }
 
   public function getIgnoreOnNoEffect() {
     return $this->ignoreOnNoEffect;
   }
 
   public function shouldGenerateOldValue() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         return false;
     }
     return true;
   }
 
   abstract public function getApplicationTransactionType();
 
   private function getApplicationObjectTypeName() {
     $types = PhabricatorPHIDType::getAllTypes();
 
     $type = idx($types, $this->getApplicationTransactionType());
     if ($type) {
       return $type->getTypeName();
     }
 
     return pht('Object');
   }
 
   public function getApplicationTransactionCommentObject() {
-    throw new Exception("Not implemented!");
+    throw new Exception('Not implemented!');
   }
 
   public function getApplicationTransactionViewObject() {
     return new PhabricatorApplicationTransactionView();
   }
 
   public function getMetadataValue($key, $default = null) {
     return idx($this->metadata, $key, $default);
   }
 
   public function setMetadataValue($key, $value) {
     $this->metadata[$key] = $value;
     return $this;
   }
 
   public function generatePHID() {
     $type = PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST;
     $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,
         'metadata' => 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.");
+      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;
   }
 
   public function attachObject($object) {
     $this->object = $object;
     return $this;
   }
 
   public function getObject() {
     return $this->assertAttached($this->object);
   }
 
   public function getRemarkupBlocks() {
     $blocks = array();
 
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           $custom_blocks = $field->getApplicationTransactionRemarkupBlocks(
             $this);
           foreach ($custom_blocks as $custom_block) {
             $blocks[] = $custom_block;
           }
         }
         break;
     }
 
     if ($this->getComment()) {
       $blocks[] = $this->getComment()->getContent();
     }
 
     return $blocks;
   }
 
   public function setOldValue($value) {
     $this->oldValueHasBeenSet = true;
     $this->writeField('oldValue', $value);
     return $this;
   }
 
   public function hasOldValue() {
     return $this->oldValueHasBeenSet;
   }
 
 
 /* -(  Rendering  )---------------------------------------------------------- */
 
   public function setRenderingTarget($rendering_target) {
     $this->renderingTarget = $rendering_target;
     return $this;
   }
 
   public function getRenderingTarget() {
     return $this->renderingTarget;
   }
 
   public function attachViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
   public function getViewer() {
     return $this->assertAttached($this->viewer);
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = array();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     $phids[] = array($this->getAuthorPHID());
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           $phids[] = $field->getApplicationTransactionRequiredHandlePHIDs(
             $this);
         }
         break;
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         $phids[] = $old;
         $phids[] = $new;
         break;
       case PhabricatorTransactions::TYPE_EDGE:
         $phids[] = ipull($old, 'dst');
         $phids[] = ipull($new, 'dst');
         break;
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         if (!PhabricatorPolicyQuery::isGlobalPolicy($old)) {
           $phids[] = array($old);
         }
         if (!PhabricatorPolicyQuery::isGlobalPolicy($new)) {
           $phids[] = array($new);
         }
         break;
       case PhabricatorTransactions::TYPE_TOKEN:
         break;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         $phid = $this->getMetadataValue('harbormaster:buildablePHID');
         if ($phid) {
           $phids[] = array($phid);
         }
         break;
     }
 
     if ($this->getComment()) {
       $phids[] = array($this->getComment()->getAuthorPHID());
     }
 
     return array_mergev($phids);
   }
 
   public function setHandles(array $handles) {
     $this->handles = $handles;
     return $this;
   }
 
   public function getHandle($phid) {
     if (empty($this->handles[$phid])) {
       throw new Exception(
         pht(
           'Transaction ("%s") requires a handle ("%s") that it did not '.
           'load.',
           $this->getPHID(),
           $phid));
     }
     return $this->handles[$phid];
   }
 
   public function getHandleIfExists($phid) {
     return idx($this->handles, $phid);
   }
 
   public function getHandles() {
     if ($this->handles === null) {
       throw new Exception(
         'Transaction requires handles and it did not load them.'
       );
     }
     return $this->handles;
   }
 
   public function renderHandleLink($phid) {
     if ($this->renderingTarget == self::TARGET_HTML) {
       return $this->getHandle($phid)->renderLink();
     } else {
       return $this->getHandle($phid)->getLinkName();
     }
   }
 
   public function renderHandleList(array $phids) {
     $links = array();
     foreach ($phids as $phid) {
       $links[] = $this->renderHandleLink($phid);
     }
     if ($this->renderingTarget == self::TARGET_HTML) {
       return phutil_implode_html(', ', $links);
     } else {
       return implode(', ', $links);
     }
   }
 
   private function renderSubscriberList(array $phids, $change_type) {
     if ($this->getRenderingTarget() == self::TARGET_TEXT) {
       return $this->renderHandleList($phids);
     } else {
       $handles = array_select_keys($this->getHandles(), $phids);
       return id(new SubscriptionListStringBuilder())
         ->setHandles($handles)
         ->setObjectPHID($this->getPHID())
         ->buildTransactionString($change_type);
     }
   }
 
   protected function renderPolicyName($phid, $state = 'old') {
     $policy = PhabricatorPolicy::newFromPolicyAndHandle(
       $phid,
       $this->getHandleIfExists($phid));
     if ($this->renderingTarget == self::TARGET_HTML) {
       switch ($policy->getType()) {
         case PhabricatorPolicyType::TYPE_CUSTOM:
           $policy->setHref('/transactions/'.$state.'/'.$this->getPHID().'/');
           $policy->setWorkflow(true);
           break;
         default:
           break;
       }
       $output = $policy->renderDescription();
     } else {
       $output = hsprintf('%s', $policy->getFullName());
     }
     return $output;
   }
 
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         $comment = $this->getComment();
         if ($comment && $comment->getIsRemoved()) {
           return 'fa-eraser';
         }
         return 'fa-comment';
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return 'fa-envelope';
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         return 'fa-lock';
       case PhabricatorTransactions::TYPE_EDGE:
         return 'fa-link';
       case PhabricatorTransactions::TYPE_BUILDABLE:
         return 'fa-wrench';
       case PhabricatorTransactions::TYPE_TOKEN:
         return 'fa-trophy';
     }
 
     return 'fa-pencil';
   }
 
   public function getToken() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_TOKEN:
         $old = $this->getOldValue();
         $new = $this->getNewValue();
         if ($new) {
           $icon = substr($new, 10);
         } else {
           $icon = substr($old, 10);
         }
         return array($icon, !$this->getNewValue());
     }
 
     return array(null, null);
   }
 
   public function getColor() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT;
         $comment = $this->getComment();
         if ($comment && $comment->getIsRemoved()) {
           return 'black';
         }
         break;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_PASSED:
             return 'green';
           case HarbormasterBuildable::STATUS_FAILED:
             return 'red';
         }
         break;
     }
     return null;
   }
 
   protected function getTransactionCustomField() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $key = $this->getMetadataValue('customfield:key');
         if (!$key) {
           return null;
         }
 
         $field = PhabricatorCustomField::getObjectField(
           $this->getObject(),
           PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS,
           $key);
         if (!$field) {
           return null;
         }
 
         $field->setViewer($this->getViewer());
         return $field;
     }
 
     return null;
   }
 
   public function shouldHide() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         if ($this->getOldValue() === null) {
           return true;
         } else {
           return false;
         }
         break;
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           return $field->shouldHideInApplicationTransactions($this);
         }
     }
 
     return false;
   }
 
   public function shouldHideForMail(array $xactions) {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_TOKEN:
         return true;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_FAILED:
             // For now, only ever send mail when builds fail. We might let
             // you customize this later, but in most cases this is probably
             // completely uninteresting.
             return false;
         }
         return true;
     }
 
     return $this->shouldHide();
   }
 
   public function shouldHideForFeed() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_TOKEN:
         return true;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_FAILED:
             // For now, don't notify on build passes either. These are pretty
             // high volume and annoying, with very little present value. We
             // might want to turn them back on in the specific case of
             // build successes on the current document?
             return false;
         }
         return true;
     }
 
     return $this->shouldHide();
   }
 
   public function getTitleForMail() {
     return id(clone $this)->setRenderingTarget('text')->getTitle();
   }
 
   public function getBodyForMail() {
     $comment = $this->getComment();
     if ($comment && strlen($comment->getContent())) {
       return $comment->getContent();
     }
     return null;
   }
 
   public function getNoEffectDescription() {
 
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         return pht('You can not post an empty comment.');
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
         return pht(
           'This %s already has that view policy.',
           $this->getApplicationObjectTypeName());
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         return pht(
           'This %s already has that edit policy.',
           $this->getApplicationObjectTypeName());
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         return pht(
           'This %s already has that join policy.',
           $this->getApplicationObjectTypeName());
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return pht(
           'All users are already subscribed to this %s.',
           $this->getApplicationObjectTypeName());
       case PhabricatorTransactions::TYPE_EDGE:
         return pht('Edges already exist; transaction has no effect.');
     }
 
     return pht('Transaction has no effect.');
   }
 
   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:
         return pht(
           '%s changed the visibility of this %s from "%s" to "%s".',
           $this->renderHandleLink($author_phid),
           $this->getApplicationObjectTypeName(),
           $this->renderPolicyName($old, 'old'),
           $this->renderPolicyName($new, 'new'));
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
         return pht(
           '%s changed the edit policy of this %s from "%s" to "%s".',
           $this->renderHandleLink($author_phid),
           $this->getApplicationObjectTypeName(),
           $this->renderPolicyName($old, 'old'),
           $this->renderPolicyName($new, 'new'));
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         return pht(
           '%s changed the join policy of this %s from "%s" to "%s".',
           $this->renderHandleLink($author_phid),
           $this->getApplicationObjectTypeName(),
           $this->renderPolicyName($old, 'old'),
           $this->renderPolicyName($new, 'new'));
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         $add = array_diff($new, $old);
         $rem = array_diff($old, $new);
 
         if ($add && $rem) {
           return pht(
             '%s edited subscriber(s), added %d: %s; removed %d: %s.',
             $this->renderHandleLink($author_phid),
             count($add),
             $this->renderSubscriberList($add, 'add'),
             count($rem),
             $this->renderSubscriberList($rem, 'rem'));
         } else if ($add) {
           return pht(
             '%s added %d subscriber(s): %s.',
             $this->renderHandleLink($author_phid),
             count($add),
             $this->renderSubscriberList($add, 'add'));
         } else if ($rem) {
           return pht(
             '%s removed %d subscriber(s): %s.',
             $this->renderHandleLink($author_phid),
             count($rem),
             $this->renderSubscriberList($rem, 'rem'));
         } else {
           // This is used when rendering previews, before the user actually
           // selects any CCs.
           return pht(
             '%s updated subscribers...',
             $this->renderHandleLink($author_phid));
         }
         break;
       case PhabricatorTransactions::TYPE_EDGE:
         $new = ipull($new, 'dst');
         $old = ipull($old, 'dst');
         $add = array_diff($new, $old);
         $rem = array_diff($old, $new);
         $type = $this->getMetadata('edge:type');
         $type = head($type);
 
         if ($add && $rem) {
           $string = PhabricatorEdgeConfig::getEditStringForEdgeType($type);
           return pht(
             $string,
             $this->renderHandleLink($author_phid),
             count($add),
             $this->renderHandleList($add),
             count($rem),
             $this->renderHandleList($rem));
         } else if ($add) {
           $string = PhabricatorEdgeConfig::getAddStringForEdgeType($type);
           return pht(
             $string,
             $this->renderHandleLink($author_phid),
             count($add),
             $this->renderHandleList($add));
         } else if ($rem) {
           $string = PhabricatorEdgeConfig::getRemoveStringForEdgeType($type);
           return pht(
             $string,
             $this->renderHandleLink($author_phid),
             count($rem),
             $this->renderHandleList($rem));
         } else {
           return pht(
             '%s edited edge metadata.',
             $this->renderHandleLink($author_phid));
         }
 
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           return $field->getApplicationTransactionTitle($this);
         } else {
           return pht(
             '%s edited a custom field.',
             $this->renderHandleLink($author_phid));
         }
 
       case PhabricatorTransactions::TYPE_TOKEN:
         if ($old && $new) {
           return pht(
             '%s updated a token.',
             $this->renderHandleLink($author_phid));
         } else if ($old) {
           return pht(
             '%s rescinded a token.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s awarded a token.',
             $this->renderHandleLink($author_phid));
         }
 
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_BUILDING:
             return pht(
               '%s started building %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')));
           case HarbormasterBuildable::STATUS_PASSED:
             return pht(
               '%s completed building %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')));
           case HarbormasterBuildable::STATUS_FAILED:
             return pht(
               '%s failed to build %s!',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')));
           default:
             return null;
         }
 
       default:
         return pht(
           '%s edited this %s.',
           $this->renderHandleLink($author_phid),
           $this->getApplicationObjectTypeName());
     }
   }
 
   public function getTitleForFeed(PhabricatorFeedStory $story) {
     $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_JOIN_POLICY:
         return pht(
           '%s changed the join policy for %s.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid));
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return pht(
           '%s updated subscribers of %s.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid));
       case PhabricatorTransactions::TYPE_EDGE:
         $type = $this->getMetadata('edge:type');
         $type = head($type);
         $string = PhabricatorEdgeConfig::getFeedStringForEdgeType($type);
         return pht(
           $string,
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid));
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           return $field->getApplicationTransactionTitleForFeed($this, $story);
         } else {
           return pht(
             '%s edited a custom field on %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid));
         }
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_BUILDING:
             return pht(
               '%s started building %s for %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')),
               $this->renderHandleLink($object_phid));
           case HarbormasterBuildable::STATUS_PASSED:
             return pht(
               '%s completed building %s for %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')),
               $this->renderHandleLink($object_phid));
           case HarbormasterBuildable::STATUS_FAILED:
             return pht(
               '%s failed to build %s for %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')),
               $this->renderHandleLink($object_phid));
           default:
             return null;
         }
 
     }
 
     return $this->getTitle();
   }
 
   public function getBodyForFeed(PhabricatorFeedStory $story) {
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     $body = null;
 
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         $text = $this->getComment()->getContent();
         $body = phutil_escape_html_newlines(
           phutil_utf8_shorten($text, 128));
         break;
     }
     return $body;
   }
 
   public function getActionStrength() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         return 0.5;
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         $old = $this->getOldValue();
         $new = $this->getNewValue();
 
         $add = array_diff($old, $new);
         $rem = array_diff($new, $old);
 
         // If this action is the actor subscribing or unsubscribing themselves,
         // it is less interesting. In particular, if someone makes a comment and
         // also implicitly subscribes themselves, we should treat the
         // transaction group as "comment", not "subscribe". In this specific
         // case (one affected user, and that affected user it the actor),
         // decrease the action strength.
 
         if ((count($add) + count($rem)) != 1) {
           // Not exactly one CC change.
           break;
         }
 
         $affected_phid = head(array_merge($add, $rem));
         if ($affected_phid != $this->getAuthorPHID()) {
           // Affected user is someone else.
           break;
         }
 
         // Make this weaker than TYPE_COMMENT.
         return 0.25;
     }
     return 1.0;
   }
 
   public function isCommentTransaction() {
     if ($this->hasComment()) {
       return true;
     }
 
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         return true;
     }
 
     return false;
   }
 
   public function getActionName() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         return pht('Commented On');
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         return pht('Changed Policy');
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return pht('Changed Subscribers');
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_PASSED:
             return pht('Build Passed');
           case HarbormasterBuildable::STATUS_FAILED:
             return pht('Build Failed');
           default:
             return pht('Build Status');
         }
       default:
         return pht('Updated');
     }
   }
 
   public function getMailTags() {
     return array();
   }
 
   public function hasChangeDetails() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           return $field->getApplicationTransactionHasChangeDetails($this);
         }
         break;
     }
     return false;
   }
 
   public function renderChangeDetails(PhabricatorUser $viewer) {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getTransactionCustomField();
         if ($field) {
           return $field->getApplicationTransactionChangeDetails($this, $viewer);
         }
         break;
     }
 
     return $this->renderTextCorpusChangeDetails(
       $viewer,
       $this->getOldValue(),
       $this->getNewValue());
   }
 
   public function renderTextCorpusChangeDetails(
     PhabricatorUser $viewer,
     $old,
     $new) {
 
     require_celerity_resource('differential-changeset-view-css');
 
     $view = id(new PhabricatorApplicationTransactionTextDiffDetailView())
       ->setUser($viewer)
       ->setOldText($old)
       ->setNewText($new);
 
     return $view->render();
   }
 
   public function attachTransactionGroup(array $group) {
     assert_instances_of($group, 'PhabricatorApplicationTransaction');
     $this->transactionGroup = $group;
     return $this;
   }
 
   public function getTransactionGroup() {
     return $this->transactionGroup;
   }
 
   /**
    * Should this transaction be visually grouped with an existing transaction
    * group?
    *
    * @param list<PhabricatorApplicationTransaction> List of transactions.
    * @return bool True to display in a group with the other transactions.
    */
   public function shouldDisplayGroupWith(array $group) {
     $this_source = null;
     if ($this->getContentSource()) {
       $this_source = $this->getContentSource()->getSource();
     }
 
     foreach ($group as $xaction) {
       // Don't group transactions by different authors.
       if ($xaction->getAuthorPHID() != $this->getAuthorPHID()) {
         return false;
       }
 
       // Don't group transactions for different objects.
       if ($xaction->getObjectPHID() != $this->getObjectPHID()) {
         return false;
       }
 
       // Don't group anything into a group which already has a comment.
       if ($xaction->isCommentTransaction()) {
         return false;
       }
 
       // Don't group transactions from different content sources.
       $other_source = null;
       if ($xaction->getContentSource()) {
         $other_source = $xaction->getContentSource()->getSource();
       }
 
       if ($other_source != $this_source) {
         return false;
       }
 
       // Don't group transactions which happened more than 2 minutes apart.
       $apart = abs($xaction->getDateCreated() - $this->getDateCreated());
       if ($apart > (60 * 2)) {
         return false;
       }
     }
 
     return true;
   }
 
   public function renderExtraInformationLink() {
     $herald_xscript_id = $this->getMetadataValue('herald:transcriptID');
 
     if ($herald_xscript_id) {
       return phutil_tag(
         'a',
         array(
           'href' => '/herald/transcript/'.$herald_xscript_id.'/',
         ),
         pht('View Herald Transcript'));
     }
 
     return null;
   }
 
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return ($viewer->getPHID() == $this->getAuthorPHID());
   }
 
   public function describeAutomaticCapability($capability) {
     // TODO: (T603) Exact policies are unclear here.
     return null;
   }
 
 
 /* -(  PhabricatorDestructableInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $comment_template = null;
       try {
         $comment_template = $this->getApplicationTransactionCommentObject();
       } catch (Exception $ex) {
         // Continue; no comments for these transactions.
       }
 
       if ($comment_template) {
         $comments = $comment_template->loadAllWhere(
           'transactionPHID = %s',
           $this->getPHID());
         foreach ($comments as $comment) {
           $engine->destroyObject($comment);
         }
       }
 
       $this->delete();
     $this->saveTransaction();
   }
 
 
 }
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index 6ff13c78a..a8bc51feb 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -1,236 +1,236 @@
 <?php
 
 /**
  * @concrete-extensible
  */
 class PhabricatorApplicationTransactionCommentView extends AphrontView {
 
   private $submitButtonName;
   private $action;
 
   private $previewPanelID;
   private $previewTimelineID;
   private $previewToggleID;
   private $formID;
   private $statusID;
   private $commentID;
   private $draft;
   private $requestURI;
   private $showPreview = true;
   private $objectPHID;
   private $headerText;
 
   public function setObjectPHID($object_phid) {
     $this->objectPHID = $object_phid;
     return $this;
   }
 
   public function getObjectPHID() {
     return $this->objectPHID;
   }
 
   public function setShowPreview($show_preview) {
     $this->showPreview = $show_preview;
     return $this;
   }
 
   public function getShowPreview() {
     return $this->showPreview;
   }
 
   public function setRequestURI(PhutilURI $request_uri) {
     $this->requestURI = $request_uri;
     return $this;
   }
   public function getRequestURI() {
     return $this->requestURI;
   }
 
   public function setDraft(PhabricatorDraft $draft) {
     $this->draft = $draft;
     return $this;
   }
 
   public function getDraft() {
     return $this->draft;
   }
 
   public function setSubmitButtonName($submit_button_name) {
     $this->submitButtonName = $submit_button_name;
     return $this;
   }
 
   public function getSubmitButtonName() {
     return $this->submitButtonName;
   }
 
   public function setAction($action) {
     $this->action = $action;
     return $this;
   }
 
   public function getAction() {
     return $this->action;
   }
 
   public function setHeaderText($text) {
     $this->headerText = $text;
     return $this;
   }
 
   public function render() {
 
     $user = $this->getUser();
     if (!$user->isLoggedIn()) {
       $uri = id(new PhutilURI('/login/'))
         ->setQueryParam('next', (string) $this->getRequestURI());
       return id(new PHUIObjectBoxView())
         ->setFlush(true)
         ->setHeaderText(pht('Add Comment'))
         ->appendChild(
           javelin_tag(
             'a',
             array(
               'class' => 'login-to-comment button',
               'sigil' => 'workflow',
               'href' => $uri
             ),
             pht('Login to Comment')));
     }
 
     $data = array();
 
     $comment = $this->renderCommentPanel();
 
     if ($this->getShowPreview()) {
       $preview = $this->renderPreviewPanel();
     } else {
       $preview = null;
     }
 
     Javelin::initBehavior(
       'phabricator-transaction-comment-form',
       array(
         'formID'        => $this->getFormID(),
         'timelineID'    => $this->getPreviewTimelineID(),
         'panelID'       => $this->getPreviewPanelID(),
         'statusID'      => $this->getStatusID(),
         'commentID'     => $this->getCommentID(),
 
         'loadingString' => pht('Loading Preview...'),
         'savingString'  => pht('Saving Draft...'),
         'draftString'   => pht('Saved Draft'),
 
         'showPreview'   => $this->getShowPreview(),
 
         'actionURI'     => $this->getAction(),
         'draftKey'      => $this->getDraft()
           ? $this->getDraft()->getDraftKey()
           : null,
       ));
 
     $comment_box = id(new PHUIObjectBoxView())
       ->setFlush(true)
       ->setHeaderText($this->headerText)
       ->appendChild($comment);
 
     return array($comment_box, $preview);
   }
 
   private function renderCommentPanel() {
     $status = phutil_tag(
       'div',
       array(
         'id' => $this->getStatusID(),
       ),
       '');
 
     $draft_comment = '';
     if ($this->getDraft()) {
       $draft_comment = $this->getDraft()->getDraft();
     }
 
     if (!$this->getObjectPHID()) {
-      throw new Exception("Call setObjectPHID() before render()!");
+      throw new Exception('Call setObjectPHID() before render()!');
     }
 
     return id(new AphrontFormView())
       ->setUser($this->getUser())
       ->addSigil('transaction-append')
       ->setWorkflow(true)
       ->setMetadata(
         array(
           'objectPHID' => $this->getObjectPHID(),
         ))
       ->setAction($this->getAction())
       ->setID($this->getFormID())
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setID($this->getCommentID())
           ->setName('comment')
           ->setLabel(pht('Comment'))
           ->setUser($this->getUser())
           ->setValue($draft_comment))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue($this->getSubmitButtonName()))
       ->appendChild(
         id(new AphrontFormMarkupControl())
           ->setValue($status));
   }
 
   private function renderPreviewPanel() {
 
     $preview = id(new PHUITimelineView())
       ->setID($this->getPreviewTimelineID());
 
     return phutil_tag(
       'div',
       array(
         'id'    => $this->getPreviewPanelID(),
         'style' => 'display: none',
       ),
       $preview);
   }
 
   private function getPreviewPanelID() {
     if (!$this->previewPanelID) {
       $this->previewPanelID = celerity_generate_unique_node_id();
     }
     return $this->previewPanelID;
   }
 
   private function getPreviewTimelineID() {
     if (!$this->previewTimelineID) {
       $this->previewTimelineID = celerity_generate_unique_node_id();
     }
     return $this->previewTimelineID;
   }
 
   public function setFormID($id) {
     $this->formID = $id;
     return $this;
   }
 
   private function getFormID() {
     if (!$this->formID) {
       $this->formID = celerity_generate_unique_node_id();
     }
     return $this->formID;
   }
 
   private function getStatusID() {
     if (!$this->statusID) {
       $this->statusID = celerity_generate_unique_node_id();
     }
     return $this->statusID;
   }
 
   private function getCommentID() {
     if (!$this->commentID) {
       $this->commentID = celerity_generate_unique_node_id();
     }
     return $this->commentID;
   }
 
 }
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
index 524b47652..abc49488d 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
@@ -1,460 +1,460 @@
 <?php
 
 /**
  * @concrete-extensible
  */
 class PhabricatorApplicationTransactionView extends AphrontView {
 
   private $transactions;
   private $engine;
   private $anchorOffset = 1;
   private $showEditActions = true;
   private $isPreview;
   private $objectPHID;
   private $shouldTerminate = false;
   private $quoteTargetID;
   private $quoteRef;
 
   public function setQuoteRef($quote_ref) {
     $this->quoteRef = $quote_ref;
     return $this;
   }
 
   public function getQuoteRef() {
     return $this->quoteRef;
   }
 
   public function setQuoteTargetID($quote_target_id) {
     $this->quoteTargetID = $quote_target_id;
     return $this;
   }
 
   public function getQuoteTargetID() {
     return $this->quoteTargetID;
   }
 
   public function setObjectPHID($object_phid) {
     $this->objectPHID = $object_phid;
     return $this;
   }
 
   public function getObjectPHID() {
     return $this->objectPHID;
   }
 
   public function setIsPreview($is_preview) {
     $this->isPreview = $is_preview;
     return $this;
   }
 
   public function setShowEditActions($show_edit_actions) {
     $this->showEditActions = $show_edit_actions;
     return $this;
   }
 
   public function getShowEditActions() {
     return $this->showEditActions;
   }
 
   public function 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 setShouldTerminate($term) {
     $this->shouldTerminate = $term;
     return $this;
   }
 
   public function buildEvents($with_hiding = false) {
     $user = $this->getUser();
 
     $anchor = $this->anchorOffset;
 
     $xactions = $this->transactions;
 
     $xactions = $this->filterHiddenTransactions($xactions);
     $xactions = $this->groupRelatedTransactions($xactions);
     $groups = $this->groupDisplayTransactions($xactions);
 
     // If the viewer has interacted with this object, we hide things from
     // before their most recent interaction by default. This tends to make
     // very long threads much more manageable, because you don't have to
     // scroll through a lot of history and can focus on just new stuff.
 
     $show_group = null;
 
     if ($with_hiding) {
       // Find the most recent comment by the viewer.
       $group_keys = array_keys($groups);
       $group_keys = array_reverse($group_keys);
 
       // If we would only hide a small number of transactions, don't hide
       // anything. Just don't examine the last few keys. Also, we always
       // want to show the most recent pieces of activity, so don't examine
       // the first few keys either.
       $group_keys = array_slice($group_keys, 2, -2);
 
       $type_comment = PhabricatorTransactions::TYPE_COMMENT;
       foreach ($group_keys as $group_key) {
         $group = $groups[$group_key];
         foreach ($group as $xaction) {
           if ($xaction->getAuthorPHID() == $user->getPHID() &&
               $xaction->getTransactionType() == $type_comment) {
             // This is the most recent group where the user commented.
             $show_group = $group_key;
             break 2;
           }
         }
       }
     }
 
     $events = array();
     $hide_by_default = ($show_group !== null);
 
     foreach ($groups as $group_key => $group) {
       if ($hide_by_default && ($show_group === $group_key)) {
         $hide_by_default = false;
       }
 
       $group_event = null;
       foreach ($group as $xaction) {
         $event = $this->renderEvent($xaction, $group, $anchor);
         $event->setHideByDefault($hide_by_default);
         $anchor++;
         if (!$group_event) {
           $group_event = $event;
         } else {
           $group_event->addEventToGroup($event);
         }
       }
       $events[] = $group_event;
 
     }
 
     return $events;
   }
 
   public function render() {
     if (!$this->getObjectPHID()) {
-      throw new Exception("Call setObjectPHID() before render()!");
+      throw new Exception('Call setObjectPHID() before render()!');
     }
 
     $view = new PHUITimelineView();
     $view->setShouldTerminate($this->shouldTerminate);
     $events = $this->buildEvents($with_hiding = true);
     foreach ($events as $event) {
       $view->addEvent($event);
     }
 
     if ($this->getShowEditActions()) {
       $list_id = celerity_generate_unique_node_id();
 
       $view->setID($list_id);
 
       Javelin::initBehavior(
         'phabricator-transaction-list',
         array(
           'listID'          => $list_id,
           'objectPHID'      => $this->getObjectPHID(),
           'nextAnchor'      => $this->anchorOffset + count($events),
         ));
     }
 
     return $view->render();
   }
 
   protected function getOrBuildEngine() {
     if (!$this->engine) {
       $field = PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT;
 
       $engine = id(new PhabricatorMarkupEngine())
         ->setViewer($this->getUser());
       foreach ($this->transactions as $xaction) {
         if (!$xaction->hasComment()) {
           continue;
         }
         $engine->addObject($xaction->getComment(), $field);
       }
       $engine->process();
 
       $this->engine = $engine;
     }
 
     return $this->engine;
   }
 
   private function buildChangeDetailsLink(
     PhabricatorApplicationTransaction $xaction) {
 
     return javelin_tag(
       'a',
       array(
         'href' => '/transactions/detail/'.$xaction->getPHID().'/',
         'sigil' => 'workflow',
       ),
       pht('(Show Details)'));
   }
 
   private function buildExtraInformationLink(
     PhabricatorApplicationTransaction $xaction) {
 
     $link = $xaction->renderExtraInformationLink();
     if (!$link) {
       return null;
     }
 
     return phutil_tag(
       'span',
       array(
         'class' => 'phui-timeline-extra-information',
       ),
       array(" \xC2\xB7  ", $link));
   }
 
   protected function shouldGroupTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
     return false;
   }
 
   protected function renderTransactionContent(
     PhabricatorApplicationTransaction $xaction) {
 
     $field = PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT;
     $engine = $this->getOrBuildEngine();
     $comment = $xaction->getComment();
 
     if ($comment) {
       if ($comment->getIsRemoved()) {
         return javelin_tag(
           'span',
           array(
             'class' => 'comment-deleted',
             'sigil' => 'transaction-comment',
             'meta'  => array('phid' => $comment->getTransactionPHID()),
           ),
           pht(
             'This comment was removed by %s.',
             $xaction->getHandle($comment->getAuthorPHID())->renderLink()));
       } else if ($comment->getIsDeleted()) {
         return javelin_tag(
           'span',
           array(
             'class' => 'comment-deleted',
             'sigil' => 'transaction-comment',
             'meta'  => array('phid' => $comment->getTransactionPHID()),
           ),
           pht('This comment has been deleted.'));
       } else if ($xaction->hasComment()) {
         return javelin_tag(
           'span',
           array(
             'sigil' => 'transaction-comment',
             'meta'  => array('phid' => $comment->getTransactionPHID()),
           ),
           $engine->getOutput($comment, $field));
       } else {
         // This is an empty, non-deleted comment. Usually this happens when
         // rendering previews.
         return null;
       }
     }
 
     return null;
   }
 
   private function filterHiddenTransactions(array $xactions) {
     foreach ($xactions as $key => $xaction) {
       if ($xaction->shouldHide()) {
         unset($xactions[$key]);
       }
     }
     return $xactions;
   }
 
   private function groupRelatedTransactions(array $xactions) {
     $last = null;
     $last_key = null;
     $groups = array();
     foreach ($xactions as $key => $xaction) {
       if ($last && $this->shouldGroupTransactions($last, $xaction)) {
         $groups[$last_key][] = $xaction;
         unset($xactions[$key]);
       } else {
         $last = $xaction;
         $last_key = $key;
       }
     }
 
     foreach ($xactions as $key => $xaction) {
       $xaction->attachTransactionGroup(idx($groups, $key, array()));
     }
 
     return $xactions;
   }
 
   private function groupDisplayTransactions(array $xactions) {
     $groups = array();
     $group = array();
     foreach ($xactions as $xaction) {
       if ($xaction->shouldDisplayGroupWith($group)) {
         $group[] = $xaction;
       } else {
         if ($group) {
           $groups[] = $group;
         }
         $group = array($xaction);
       }
     }
 
     if ($group) {
       $groups[] = $group;
     }
 
     foreach ($groups as $key => $group) {
       $group = msort($group, 'getActionStrength');
       $group = array_reverse($group);
       $groups[$key] = $group;
     }
 
     return $groups;
   }
 
   private function renderEvent(
     PhabricatorApplicationTransaction $xaction,
     array $group,
     $anchor) {
     $viewer = $this->getUser();
 
     $event = id(new PHUITimelineEventView())
       ->setUser($viewer)
       ->setTransactionPHID($xaction->getPHID())
       ->setUserHandle($xaction->getHandle($xaction->getAuthorPHID()))
       ->setIcon($xaction->getIcon())
       ->setColor($xaction->getColor());
 
     list($token, $token_removed) = $xaction->getToken();
     if ($token) {
       $event->setToken($token, $token_removed);
     }
 
     if (!$this->shouldSuppressTitle($xaction, $group)) {
       $title = $xaction->getTitle();
       if ($xaction->hasChangeDetails()) {
         if (!$this->isPreview) {
           $details = $this->buildChangeDetailsLink($xaction);
           $title = array(
             $title,
             ' ',
             $details,
           );
         }
       }
 
       if (!$this->isPreview) {
         $more = $this->buildExtraInformationLink($xaction);
         if ($more) {
           $title = array($title, ' ', $more);
         }
       }
 
       $event->setTitle($title);
     }
 
     if ($this->isPreview) {
       $event->setIsPreview(true);
     } else {
       $event
         ->setDateCreated($xaction->getDateCreated())
         ->setContentSource($xaction->getContentSource())
         ->setAnchor($anchor);
     }
 
     $transaction_type = $xaction->getTransactionType();
     $comment_type = PhabricatorTransactions::TYPE_COMMENT;
     $is_normal_comment = ($transaction_type == $comment_type);
 
     if ($this->getShowEditActions() &&
         !$this->isPreview &&
         $is_normal_comment) {
 
       $has_deleted_comment =
         $xaction->getComment() &&
         $xaction->getComment()->getIsDeleted();
 
       $has_removed_comment =
         $xaction->getComment() &&
         $xaction->getComment()->getIsRemoved();
 
       if ($xaction->getCommentVersion() > 1 && !$has_removed_comment) {
         $event->setIsEdited(true);
       }
 
       // If we have a place for quoted text to go and this is a quotable
       // comment, pass the quote target ID to the event view.
       if ($this->getQuoteTargetID()) {
         if ($xaction->hasComment()) {
           if (!$has_removed_comment && !$has_deleted_comment) {
             $event->setQuoteTargetID($this->getQuoteTargetID());
             $event->setQuoteRef($this->getQuoteRef());
           }
         }
       }
 
       $can_edit = PhabricatorPolicyCapability::CAN_EDIT;
 
       if ($xaction->hasComment() || $has_deleted_comment) {
         $has_edit_capability = PhabricatorPolicyFilter::hasCapability(
           $viewer,
           $xaction,
           $can_edit);
         if ($has_edit_capability && !$has_removed_comment) {
           $event->setIsEditable(true);
         }
         if ($has_edit_capability || $viewer->getIsAdmin()) {
           if (!$has_removed_comment) {
             $event->setIsRemovable(true);
           }
         }
       }
     }
 
     $comment = $this->renderTransactionContent($xaction);
     if ($comment) {
       $event->appendChild($comment);
     }
 
     return $event;
   }
 
   private function shouldSuppressTitle(
     PhabricatorApplicationTransaction $xaction,
     array $group) {
 
     // This is a little hard-coded, but we don't have any other reasonable
     // cases for now. Suppress "commented on" if there are other actions in
     // the display group.
 
     if (count($group) > 1) {
       $type_comment = PhabricatorTransactions::TYPE_COMMENT;
       if ($xaction->getTransactionType() == $type_comment) {
         return true;
       }
     }
 
     return false;
   }
 
 }
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
index 712222215..29bf07ead 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
@@ -1,440 +1,440 @@
 <?php
 
 final class PhabricatorTypeaheadCommonDatasourceController
   extends PhabricatorTypeaheadDatasourceController {
 
   private $type;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->type = $data['type'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $query = $request->getStr('q');
     $raw_query = $request->getStr('raw');
 
     $need_rich_data = false;
 
     $need_users = false;
     $need_agents = false;
     $need_applications = false;
     $need_lists = false;
     $need_projs = false;
     $need_repos = false;
     $need_packages = false;
     $need_upforgrabs = false;
     $need_arcanist_projects = false;
     $need_noproject = false;
     $need_symbols = false;
     $need_jump_objects = false;
     $need_build_plans = false;
     $need_task_priority = false;
     $need_macros = false;
     $need_legalpad_documents = false;
     switch ($this->type) {
       case 'mainsearch':
         $need_users = true;
         $need_applications = true;
         $need_rich_data = true;
         $need_symbols = true;
         $need_projs = true;
         $need_jump_objects = true;
         break;
       case 'searchowner':
         $need_users = true;
         $need_upforgrabs = true;
         break;
       case 'searchproject':
         $need_projs = true;
         $need_noproject = true;
         break;
       case 'users':
       case 'accounts':
       case 'authors':
         $need_users = true;
         break;
       case 'mailable':
       case 'allmailable':
         $need_users = true;
         $need_lists = true;
         $need_projs = true;
         break;
       case 'projects':
         $need_projs = true;
         break;
       case 'usersorprojects':
       case 'accountsorprojects':
         $need_users = true;
         $need_projs = true;
         break;
       case 'usersprojectsorpackages':
         $need_users = true;
         $need_projs = true;
         $need_packages = true;
         break;
       case 'repositories':
         $need_repos = true;
         break;
       case 'packages':
         $need_packages = true;
         break;
       case 'arcanistprojects':
         $need_arcanist_projects = true;
         break;
       case 'buildplans':
         $need_build_plans = true;
         break;
       case 'taskpriority':
         $need_task_priority = true;
         break;
       case 'macros':
         $need_macros = true;
         break;
       case 'legalpaddocuments':
         $need_legalpad_documents = true;
         break;
     }
 
     $results = array();
 
     if ($need_upforgrabs) {
       $results[] = id(new PhabricatorTypeaheadResult())
         ->setName('upforgrabs (Up For Grabs)')
         ->setPHID(ManiphestTaskOwner::OWNER_UP_FOR_GRABS);
     }
 
     if ($need_noproject) {
       $results[] = id(new PhabricatorTypeaheadResult())
         ->setName('noproject (No Project)')
         ->setPHID(ManiphestTaskOwner::PROJECT_NO_PROJECT);
     }
 
 
     if ($need_users) {
       $columns = array(
         'isSystemAgent',
         'isAdmin',
         'isDisabled',
         'userName',
         'realName',
         'phid');
 
       if ($query) {
         // This is an arbitrary limit which is just larger than any limit we
         // actually use in the application.
 
         // TODO: The datasource should pass this in the query.
         $limit = 15;
 
         $user_table = new PhabricatorUser();
         $conn_r = $user_table->establishConnection('r');
         $ids = queryfx_all(
           $conn_r,
           'SELECT id FROM %T WHERE username LIKE %>
             ORDER BY username ASC LIMIT %d',
           $user_table->getTableName(),
           $query,
           $limit);
         $ids = ipull($ids, 'id');
 
         if (count($ids) < $limit) {
           // If we didn't find enough username hits, look for real name hits.
           // We need to pull the entire pagesize so that we end up with the
           // right number of items if this query returns many duplicate IDs
           // that we've already selected.
 
           $realname_ids = queryfx_all(
             $conn_r,
             'SELECT DISTINCT userID FROM %T WHERE token LIKE %>
               ORDER BY token ASC LIMIT %d',
             PhabricatorUser::NAMETOKEN_TABLE,
             $query,
             $limit);
           $realname_ids = ipull($realname_ids, 'userID');
           $ids = array_merge($ids, $realname_ids);
 
           $ids = array_unique($ids);
           $ids = array_slice($ids, 0, $limit);
         }
 
         // Always add the logged-in user because some tokenizers autosort them
         // first. They'll be filtered out on the client side if they don't
         // match the query.
         $ids[] = $request->getUser()->getID();
 
         if ($ids) {
           $users = id(new PhabricatorUser())->loadColumnsWhere(
             $columns,
             'id IN (%Ld)',
             $ids);
         } else {
           $users = array();
         }
       } else {
         $users = id(new PhabricatorUser())->loadColumns($columns);
       }
 
       if ($need_rich_data) {
         $phids = mpull($users, 'getPHID');
         $handles = $this->loadViewerHandles($phids);
       }
 
       foreach ($users as $user) {
         $closed = null;
         if ($user->getIsDisabled()) {
           $closed = pht('Disabled');
         } else if ($user->getIsSystemAgent()) {
           $closed = pht('Bot/Script');
         }
 
         $result = id(new PhabricatorTypeaheadResult())
           ->setName($user->getFullName())
           ->setURI('/p/'.$user->getUsername())
           ->setPHID($user->getPHID())
           ->setPriorityString($user->getUsername())
           ->setIcon('fa-user bluegrey')
           ->setPriorityType('user')
           ->setClosed($closed);
 
         if ($need_rich_data) {
           $display_type = 'User';
           if ($user->getIsAdmin()) {
             $display_type = 'Administrator';
           }
           $result->setDisplayType($display_type);
           $result->setImageURI($handles[$user->getPHID()]->getImageURI());
         }
         $results[] = $result;
       }
     }
 
     if ($need_lists) {
       $lists = id(new PhabricatorMailingListQuery())
         ->setViewer($viewer)
         ->execute();
       foreach ($lists as $list) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setName($list->getName())
           ->setURI($list->getURI())
           ->setPHID($list->getPHID());
       }
     }
 
     if ($need_build_plans) {
       $plans = id(new HarbormasterBuildPlanQuery())
         ->setViewer($viewer)
         ->execute();
       foreach ($plans as $plan) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setName($plan->getName())
           ->setPHID($plan->getPHID());
       }
     }
 
     if ($need_task_priority) {
       $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
       foreach ($priority_map as $value => $name) {
         // NOTE: $value is not a phid but is unique. This'll work.
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setPHID($value)
           ->setName($name);
       }
     }
 
     if ($need_macros) {
       $macros = id(new PhabricatorMacroQuery())
         ->setViewer($viewer)
         ->withStatus(PhabricatorMacroQuery::STATUS_ACTIVE)
         ->execute();
       $macros = mpull($macros, 'getName', 'getPHID');
       foreach ($macros as $phid => $name) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setPHID($phid)
           ->setName($name);
       }
     }
 
     if ($need_legalpad_documents) {
       $documents = id(new LegalpadDocumentQuery())
         ->setViewer($viewer)
         ->execute();
       $documents = mpull($documents, 'getTitle', 'getPHID');
       foreach ($documents as $phid => $title) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setPHID($phid)
           ->setName($title);
       }
     }
 
     if ($need_projs) {
       $projs = id(new PhabricatorProjectQuery())
         ->setViewer($viewer)
         ->needImages(true)
         ->execute();
       foreach ($projs as $proj) {
         $closed = null;
         if ($proj->isArchived()) {
           $closed = pht('Archived');
         }
 
         $proj_result = id(new PhabricatorTypeaheadResult())
           ->setName($proj->getName())
-          ->setDisplayType("Project")
+          ->setDisplayType('Project')
           ->setURI('/project/view/'.$proj->getID().'/')
           ->setPHID($proj->getPHID())
           ->setIcon($proj->getIcon().' bluegrey')
           ->setPriorityType('proj')
           ->setClosed($closed);
 
         $proj_result->setImageURI($proj->getProfileImageURI());
 
         $results[] = $proj_result;
       }
     }
 
     if ($need_repos) {
       $repos = id(new PhabricatorRepositoryQuery())
         ->setViewer($viewer)
         ->execute();
       foreach ($repos as $repo) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setName('r'.$repo->getCallsign().' ('.$repo->getName().')')
           ->setURI('/diffusion/'.$repo->getCallsign().'/')
           ->setPHID($repo->getPHID())
           ->setPriorityString('r'.$repo->getCallsign());
       }
     }
 
     if ($need_packages) {
       $packages = id(new PhabricatorOwnersPackage())->loadAll();
       foreach ($packages as $package) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setIcon('pl-testplan')
           ->setName($package->getName())
           ->setURI('/owners/package/'.$package->getID().'/')
           ->setPHID($package->getPHID());
       }
     }
 
     if ($need_arcanist_projects) {
       $arcprojs = id(new PhabricatorRepositoryArcanistProject())->loadAll();
       foreach ($arcprojs as $proj) {
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setName($proj->getName())
           ->setPHID($proj->getPHID());
       }
     }
 
     if ($need_applications) {
       $applications = PhabricatorApplication::getAllInstalledApplications();
       foreach ($applications as $application) {
         $uri = $application->getTypeaheadURI();
         if (!$uri) {
           continue;
         }
         $name = $application->getName().' '.$application->getShortDescription();
 
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setName($name)
           ->setURI($uri)
           ->setPHID($application->getPHID())
           ->setPriorityString($application->getName())
           ->setDisplayName($application->getName())
           ->setDisplayType($application->getShortDescription())
           ->setImageuRI($application->getIconURI())
           ->setPriorityType('apps');
       }
     }
 
     if ($need_symbols) {
       $symbols = id(new DiffusionSymbolQuery())
         ->setNamePrefix($query)
         ->setLimit(15)
         ->needArcanistProjects(true)
         ->needRepositories(true)
         ->needPaths(true)
         ->execute();
       foreach ($symbols as $symbol) {
         $lang = $symbol->getSymbolLanguage();
         $name = $symbol->getSymbolName();
         $type = $symbol->getSymbolType();
         $proj = $symbol->getArcanistProject()->getName();
 
         $results[] = id(new PhabricatorTypeaheadResult())
           ->setName($name)
           ->setURI($symbol->getURI())
           ->setPHID(md5($symbol->getURI())) // Just needs to be unique.
           ->setDisplayName($name)
           ->setDisplayType(strtoupper($lang).' '.ucwords($type).' ('.$proj.')')
           ->setPriorityType('symb');
       }
     }
 
     if ($need_jump_objects) {
       $objects = id(new PhabricatorObjectQuery())
         ->setViewer($viewer)
         ->withNames(array($raw_query))
         ->execute();
       if ($objects) {
         $handles = id(new PhabricatorHandleQuery())
           ->setViewer($viewer)
           ->withPHIDs(mpull($objects, 'getPHID'))
           ->execute();
         $handle = head($handles);
         if ($handle) {
           $results[] = id(new PhabricatorTypeaheadResult())
             ->setName($handle->getFullName())
             ->setDisplayType($handle->getTypeName())
             ->setURI($handle->getURI())
             ->setPHID($handle->getPHID())
             ->setPriorityType('jump');
         }
       }
     }
 
     $content = mpull($results, 'getWireFormat');
 
     if ($request->isAjax()) {
       return id(new AphrontAjaxResponse())->setContent($content);
     }
 
     // If there's a non-Ajax request to this endpoint, show results in a tabular
     // format to make it easier to debug typeahead output.
 
     $rows = array();
     foreach ($results as $result) {
       $wire = $result->getWireFormat();
       $rows[] = $wire;
     }
 
     $table = new AphrontTableView($rows);
     $table->setHeaders(
       array(
         'Name',
         'URI',
         'PHID',
         'Priority',
         'Display Name',
         'Display Type',
         'Image URI',
         'Priority Type',
       ));
 
     $panel = new AphrontPanelView();
     $panel->setHeader('Typeahead Results');
     $panel->appendChild($table);
 
     return $this->buildStandardPageResponse(
       $panel,
       array(
         'title' => 'Typeahead Results',
       ));
   }
 
 }
diff --git a/src/applications/uiexample/examples/PHUITimelineExample.php b/src/applications/uiexample/examples/PHUITimelineExample.php
index cfd5837c6..ff7ac1a93 100644
--- a/src/applications/uiexample/examples/PHUITimelineExample.php
+++ b/src/applications/uiexample/examples/PHUITimelineExample.php
@@ -1,200 +1,200 @@
 <?php
 
 final class PHUITimelineExample extends PhabricatorUIExample {
 
   public function getName() {
     return 'Timeline View';
   }
 
   public function getDescription() {
     return hsprintf(
       'Use <tt>PHUITimelineView</tt> to comments and transactions.');
   }
 
   public function renderExample() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($user->getPHID()))
       ->executeOne();
 
     $events = array();
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setTitle('A major event.')
       ->appendChild('This is a major timeline event.');
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('fa-heart')
       ->setTitle('A minor event.');
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('fa-comment')
       ->appendChild('A major event with no title.');
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('fa-star')
       ->setTitle('Another minor event.');
 
     $events[] = id(new PHUITimelineEventView())
       ->setIcon('fa-trophy')
       ->setToken('medal-1')
       ->setUserHandle($handle);
 
     $events[] = id(new PHUITimelineEventView())
       ->setIcon('fa-quote-left')
       ->setToken('medal-1', true)
       ->setUserHandle($handle);
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setTitle('Major Red Event')
       ->setIcon('fa-heart-o')
       ->appendChild('This event is red!')
       ->setColor(PhabricatorTransactions::COLOR_RED);
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('fa-female')
       ->setTitle('Minor Red Event')
       ->setColor(PhabricatorTransactions::COLOR_RED);
 
     $events[] = id(new PHUITimelineEventView())
       ->setIcon('fa-refresh')
       ->setUserHandle($handle)
       ->setTitle('Minor Not-Red Event')
       ->setColor(PhabricatorTransactions::COLOR_GREEN);
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('fa-calendar-o')
       ->setTitle('Minor Red Event')
       ->setColor(PhabricatorTransactions::COLOR_RED);
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('fa-random')
       ->setTitle('Minor Not-Red Event')
       ->setColor(PhabricatorTransactions::COLOR_BLACK);
 
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('tag')
       ->setTitle('Major Green Event')
       ->appendChild('This event is green!')
       ->setColor(PhabricatorTransactions::COLOR_GREEN);
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setIcon('tag')
       ->setTitle(str_repeat('Long Text Title ', 64))
       ->appendChild(str_repeat('Long Text Body ', 64))
       ->setColor(PhabricatorTransactions::COLOR_ORANGE);
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setTitle(str_repeat('LongTextEventNoSpaces', 1024))
       ->appendChild(str_repeat('LongTextNoSpaces', 1024))
       ->setColor(PhabricatorTransactions::COLOR_RED);
 
     $colors = array(
       PhabricatorTransactions::COLOR_RED,
       PhabricatorTransactions::COLOR_ORANGE,
       PhabricatorTransactions::COLOR_YELLOW,
       PhabricatorTransactions::COLOR_GREEN,
       PhabricatorTransactions::COLOR_SKY,
       PhabricatorTransactions::COLOR_BLUE,
       PhabricatorTransactions::COLOR_INDIGO,
       PhabricatorTransactions::COLOR_VIOLET,
       PhabricatorTransactions::COLOR_GREY,
       PhabricatorTransactions::COLOR_BLACK,
     );
 
     $events[] = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
-      ->setTitle("Colorless")
+      ->setTitle('Colorless')
       ->setIcon('lock');
 
     foreach ($colors as $color) {
       $events[] = id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle("Color '{$color}'")
         ->setIcon('lock')
         ->setColor($color);
     }
 
     $vhandle = $handle->renderLink();
 
     $group_event = id(new PHUITimelineEventView())
       ->setUserHandle($handle)
       ->setTitle(pht('%s went to the store.', $vhandle));
 
     $group_event->addEventToGroup(
       id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle(pht('%s bought an apple.', $vhandle))
         ->setColor('green')
         ->setIcon('check'));
 
     $group_event->addEventToGroup(
       id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle(pht('%s bought a banana.', $vhandle))
         ->setColor('yellow')
         ->setIcon('check'));
 
     $group_event->addEventToGroup(
       id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle(pht('%s bought a cherry.', $vhandle))
         ->setColor('red')
         ->setIcon('check'));
 
     $group_event->addEventToGroup(
       id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle(pht('%s paid for his goods.', $vhandle)));
 
     $group_event->addEventToGroup(
       id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle(pht('%s returned home.', $vhandle))
         ->setIcon('home')
         ->setColor('blue'));
 
     $group_event->addEventToGroup(
       id(new PHUITimelineEventView())
         ->setUserHandle($handle)
         ->setTitle(pht('%s related on his adventures.', $vhandle))
         ->appendChild(
           pht(
             'Today, I went to the store. I bought an apple. I bought a '.
             'banana. I bought a cherry. I paid for my goods, then I returned '.
             'home.')));
 
     $events[] = $group_event;
 
     $anchor = 0;
     foreach ($events as $group) {
       foreach ($group->getEventGroup() as $event) {
         $event->setUser($user);
         $event->setDateCreated(time() + ($anchor * 60 * 8));
         $event->setAnchor(++$anchor);
       }
     }
 
     $timeline = id(new PHUITimelineView());
     foreach ($events as $event) {
       $timeline->addEvent($event);
     }
 
     return $timeline;
   }
 }
diff --git a/src/applications/uiexample/examples/PhabricatorAphrontBarExample.php b/src/applications/uiexample/examples/PhabricatorAphrontBarExample.php
index f22f5757f..61d62b282 100644
--- a/src/applications/uiexample/examples/PhabricatorAphrontBarExample.php
+++ b/src/applications/uiexample/examples/PhabricatorAphrontBarExample.php
@@ -1,75 +1,75 @@
 <?php
 
 final class PhabricatorAphrontBarExample extends PhabricatorUIExample {
 
   public function getName() {
-    return "Bars";
+    return 'Bars';
   }
 
   public function getDescription() {
     return 'Like fractions, but more horizontal.';
   }
 
   public function renderExample() {
     $out = '';
     $out .= $this->renderTestThings('AphrontProgressBarView', 13, 10);
     $out .= $this->renderTestThings('AphrontGlyphBarView', 13, 10);
     $out .= $this->renderWeirdOrderGlyphBars();
     $out .= $this->renderAsciiStarBar();
     return phutil_safe_html($out);
   }
 
   private function wrap($title, $thing) {
     return id(new AphrontPanelView())
       ->setHeader($title)
       ->appendChild($thing)
       ->render();
   }
 
   private function renderTestThings($class, $max, $incr) {
     $bars = array();
     for ($ii = 0; $ii <= $max; $ii++) {
       $bars[] = newv($class, array())
         ->setValue($ii * $incr)
         ->setMax($max * $incr)
         ->setCaption("{$ii} outta {$max} ain't bad!");
     }
     return $this->wrap(
       "Test {$class}",
       phutil_implode_html('', mpull($bars, 'render')));
   }
 
   private function renderWeirdOrderGlyphBars() {
     $views = array();
     $indices = array(1, 3, 7, 4, 2, 8, 9, 5, 10, 6);
     $max = count($indices);
     foreach ($indices as $index) {
       $views[] = id(new AphrontGlyphBarView())
         ->setValue($index)
         ->setMax($max)
         ->setNumGlyphs(5)
         ->setCaption("Lol score is {$index}/{$max}")
         ->setGlyph(hsprintf('%s', 'LOL!'))
         ->setBackgroundGlyph(hsprintf('%s', '____'))
         ->render();
       $views[] = hsprintf('<div style="clear:both;"></div>');
     }
 
     return $this->wrap(
-      "Glyph bars in weird order",
+      'Glyph bars in weird order',
       phutil_implode_html('', $views));
   }
 
   private function renderAsciiStarBar() {
     return $this->wrap(
-      "Ascii star glyph bar",
+      'Ascii star glyph bar',
       id(new AphrontGlyphBarView())
         ->setValue(50)
         ->setMax(100)
         ->setCaption('Glyphs!')
         ->setNumGlyphs(10)
         ->setGlyph(hsprintf('%s', '*'))
         ->render());
   }
 
 }
diff --git a/src/applications/uiexample/examples/PhabricatorBusyExample.php b/src/applications/uiexample/examples/PhabricatorBusyExample.php
index 4d88bac3e..1cee5ffca 100644
--- a/src/applications/uiexample/examples/PhabricatorBusyExample.php
+++ b/src/applications/uiexample/examples/PhabricatorBusyExample.php
@@ -1,17 +1,17 @@
 <?php
 
 final class PhabricatorBusyExample extends PhabricatorUIExample {
 
   public function getName() {
     return 'Busy';
   }
 
   public function getDescription() {
-    return "Busy.";
+    return 'Busy.';
   }
 
   public function renderExample() {
     Javelin::initBehavior('phabricator-busy-example');
     return null;
   }
 }
diff --git a/src/applications/uiexample/examples/PhabricatorHovercardExample.php b/src/applications/uiexample/examples/PhabricatorHovercardExample.php
index e83081f81..ca73039af 100644
--- a/src/applications/uiexample/examples/PhabricatorHovercardExample.php
+++ b/src/applications/uiexample/examples/PhabricatorHovercardExample.php
@@ -1,78 +1,78 @@
 <?php
 
 final class PhabricatorHovercardExample extends PhabricatorUIExample {
 
   public function getName() {
     return 'Hovercard';
   }
 
   public function getDescription() {
     return hsprintf('Use <tt>PhabricatorHovercardView</tt> to render '.
       'hovercards. Aren\'t I genius?');
   }
 
   public function renderExample() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $elements = array();
 
     $diff_handle = $this->createBasicDummyHandle(
-      "D123",
+      'D123',
       DifferentialPHIDTypeRevision::TYPECONST,
-      "Introduce cooler Differential Revisions");
+      'Introduce cooler Differential Revisions');
 
-    $panel = $this->createPanel("Differential Hovercard");
+    $panel = $this->createPanel('Differential Hovercard');
     $panel->appendChild(id(new PhabricatorHovercardView())
       ->setObjectHandle($diff_handle)
       ->addField(pht('Author'), $user->getUsername())
       ->addField(pht('Updated'), phabricator_datetime(time(), $user))
       ->addAction(pht('Subscribe'), '/dev/random')
       ->setUser($user));
     $elements[] = $panel;
 
     $task_handle = $this->createBasicDummyHandle(
-      "T123",
+      'T123',
       ManiphestPHIDTypeTask::TYPECONST,
-      "Improve Mobile Experience for Phabricator");
+      'Improve Mobile Experience for Phabricator');
 
     $tag = id(new PHUITagView())
       ->setType(PHUITagView::TYPE_STATE)
       ->setName('Closed, Resolved');
-    $panel = $this->createPanel("Maniphest Hovercard");
+    $panel = $this->createPanel('Maniphest Hovercard');
     $panel->appendChild(id(new PhabricatorHovercardView())
       ->setObjectHandle($task_handle)
       ->setUser($user)
       ->addField(pht('Assigned to'), $user->getUsername())
       ->addField(pht('Dependent Tasks'), 'T123, T124, T125')
       ->addAction(pht('Subscribe'), '/dev/random')
       ->addAction(pht('Create Subtask'), '/dev/urandom')
       ->addTag($tag));
     $elements[] = $panel;
 
     $user_handle = $this->createBasicDummyHandle(
       'gwashington',
       PhabricatorPeoplePHIDTypeUser::TYPECONST,
       'George Washington');
     $user_handle->setImageURI(
       celerity_get_resource_uri('/rsrc/image/people/washington.png'));
-    $panel = $this->createPanel("Whatevery Hovercard");
+    $panel = $this->createPanel('Whatevery Hovercard');
     $panel->appendChild(id(new PhabricatorHovercardView())
       ->setObjectHandle($user_handle)
       ->addField(pht('Status'), 'Available')
       ->addField(pht('Member since'), '30. February 1750')
       ->addAction(pht('Send a Message'), '/dev/null')
       ->setUser($user));
     $elements[] = $panel;
 
-    return phutil_implode_html("", $elements);
+    return phutil_implode_html('', $elements);
   }
 
   private function createPanel($header) {
     $panel = new PHUIBoxView();
     $panel->addClass('grouped');
     $panel->addClass('ml');
     return $panel;
   }
 
 }
diff --git a/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php b/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
index 48cf29d1f..9dbf1bd0b 100644
--- a/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
+++ b/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
@@ -1,53 +1,53 @@
 <?php
 
 final class PhabricatorXHProfProfileController
   extends PhabricatorXHProfController {
 
   private $phid;
 
   public function willProcessRequest(array $data) {
     $this->phid = $data['phid'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(array($this->phid))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     $data = $file->loadFileData();
     $data = @json_decode($data, true);
     if (!$data) {
-      throw new Exception("Failed to unserialize XHProf profile!");
+      throw new Exception('Failed to unserialize XHProf profile!');
     }
 
     $symbol = $request->getStr('symbol');
 
     $is_framed = $request->getBool('frame');
 
     if ($symbol) {
       $view = new PhabricatorXHProfProfileSymbolView();
       $view->setSymbol($symbol);
     } else {
       $view = new PhabricatorXHProfProfileTopLevelView();
       $view->setFile($file);
       $view->setLimit(100);
     }
 
     $view->setBaseURI($request->getRequestURI()->getPath());
     $view->setIsFramed($is_framed);
     $view->setProfileData($data);
 
     return $this->buildStandardPageResponse(
       $view,
       array(
         'title' => 'Profile',
         'frame' => $is_framed,
       ));
   }
 }
diff --git a/src/infrastructure/celerity/CelerityResourceController.php b/src/infrastructure/celerity/CelerityResourceController.php
index 8ab192b6f..286b21505 100644
--- a/src/infrastructure/celerity/CelerityResourceController.php
+++ b/src/infrastructure/celerity/CelerityResourceController.php
@@ -1,158 +1,158 @@
 <?php
 
 abstract class CelerityResourceController extends PhabricatorController {
 
   protected function buildResourceTransformer() {
     return null;
   }
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function shouldRequireEnabledUser() {
     return false;
   }
 
   public function shouldAllowPartialSessions() {
     return true;
   }
 
   abstract public function getCelerityResourceMap();
 
   protected function serveResource($path, $package_hash = null) {
     // Sanity checking to keep this from exposing anything sensitive, since it
     // ultimately boils down to disk reads.
     if (preg_match('@(//|\.\.)@', $path)) {
       return new Aphront400Response();
     }
 
     $type = CelerityResourceTransformer::getResourceType($path);
     $type_map = self::getSupportedResourceTypes();
 
     if (empty($type_map[$type])) {
-      throw new Exception("Only static resources may be served.");
+      throw new Exception('Only static resources may be served.');
     }
 
     $dev_mode = PhabricatorEnv::getEnvConfig('phabricator.developer-mode');
 
     if (AphrontRequest::getHTTPHeader('If-Modified-Since') && !$dev_mode) {
       // Return a "304 Not Modified". We don't care about the value of this
       // field since we never change what resource is served by a given URI.
       return $this->makeResponseCacheable(new Aphront304Response());
     }
 
     $is_cacheable = (!$dev_mode) &&
                     $this->isCacheableResourceType($type);
 
     $cache = null;
     $data = null;
     if ($is_cacheable) {
       $cache = PhabricatorCaches::getImmutableCache();
 
       $request_path = $this->getRequest()->getPath();
       $cache_key = $this->getCacheKey($request_path);
 
       $data = $cache->getKey($cache_key);
     }
 
     if ($data === null) {
       $map = $this->getCelerityResourceMap();
 
       if ($map->isPackageResource($path)) {
         $resource_names = $map->getResourceNamesForPackageName($path);
         if (!$resource_names) {
           return new Aphront404Response();
         }
 
         try {
           $data = array();
           foreach ($resource_names as $resource_name) {
             $data[] = $map->getResourceDataForName($resource_name);
           }
           $data = implode("\n\n", $data);
         } catch (Exception $ex) {
           return new Aphront404Response();
         }
       } else {
         try {
           $data = $map->getResourceDataForName($path);
         } catch (Exception $ex) {
           return new Aphront404Response();
         }
       }
 
       $xformer = $this->buildResourceTransformer();
       if ($xformer) {
         $data = $xformer->transformResource($path, $data);
       }
 
       if ($cache) {
         $cache->setKey($cache_key, $data);
       }
     }
 
     $response = new AphrontFileResponse();
     $response->setContent($data);
     $response->setMimeType($type_map[$type]);
 
     // NOTE: This is a piece of magic required to make WOFF fonts work in
     // Firefox. Possibly we should generalize this.
     if ($type == 'woff') {
       // We could be more tailored here, but it's not currently trivial to
       // generate a comprehensive list of valid origins (an install may have
       // arbitrarily many Phame blogs, for example), and we lose nothing by
       // allowing access from anywhere.
-      $response->addAllowOrigin("*");
+      $response->addAllowOrigin('*');
     }
 
     return $this->makeResponseCacheable($response);
   }
 
   public static function getSupportedResourceTypes() {
     return array(
       'css' => 'text/css; charset=utf-8',
       'js'  => 'text/javascript; charset=utf-8',
       'png' => 'image/png',
       'gif' => 'image/gif',
       'jpg' => 'image/jpeg',
       'swf' => 'application/x-shockwave-flash',
       'woff' => 'font/woff',
       'eot' => 'font/eot',
       'ttf' => 'font/ttf',
     );
   }
 
   private function makeResponseCacheable(AphrontResponse $response) {
     $response->setCacheDurationInSeconds(60 * 60 * 24 * 30);
     $response->setLastModified(time());
 
     return $response;
   }
 
 
   /**
    * Is it appropriate to cache the data for this resource type in the fast
    * immutable cache?
    *
    * Generally, text resources (which are small, and expensive to process)
    * are cached, while other types of resources (which are large, and cheap
    * to process) are not.
    *
    * @param string  Resource type.
    * @return bool   True to enable caching.
    */
   private function isCacheableResourceType($type) {
     $types = array(
       'js' => true,
       'css' => true,
     );
 
     return isset($types[$type]);
   }
 
   private function getCacheKey($path) {
     return 'celerity:'.$path;
   }
 
 }
diff --git a/src/infrastructure/celerity/CelerityResourceGraph.php b/src/infrastructure/celerity/CelerityResourceGraph.php
index 358c6a0c0..a85c3ffbd 100644
--- a/src/infrastructure/celerity/CelerityResourceGraph.php
+++ b/src/infrastructure/celerity/CelerityResourceGraph.php
@@ -1,32 +1,32 @@
 <?php
 
 final class CelerityResourceGraph extends AbstractDirectedGraph {
 
   private $resourceGraph = array();
   private $graphSet = false;
 
   protected function loadEdges(array $nodes) {
     if (!$this->graphSet) {
       throw new Exception(
-        "Call setResourceGraph before loading the graph!"
+        'Call setResourceGraph before loading the graph!'
       );
     }
 
     $graph = $this->getResourceGraph();
     $edges = array();
     foreach ($nodes as $node) {
       $edges[$node] = idx($graph, $node, array());
     }
     return $edges;
   }
 
   final public function setResourceGraph(array $graph) {
     $this->resourceGraph = $graph;
     $this->graphSet = true;
     return $this;
   }
 
   private function getResourceGraph() {
     return $this->resourceGraph;
   }
 }
diff --git a/src/infrastructure/celerity/management/CelerityManagementMapWorkflow.php b/src/infrastructure/celerity/management/CelerityManagementMapWorkflow.php
index a904c4fea..29baccf5f 100644
--- a/src/infrastructure/celerity/management/CelerityManagementMapWorkflow.php
+++ b/src/infrastructure/celerity/management/CelerityManagementMapWorkflow.php
@@ -1,372 +1,372 @@
 <?php
 
 final class CelerityManagementMapWorkflow
   extends CelerityManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('map')
       ->setExamples('**map** [options]')
       ->setSynopsis(pht('Rebuild static resource maps.'))
       ->setArguments(
         array());
   }
 
   public function execute(PhutilArgumentParser $args) {
     $resources_map = CelerityPhysicalResources::getAll();
 
     $this->log(
       pht(
-        "Rebuilding %d resource source(s).",
+        'Rebuilding %d resource source(s).',
         new PhutilNumber(count($resources_map))));
 
     foreach ($resources_map as $name => $resources) {
       $this->rebuildResources($resources);
     }
 
-    $this->log(pht("Done."));
+    $this->log(pht('Done.'));
 
     return 0;
   }
 
   /**
    * Rebuild the resource map for a resource source.
    *
    * @param CelerityPhysicalResources Resource source to rebuild.
    * @return void
    */
   private function rebuildResources(CelerityPhysicalResources $resources) {
     $this->log(
       pht(
         'Rebuilding resource source "%s" (%s)...',
         $resources->getName(),
         get_class($resources)));
 
     $binary_map = $this->rebuildBinaryResources($resources);
 
     $this->log(
       pht(
         'Found %d binary resources.',
         new PhutilNumber(count($binary_map))));
 
     $xformer = id(new CelerityResourceTransformer())
       ->setMinify(false)
       ->setRawURIMap(ipull($binary_map, 'uri'));
 
     $text_map = $this->rebuildTextResources($resources, $xformer);
 
     $this->log(
       pht(
         'Found %d text resources.',
         new PhutilNumber(count($text_map))));
 
     $resource_graph = array();
     $requires_map = array();
     $symbol_map = array();
     foreach ($text_map as $name => $info) {
       if (isset($info['provides'])) {
         $symbol_map[$info['provides']] = $info['hash'];
 
         // We only need to check for cycles and add this to the requires map
         // if it actually requires anything.
         if (!empty($info['requires'])) {
           $resource_graph[$info['provides']] = $info['requires'];
           $requires_map[$info['hash']] = $info['requires'];
         }
       }
     }
 
     $this->detectGraphCycles($resource_graph);
     $name_map = ipull($binary_map, 'hash') + ipull($text_map, 'hash');
     $hash_map = array_flip($name_map);
 
     $package_map = $this->rebuildPackages(
       $resources,
       $symbol_map,
       $hash_map);
 
     $this->log(
       pht(
         'Found %d packages.',
         new PhutilNumber(count($package_map))));
 
     $component_map = array();
     foreach ($package_map as $package_name => $package_info) {
       foreach ($package_info['symbols'] as $symbol) {
         $component_map[$symbol] = $package_name;
       }
     }
 
     $name_map = $this->mergeNameMaps(
       array(
         array(pht('Binary'), ipull($binary_map, 'hash')),
         array(pht('Text'), ipull($text_map, 'hash')),
         array(pht('Package'), ipull($package_map, 'hash')),
       ));
     $package_map = ipull($package_map, 'symbols');
 
     ksort($name_map);
     ksort($symbol_map);
     ksort($requires_map);
     ksort($package_map);
 
     $map_content = $this->formatMapContent(array(
       'names' => $name_map,
       'symbols' => $symbol_map,
       'requires' => $requires_map,
       'packages' => $package_map,
     ));
 
     $map_path = $resources->getPathToMap();
     $this->log(pht('Writing map "%s".', Filesystem::readablePath($map_path)));
     Filesystem::writeFile($map_path, $map_content);
   }
 
 
   /**
    * Find binary resources (like PNG and SWF) and return information about
    * them.
    *
    * @param CelerityPhysicalResources Resource map to find binary resources for.
    * @return map<string, map<string, string>> Resource information map.
    */
   private function rebuildBinaryResources(
     CelerityPhysicalResources $resources) {
 
     $binary_map = $resources->findBinaryResources();
 
     $result_map = array();
     foreach ($binary_map as $name => $data_hash) {
       $hash = $resources->getCelerityHash($data_hash.$name);
 
       $result_map[$name] = array(
         'hash' => $hash,
         'uri' => $resources->getResourceURI($hash, $name),
       );
     }
 
     return $result_map;
   }
 
 
   /**
    * Find text resources (like JS and CSS) and return information about them.
    *
    * @param CelerityPhysicalResources Resource map to find text resources for.
    * @param CelerityResourceTransformer Configured resource transformer.
    * @return map<string, map<string, string>> Resource information map.
    */
   private function rebuildTextResources(
     CelerityPhysicalResources $resources,
     CelerityResourceTransformer $xformer) {
 
     $text_map = $resources->findTextResources();
 
     $result_map = array();
     foreach ($text_map as $name => $data_hash) {
       $raw_data = $resources->getResourceData($name);
       $xformed_data = $xformer->transformResource($name, $raw_data);
 
       $data_hash = $resources->getCelerityHash($xformed_data);
       $hash = $resources->getCelerityHash($data_hash.$name);
 
       list($provides, $requires) = $this->getProvidesAndRequires(
         $name,
         $raw_data);
 
       $result_map[$name] = array(
         'hash' => $hash,
       );
 
       if ($provides !== null) {
         $result_map[$name] += array(
           'provides' => $provides,
           'requires' => $requires,
         );
       }
     }
 
     return $result_map;
   }
 
 
   /**
    * Parse the `@provides` and `@requires` symbols out of a text resource, like
    * JS or CSS.
    *
    * @param string Resource name.
    * @param string Resource data.
    * @return pair<string|null, list<string>|null> The `@provides` symbol and the
    *    list of `@requires` symbols. If the resource is not part of the
    *    dependency graph, both are null.
    */
   private function getProvidesAndRequires($name, $data) {
     $parser = new PhutilDocblockParser();
 
     $matches = array();
     $ok = preg_match('@/[*][*].*?[*]/@s', $data, $matches);
     if (!$ok) {
       throw new Exception(
         pht(
           'Resource "%s" does not have a header doc comment. Encode '.
           'dependency data in a header docblock.',
           $name));
     }
 
     list($description, $metadata) = $parser->parse($matches[0]);
 
     $provides = preg_split('/\s+/', trim(idx($metadata, 'provides')));
     $requires = preg_split('/\s+/', trim(idx($metadata, 'requires')));
     $provides = array_filter($provides);
     $requires = array_filter($requires);
 
     if (!$provides) {
       // Tests and documentation-only JS is permitted to @provide no targets.
       return array(null, null);
     }
 
     if (count($provides) > 1) {
       throw new Exception(
         pht(
           'Resource "%s" must @provide at most one Celerity target.',
           $name));
     }
 
     return array(head($provides), $requires);
   }
 
 
   /**
    * Check for dependency cycles in the resource graph. Raises an exception if
    * a cycle is detected.
    *
    * @param map<string, list<string>> Map of `@provides` symbols to their
    *                                  `@requires` symbols.
    * @return void
    */
   private function detectGraphCycles(array $nodes) {
     $graph = id(new CelerityResourceGraph())
       ->addNodes($nodes)
       ->setResourceGraph($nodes)
       ->loadGraph();
 
     foreach ($nodes as $provides => $requires) {
       $cycle = $graph->detectCycles($provides);
       if ($cycle) {
         throw new Exception(
           pht(
             'Cycle detected in resource graph: %s',
             implode(' > ', $cycle)));
       }
     }
   }
 
   /**
    * Build package specifications for a given resource source.
    *
    * @param CelerityPhysicalResources Resource source to rebuild.
    * @param list<string, string> Map of `@provides` to hashes.
    * @param list<string, string> Map of hashes to resource names.
    * @return map<string, map<string, string>> Package information maps.
    */
   private function rebuildPackages(
     CelerityPhysicalResources $resources,
     array $symbol_map,
     array $reverse_map) {
 
     $package_map = array();
 
     $package_spec = $resources->getResourcePackages();
     foreach ($package_spec as $package_name => $package_symbols) {
       $type = null;
       $hashes = array();
       foreach ($package_symbols as $symbol) {
         $symbol_hash = idx($symbol_map, $symbol);
         if ($symbol_hash === null) {
           throw new Exception(
             pht(
               'Package specification for "%s" includes "%s", but that symbol '.
               'is not @provided by any resource.',
               $package_name,
               $symbol));
         }
 
         $resource_name = $reverse_map[$symbol_hash];
         $resource_type = $resources->getResourceType($resource_name);
         if ($type === null) {
           $type = $resource_type;
         } else if ($type !== $resource_type) {
           throw new Exception(
             pht(
               'Package specification for "%s" includes resources of multiple '.
               'types (%s, %s). Each package may only contain one type of '.
               'resource.',
               $package_name,
               $type,
               $resource_type));
         }
 
         $hashes[] = $symbol.':'.$symbol_hash;
       }
 
       $hash = $resources->getCelerityHash(implode("\n", $hashes));
       $package_map[$package_name] = array(
         'hash' => $hash,
         'symbols' => $package_symbols,
       );
     }
 
     return $package_map;
   }
 
   private function mergeNameMaps(array $maps) {
     $result = array();
     $origin = array();
     foreach ($maps as $map) {
       list($map_name, $data) = $map;
       foreach ($data as $name => $hash) {
         if (empty($result[$name])) {
           $result[$name] = $hash;
           $origin[$name] = $map_name;
         } else {
           $old = $origin[$name];
           $new = $map_name;
           throw new Exception(
             pht(
               'Resource source defines two resources with the same name, '.
               '"%s". One is defined in the "%s" map; the other in the "%s" '.
               'map. Each resource must have a unique name.',
               $name,
               $old,
               $new));
         }
       }
     }
     return $result;
   }
 
   private function log($message) {
     $console = PhutilConsole::getConsole();
     $console->writeErr("%s\n", $message);
   }
 
   private function formatMapContent(array $data) {
     $content = var_export($data, true);
     $content = preg_replace('/\s+$/m', '', $content);
     $content = preg_replace('/array \(/', 'array(', $content);
 
     $generated = '@'.'generated';
     return <<<EOFILE
 <?php
 
 /**
  * This file is automatically generated. Use 'bin/celerity map' to rebuild it.
  * {$generated}
  */
 return {$content};
 
 EOFILE;
   }
 
 
 }
diff --git a/src/infrastructure/daemon/bot/PhabricatorBot.php b/src/infrastructure/daemon/bot/PhabricatorBot.php
index fb30fa7b7..a8f11c0d6 100644
--- a/src/infrastructure/daemon/bot/PhabricatorBot.php
+++ b/src/infrastructure/daemon/bot/PhabricatorBot.php
@@ -1,148 +1,148 @@
 <?php
 
 /**
  * Simple IRC bot which runs as a Phabricator daemon. Although this bot is
  * somewhat useful, it is also intended to serve as a demo of how to write
  * "system agents" which communicate with Phabricator over Conduit, so you can
  * script system interactions and integrate with other systems.
  *
  * NOTE: This is super janky and experimental right now.
  *
  * @group irc
  */
 final class PhabricatorBot extends PhabricatorDaemon {
 
   private $handlers;
 
   private $conduit;
   private $config;
   private $pollFrequency;
 
   public function run() {
     $argv = $this->getArgv();
     if (count($argv) !== 1) {
-      throw new Exception("usage: PhabricatorBot <json_config_file>");
+      throw new Exception('usage: PhabricatorBot <json_config_file>');
     }
 
     $json_raw = Filesystem::readFile($argv[0]);
     $config = json_decode($json_raw, true);
     if (!is_array($config)) {
       throw new Exception("File '{$argv[0]}' is not valid JSON!");
     }
 
     $nick                   = idx($config, 'nick', 'phabot');
     $handlers               = idx($config, 'handlers', array());
     $protocol_adapter_class = idx(
       $config,
       'protocol-adapter',
       'PhabricatorIRCProtocolAdapter');
     $this->pollFrequency = idx($config, 'poll-frequency', 1);
 
     $this->config = $config;
 
     foreach ($handlers as $handler) {
       $obj = newv($handler, array($this));
       $this->handlers[] = $obj;
     }
 
     $ca_bundle = idx($config, 'https.cabundle');
     if ($ca_bundle) {
       HTTPSFuture::setGlobalCABundleFromPath($ca_bundle);
     }
 
     $conduit_uri = idx($config, 'conduit.uri');
     if ($conduit_uri) {
       $conduit_user = idx($config, 'conduit.user');
       $conduit_cert = idx($config, 'conduit.cert');
 
       // Normalize the path component of the URI so users can enter the
       // domain without the "/api/" part.
       $conduit_uri = new PhutilURI($conduit_uri);
       $conduit_uri->setPath('/api/');
       $conduit_uri = (string)$conduit_uri;
 
       $conduit = new ConduitClient($conduit_uri);
       $response = $conduit->callMethodSynchronous(
         'conduit.connect',
         array(
           'client'            => 'PhabricatorBot',
           'clientVersion'     => '1.0',
           'clientDescription' => php_uname('n').':'.$nick,
           'user'              => $conduit_user,
           'certificate'       => $conduit_cert,
         ));
 
       $this->conduit = $conduit;
     }
 
     // Instantiate Protocol Adapter, for now follow same technique as
     // handler instantiation
     $this->protocolAdapter = newv($protocol_adapter_class, array());
     $this->protocolAdapter
       ->setConfig($this->config)
       ->connect();
 
     $this->runLoop();
   }
 
   public function getConfig($key, $default = null) {
     return idx($this->config, $key, $default);
   }
 
   private function runLoop() {
     do {
       $this->stillWorking();
 
       $messages = $this->protocolAdapter->getNextMessages($this->pollFrequency);
       if (count($messages) > 0) {
         foreach ($messages as $message) {
           $this->routeMessage($message);
         }
       }
 
       foreach ($this->handlers as $handler) {
         $handler->runBackgroundTasks();
       }
     } while (true);
   }
 
   public function writeMessage(PhabricatorBotMessage $message) {
     return $this->protocolAdapter->writeMessage($message);
   }
 
   private function routeMessage(PhabricatorBotMessage $message) {
     $ignore = $this->getConfig('ignore');
     if ($ignore) {
       $sender = $message->getSender();
       if ($sender && in_array($sender->getName(), $ignore)) {
         return;
       }
     }
 
     if ($message->getCommand() == 'LOG') {
-      $this->log("[LOG] ".$message->getBody());
+      $this->log('[LOG] '.$message->getBody());
     }
 
     foreach ($this->handlers as $handler) {
       try {
         $handler->receiveMessage($message);
       } catch (Exception $ex) {
         phlog($ex);
       }
     }
   }
 
   public function getAdapter() {
     return $this->protocolAdapter;
   }
 
   public function getConduit() {
     if (empty($this->conduit)) {
       throw new Exception(
         "This bot is not configured with a Conduit uplink. Set 'conduit.uri', ".
         "'conduit.user' and 'conduit.cert' in the configuration to connect.");
     }
     return $this->conduit;
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/PhabricatorIRCBot.php b/src/infrastructure/daemon/bot/PhabricatorIRCBot.php
index 81f6cc0fe..a955ae561 100644
--- a/src/infrastructure/daemon/bot/PhabricatorIRCBot.php
+++ b/src/infrastructure/daemon/bot/PhabricatorIRCBot.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
  * Placeholder to let people know that the bot has been renamed
  */
 final class PhabricatorIRCBot extends PhabricatorDaemon {
   public function run() {
     throw new Exception(
-      "This daemon has been deprecated, use `PhabricatorBot` instead.");
+      'This daemon has been deprecated, use `PhabricatorBot` instead.');
   }
 }
diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php
index 1456085eb..2511d739e 100644
--- a/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php
+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php
@@ -1,162 +1,162 @@
 <?php
 
 abstract class PhabricatorBotBaseStreamingProtocolAdapter
   extends PhabricatorBaseProtocolAdapter {
 
   private $readBuffers;
   private $authtoken;
   private $server;
   private $readHandles;
   private $multiHandle;
   private $active;
   private $inRooms = array();
 
   public function getServiceName() {
     $uri = new PhutilURI($this->server);
     return $uri->getDomain();
   }
 
   public function connect() {
     $this->server = $this->getConfig('server');
     $this->authtoken = $this->getConfig('authtoken');
     $rooms = $this->getConfig('join');
 
     // First, join the room
     if (!$rooms) {
-      throw new Exception("Not configured to join any rooms!");
+      throw new Exception('Not configured to join any rooms!');
     }
 
     $this->readBuffers = array();
 
     // Set up our long poll in a curl multi request so we can
     // continue running while it executes in the background
     $this->multiHandle = curl_multi_init();
     $this->readHandles = array();
 
     foreach ($rooms as $room_id) {
       $this->joinRoom($room_id);
 
       // Set up the curl stream for reading
       $url = $this->buildStreamingUrl($room_id);
       $this->readHandle[$url] = curl_init();
       curl_setopt($this->readHandle[$url], CURLOPT_URL, $url);
       curl_setopt($this->readHandle[$url], CURLOPT_RETURNTRANSFER, true);
       curl_setopt($this->readHandle[$url], CURLOPT_FOLLOWLOCATION, 1);
       curl_setopt(
         $this->readHandle[$url],
         CURLOPT_USERPWD,
         $this->authtoken.':x');
       curl_setopt(
         $this->readHandle[$url],
         CURLOPT_HTTPHEADER,
-        array("Content-type: application/json"));
+        array('Content-type: application/json'));
       curl_setopt(
         $this->readHandle[$url],
         CURLOPT_WRITEFUNCTION,
         array($this, 'read'));
       curl_setopt($this->readHandle[$url], CURLOPT_BUFFERSIZE, 128);
       curl_setopt($this->readHandle[$url], CURLOPT_TIMEOUT, 0);
 
       curl_multi_add_handle($this->multiHandle, $this->readHandle[$url]);
 
       // Initialize read buffer
       $this->readBuffers[$url] = '';
     }
 
     $this->active = null;
     $this->blockingMultiExec();
   }
 
   protected function joinRoom($room_id) {
     // Optional hook, by default, do nothing
   }
 
   // This is our callback for the background curl multi-request.
   // Puts the data read in on the readBuffer for processing.
   private function read($ch, $data) {
     $info = curl_getinfo($ch);
     $length = strlen($data);
     $this->readBuffers[$info['url']] .= $data;
     return $length;
   }
 
   private function blockingMultiExec() {
     do {
       $status = curl_multi_exec($this->multiHandle, $this->active);
     } while ($status == CURLM_CALL_MULTI_PERFORM);
 
     // Check for errors
     if ($status != CURLM_OK) {
       throw new Exception(
-        "Phabricator Bot had a problem reading from stream.");
+        'Phabricator Bot had a problem reading from stream.');
     }
   }
 
   public function getNextMessages($poll_frequency) {
     $messages = array();
 
     if (!$this->active) {
-      throw new Exception("Phabricator Bot stopped reading from stream.");
+      throw new Exception('Phabricator Bot stopped reading from stream.');
     }
 
     // Prod our http request
     curl_multi_select($this->multiHandle, $poll_frequency);
     $this->blockingMultiExec();
 
     // Process anything waiting on the read buffer
     while ($m = $this->processReadBuffer()) {
       $messages[] = $m;
     }
 
     return $messages;
   }
 
   private function processReadBuffer() {
     foreach ($this->readBuffers as $url => &$buffer) {
       $until = strpos($buffer, "}\r");
       if ($until == false) {
         continue;
       }
 
       $message = substr($buffer, 0, $until + 1);
       $buffer = substr($buffer, $until + 2);
 
       $m_obj = json_decode($message, true);
       if ($message = $this->processMessage($m_obj)) {
         return $message;
       }
     }
 
     // If we're here, there's nothing to process
     return false;
   }
 
   protected function performPost($endpoint, $data = null) {
     $uri = new PhutilURI($this->server);
     $uri->setPath($endpoint);
 
     $payload = json_encode($data);
 
     list($output) = id(new HTTPSFuture($uri))
       ->setMethod('POST')
       ->addHeader('Content-Type', 'application/json')
       ->addHeader('Authorization', $this->getAuthorizationHeader())
       ->setData($payload)
       ->resolvex();
 
     $output = trim($output);
     if (strlen($output)) {
       return json_decode($output, true);
     }
 
     return true;
   }
 
   protected function getAuthorizationHeader() {
     return 'Basic '.base64_encode($this->authtoken.':x');
   }
 
   abstract protected function buildStreamingUrl($channel);
 
   abstract protected function processMessage($raw_object);
 }
diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php
index 86da1f554..dc3b568a8 100644
--- a/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php
+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php
@@ -1,82 +1,82 @@
 <?php
 
 final class PhabricatorBotFlowdockProtocolAdapter
   extends PhabricatorBotBaseStreamingProtocolAdapter {
 
   public function getServiceType() {
     return 'Flowdock';
   }
 
   protected function buildStreamingUrl($channel) {
     $organization = $this->getConfig('organization');
     $ssl = $this->getConfig('ssl');
 
-    $url = ($ssl) ? "https://" : "http://";
+    $url = ($ssl) ? 'https://' : 'http://';
     $url .= "stream.flowdock.com/flows/{$organization}/{$channel}";
 
     return $url;
   }
 
   protected function processMessage($m_obj) {
       $command = null;
       switch ($m_obj['event']) {
         case 'message':
           $command = 'MESSAGE';
           break;
         default:
           // For now, ignore anything which we don't otherwise know about.
           break;
       }
 
       if ($command === null) {
         return false;
       }
 
       // TODO: These should be usernames, not user IDs.
       $sender = id(new PhabricatorBotUser())
         ->setName($m_obj['user']);
 
       $target = id(new PhabricatorBotChannel())
         ->setName($m_obj['flow']);
 
       return id(new PhabricatorBotMessage())
         ->setCommand($command)
         ->setSender($sender)
         ->setTarget($target)
         ->setBody($m_obj['content']);
   }
 
   public function writeMessage(PhabricatorBotMessage $message) {
     switch ($message->getCommand()) {
       case 'MESSAGE':
         $this->speak(
           $message->getBody(),
           $message->getTarget());
         break;
     }
   }
 
   private function speak(
     $body,
     PhabricatorBotTarget $flow) {
 
-    list($organization, $room_id) = explode(":", $flow->getName());
+    list($organization, $room_id) = explode(':', $flow->getName());
 
     $this->performPost(
       "/flows/{$organization}/{$room_id}/messages",
       array(
         'event' => 'message',
         'content' => $body));
   }
 
   public function __destruct() {
     if ($this->readHandles) {
       foreach ($this->readHandles as $read_handle) {
         curl_multi_remove_handle($this->multiHandle, $read_handle);
         curl_close($read_handle);
       }
     }
 
     curl_multi_close($this->multiHandle);
   }
 }
diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php
index b3afaa8a0..42054ec72 100644
--- a/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php
+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php
@@ -1,112 +1,112 @@
 <?php
 
 final class PhabricatorCampfireProtocolAdapter
   extends PhabricatorBotBaseStreamingProtocolAdapter {
 
   public function getServiceType() {
     return 'Campfire';
   }
 
   protected function buildStreamingUrl($channel) {
     $ssl = $this->getConfig('ssl');
 
-    $url = ($ssl) ? "https://" : "http://";
+    $url = ($ssl) ? 'https://' : 'http://';
     $url .= "streaming.campfirenow.com/room/{$channel}/live.json";
 
     return $url;
   }
 
   protected function processMessage($m_obj) {
       $command = null;
       switch ($m_obj['type']) {
         case 'TextMessage':
           $command = 'MESSAGE';
           break;
         case 'PasteMessage':
           $command = 'PASTE';
           break;
         default:
           // For now, ignore anything which we don't otherwise know about.
           break;
       }
 
       if ($command === null) {
         return false;
       }
 
       // TODO: These should be usernames, not user IDs.
       $sender = id(new PhabricatorBotUser())
         ->setName($m_obj['user_id']);
 
       $target = id(new PhabricatorBotChannel())
         ->setName($m_obj['room_id']);
 
       return id(new PhabricatorBotMessage())
         ->setCommand($command)
         ->setSender($sender)
         ->setTarget($target)
         ->setBody($m_obj['body']);
   }
 
   public function writeMessage(PhabricatorBotMessage $message) {
     switch ($message->getCommand()) {
       case 'MESSAGE':
         $this->speak(
           $message->getBody(),
           $message->getTarget());
         break;
       case 'SOUND':
         $this->speak(
           $message->getBody(),
           $message->getTarget(),
           'SoundMessage');
         break;
       case 'PASTE':
         $this->speak(
           $message->getBody(),
           $message->getTarget(),
           'PasteMessage');
         break;
     }
   }
 
   protected function joinRoom($room_id) {
     $this->performPost("/room/{$room_id}/join.json");
     $this->inRooms[$room_id] = true;
   }
 
   private function leaveRoom($room_id) {
     $this->performPost("/room/{$room_id}/leave.json");
     unset($this->inRooms[$room_id]);
   }
 
   private function speak(
     $message,
     PhabricatorBotTarget $channel,
     $type = 'TextMessage') {
 
     $room_id = $channel->getName();
 
     $this->performPost(
       "/room/{$room_id}/speak.json",
       array(
         'message' => array(
           'type' => $type,
           'body' => $message)));
   }
 
   public function __destruct() {
     foreach ($this->inRooms as $room_id => $ignored) {
       $this->leaveRoom($room_id);
     }
 
     if ($this->readHandles) {
       foreach ($this->readHandles as $read_handle) {
         curl_multi_remove_handle($this->multiHandle, $read_handle);
         curl_close($read_handle);
       }
     }
 
     curl_multi_close($this->multiHandle);
   }
 }
diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php
index c9d701d36..d2740209b 100644
--- a/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php
+++ b/src/infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php
@@ -1,257 +1,257 @@
 <?php
 
 final class PhabricatorIRCProtocolAdapter
   extends PhabricatorBaseProtocolAdapter {
 
   private $socket;
 
   private $writeBuffer;
   private $readBuffer;
 
   private $nickIncrement = 0;
 
   public function getServiceType() {
     return 'IRC';
   }
 
   public function getServiceName() {
     return $this->getConfig('network', $this->getConfig('server'));
   }
 
   // Hash map of command translations
   public static $commandTranslations = array(
     'PRIVMSG' => 'MESSAGE');
 
   public function connect() {
     $nick = $this->getConfig('nick', 'phabot');
     $server = $this->getConfig('server');
     $port = $this->getConfig('port', 6667);
     $pass = $this->getConfig('pass');
     $ssl = $this->getConfig('ssl', false);
     $user = $this->getConfig('user', $nick);
 
     if (!preg_match('/^[A-Za-z0-9_`[{}^|\]\\-]+$/', $nick)) {
       throw new Exception(
         "Nickname '{$nick}' is invalid!");
     }
 
     $errno = null;
     $error = null;
     if (!$ssl) {
       $socket = fsockopen($server, $port, $errno, $error);
     } else {
       $socket = fsockopen('ssl://'.$server, $port, $errno, $error);
     }
     if (!$socket) {
       throw new Exception("Failed to connect, #{$errno}: {$error}");
     }
     $ok = stream_set_blocking($socket, false);
     if (!$ok) {
-      throw new Exception("Failed to set stream nonblocking.");
+      throw new Exception('Failed to set stream nonblocking.');
     }
 
     $this->socket = $socket;
     if ($pass) {
       $this->write("PASS {$pass}");
     }
     $this->write("NICK {$nick}");
     $this->write("USER {$user} 0 * :{$user}");
   }
 
   public function getNextMessages($poll_frequency) {
     $messages = array();
 
     $read = array($this->socket);
     if (strlen($this->writeBuffer)) {
       $write = array($this->socket);
     } else {
       $write = array();
     }
     $except = array();
 
     $ok = @stream_select($read, $write, $except, $timeout_sec = 1);
     if ($ok === false) {
       throw new Exception(
-        "socket_select() failed: ".socket_strerror(socket_last_error()));
+        'socket_select() failed: '.socket_strerror(socket_last_error()));
     }
 
     if ($read) {
       // Test for connection termination; in PHP, fread() off a nonblocking,
       // closed socket is empty string.
       if (feof($this->socket)) {
         // This indicates the connection was terminated on the other side,
         // just exit via exception and let the overseer restart us after a
         // delay so we can reconnect.
-        throw new Exception("Remote host closed connection.");
+        throw new Exception('Remote host closed connection.');
       }
       do {
         $data = fread($this->socket, 4096);
         if ($data === false) {
-          throw new Exception("fread() failed!");
+          throw new Exception('fread() failed!');
         } else {
           $messages[] = id(new PhabricatorBotMessage())
-            ->setCommand("LOG")
-            ->setBody(">>> ".$data);
+            ->setCommand('LOG')
+            ->setBody('>>> '.$data);
           $this->readBuffer .= $data;
         }
       } while (strlen($data));
     }
 
     if ($write) {
       do {
         $len = fwrite($this->socket, $this->writeBuffer);
         if ($len === false) {
-          throw new Exception("fwrite() failed!");
+          throw new Exception('fwrite() failed!');
         } else {
           $messages[] = id(new PhabricatorBotMessage())
-            ->setCommand("LOG")
-            ->setBody(">>> ".substr($this->writeBuffer, 0, $len));
+            ->setCommand('LOG')
+            ->setBody('>>> '.substr($this->writeBuffer, 0, $len));
           $this->writeBuffer = substr($this->writeBuffer, $len);
         }
       } while (strlen($this->writeBuffer));
     }
 
     while (($m = $this->processReadBuffer()) !== false) {
       if ($m !== null) {
         $messages[] = $m;
       }
     }
 
     return $messages;
   }
 
   private function write($message) {
     $this->writeBuffer .= $message."\r\n";
     return $this;
   }
 
   public function writeMessage(PhabricatorBotMessage $message) {
     switch ($message->getCommand()) {
       case 'MESSAGE':
       case 'PASTE':
         $name = $message->getTarget()->getName();
         $body = $message->getBody();
         $this->write("PRIVMSG {$name} :{$body}");
         return true;
       default:
         return false;
     }
   }
 
   private function processReadBuffer() {
     $until = strpos($this->readBuffer, "\r\n");
     if ($until === false) {
       return false;
     }
 
     $message = substr($this->readBuffer, 0, $until);
     $this->readBuffer = substr($this->readBuffer, $until + 2);
 
     $pattern =
       '/^'.
       '(?::(?P<sender>(\S+?))(?:!\S*)? )?'. // This may not be present.
       '(?P<command>[A-Z0-9]+) '.
       '(?P<data>.*)'.
       '$/';
 
     $matches = null;
     if (!preg_match($pattern, $message, $matches)) {
       throw new Exception("Unexpected message from server: {$message}");
     }
 
     if ($this->handleIRCProtocol($matches)) {
       return null;
     }
 
     $command = $this->getBotCommand($matches['command']);
     list($target, $body) = $this->parseMessageData($command, $matches['data']);
 
     if (!strlen($matches['sender'])) {
       $sender = null;
     } else {
       $sender = id(new PhabricatorBotUser())
        ->setName($matches['sender']);
     }
 
     $bot_message = id(new PhabricatorBotMessage())
       ->setSender($sender)
       ->setCommand($command)
       ->setTarget($target)
       ->setBody($body);
 
     return $bot_message;
   }
 
   private function handleIRCProtocol(array $matches) {
     $data = $matches['data'];
     switch ($matches['command']) {
       case '433': // Nickname already in use
         // If we receive this error, try appending "-1", "-2", etc. to the nick
         $this->nickIncrement++;
         $nick = $this->getConfig('nick', 'phabot').'-'.$this->nickIncrement;
         $this->write("NICK {$nick}");
         return true;
       case '422': // Error - no MOTD
       case '376': // End of MOTD
         $nickpass = $this->getConfig('nickpass');
         if ($nickpass) {
           $this->write("PRIVMSG nickserv :IDENTIFY {$nickpass}");
         }
         $join = $this->getConfig('join');
         if (!$join) {
-          throw new Exception("Not configured to join any channels!");
+          throw new Exception('Not configured to join any channels!');
         }
         foreach ($join as $channel) {
           $this->write("JOIN {$channel}");
         }
         return true;
       case 'PING':
         $this->write("PONG {$data}");
         return true;
     }
 
     return false;
   }
 
   private function getBotCommand($irc_command) {
     if (isset(self::$commandTranslations[$irc_command])) {
       return self::$commandTranslations[$irc_command];
     }
 
     // We have no translation for this command, use as-is
     return $irc_command;
   }
 
   private function parseMessageData($command, $data) {
     switch ($command) {
       case 'MESSAGE':
         $matches = null;
         if (preg_match('/^(\S+)\s+:?(.*)$/', $data, $matches)) {
 
           $target_name = $matches[1];
           if (strncmp($target_name, '#', 1) === 0) {
             $target = id(new PhabricatorBotChannel())
               ->setName($target_name);
           } else {
             $target = id(new PhabricatorBotUser())
               ->setName($target_name);
           }
 
           return array(
             $target,
             rtrim($matches[2], "\r\n"));
         }
         break;
     }
 
     // By default we assume there is no target, only a body
     return array(
       null,
       $data);
   }
 
   public function __destruct() {
-    $this->write("QUIT Goodbye.");
+    $this->write('QUIT Goodbye.');
     fclose($this->socket);
   }
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php
index 77ac1891e..9dd449b15 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php
@@ -1,73 +1,73 @@
 <?php
 
 /**
  * Responds to IRC messages. You plug a bunch of these into a
  * @{class:PhabricatorBot} to give it special behavior.
  *
  * @group irc
  */
 abstract class PhabricatorBotHandler {
 
   private $bot;
 
   final public function __construct(PhabricatorBot $irc_bot) {
     $this->bot = $irc_bot;
   }
 
   final protected function writeMessage(PhabricatorBotMessage $message) {
     $this->bot->writeMessage($message);
     return $this;
   }
 
   final protected function getConduit() {
     return $this->bot->getConduit();
   }
 
   final protected function getConfig($key, $default = null) {
     return $this->bot->getConfig($key, $default);
   }
 
   final protected function getURI($path) {
     $base_uri = new PhutilURI($this->bot->getConfig('conduit.uri'));
     $base_uri->setPath($path);
     return (string)$base_uri;
   }
 
   final protected function getServiceName() {
     return $this->bot->getAdapter()->getServiceName();
   }
 
   final protected function getServiceType() {
     return $this->bot->getAdapter()->getServiceType();
   }
 
   abstract public function receiveMessage(PhabricatorBotMessage $message);
 
   public function runBackgroundTasks() {
     return;
   }
 
   public function replyTo(PhabricatorBotMessage $original_message, $body) {
     if ($original_message->getCommand() != 'MESSAGE') {
       throw new Exception(
-        "Handler is trying to reply to something which is not a message!");
+        'Handler is trying to reply to something which is not a message!');
     }
 
     $reply = id(new PhabricatorBotMessage())
       ->setCommand('MESSAGE');
 
     if ($original_message->getTarget()->isPublic()) {
       // This is a public target, like a chatroom. Send the response to the
       // chatroom.
       $reply->setTarget($original_message->getTarget());
     } else {
       // This is a private target, like a private message. Send the response
       // back to the sender (presumably, we are the target).
       $reply->setTarget($original_message->getSender());
     }
 
     $reply->setBody($body);
 
     return $this->writeMessage($reply);
   }
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
index 9d7ac4a19..800f5aa76 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
@@ -1,197 +1,197 @@
 <?php
 
 /**
  * Looks for Dxxxx, Txxxx and links to them.
  *
  * @group irc
  */
 final class PhabricatorBotObjectNameHandler extends PhabricatorBotHandler {
 
   /**
    * Map of PHIDs to the last mention of them (as an epoch timestamp); prevents
    * us from spamming chat when a single object is discussed.
    */
   private $recentlyMentioned = array();
 
   public function receiveMessage(PhabricatorBotMessage $original_message) {
 
     switch ($original_message->getCommand()) {
     case 'MESSAGE':
       $message = $original_message->getBody();
       $matches = null;
 
       $paste_ids = array();
       $commit_names = array();
       $vote_ids = array();
       $file_ids = array();
       $object_names = array();
       $output = array();
 
       $pattern =
         '@'.
         '(?<!/)(?:^|\b)'.
         '(R2D2)'.
         '(?:\b|$)'.
         '@';
 
       if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
         foreach ($matches as $match) {
           switch ($match[1]) {
             case 'R2D2':
               $output[$match[1]] = pht('beep hoop bop');
               break;
           }
         }
       }
 
       $pattern =
         '@'.
         '(?<!/)(?:^|\b)'. // Negative lookbehind prevent matching "/D123".
         '([A-Z])(\d+)'.
         '(?:\b|$)'.
         '@';
 
       if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
         foreach ($matches as $match) {
           switch ($match[1]) {
             case 'P':
               $paste_ids[] = $match[2];
               break;
             case 'V':
               $vote_ids[] = $match[2];
               break;
             case 'F':
               $file_ids[] = $match[2];
               break;
             default:
               $name = $match[1].$match[2];
               switch ($name) {
                 case 'T1000':
                   $output[$name] = pht(
                     'T1000: A mimetic poly-alloy assassin controlled by '.
                     'Skynet');
                   break;
                 default:
                   $object_names[] = $name;
                   break;
               }
               break;
           }
         }
       }
 
       $pattern =
         '@'.
         '(?<!/)(?:^|\b)'.
         '(r[A-Z]+)([0-9a-z]{0,40})'.
         '(?:\b|$)'.
         '@';
       if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
         foreach ($matches as $match) {
           if ($match[2]) {
             $commit_names[] = $match[1].$match[2];
           } else {
             $object_names[] = $match[1];
           }
         }
       }
 
       if ($object_names) {
         $objects = $this->getConduit()->callMethodSynchronous(
           'phid.lookup',
           array(
             'names' => $object_names,
           ));
         foreach ($objects as $object) {
           $output[$object['phid']] = $object['fullName'].' - '.$object['uri'];
         }
       }
 
       if ($vote_ids) {
         foreach ($vote_ids as $vote_id) {
           $vote = $this->getConduit()->callMethodSynchronous(
             'slowvote.info',
             array(
               'poll_id' => $vote_id,
             ));
           $output[$vote['phid']] = 'V'.$vote['id'].': '.$vote['question'].
             ' Come Vote '.$vote['uri'];
         }
       }
 
       if ($file_ids) {
         foreach ($file_ids as $file_id) {
           $file = $this->getConduit()->callMethodSynchronous(
             'file.info',
             array(
               'id' => $file_id,
             ));
-          $output[$file['phid']] = $file['objectName'].": ".$file['uri']." - ".
+          $output[$file['phid']] = $file['objectName'].': '.$file['uri'].' - '.
             $file['name'];
         }
       }
 
       if ($paste_ids) {
         foreach ($paste_ids as $paste_id) {
           $paste = $this->getConduit()->callMethodSynchronous(
             'paste.info',
             array(
               'paste_id' => $paste_id,
             ));
           // Eventually I'd like to show the username of the paster as well,
           // however that will need something like a user.username_from_phid
           // since we (ideally) want to keep the bot to Conduit calls...and
           // not call to Phabricator-specific stuff (like actually loading
           // the User object and fetching his/her username.)
           $output[$paste['phid']] = 'P'.$paste['id'].': '.$paste['uri'].' - '.
             $paste['title'];
 
           if ($paste['language']) {
             $output[$paste['phid']] .= ' ('.$paste['language'].')';
           }
         }
       }
 
       if ($commit_names) {
         $commits = $this->getConduit()->callMethodSynchronous(
           'diffusion.getcommits',
           array(
             'commits' => $commit_names,
           ));
         foreach ($commits as $commit) {
           if (isset($commit['error'])) {
             continue;
           }
           $output[$commit['commitPHID']] = $commit['uri'];
         }
       }
 
       foreach ($output as $phid => $description) {
 
         // Don't mention the same object more than once every 10 minutes
         // in public channels, so we avoid spamming the chat over and over
         // again for discsussions of a specific revision, for example.
 
         $target_name = $original_message->getTarget()->getName();
         if (empty($this->recentlyMentioned[$target_name])) {
           $this->recentlyMentioned[$target_name] = array();
         }
 
         $quiet_until = idx(
           $this->recentlyMentioned[$target_name],
           $phid,
           0) + (60 * 10);
 
         if (time() < $quiet_until) {
           // Remain quiet on this channel.
           continue;
         }
 
         $this->recentlyMentioned[$target_name][$phid] = time();
         $this->replyTo($original_message, $description);
       }
       break;
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorIRCProtocolHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorIRCProtocolHandler.php
index 3f3ee2863..8eee254c4 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorIRCProtocolHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorIRCProtocolHandler.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
  * @deprecated
  */
 final class PhabricatorIRCProtocolHandler extends PhabricatorBotHandler {
 
   public function receiveMessage(PhabricatorBotMessage $message) {
     static $warned;
     if (!$warned) {
       $warned = true;
-      phlog("The PhabricatorIRCProtocolHandler has been deprecated.");
+      phlog('The PhabricatorIRCProtocolHandler has been deprecated.');
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/workers/PhabricatorWorker.php b/src/infrastructure/daemon/workers/PhabricatorWorker.php
index dbe4fbdd4..b162f4344 100644
--- a/src/infrastructure/daemon/workers/PhabricatorWorker.php
+++ b/src/infrastructure/daemon/workers/PhabricatorWorker.php
@@ -1,241 +1,241 @@
 <?php
 
 /**
  * @task config   Configuring Retries and Failures
  *
  * @group worker
  */
 abstract class PhabricatorWorker {
 
   private $data;
   private static $runAllTasksInProcess = false;
   private $queuedTasks = array();
 
 
 /* -(  Configuring Retries and Failures  )----------------------------------- */
 
 
   /**
    * Return the number of seconds this worker needs hold a lease on the task for
    * while it performs work. For most tasks you can leave this at `null`, which
    * will give you a default lease (currently 2 hours).
    *
    * For tasks which may take a very long time to complete, you should return
    * an upper bound on the amount of time the task may require.
    *
    * @return int|null  Number of seconds this task needs to remain leased for,
    *                   or null for a default lease.
    *
    * @task config
    */
   public function getRequiredLeaseTime() {
     return null;
   }
 
 
   /**
    * Return the maximum number of times this task may be retried before it
    * is considered permanently failed. By default, tasks retry indefinitely. You
    * can throw a @{class:PhabricatorWorkerPermanentFailureException} to cause an
    * immediate permanent failure.
    *
    * @return int|null   Number of times the task will retry before permanent
    *                    failure. Return `null` to retry indefinitely.
    *
    * @task config
    */
   public function getMaximumRetryCount() {
     return null;
   }
 
 
   /**
    * Return the number of seconds a task should wait after a failure before
    * retrying. For most tasks you can leave this at `null`, which will give you
    * a short default retry period (currently 60 seconds).
    *
    * @param   PhabricatorWorkerTask   The task itself. This object is probably
    *                                  useful mostly to examine the failure
    *                                  count if you want to implement staggered
    *                                  retries, or to examine the execution
    *                                  exception if you want to react to
    *                                  different failures in different ways.
    * @return  int|null                Number of seconds to wait between retries,
    *                                  or null for a default retry period
    *                                  (currently 60 seconds).
    *
    * @task config
    */
   public function getWaitBeforeRetry(PhabricatorWorkerTask $task) {
     return null;
   }
 
   abstract protected function doWork();
 
 
   final public function __construct($data) {
     $this->data = $data;
   }
 
   final protected function getTaskData() {
     return $this->data;
   }
 
   final public function executeTask() {
     $this->doWork();
   }
 
   final public static function scheduleTask($task_class, $data) {
     $task = id(new PhabricatorWorkerActiveTask())
       ->setTaskClass($task_class)
       ->setData($data);
 
     if (self::$runAllTasksInProcess) {
       // Do the work in-process.
       $worker = newv($task_class, array($data));
 
       while (true) {
         try {
           $worker->doWork();
           foreach ($worker->getQueuedTasks() as $queued_task) {
             list($queued_class, $queued_data) = $queued_task;
             self::scheduleTask($queued_class, $queued_data);
           }
           break;
         } catch (PhabricatorWorkerYieldException $ex) {
           phlog(
             pht(
               'In-process task "%s" yielded for %s seconds, sleeping...',
               $task_class,
               $ex->getDuration()));
 
           sleep($ex->getDuration());
         }
       }
 
       // Now, save a task row and immediately archive it so we can return an
       // object with a valid ID.
       $task->openTransaction();
         $task->save();
         $archived = $task->archiveTask(
           PhabricatorWorkerArchiveTask::RESULT_SUCCESS,
           0);
       $task->saveTransaction();
 
       return $archived;
     } else {
       $task->save();
       return $task;
     }
   }
 
 
   /**
    * Wait for tasks to complete. If tasks are not leased by other workers, they
    * will be executed in this process while waiting.
    *
    * @param list<int>   List of queued task IDs to wait for.
    * @return void
    */
   final public static function waitForTasks(array $task_ids) {
     if (!$task_ids) {
       return;
     }
 
     $task_table = new PhabricatorWorkerActiveTask();
 
     $waiting = array_fuse($task_ids);
     while ($waiting) {
       $conn_w = $task_table->establishConnection('w');
 
       // Check if any of the tasks we're waiting on are still queued. If they
       // are not, we're done waiting.
       $row = queryfx_one(
         $conn_w,
         'SELECT COUNT(*) N FROM %T WHERE id IN (%Ld)',
         $task_table->getTableName(),
         $waiting);
       if (!$row['N']) {
         // Nothing is queued anymore. Stop waiting.
         break;
       }
 
       $tasks = id(new PhabricatorWorkerLeaseQuery())
         ->withIDs($waiting)
         ->setLimit(1)
         ->execute();
 
       if (!$tasks) {
         // We were not successful in leasing anything. Sleep for a bit and
         // see if we have better luck later.
         sleep(1);
         continue;
       }
 
       $task = head($tasks)->executeTask();
 
       $ex = $task->getExecutionException();
       if ($ex) {
         throw $ex;
       }
     }
 
     $tasks = id(new PhabricatorWorkerArchiveTask())->loadAllWhere(
       'id IN (%Ld)',
       $task_ids);
 
     foreach ($tasks as $task) {
       if ($task->getResult() != PhabricatorWorkerArchiveTask::RESULT_SUCCESS) {
         throw new Exception(
-          pht("Task %d failed!", $task->getID()));
+          pht('Task %d failed!', $task->getID()));
       }
     }
   }
 
   public function renderForDisplay(PhabricatorUser $viewer) {
     $data = PhutilReadableSerializer::printableValue($this->data);
     return phutil_tag('pre', array(), $data);
   }
 
   /**
    * Set this flag to execute scheduled tasks synchronously, in the same
    * process. This is useful for debugging, and otherwise dramatically worse
    * in every way imaginable.
    */
   public static function setRunAllTasksInProcess($all) {
     self::$runAllTasksInProcess = $all;
   }
 
   protected function log($pattern /* $args */) {
     $console = PhutilConsole::getConsole();
     $argv = func_get_args();
     call_user_func_array(array($console, 'writeLog'), $argv);
     return $this;
   }
 
 
   /**
    * Queue a task to be executed after this one suceeds.
    *
    * The followup task will be queued only if this task completes cleanly.
    *
    * @param string Task class to queue.
    * @param array  Data for the followup task.
    * @return this
    */
   protected function queueTask($class, array $data) {
     $this->queuedTasks[] = array($class, $data);
     return $this;
   }
 
 
   /**
    * Get tasks queued as followups by @{method:queueTask}.
    *
    * @return list<pair<string, wild>> Queued task specifications.
    */
   public function getQueuedTasks() {
     return $this->queuedTasks;
   }
 
 }
diff --git a/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php b/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php
index 313074cc9..f871a00fb 100644
--- a/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php
+++ b/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php
@@ -1,39 +1,39 @@
 <?php
 
 final class PhabricatorTestWorker extends PhabricatorWorker {
 
   public function getRequiredLeaseTime() {
     return idx(
       $this->getTaskData(),
       'getRequiredLeaseTime',
       parent::getRequiredLeaseTime());
   }
 
   public function getMaximumRetryCount() {
     return idx(
       $this->getTaskData(),
       'getMaximumRetryCount',
       parent::getMaximumRetryCount());
   }
 
   public function getWaitBeforeRetry(PhabricatorWorkerTask $task) {
     return idx(
       $this->getTaskData(),
       'getWaitBeforeRetry',
       parent::getWaitBeforeRetry($task));
   }
 
   protected function doWork() {
     switch (idx($this->getTaskData(), 'doWork')) {
       case 'fail-temporary':
         throw new Exception(
-          "Temporary failure!");
+          'Temporary failure!');
       case 'fail-permanent':
         throw new PhabricatorWorkerPermanentFailureException(
-          "Permanent failure!");
+          'Permanent failure!');
       default:
         return;
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php
index 7d21cc5c2..344720617 100644
--- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php
+++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php
@@ -1,236 +1,236 @@
 <?php
 
 /**
  * Select and lease tasks from the worker task queue.
  *
  * @group worker
  */
 final class PhabricatorWorkerLeaseQuery extends PhabricatorQuery {
 
   const PHASE_UNLEASED = 'unleased';
   const PHASE_EXPIRED  = 'expired';
 
   private $ids;
   private $limit;
 
   public static function getDefaultWaitBeforeRetry() {
     return phutil_units('5 minutes in seconds');
   }
 
   public static function getDefaultLeaseDuration() {
     return phutil_units('2 hours in seconds');
   }
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function setLimit($limit) {
     $this->limit = $limit;
     return $this;
   }
 
   public function execute() {
     if (!$this->limit) {
-      throw new Exception("You must setLimit() when leasing tasks.");
+      throw new Exception('You must setLimit() when leasing tasks.');
     }
 
     $task_table = new PhabricatorWorkerActiveTask();
     $taskdata_table = new PhabricatorWorkerTaskData();
     $lease_ownership_name = $this->getLeaseOwnershipName();
 
     $conn_w = $task_table->establishConnection('w');
 
     // Try to satisfy the request from new, unleased tasks first. If we don't
     // find enough tasks, try tasks with expired leases (i.e., tasks which have
     // previously failed).
 
     $phases = array(
       self::PHASE_UNLEASED,
       self::PHASE_EXPIRED,
     );
     $limit = $this->limit;
 
     $leased = 0;
     foreach ($phases as $phase) {
 
       // NOTE: If we issue `UPDATE ... WHERE ... ORDER BY id ASC`, the query
       // goes very, very slowly. The `ORDER BY` triggers this, although we get
       // the same apparent results without it. Without the ORDER BY, binary
       // read slaves complain that the query isn't repeatable. To avoid both
       // problems, do a SELECT and then an UPDATE.
 
       $rows = queryfx_all(
         $conn_w,
         'SELECT id, leaseOwner FROM %T %Q %Q %Q',
         $task_table->getTableName(),
         $this->buildWhereClause($conn_w, $phase),
         $this->buildOrderClause($conn_w, $phase),
         $this->buildLimitClause($conn_w, $limit - $leased));
 
       // NOTE: Sometimes, we'll race with another worker and they'll grab
       // this task before we do. We could reduce how often this happens by
       // selecting more tasks than we need, then shuffling them and trying
       // to lock only the number we're actually after. However, the amount
       // of time workers spend here should be very small relative to their
       // total runtime, so keep it simple for the moment.
 
       if ($rows) {
         queryfx(
           $conn_w,
           'UPDATE %T task
             SET leaseOwner = %s, leaseExpires = UNIX_TIMESTAMP() + %d
             %Q',
           $task_table->getTableName(),
           $lease_ownership_name,
           self::getDefaultLeaseDuration(),
           $this->buildUpdateWhereClause($conn_w, $phase, $rows));
 
         $leased += $conn_w->getAffectedRows();
         if ($leased == $limit) {
           break;
         }
       }
     }
 
     if (!$leased) {
       return array();
     }
 
     $data = queryfx_all(
       $conn_w,
       'SELECT task.*, taskdata.data _taskData, UNIX_TIMESTAMP() _serverTime
         FROM %T task LEFT JOIN %T taskdata
           ON taskdata.id = task.dataID
         WHERE leaseOwner = %s AND leaseExpires > UNIX_TIMESTAMP()
         %Q %Q',
       $task_table->getTableName(),
       $taskdata_table->getTableName(),
       $lease_ownership_name,
       $this->buildOrderClause($conn_w, $phase),
       $this->buildLimitClause($conn_w, $limit));
 
     $tasks = $task_table->loadAllFromArray($data);
     $tasks = mpull($tasks, null, 'getID');
 
     foreach ($data as $row) {
       $tasks[$row['id']]->setServerTime($row['_serverTime']);
       if ($row['_taskData']) {
         $task_data = json_decode($row['_taskData'], true);
       } else {
         $task_data = null;
       }
       $tasks[$row['id']]->setData($task_data);
     }
 
     return $tasks;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_w, $phase) {
 
     $where = array();
 
     switch ($phase) {
       case self::PHASE_UNLEASED:
         $where[] = 'leaseOwner IS NULL';
         break;
       case self::PHASE_EXPIRED:
         $where[] = 'leaseExpires < UNIX_TIMESTAMP()';
         break;
       default:
         throw new Exception("Unknown phase '{$phase}'!");
     }
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_w,
         'id IN (%Ld)',
         $this->ids);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function buildUpdateWhereClause(
     AphrontDatabaseConnection $conn_w,
     $phase,
     array $rows) {
 
     $where = array();
 
     // NOTE: This is basically working around the MySQL behavior that
     // `IN (NULL)` doesn't match NULL.
 
     switch ($phase) {
       case self::PHASE_UNLEASED:
         $where[] = qsprintf(
           $conn_w,
           'leaseOwner IS NULL');
         $where[] = qsprintf(
           $conn_w,
           'id IN (%Ld)',
           ipull($rows, 'id'));
         break;
       case self::PHASE_EXPIRED:
         $in = array();
         foreach ($rows as $row) {
           $in[] = qsprintf(
             $conn_w,
             '(id = %d AND leaseOwner = %s)',
             $row['id'],
             $row['leaseOwner']);
         }
         $where[] = qsprintf(
           $conn_w,
           '(%Q)',
           implode(' OR ', $in));
         break;
       default:
         throw new Exception("Unknown phase '{$phase}'!");
     }
 
     return $this->formatWhereClause($where);
 
   }
 
   private function buildOrderClause(AphrontDatabaseConnection $conn_w, $phase) {
     switch ($phase) {
       case self::PHASE_UNLEASED:
         // When selecting new tasks, we want to consume them in roughly
         // FIFO order, so we order by the task ID.
         return qsprintf($conn_w, 'ORDER BY id ASC');
       case self::PHASE_EXPIRED:
         // When selecting failed tasks, we want to consume them in roughly
         // FIFO order of their failures, which is not necessarily their original
         // queue order.
 
         // Particularly, this is important for tasks which use soft failures to
         // indicate that they are waiting on other tasks to complete: we need to
         // push them to the end of the queue after they fail, at least on
         // average, so we don't deadlock retrying the same blocked task over
         // and over again.
         return qsprintf($conn_w, 'ORDER BY leaseExpires ASC');
       default:
         throw new Exception(pht('Unknown phase "%s"!', $phase));
     }
   }
 
   private function buildLimitClause(AphrontDatabaseConnection $conn_w, $limit) {
     return qsprintf($conn_w, 'LIMIT %d', $limit);
   }
 
   private function getLeaseOwnershipName() {
     static $sequence = 0;
 
     $parts = array(
       getmypid(),
       time(),
       php_uname('n'),
       ++$sequence,
     );
 
     return implode(':', $parts);
   }
 
 }
diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php
index a8eca94cb..c40ebbb82 100644
--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php
+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php
@@ -1,175 +1,175 @@
 <?php
 
 final class PhabricatorWorkerActiveTask extends PhabricatorWorkerTask {
 
   protected $failureTime;
 
   private $serverTime;
   private $localTime;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_IDS => self::IDS_COUNTER,
       self::CONFIG_TIMESTAMPS => false,
     ) + parent::getConfiguration();
   }
 
   public function setServerTime($server_time) {
     $this->serverTime = $server_time;
     $this->localTime = time();
     return $this;
   }
 
   public function setLeaseDuration($lease_duration) {
     $this->checkLease();
     $server_lease_expires = $this->serverTime + $lease_duration;
     $this->setLeaseExpires($server_lease_expires);
 
     // NOTE: This is primarily to allow unit tests to set negative lease
     // durations so they don't have to wait around for leases to expire. We
     // check that the lease is valid above.
     return $this->forceSaveWithoutLease();
   }
 
   public function save() {
     $this->checkLease();
     return $this->forceSaveWithoutLease();
   }
 
   public function forceSaveWithoutLease() {
     $is_new = !$this->getID();
     if ($is_new) {
       $this->failureCount = 0;
     }
 
     if ($is_new && ($this->getData() !== null)) {
       $data = new PhabricatorWorkerTaskData();
       $data->setData($this->getData());
       $data->save();
 
       $this->setDataID($data->getID());
     }
 
     return parent::save();
   }
 
   protected function checkLease() {
     if ($this->leaseOwner) {
       $current_server_time = $this->serverTime + (time() - $this->localTime);
       if ($current_server_time >= $this->leaseExpires) {
         $id = $this->getID();
         $class = $this->getTaskClass();
         throw new Exception(
           "Trying to update Task {$id} ({$class}) after lease expiration!");
       }
     }
   }
 
   public function delete() {
     throw new Exception(
-      "Active tasks can not be deleted directly. ".
-      "Use archiveTask() to move tasks to the archive.");
+      'Active tasks can not be deleted directly. '.
+      'Use archiveTask() to move tasks to the archive.');
   }
 
   public function archiveTask($result, $duration) {
     if ($this->getID() === null) {
       throw new Exception(
         "Attempting to archive a task which hasn't been save()d!");
     }
 
     $this->checkLease();
 
     $archive = id(new PhabricatorWorkerArchiveTask())
       ->setID($this->getID())
       ->setTaskClass($this->getTaskClass())
       ->setLeaseOwner($this->getLeaseOwner())
       ->setLeaseExpires($this->getLeaseExpires())
       ->setFailureCount($this->getFailureCount())
       ->setDataID($this->getDataID())
       ->setResult($result)
       ->setDuration($duration);
 
     // NOTE: This deletes the active task (this object)!
     $archive->save();
 
     return $archive;
   }
 
   public function executeTask() {
     // We do this outside of the try .. catch because we don't have permission
     // to release the lease otherwise.
     $this->checkLease();
 
     $did_succeed = false;
     try {
       $worker = $this->getWorkerInstance();
 
       $maximum_failures = $worker->getMaximumRetryCount();
       if ($maximum_failures !== null) {
         if ($this->getFailureCount() > $maximum_failures) {
           $id = $this->getID();
           throw new PhabricatorWorkerPermanentFailureException(
             "Task {$id} has exceeded the maximum number of failures ".
             "({$maximum_failures}).");
         }
       }
 
       $lease = $worker->getRequiredLeaseTime();
       if ($lease !== null) {
         $this->setLeaseDuration($lease);
       }
 
       $t_start = microtime(true);
         $worker->executeTask();
       $t_end = microtime(true);
       $duration = (int)(1000000 * ($t_end - $t_start));
 
       $result = $this->archiveTask(
         PhabricatorWorkerArchiveTask::RESULT_SUCCESS,
         $duration);
       $did_succeed = true;
     } catch (PhabricatorWorkerPermanentFailureException $ex) {
       $result = $this->archiveTask(
         PhabricatorWorkerArchiveTask::RESULT_FAILURE,
         0);
       $result->setExecutionException($ex);
     } catch (PhabricatorWorkerYieldException $ex) {
       $this->setExecutionException($ex);
 
       $retry = $ex->getDuration();
       $retry = max($retry, 5);
 
       // NOTE: As a side effect, this saves the object.
       $this->setLeaseDuration($retry);
 
       $result = $this;
     } catch (Exception $ex) {
       $this->setExecutionException($ex);
       $this->setFailureCount($this->getFailureCount() + 1);
       $this->setFailureTime(time());
 
       $retry = $worker->getWaitBeforeRetry($this);
       $retry = coalesce(
         $retry,
         PhabricatorWorkerLeaseQuery::getDefaultWaitBeforeRetry());
 
       // NOTE: As a side effect, this saves the object.
       $this->setLeaseDuration($retry);
 
       $result = $this;
     }
 
     // NOTE: If this throws, we don't want it to cause the task to fail again,
     // so execute it out here and just let the exception escape.
     if ($did_succeed) {
       foreach ($worker->getQueuedTasks() as $task) {
         list($class, $data) = $task;
         PhabricatorWorker::scheduleTask($class, $data);
       }
     }
 
     return $result;
   }
 
 
 }
diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php
index 6cdfa9392..cf985ca88 100644
--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php
+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php
@@ -1,69 +1,69 @@
 <?php
 
 final class PhabricatorWorkerArchiveTask extends PhabricatorWorkerTask {
 
   const RESULT_SUCCESS    = 0;
   const RESULT_FAILURE    = 1;
   const RESULT_CANCELLED  = 2;
 
   protected $duration;
   protected $result;
 
   public function save() {
     if ($this->getID() === null) {
       throw new Exception(
-        "Trying to archive a task with no ID.");
+        'Trying to archive a task with no ID.');
     }
 
     $other = new PhabricatorWorkerActiveTask();
     $conn_w = $this->establishConnection('w');
 
     $this->openTransaction();
       queryfx(
         $conn_w,
         'DELETE FROM %T WHERE id = %d',
         $other->getTableName(),
         $this->getID());
       $result = parent::insert();
     $this->saveTransaction();
 
     return $result;
   }
 
   public function delete() {
     $this->openTransaction();
       if ($this->getDataID()) {
         $conn_w = $this->establishConnection('w');
         $data_table = new PhabricatorWorkerTaskData();
 
         queryfx(
           $conn_w,
           'DELETE FROM %T WHERE id = %d',
           $data_table->getTableName(),
           $this->getDataID());
       }
 
       $result = parent::delete();
     $this->saveTransaction();
     return $result;
   }
 
   public function unarchiveTask() {
     $this->openTransaction();
       $active = id(new PhabricatorWorkerActiveTask())
         ->setID($this->getID())
         ->setTaskClass($this->getTaskClass())
         ->setLeaseOwner(null)
         ->setLeaseExpires(0)
         ->setFailureCount(0)
         ->setDataID($this->getDataID())
         ->insert();
 
       $this->setDataID(null);
       $this->delete();
     $this->saveTransaction();
 
     return $active;
   }
 
 }
diff --git a/src/infrastructure/edges/query/PhabricatorEdgeQuery.php b/src/infrastructure/edges/query/PhabricatorEdgeQuery.php
index e46c65ad0..976a35b9a 100644
--- a/src/infrastructure/edges/query/PhabricatorEdgeQuery.php
+++ b/src/infrastructure/edges/query/PhabricatorEdgeQuery.php
@@ -1,331 +1,331 @@
 <?php
 
 /**
  * Load object edges created by @{class:PhabricatorEdgeEditor}.
  *
  *   name=Querying Edges
  *   $src  = $earth_phid;
  *   $type = PhabricatorEdgeConfig::TYPE_BODY_HAS_SATELLITE;
  *
  *   // Load the earth's satellites.
  *   $satellite_edges = id(new PhabricatorEdgeQuery())
  *     ->withSourcePHIDs(array($src))
  *     ->withEdgeTypes(array($type))
  *     ->execute();
  *
  * For more information on edges, see @{article:Using Edges}.
  *
  * @task config   Configuring the Query
  * @task exec     Executing the Query
  * @task internal Internal
  */
 final class PhabricatorEdgeQuery extends PhabricatorQuery {
 
   private $sourcePHIDs;
   private $destPHIDs;
   private $edgeTypes;
   private $resultSet;
 
   const ORDER_OLDEST_FIRST = 'order:oldest';
   const ORDER_NEWEST_FIRST = 'order:newest';
   private $order = self::ORDER_NEWEST_FIRST;
 
   private $needEdgeData;
 
 
 /* -(  Configuring the Query  )---------------------------------------------- */
 
 
   /**
    * Find edges originating at one or more source PHIDs. You MUST provide this
    * to execute an edge query.
    *
    * @param list List of source PHIDs.
    * @return this
    *
    * @task config
    */
   public function withSourcePHIDs(array $source_phids) {
     $this->sourcePHIDs = $source_phids;
     return $this;
   }
 
 
   /**
    * Find edges terminating at one or more destination PHIDs.
    *
    * @param list List of destination PHIDs.
    * @return this
    *
    */
   public function withDestinationPHIDs(array $dest_phids) {
     $this->destPHIDs = $dest_phids;
     return $this;
   }
 
 
   /**
    * Find edges of specific types.
    *
    * @param list List of PhabricatorEdgeConfig type constants.
    * @return this
    *
    * @task config
    */
   public function withEdgeTypes(array $types) {
     $this->edgeTypes = $types;
     return $this;
   }
 
 
   /**
    * Configure the order edge results are returned in.
    *
    * @param const Order constant.
    * @return this
    *
    * @task config
    */
   public function setOrder($order) {
     $this->order = $order;
     return $this;
   }
 
 
   /**
    * When loading edges, also load edge data.
    *
    * @param bool True to load edge data.
    * @return this
    *
    * @task config
    */
   public function needEdgeData($need) {
     $this->needEdgeData = $need;
     return $this;
   }
 
 
 /* -(  Executing the Query  )------------------------------------------------ */
 
 
   /**
    * Convenience method for loading destination PHIDs with one source and one
    * edge type. Equivalent to building a full query, but simplifies a common
    * use case.
    *
    * @param phid  Source PHID.
    * @param const Edge type.
    * @return list<phid> List of destination PHIDs.
    */
   public static function loadDestinationPHIDs($src_phid, $edge_type) {
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array($src_phid))
       ->withEdgeTypes(array($edge_type))
       ->execute();
     return array_keys($edges[$src_phid][$edge_type]);
   }
 
   /**
    * Convenience method for loading a single edge's metadata for
    * a given source, destination, and edge type. Returns null
    * if the edge does not exist or does not have metadata. Builds
    * and immediately executes a full query.
    *
    * @param phid  Source PHID.
    * @param const Edge type.
    * @param phid  Destination PHID.
    * @return wild Edge annotation (or null).
    */
   public static function loadSingleEdgeData($src_phid, $edge_type, $dest_phid) {
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array($src_phid))
       ->withEdgeTypes(array($edge_type))
       ->withDestinationPHIDs(array($dest_phid))
       ->needEdgeData(true)
       ->execute();
 
     if (isset($edges[$src_phid][$edge_type][$dest_phid]['data'])) {
       return $edges[$src_phid][$edge_type][$dest_phid]['data'];
     }
     return null;
   }
 
 
   /**
    * Load specified edges.
    *
    * @task exec
    */
   public function execute() {
     if (!$this->sourcePHIDs) {
       throw new Exception(
-      "You must use withSourcePHIDs() to query edges.");
+      'You must use withSourcePHIDs() to query edges.');
     }
 
     $sources = phid_group_by_type($this->sourcePHIDs);
 
     $result = array();
 
     // When a query specifies types, make sure we return data for all queried
     // types.
     if ($this->edgeTypes) {
       foreach ($this->sourcePHIDs as $phid) {
         foreach ($this->edgeTypes as $type) {
           $result[$phid][$type] = array();
         }
       }
     }
 
     foreach ($sources as $type => $phids) {
       $conn_r = PhabricatorEdgeConfig::establishConnection($type, 'r');
 
       $where = $this->buildWhereClause($conn_r);
       $order = $this->buildOrderClause($conn_r);
 
       $edges = queryfx_all(
         $conn_r,
         'SELECT edge.* FROM %T edge %Q %Q',
         PhabricatorEdgeConfig::TABLE_NAME_EDGE,
         $where,
         $order);
 
       if ($this->needEdgeData) {
         $data_ids = array_filter(ipull($edges, 'dataID'));
         $data_map = array();
         if ($data_ids) {
           $data_rows = queryfx_all(
             $conn_r,
             'SELECT edgedata.* FROM %T edgedata WHERE id IN (%Ld)',
             PhabricatorEdgeConfig::TABLE_NAME_EDGEDATA,
             $data_ids);
           foreach ($data_rows as $row) {
             $data_map[$row['id']] = idx(
               json_decode($row['data'], true),
               'data');
           }
         }
         foreach ($edges as $key => $edge) {
           $edges[$key]['data'] = idx($data_map, $edge['dataID'], array());
         }
       }
 
       foreach ($edges as $edge) {
         $result[$edge['src']][$edge['type']][$edge['dst']] = $edge;
       }
     }
 
     $this->resultSet = $result;
     return $result;
   }
 
 
   /**
    * Convenience function for selecting edge destination PHIDs after calling
    * execute().
    *
    * Returns a flat list of PHIDs matching the provided source PHID and type
    * filters. By default, the filters are empty so all PHIDs will be returned.
    * For example, if you're doing a batch query from several sources, you might
    * write code like this:
    *
    *   $query = new PhabricatorEdgeQuery();
    *   $query->setViewer($viewer);
    *   $query->withSourcePHIDs(mpull($objects, 'getPHID'));
    *   $query->withEdgeTypes(array($some_type));
    *   $query->execute();
    *
    *   // Gets all of the destinations.
    *   $all_phids = $query->getDestinationPHIDs();
    *   $handles = id(new PhabricatorHandleQuery())
    *     ->setViewer($viewer)
    *     ->withPHIDs($all_phids)
    *     ->execute();
    *
    *   foreach ($objects as $object) {
    *     // Get all of the destinations for the given object.
    *     $dst_phids = $query->getDestinationPHIDs(array($object->getPHID()));
    *     $object->attachHandles(array_select_keys($handles, $dst_phids));
    *   }
    *
    * @param list? List of PHIDs to select, or empty to select all.
    * @param list? List of edge types to select, or empty to select all.
    * @return list<phid> List of matching destination PHIDs.
    */
   public function getDestinationPHIDs(
     array $src_phids = array(),
     array $types = array()) {
     if ($this->resultSet === null) {
       throw new Exception(
-        "You must execute() a query before you you can getDestinationPHIDs().");
+        'You must execute() a query before you you can getDestinationPHIDs().');
     }
 
     $src_phids = array_fill_keys($src_phids, true);
     $types = array_fill_keys($types, true);
 
     $result_phids = array();
     foreach ($this->resultSet as $src => $edges_by_type) {
       if ($src_phids && empty($src_phids[$src])) {
         continue;
       }
       foreach ($edges_by_type as $type => $edges_by_dst) {
         if ($types && empty($types[$type])) {
           continue;
         }
         foreach ($edges_by_dst as $dst => $edge) {
           $result_phids[$dst] = true;
         }
       }
     }
 
     return array_keys($result_phids);
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if ($this->sourcePHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'edge.src IN (%Ls)',
         $this->sourcePHIDs);
     }
 
     if ($this->edgeTypes) {
       $where[] = qsprintf(
         $conn_r,
         'edge.type IN (%Ls)',
         $this->edgeTypes);
     }
 
     if ($this->destPHIDs) {
       // potentially complain if $this->edgeType was not set
       $where[] = qsprintf(
         $conn_r,
         'edge.dst IN (%Ls)',
         $this->destPHIDs);
     }
 
     return $this->formatWhereClause($where);
   }
 
 
   /**
    * @task internal
    */
   private function buildOrderClause($conn_r) {
     if ($this->order == self::ORDER_NEWEST_FIRST) {
       return 'ORDER BY edge.dateCreated DESC, edge.seq DESC';
     } else {
       return 'ORDER BY edge.dateCreated ASC, edge.seq ASC';
     }
   }
 
 }
diff --git a/src/infrastructure/edges/util/PhabricatorEdgeGraph.php b/src/infrastructure/edges/util/PhabricatorEdgeGraph.php
index 94a11bb2d..57b422328 100644
--- a/src/infrastructure/edges/util/PhabricatorEdgeGraph.php
+++ b/src/infrastructure/edges/util/PhabricatorEdgeGraph.php
@@ -1,34 +1,34 @@
 <?php
 
 final class PhabricatorEdgeGraph extends AbstractDirectedGraph {
 
   private $edgeType;
 
   public function setEdgeType($edge_type) {
     $this->edgeType = $edge_type;
     return $this;
   }
 
   protected function loadEdges(array $nodes) {
     if (!$this->edgeType) {
-      throw new Exception("Set edge type before loading graph!");
+      throw new Exception('Set edge type before loading graph!');
     }
 
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs($nodes)
       ->withEdgeTypes(array($this->edgeType))
       ->execute();
 
     $results = array_fill_keys($nodes, array());
     foreach ($edges as $src => $types) {
       foreach ($types as $type => $dsts) {
         foreach ($dsts as $dst => $edge) {
           $results[$src][] = $dst;
         }
       }
     }
 
     return $results;
   }
 
 }
diff --git a/src/infrastructure/env/PhabricatorConfigProxySource.php b/src/infrastructure/env/PhabricatorConfigProxySource.php
index cb0ede711..818b55452 100644
--- a/src/infrastructure/env/PhabricatorConfigProxySource.php
+++ b/src/infrastructure/env/PhabricatorConfigProxySource.php
@@ -1,54 +1,54 @@
 <?php
 
 /**
  * Configuration source which proxies some other configuration source.
  */
 abstract class PhabricatorConfigProxySource
   extends PhabricatorConfigSource {
 
   private $source;
 
   final protected function getSource() {
     if (!$this->source) {
-      throw new Exception("No configuration source set!");
+      throw new Exception('No configuration source set!');
     }
     return $this->source;
   }
 
   final protected function setSource(PhabricatorConfigSource $source) {
     $this->source = $source;
     return $this;
   }
 
   public function getAllKeys() {
     return $this->getSource()->getAllKeys();
   }
 
   public function getKeys(array $keys) {
     return $this->getSource()->getKeys($keys);
   }
 
   public function canWrite() {
     return $this->getSource()->canWrite();
   }
 
   public function setKeys(array $keys) {
     $this->getSource()->setKeys($keys);
     return $this;
   }
 
   public function deleteKeys(array $keys) {
     $this->getSource()->deleteKeys($keys);
     return $this;
   }
 
   public function setName($name) {
     $this->getSource()->setName($name);
     return $this;
   }
 
   public function getName() {
     return $this->getSource()->getName();
   }
 
 }
diff --git a/src/infrastructure/env/PhabricatorConfigSource.php b/src/infrastructure/env/PhabricatorConfigSource.php
index bfbc68d5d..dd52a18c7 100644
--- a/src/infrastructure/env/PhabricatorConfigSource.php
+++ b/src/infrastructure/env/PhabricatorConfigSource.php
@@ -1,31 +1,31 @@
 <?php
 
 abstract class PhabricatorConfigSource {
 
   private $name;
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->name;
   }
 
   abstract public function getKeys(array $keys);
   abstract public function getAllKeys();
 
   public function canWrite() {
     return false;
   }
 
   public function setKeys(array $keys) {
-    throw new Exception("This configuration source does not support writes.");
+    throw new Exception('This configuration source does not support writes.');
   }
 
   public function deleteKeys(array $keys) {
-    throw new Exception("This configuration source does not support writes.");
+    throw new Exception('This configuration source does not support writes.');
   }
 
 }
diff --git a/src/infrastructure/env/PhabricatorConfigStackSource.php b/src/infrastructure/env/PhabricatorConfigStackSource.php
index 2d6f735ff..a118cf01b 100644
--- a/src/infrastructure/env/PhabricatorConfigStackSource.php
+++ b/src/infrastructure/env/PhabricatorConfigStackSource.php
@@ -1,80 +1,80 @@
 <?php
 
 /**
  * Configuration source which reads from a stack of other configuration
  * sources.
  *
  * This source is writable if any source in the stack is writable. Writes happen
  * to the first writable source only.
  */
 final class PhabricatorConfigStackSource
   extends PhabricatorConfigSource {
 
   private $stack = array();
 
   public function pushSource(PhabricatorConfigSource $source) {
     array_unshift($this->stack, $source);
     return $this;
   }
 
   public function popSource() {
     if (empty($this->stack)) {
-      throw new Exception("Popping an empty config stack!");
+      throw new Exception('Popping an empty config stack!');
     }
     return array_shift($this->stack);
   }
 
   public function getStack() {
     return $this->stack;
   }
 
   public function getKeys(array $keys) {
     $result = array();
     foreach ($this->stack as $source) {
       $result = $result + $source->getKeys($keys);
     }
     return $result;
   }
 
   public function getAllKeys() {
     $result = array();
     foreach ($this->stack as $source) {
       $result = $result + $source->getAllKeys();
     }
     return $result;
   }
 
   public function canWrite() {
     foreach ($this->stack as $source) {
       if ($source->canWrite()) {
         return true;
       }
     }
     return false;
   }
 
   public function setKeys(array $keys) {
     foreach ($this->stack as $source) {
       if ($source->canWrite()) {
         $source->setKeys($keys);
         return;
       }
     }
 
     // We can't write; this will throw an appropriate exception.
     parent::setKeys($keys);
   }
 
   public function deleteKeys(array $keys) {
     foreach ($this->stack as $source) {
       if ($source->canWrite()) {
         $source->deleteKeys($keys);
         return;
       }
     }
 
     // We can't write; this will throw an appropriate exception.
     parent::deleteKeys($keys);
   }
 
 }
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
index 8d83ffb4f..3286a7258 100644
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -1,547 +1,547 @@
 <?php
 
 /**
  * Manages the execution environment configuration, exposing APIs to read
  * configuration settings and other similar values that are derived directly
  * from configuration settings.
  *
  *
  * = Reading Configuration =
  *
  * The primary role of this class is to provide an API for reading
  * Phabricator configuration, @{method:getEnvConfig}:
  *
  *   $value = PhabricatorEnv::getEnvConfig('some.key', $default);
  *
  * The class also handles some URI construction based on configuration, via
  * the methods @{method:getURI}, @{method:getProductionURI},
  * @{method:getCDNURI}, and @{method:getDoclink}.
  *
  * For configuration which allows you to choose a class to be responsible for
  * some functionality (e.g., which mail adapter to use to deliver email),
  * @{method:newObjectFromConfig} provides a simple interface that validates
  * the configured value.
  *
  *
  * = Unit Test Support =
  *
  * In unit tests, you can use @{method:beginScopedEnv} to create a temporary,
  * mutable environment. The method returns a scope guard object which restores
  * the environment when it is destroyed. For example:
  *
  *   public function testExample() {
  *     $env = PhabricatorEnv::beginScopedEnv();
  *     $env->overrideEnv('some.key', 'new-value-for-this-test');
  *
  *     // Some test which depends on the value of 'some.key'.
  *
  *   }
  *
  * Your changes will persist until the `$env` object leaves scope or is
  * destroyed.
  *
  * You should //not// use this in normal code.
  *
  *
  * @task read     Reading Configuration
  * @task uri      URI Validation
  * @task test     Unit Test Support
  * @task internal Internals
  */
 final class PhabricatorEnv {
 
   private static $sourceStack;
   private static $repairSource;
   private static $overrideSource;
   private static $requestBaseURI;
   private static $cache;
 
   /**
    * @phutil-external-symbol class PhabricatorStartup
    */
   public static function initializeWebEnvironment() {
     self::initializeCommonEnvironment();
   }
 
   public static function initializeScriptEnvironment() {
     self::initializeCommonEnvironment();
 
     // NOTE: This is dangerous in general, but we know we're in a script context
     // and are not vulnerable to CSRF.
     AphrontWriteGuard::allowDangerousUnguardedWrites(true);
 
     // There are several places where we log information (about errors, events,
     // service calls, etc.) for analysis via DarkConsole or similar. These are
     // useful for web requests, but grow unboundedly in long-running scripts and
     // daemons. Discard data as it arrives in these cases.
     PhutilServiceProfiler::getInstance()->enableDiscardMode();
     DarkConsoleErrorLogPluginAPI::enableDiscardMode();
     DarkConsoleEventPluginAPI::enableDiscardMode();
   }
 
 
   private static function initializeCommonEnvironment() {
     PhutilErrorHandler::initialize();
 
     self::buildConfigurationSourceStack();
 
     // Force a valid timezone. If both PHP and Phabricator configuration are
     // invalid, use UTC.
     $tz = PhabricatorEnv::getEnvConfig('phabricator.timezone');
     if ($tz) {
       @date_default_timezone_set($tz);
     }
     $ok = @date_default_timezone_set(date_default_timezone_get());
     if (!$ok) {
       date_default_timezone_set('UTC');
     }
 
     // Prepend '/support/bin' and append any paths to $PATH if we need to.
     $env_path = getenv('PATH');
     $phabricator_path = dirname(phutil_get_library_root('phabricator'));
     $support_path = $phabricator_path.'/support/bin';
     $env_path = $support_path.PATH_SEPARATOR.$env_path;
     $append_dirs = PhabricatorEnv::getEnvConfig('environment.append-paths');
     if (!empty($append_dirs)) {
       $append_path = implode(PATH_SEPARATOR, $append_dirs);
       $env_path = $env_path.PATH_SEPARATOR.$append_path;
     }
     putenv('PATH='.$env_path);
 
     // Write this back into $_ENV, too, so ExecFuture picks it up when creating
     // subprocess environments.
     $_ENV['PATH'] = $env_path;
 
     PhabricatorEventEngine::initialize();
 
     $translation = PhabricatorEnv::newObjectFromConfig('translation.provider');
     PhutilTranslator::getInstance()
       ->setLanguage($translation->getLanguage())
       ->addTranslations($translation->getTranslations());
   }
 
   private static function buildConfigurationSourceStack() {
     self::dropConfigCache();
 
     $stack = new PhabricatorConfigStackSource();
     self::$sourceStack = $stack;
 
     $default_source = id(new PhabricatorConfigDefaultSource())
       ->setName(pht('Global Default'));
     $stack->pushSource($default_source);
 
     $env = self::getSelectedEnvironmentName();
     if ($env) {
       $stack->pushSource(
         id(new PhabricatorConfigFileSource($env))
           ->setName(pht("File '%s'", $env)));
     }
 
     $stack->pushSource(
       id(new PhabricatorConfigLocalSource())
-        ->setName(pht("Local Config")));
+        ->setName(pht('Local Config')));
 
     // If the install overrides the database adapter, we might need to load
     // the database adapter class before we can push on the database config.
     // This config is locked and can't be edited from the web UI anyway.
     foreach (PhabricatorEnv::getEnvConfig('load-libraries') as $library) {
       phutil_load_library($library);
     }
 
     // If custom libraries specify config options, they won't get default
     // values as the Default source has already been loaded, so we get it to
     // pull in all options from non-phabricator libraries now they are loaded.
     $default_source->loadExternalOptions();
 
     try {
       $stack->pushSource(
         id(new PhabricatorConfigDatabaseSource('default'))
-          ->setName(pht("Database")));
+          ->setName(pht('Database')));
     } catch (AphrontQueryException $exception) {
       // If the database is not available, just skip this configuration
       // source. This happens during `bin/storage upgrade`, `bin/conf` before
       // schema setup, etc.
     }
   }
 
   public static function repairConfig($key, $value) {
     if (!self::$repairSource) {
       self::$repairSource = id(new PhabricatorConfigDictionarySource(array()))
-        ->setName(pht("Repaired Config"));
+        ->setName(pht('Repaired Config'));
       self::$sourceStack->pushSource(self::$repairSource);
     }
     self::$repairSource->setKeys(array($key => $value));
     self::dropConfigCache();
   }
 
   public static function overrideConfig($key, $value) {
     if (!self::$overrideSource) {
       self::$overrideSource = id(new PhabricatorConfigDictionarySource(array()))
-        ->setName(pht("Overridden Config"));
+        ->setName(pht('Overridden Config'));
       self::$sourceStack->pushSource(self::$overrideSource);
     }
     self::$overrideSource->setKeys(array($key => $value));
     self::dropConfigCache();
   }
 
   public static function getUnrepairedEnvConfig($key, $default = null) {
     foreach (self::$sourceStack->getStack() as $source) {
       if ($source === self::$repairSource) {
         continue;
       }
       $result = $source->getKeys(array($key));
       if ($result) {
         return $result[$key];
       }
     }
     return $default;
   }
 
   public static function getSelectedEnvironmentName() {
     $env_var = 'PHABRICATOR_ENV';
 
     $env = idx($_SERVER, $env_var);
 
     if (!$env) {
       $env = getenv($env_var);
     }
 
     if (!$env) {
       $env = idx($_ENV, $env_var);
     }
 
     if (!$env) {
       $root = dirname(phutil_get_library_root('phabricator'));
       $path = $root.'/conf/local/ENVIRONMENT';
       if (Filesystem::pathExists($path)) {
         $env = trim(Filesystem::readFile($path));
       }
     }
 
     return $env;
   }
 
 
 /* -(  Reading Configuration  )---------------------------------------------- */
 
 
   /**
    * Get the current configuration setting for a given key.
    *
    * If the key is not found, then throw an Exception.
    *
    * @task read
    */
   public static function getEnvConfig($key) {
     if (isset(self::$cache[$key])) {
       return self::$cache[$key];
     }
 
     if (array_key_exists($key, self::$cache)) {
       return self::$cache[$key];
     }
 
     $result = self::$sourceStack->getKeys(array($key));
     if (array_key_exists($key, $result)) {
       self::$cache[$key] = $result[$key];
       return $result[$key];
     } else {
       throw new Exception("No config value specified for key '{$key}'.");
     }
   }
 
 
   /**
    * Get the current configuration setting for a given key. If the key
    * does not exist, return a default value instead of throwing. This is
    * primarily useful for migrations involving keys which are slated for
    * removal.
    *
    * @task read
    */
   public static function getEnvConfigIfExists($key, $default = null) {
     try {
       return self::getEnvConfig($key);
     } catch (Exception $ex) {
       return $default;
     }
   }
 
 
   /**
    * Get the fully-qualified URI for a path.
    *
    * @task read
    */
   public static function getURI($path) {
     return rtrim(self::getAnyBaseURI(), '/').$path;
   }
 
 
   /**
    * Get the fully-qualified production URI for a path.
    *
    * @task read
    */
   public static function getProductionURI($path) {
     // If we're passed a URI which already has a domain, simply return it
     // unmodified. In particular, files may have URIs which point to a CDN
     // domain.
     $uri = new PhutilURI($path);
     if ($uri->getDomain()) {
       return $path;
     }
 
     $production_domain = self::getEnvConfig('phabricator.production-uri');
     if (!$production_domain) {
       $production_domain = self::getAnyBaseURI();
     }
     return rtrim($production_domain, '/').$path;
   }
 
   public static function getAllowedURIs($path) {
     $uri = new PhutilURI($path);
     if ($uri->getDomain()) {
       return $path;
     }
 
     $allowed_uris = self::getEnvConfig('phabricator.allowed-uris');
     $return = array();
     foreach ($allowed_uris as $allowed_uri) {
       $return[] = rtrim($allowed_uri, '/').$path;
     }
 
     return $return;
   }
 
 
   /**
    * Get the fully-qualified production URI for a static resource path.
    *
    * @task read
    */
   public static function getCDNURI($path) {
     $alt = self::getEnvConfig('security.alternate-file-domain');
     if (!$alt) {
       $alt = self::getAnyBaseURI();
     }
     $uri = new PhutilURI($alt);
     $uri->setPath($path);
     return (string)$uri;
   }
 
 
   /**
    * Get the fully-qualified production URI for a documentation resource.
    *
    * @task read
    */
   public static function getDoclink($resource, $type = 'article') {
     $uri = new PhutilURI('https://secure.phabricator.com/diviner/find/');
     $uri->setQueryParam('name', $resource);
     $uri->setQueryParam('type', $type);
     $uri->setQueryParam('jump', true);
     return (string)$uri;
   }
 
 
   /**
    * Build a concrete object from a configuration key.
    *
    * @task read
    */
   public static function newObjectFromConfig($key, $args = array()) {
     $class = self::getEnvConfig($key);
     return newv($class, $args);
   }
 
   public static function getAnyBaseURI() {
     $base_uri = self::getEnvConfig('phabricator.base-uri');
 
     if (!$base_uri) {
       $base_uri = self::getRequestBaseURI();
     }
 
     if (!$base_uri) {
       throw new Exception(
         "Define 'phabricator.base-uri' in your configuration to continue.");
     }
 
     return $base_uri;
   }
 
   public static function getRequestBaseURI() {
     return self::$requestBaseURI;
   }
 
   public static function setRequestBaseURI($uri) {
     self::$requestBaseURI = $uri;
   }
 
 /* -(  Unit Test Support  )-------------------------------------------------- */
 
 
   /**
    * @task test
    */
   public static function beginScopedEnv() {
     return new PhabricatorScopedEnv(self::pushTestEnvironment());
   }
 
 
   /**
    * @task test
    */
   private static function pushTestEnvironment() {
     self::dropConfigCache();
     $source = new PhabricatorConfigDictionarySource(array());
     self::$sourceStack->pushSource($source);
     return spl_object_hash($source);
   }
 
 
   /**
    * @task test
    */
   public static function popTestEnvironment($key) {
     self::dropConfigCache();
     $source = self::$sourceStack->popSource();
     $stack_key = spl_object_hash($source);
     if ($stack_key !== $key) {
       self::$sourceStack->pushSource($source);
       throw new Exception(
-        "Scoped environments were destroyed in a diffent order than they ".
-        "were initialized.");
+        'Scoped environments were destroyed in a diffent order than they '.
+        'were initialized.');
     }
   }
 
 
 /* -(  URI Validation  )----------------------------------------------------- */
 
 
   /**
    * Detect if a URI satisfies either @{method:isValidLocalWebResource} or
    * @{method:isValidRemoteWebResource}, i.e. is a page on this server or the
    * URI of some other resource which has a valid protocol. This rejects
    * garbage URIs and URIs with protocols which do not appear in the
    * ##uri.allowed-protocols## configuration, notably 'javascript:' URIs.
    *
    * NOTE: This method is generally intended to reject URIs which it may be
    * unsafe to put in an "href" link attribute.
    *
    * @param string URI to test.
    * @return bool True if the URI identifies a web resource.
    * @task uri
    */
   public static function isValidWebResource($uri) {
     return self::isValidLocalWebResource($uri) ||
            self::isValidRemoteWebResource($uri);
   }
 
 
   /**
    * Detect if a URI identifies some page on this server.
    *
    * NOTE: This method is generally intended to reject URIs which it may be
    * unsafe to issue a "Location:" redirect to.
    *
    * @param string URI to test.
    * @return bool True if the URI identifies a local page.
    * @task uri
    */
   public static function isValidLocalWebResource($uri) {
     $uri = (string)$uri;
 
     if (!strlen($uri)) {
       return false;
     }
 
     if (preg_match('/\s/', $uri)) {
       // PHP hasn't been vulnerable to header injection attacks for a bunch of
       // years, but we can safely reject these anyway since they're never valid.
       return false;
     }
 
     // Valid URIs must begin with '/', followed by the end of the string or some
     // other non-'/' character. This rejects protocol-relative URIs like
     // "//evil.com/evil_stuff/".
     return (bool)preg_match('@^/([^/]|$)@', $uri);
   }
 
 
   /**
    * Detect if a URI identifies some valid remote resource.
    *
    * @param string URI to test.
    * @return bool True if a URI idenfies a remote resource with an allowed
    *              protocol.
    * @task uri
    */
   public static function isValidRemoteWebResource($uri) {
     $uri = (string)$uri;
 
     $proto = id(new PhutilURI($uri))->getProtocol();
     if (!$proto) {
       return false;
     }
 
     $allowed = self::getEnvConfig('uri.allowed-protocols');
     if (empty($allowed[$proto])) {
       return false;
     }
 
     return true;
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   public static function envConfigExists($key) {
     return array_key_exists($key, self::$sourceStack->getKeys(array($key)));
   }
 
 
   /**
    * @task internal
    */
   public static function getAllConfigKeys() {
     return self::$sourceStack->getAllKeys();
   }
 
   public static function getConfigSourceStack() {
     return self::$sourceStack;
   }
 
   /**
    * @task internal
    */
   public static function overrideTestEnvConfig($stack_key, $key, $value) {
     $tmp = array();
 
     // If we don't have the right key, we'll throw when popping the last
     // source off the stack.
     do {
       $source = self::$sourceStack->popSource();
       array_unshift($tmp, $source);
       if (spl_object_hash($source) == $stack_key) {
         $source->setKeys(array($key => $value));
         break;
       }
     } while (true);
 
     foreach ($tmp as $source) {
       self::$sourceStack->pushSource($source);
     }
 
     self::dropConfigCache();
   }
 
   private static function dropConfigCache() {
     self::$cache = array();
   }
 
 }
diff --git a/src/infrastructure/env/__tests__/PhabricatorEnvTestCase.php b/src/infrastructure/env/__tests__/PhabricatorEnvTestCase.php
index 0097a5bef..5a10b833a 100644
--- a/src/infrastructure/env/__tests__/PhabricatorEnvTestCase.php
+++ b/src/infrastructure/env/__tests__/PhabricatorEnvTestCase.php
@@ -1,176 +1,176 @@
 <?php
 
 final class PhabricatorEnvTestCase extends PhabricatorTestCase {
 
   public function testLocalWebResource() {
     $map = array(
       '/'                     => true,
       '/D123'                 => true,
       '/path/to/something/'   => true,
       "/path/to/\nHeader: x"  => false,
       'http://evil.com/'      => false,
       '//evil.com/evil/'      => false,
       'javascript:lol'        => false,
       ''                      => false,
       null                    => false,
     );
 
     foreach ($map as $uri => $expect) {
       $this->assertEqual(
         $expect,
         PhabricatorEnv::isValidLocalWebResource($uri),
         "Valid local resource: {$uri}");
     }
   }
 
   public function testRemoteWebResource() {
     $map = array(
       'http://example.com/'   => true,
       'derp://example.com/'   => false,
       'javascript:alert(1)'   => false,
     );
 
     foreach ($map as $uri => $expect) {
       $this->assertEqual(
         $expect,
         PhabricatorEnv::isValidRemoteWebResource($uri),
         "Valid remote resource: {$uri}");
     }
   }
 
   public function testDictionarySource() {
     $source = new PhabricatorConfigDictionarySource(array('x' => 1));
 
     $this->assertEqual(
       array(
         'x' => 1,
       ),
       $source->getKeys(array('x', 'z')));
 
     $source->setKeys(array('z' => 2));
 
     $this->assertEqual(
       array(
         'x' => 1,
         'z' => 2,
       ),
       $source->getKeys(array('x', 'z')));
 
     $source->setKeys(array('x' => 3));
 
     $this->assertEqual(
       array(
         'x' => 3,
         'z' => 2,
       ),
       $source->getKeys(array('x', 'z')));
 
     $source->deleteKeys(array('x'));
 
     $this->assertEqual(
       array(
         'z' => 2,
       ),
       $source->getKeys(array('x', 'z')));
   }
 
   public function testStackSource() {
     $s1 = new PhabricatorConfigDictionarySource(array('x' => 1));
     $s2 = new PhabricatorConfigDictionarySource(array('x' => 2));
 
     $stack = new PhabricatorConfigStackSource();
 
     $this->assertEqual(array(), $stack->getKeys(array('x')));
 
     $stack->pushSource($s1);
     $this->assertEqual(array('x' => 1), $stack->getKeys(array('x')));
 
     $stack->pushSource($s2);
     $this->assertEqual(array('x' => 2), $stack->getKeys(array('x')));
 
     $stack->setKeys(array('x' => 3));
     $this->assertEqual(array('x' => 3), $stack->getKeys(array('x')));
 
     $stack->popSource();
     $this->assertEqual(array('x' => 1), $stack->getKeys(array('x')));
 
     $stack->popSource();
     $this->assertEqual(array(), $stack->getKeys(array('x')));
 
     $caught = null;
     try {
       $stack->popSource();
     } catch (Exception $ex) {
       $caught = $ex;
     }
 
     $this->assertTrue($caught instanceof Exception);
   }
 
   public function testOverrides() {
     $outer = PhabricatorEnv::beginScopedEnv();
 
       $outer->overrideEnvConfig('test.value', 1);
       $this->assertEqual(1, PhabricatorEnv::getEnvConfig('test.value'));
 
       $inner = PhabricatorEnv::beginScopedEnv();
         $inner->overrideEnvConfig('test.value', 2);
         $this->assertEqual(2, PhabricatorEnv::getEnvConfig('test.value'));
       if (phutil_is_hiphop_runtime()) {
         $inner->__destruct();
       }
       unset($inner);
 
       $this->assertEqual(1, PhabricatorEnv::getEnvConfig('test.value'));
     if (phutil_is_hiphop_runtime()) {
       $outer->__destruct();
     }
     unset($outer);
   }
 
   public function testOverrideOrder() {
     $outer = PhabricatorEnv::beginScopedEnv();
     $inner = PhabricatorEnv::beginScopedEnv();
 
     $caught = null;
     try {
       $outer->__destruct();
     } catch (Exception $ex) {
       $caught = $ex;
     }
 
     $this->assertTrue(
       $caught instanceof Exception,
-      "Destroying a scoped environment which is not on the top of the stack ".
-      "should throw.");
+      'Destroying a scoped environment which is not on the top of the stack '.
+      'should throw.');
 
     if (phutil_is_hiphop_runtime()) {
       $inner->__destruct();
     }
     unset($inner);
 
     if (phutil_is_hiphop_runtime()) {
       $outer->__destruct();
     }
     unset($outer);
   }
 
   public function testGetEnvExceptions() {
     $caught = null;
     try {
-      PhabricatorEnv::getEnvConfig("not.a.real.config.option");
+      PhabricatorEnv::getEnvConfig('not.a.real.config.option');
     } catch (Exception $ex) {
       $caught = $ex;
     }
     $this->assertTrue($caught instanceof Exception);
 
     $caught = null;
     try {
-      PhabricatorEnv::getEnvConfig("test.value");
+      PhabricatorEnv::getEnvConfig('test.value');
     } catch (Exception $ex) {
       $caught = $ex;
     }
     $this->assertFalse($caught instanceof Exception);
   }
 
 }
diff --git a/src/infrastructure/events/PhabricatorEventListener.php b/src/infrastructure/events/PhabricatorEventListener.php
index 211cc1f54..abaad375e 100644
--- a/src/infrastructure/events/PhabricatorEventListener.php
+++ b/src/infrastructure/events/PhabricatorEventListener.php
@@ -1,51 +1,51 @@
 <?php
 
 abstract class PhabricatorEventListener extends PhutilEventListener {
 
   private $application;
 
   public function setApplication(PhabricatorApplication $application) {
     $this->application = $application;
     return $this;
   }
 
   public function getApplication() {
     return $this->application;
   }
 
   public function hasApplicationCapability(
     PhabricatorUser $viewer,
     $capability) {
     return PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $this->getApplication(),
       $capability);
   }
 
   public function canUseApplication(PhabricatorUser $viewer) {
     return $this->hasApplicationCapability(
       $viewer,
       PhabricatorPolicyCapability::CAN_VIEW);
   }
 
   protected function addActionMenuItems(PhutilEvent $event, $items) {
     if ($event->getType() !== PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS) {
-      throw new Exception("Not an action menu event!");
+      throw new Exception('Not an action menu event!');
     }
 
     if (!$items) {
       return;
     }
 
     if (!is_array($items)) {
       $items = array($items);
     }
 
     $event_actions = $event->getValue('actions');
     foreach ($items as $item) {
       $event_actions[] = $item;
     }
     $event->setValue('actions', $event_actions);
   }
 
 }
diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
index acabccf57..c633b1624 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
@@ -1,946 +1,946 @@
 <?php
 
 abstract class PhabricatorBaseEnglishTranslation
   extends PhabricatorTranslation {
 
   final public function getLanguage() {
     return 'en';
   }
 
   public function getTranslations() {
     return array(
       'These %d configuration value(s) are related:' => array(
         'This configuration value is related:',
         'These configuration values are related:',
       ),
       'Differential Revision(s)' => array(
         'Differential Revision',
         'Differential Revisions',
       ),
       'file(s)' => array('file', 'files'),
       'Maniphest Task(s)' => array('Maniphest Task', 'Maniphest Tasks'),
       'Task(s)' => array('Task', 'Tasks'),
 
       'Please fix these errors and try again.' => array(
         'Please fix this error and try again.',
         'Please fix these errors and try again.',
       ),
 
       '%d Error(s)' => array('%d Error', '%d Errors'),
       '%d Warning(s)' => array('%d Warning', '%d Warnings'),
       '%d Auto-Fix(es)' => array('%d Auto-Fix', '%d Auto-Fixes'),
       '%d Advice(s)' => array('%d Advice', '%d Pieces of Advice'),
       '%d Detail(s)' => array('%d Detail', '%d Details'),
 
       '(%d line(s))' => array('(%d line)', '(%d lines)'),
 
       'COMMIT(S)' => array('COMMIT', 'COMMITS'),
 
       '%d line(s)' => array('%d line', '%d lines'),
       '%d path(s)' => array('%d path', '%d paths'),
       '%d diff(s)' => array('%d diff', '%d diffs'),
 
       'added %d commit(s): %s' => array(
         'added commit: %2$s',
         'added commits: %2$s',
       ),
 
       'removed %d commit(s): %s' => array(
         'removed commit: %2$s',
         'removed commits: %2$s',
       ),
 
       'changed %d commit(s), added %d: %s; removed %d: %s' =>
         'changed commits, added: %3$s; removed: %5$s',
 
       'ATTACHED %d COMMIT(S)' => array(
         'ATTACHED COMMIT',
         'ATTACHED COMMITS',
       ),
 
       'added %d mock(s): %s' => array(
         'added a mock: %2$s',
         'added mocks: %2$s',
       ),
 
       'removed %d mock(s): %s' => array(
         'removed a mock: %2$s',
         'removed mocks: %2$s',
       ),
 
       'changed %d mock(s), added %d: %s; removed %d: %s' =>
         'changed mocks, added: %3$s; removed: %5$s',
 
       'ATTACHED %d MOCK(S)' => array(
         'ATTACHED MOCK',
         'ATTACHED MOCKS',
       ),
 
       'added %d dependencie(s): %s' => array(
         'added dependency: %2$s',
         'added dependencies: %2$s',
       ),
 
       'added %d dependent task(s): %s' => array(
         'added dependent task: %2$s',
         'added dependent tasks: %2$s',
       ),
 
       'removed %d dependencie(s): %s' => array(
         'removed dependency: %2$s',
         'removed dependencies: %2$s',
       ),
 
       'removed %d dependent task(s): %s' => array(
         'removed dependent task: %2$s',
         'removed dependent tasks: %2$s',
       ),
 
       'changed %d dependencie(s), added %d: %s; removed %d: %s' =>
         'changed dependencies, added: %3$s; removed: %5$s',
 
       'changed %d dependent task(s), added %d: %s; removed %d: %s',
         'changed dependent tasks, added: %3$s; removed: %5$s',
 
       'DEPENDENT %d TASK(s)' => array(
         'DEPENDENT TASK',
         'DEPENDENT TASKS',
       ),
 
       'DEPENDS ON %d TASK(S)' => array(
         'DEPENDS ON TASK',
         'DEPENDS ON TASKS',
       ),
 
       'DIFFERENTIAL %d REVISION(S)' => array(
         'DIFFERENTIAL REVISION',
         'DIFFERENTIAL REVISIONS',
       ),
 
       'added %d revision(s): %s' => array(
         'added revision: %2$s',
         'added revisions: %2$s',
       ),
 
       'removed %d revision(s): %s' => array(
         'removed revision: %2$s',
         'removed revisions: %2$s',
       ),
 
       'changed %d revision(s), added %d: %s; removed %d: %s' =>
         'changed revisions, added %3$s; removed %5$s',
 
       '%s edited revision(s), added %d: %s; removed %d: %s.' =>
         '%s edited revisions, added: %3$s; removed: %5$s',
 
       'There are %d raw fact(s) in storage.' => array(
         'There is %d raw fact in storage.',
         'There are %d raw facts in storage.',
       ),
 
       'There are %d aggregate fact(s) in storage.' => array(
         'There is %d aggregate fact in storage.',
         'There are %d aggregate facts in storage.',
       ),
 
       '%d Commit(s) Awaiting Audit' => array(
         '%d Commit Awaiting Audit',
         '%d Commits Awaiting Audit',
       ),
 
       '%d Problem Commit(s)' => array(
         '%d Problem Commit',
         '%d Problem Commits',
       ),
 
       '%d Review(s) Blocking Others' => array(
         '%d Review Blocking Others',
         '%d Reviews Blocking Others',
       ),
 
       '%d Review(s) Need Attention' => array(
         '%d Review Needs Attention',
         '%d Reviews Need Attention',
       ),
 
       '%d Review(s) Waiting on Others' => array(
         '%d Review Waiting on Others',
         '%d Reviews Waiting on Others',
       ),
 
       '%d Flagged Object(s)' => array(
         '%d Flagged Object',
         '%d Flagged Objects',
       ),
 
       '%d Unbreak Now Task(s)!' => array(
         '%d Unbreak Now Task!',
         '%d Unbreak Now Tasks!',
       ),
 
       '%d Assigned Task(s)' => array(
         '%d Assigned Task',
         '%d Assigned Tasks',
       ),
 
       'Show %d Lint Message(s)' => array(
         'Show %d Lint Message',
         'Show %d Lint Messages',
       ),
       'Hide %d Lint Message(s)' => array(
         'Hide %d Lint Message',
         'Hide %d Lint Messages',
       ),
       'Switch for %d Lint Message(s)' => array(
         'Switch for %d Lint Message',
         'Switch for %d Lint Messages',
       ),
       '%d Lint Message(s)' => array(
         '%d Lint Message',
         '%d Lint Messages',
       ),
 
       'This is a binary file. It is %s byte(s) in length.' => array(
         'This is a binary file. It is %s byte in length.',
         'This is a binary file. It is %s bytes in length.',
       ),
 
       '%d Action(s) Have No Effect' => array(
         'Action Has No Effect',
         'Actions Have No Effect',
       ),
 
       '%d Action(s) With No Effect' => array(
         'Action With No Effect',
         'Actions With No Effect',
       ),
 
       'Some of your %d action(s) have no effect:' => array(
         'One of your actions has no effect:',
         'Some of your actions have no effect:',
       ),
 
       'Apply remaining %d action(s)?' => array(
         'Apply remaining action?',
         'Apply remaining actions?',
       ),
 
       'Apply %d Other Action(s)' => array(
         'Apply Remaining Action',
         'Apply Remaining Actions',
       ),
 
       'The %d action(s) you are taking have no effect:' => array(
         'The action you are taking has no effect:',
         'The actions you are taking have no effect:',
       ),
 
       '%s edited post(s), added %d: %s; removed %d: %s.' =>
         '%s edited posts, added: %3$s; removed: %5$s',
 
       '%s added %d post(s): %s.' => array(
         array(
           '%s added a post: %3$s.',
           '%s added posts: %3$s.',
         ),
       ),
 
       '%s removed %d post(s): %s.' => array(
         array(
           '%s removed a post: %3$s.',
           '%s removed posts: %3$s.',
         ),
       ),
 
       '%s edited blog(s), added %d: %s; removed %d: %s.' =>
         '%s edited blogs, added: %3$s; removed: %5$s',
 
       '%s added %d blog(s): %s.' => array(
         array(
           '%s added a blog: %3$s.',
           '%s added blogs: %3$s.',
         ),
       ),
 
       '%s removed %d blog(s): %s.' => array(
         array(
           '%s removed a blog: %3$s.',
           '%s removed blogs: %3$s.',
         ),
       ),
 
       '%s edited blogger(s), added %d: %s; removed %d: %s.' =>
         '%s edited bloggers, added: %3$s; removed: %5$s',
 
       '%s added %d blogger(s): %s.' => array(
         array(
           '%s added a blogger: %3$s.',
           '%s added bloggers: %3$s.',
         ),
       ),
 
       '%s removed %d blogger(s): %s.' => array(
         array(
           '%s removed a blogger: %3$s.',
           '%s removed bloggers: %3$s.',
         ),
       ),
 
       '%s edited member(s), added %d: %s; removed %d: %s.' =>
         '%s edited members, added: %3$s; removed: %5$s',
 
       '%s added %d member(s): %s.' => array(
         array(
           '%s added a member: %3$s.',
           '%s added members: %3$s.',
         ),
       ),
 
       '%s removed %d member(s): %s.' => array(
         array(
           '%s removed a member: %3$s.',
           '%s removed members: %3$s.',
         ),
       ),
 
       '%s edited project(s), added %d: %s; removed %d: %s.' =>
         '%s edited projects, added: %3$s; removed: %5$s',
 
       '%s added %d project(s): %s.' => array(
         array(
           '%s added a project: %3$s.',
           '%s added projects: %3$s.',
         ),
       ),
 
       '%s removed %d project(s): %s.' => array(
         array(
           '%s removed a project: %3$s.',
           '%s removed projects: %3$s.',
         ),
       ),
 
       '%s changed project(s) of %s, added %d: %s; removed %d: %s' =>
         '%s changed projects of %s, added: %4$s; removed: %6$s',
 
       '%s added %d project(s) to %s: %s' => array(
         array(
           '%s added a project to %3$s: %4$s',
           '%s added projects to %3$s: %4$s',
         ),
       ),
 
       '%s removed %d project(s) from %s: %s' => array(
         array(
           '%s removed a project from %3$s: %4$s',
           '%s removed projects from %3$s: %4$s',
         ),
       ),
 
       '%s edited voting user(s), added %d: %s; removed %d: %s.' =>
         '%s edited voting users, added: %3$s; removed: %5$s',
 
       '%s added %d voting user(s): %s.' => array(
         array(
           '%s added a voting user: %3$s.',
           '%s added voting users: %3$s.',
         ),
       ),
 
       '%s removed %d voting user(s): %s.' => array(
         array(
           '%s removed a voting user: %3$s.',
           '%s removed voting users: %3$s.',
         ),
       ),
 
       '%s added %d blocking task(s): %s.' => array(
         array(
           '%s added a blocking task: %3$s.',
           '%s added blocking tasks: %3$s.'
         ),
       ),
 
       '%s added %d blocked task(s): %s.' => array(
         array(
           '%s added a blocked task: %3$s.',
           '%s added blocked tasks: %3$s.'
         )
       ),
 
       '%s removed %d blocking task(s): %s.' => array(
         array(
           '%s removed a blocking task: %3$s.',
           '%s removed blocking tasks: %3$s.'
         ),
       ),
 
       '%s removed %d blocked task(s): %s.' => array(
         array(
           '%s removed a blocked task: %3$s.',
           '%s removed blocked tasks: %3$s.'
         )
       ),
 
       '%s edited answer(s), added %d: %s; removed %d: %s.' =>
         '%s edited answers, added: %3$s; removed: %5$s',
 
       '%s added %d answer(s): %s.' => array(
         array(
           '%s added an answer: %3$s.',
           '%s added answers: %3$s.',
         ),
       ),
 
       '%s removed %d answer(s): %s.' => array(
         array(
           '%s removed a answer: %3$s.',
           '%s removed answers: %3$s.',
         ),
       ),
 
      '%s edited question(s), added %d: %s; removed %d: %s.' =>
         '%s edited questions, added: %3$s; removed: %5$s',
 
       '%s added %d question(s): %s.' => array(
         array(
           '%s added a question: %3$s.',
           '%s added questions: %3$s.',
         ),
       ),
 
       '%s removed %d question(s): %s.' => array(
         array(
           '%s removed a question: %3$s.',
           '%s removed questions: %3$s.',
         ),
       ),
 
       '%s edited mock(s), added %d: %s; removed %d: %s.' =>
         '%s edited mocks, added: %3$s; removed: %5$s',
 
       '%s added %d mock(s): %s.' => array(
         array(
           '%s added a mock: %3$s.',
           '%s added mocks: %3$s.',
         ),
       ),
 
       '%s removed %d mock(s): %s.' => array(
         array(
           '%s removed a mock: %3$s.',
           '%s removed mocks: %3$s.',
         ),
       ),
 
       '%s edited task(s), added %d: %s; removed %d: %s.' =>
         '%s edited tasks, added: %3$s; removed: %5$s',
 
       '%s added %d task(s): %s.' => array(
         array(
           '%s added a task: %3$s.',
           '%s added tasks: %3$s.',
         ),
       ),
 
       '%s removed %d task(s): %s.' => array(
         array(
           '%s removed a task: %3$s.',
           '%s removed tasks: %3$s.',
         ),
       ),
 
       '%s edited file(s), added %d: %s; removed %d: %s.' =>
         '%s edited files, added: %3$s; removed: %5$s',
 
       '%s added %d file(s): %s.' => array(
         array(
           '%s added a file: %3$s.',
           '%s added files: %3$s.',
         ),
       ),
 
       '%s removed %d file(s): %s.' => array(
         array(
           '%s removed a file: %3$s.',
           '%s removed files: %3$s.',
         ),
       ),
 
       '%s edited account(s), added %d: %s; removed %d: %s.' =>
         '%s edited accounts, added: %3$s; removed: %5$s',
 
       '%s added %d account(s): %s.' => array(
         array(
           '%s added a account: %3$s.',
           '%s added accounts: %3$s.',
         ),
       ),
 
       '%s removed %d account(s): %s.' => array(
         array(
           '%s removed a account: %3$s.',
           '%s removed accounts: %3$s.',
         ),
       ),
 
       '%s edited charge(s), added %d: %s; removed %d: %s.' =>
         '%s edited charges, added: %3$s; removed: %5$s',
 
       '%s added %d charge(s): %s.' => array(
         array(
           '%s added a charge: %3$s.',
           '%s added charges: %3$s.',
         ),
       ),
 
       '%s removed %d charge(s): %s.' => array(
         array(
           '%s removed a charge: %3$s.',
           '%s removed charges: %3$s.',
         ),
       ),
 
       '%s edited purchase(s), added %d: %s; removed %d: %s.' =>
         '%s edited purchases, added: %3$s; removed: %5$s',
 
       '%s added %d purchase(s): %s.' => array(
         array(
           '%s added a purchase: %3$s.',
           '%s added purchases: %3$s.',
         ),
       ),
 
       '%s removed %d purchase(s): %s.' => array(
         array(
           '%s removed a purchase: %3$s.',
           '%s removed purchases: %3$s.',
         ),
       ),
 
       '%s edited contributor(s), added %d: %s; removed %d: %s.' =>
         '%s edited contributors, added: %3$s; removed: %5$s',
 
       '%s added %d contributor(s): %s.' => array(
         array(
           '%s added a contributor: %3$s.',
           '%s added contributors: %3$s.',
         ),
       ),
 
       '%s removed %d contributor(s): %s.' => array(
         array(
           '%s removed a contributor: %3$s.',
           '%s removed contributors: %3$s.',
         ),
       ),
 
       '%s edited reviewer(s), added %d: %s; removed %d: %s.' =>
         '%s edited reviewers, added: %3$s; removed: %5$s',
 
       '%s added %d reviewer(s): %s.' => array(
         array(
           '%s added a reviewer: %3$s.',
           '%s added reviewers: %3$s.',
         ),
       ),
 
       '%s removed %d reviewer(s): %s.' => array(
         array(
           '%s removed a reviewer: %3$s.',
           '%s removed reviewers: %3$s.',
         ),
       ),
 
       '%s edited object(s), added %d: %s; removed %d: %s.' =>
         '%s edited objects, added: %3$s; removed: %5$s',
 
       '%s added %d object(s): %s.' => array(
         array(
           '%s added a object: %3$s.',
           '%s added objects: %3$s.',
         ),
       ),
 
       '%s removed %d object(s): %s.' => array(
         array(
           '%s removed a object: %3$s.',
           '%s removed objects: %3$s.',
         ),
       ),
 
       '%d other(s)' => array(
         '1 other',
         '%d others',
       ),
 
       '%s edited subscriber(s), added %d: %s; removed %d: %s.' =>
         '%s edited subscribers, added: %3$s; removed: %5$s',
 
       '%s added %d subscriber(s): %s.' => array(
         array(
           '%s added a subscriber: %3$s.',
           '%s added subscribers: %3$s.',
         ),
       ),
 
       '%s removed %d subscriber(s): %s.' => array(
         array(
           '%s removed a subscriber: %3$s.',
           '%s removed subscribers: %3$s.',
         ),
       ),
 
       '%s edited unsubscriber(s), added %d: %s; removed %d: %s.' =>
         '%s edited unsubscribers, added: %3$s; removed: %5$s',
 
       '%s added %d unsubscriber(s): %s.' => array(
         array(
           '%s added a unsubscriber: %3$s.',
           '%s added unsubscribers: %3$s.',
         ),
       ),
 
       '%s removed %d unsubscriber(s): %s.' => array(
         array(
           '%s removed a unsubscriber: %3$s.',
           '%s removed unsubscribers: %3$s.',
         ),
       ),
 
       '%s edited participant(s), added %d: %s; removed %d: %s.' =>
         '%s edited participants, added: %3$s; removed: %5$s',
 
       '%s added %d participant(s): %s.' => array(
         array(
           '%s added a participant: %3$s.',
           '%s added participants: %3$s.',
         ),
       ),
 
       '%s removed %d participant(s): %s.' => array(
         array(
           '%s removed a participant: %3$s.',
           '%s removed participants: %3$s.',
         ),
       ),
 
       '%s edited image(s), added %d: %s; removed %d: %s.' =>
         '%s edited images, added: %3$s; removed: %5$s',
 
       '%s added %d image(s): %s.' => array(
         array(
           '%s added an image: %3$s.',
           '%s added images: %3$s.',
         ),
       ),
 
       '%s removed %d image(s): %s.' => array(
         array(
           '%s removed an image: %3$s.',
           '%s removed images: %3$s.',
         ),
       ),
 
       '%d people(s)' => array(
         array(
           '%d person',
           '%d people',
         ),
       ),
 
       '%s Line(s)' => array(
         '%s Line',
         '%s Lines',
       ),
 
-      "Indexing %d object(s) of type %s." => array(
-        "Indexing %d object of type %s.",
-        "Indexing %d object of type %s.",
+      'Indexing %d object(s) of type %s.' => array(
+        'Indexing %d object of type %s.',
+        'Indexing %d object of type %s.',
       ),
 
       'Run these %d command(s):' => array(
         'Run this command:',
         'Run these commands:',
       ),
 
       'Install these %d PHP extension(s):' => array(
         'Install this PHP extension:',
         'Install these PHP extensions:',
       ),
 
       'The current Phabricator configuration has these %d value(s):' => array(
         'The current Phabricator configuration has this value:',
         'The current Phabricator configuration has these values:',
       ),
 
       'To update these %d value(s), run these command(s) from the command line:'
       => array(
         'To update this value, run this command from the command line:',
         'To update these values, run these commands from the command line:',
       ),
 
       'You can update these %d value(s) here:' => array(
         'You can update this value here:',
         'You can update these values here:',
       ),
 
       'The current PHP configuration has these %d value(s):' => array(
         'The current PHP configuration has this value:',
         'The current PHP configuration has these values:',
       ),
 
       'To update these %d value(s), edit your PHP configuration file.' => array(
         'To update this %d value, edit your PHP configuration file.',
         'To update these %d values, edit your PHP configuration file.',
       ),
 
       'To update these %d value(s), edit your PHP configuration file, located '.
       'here:' => array(
         'To update this value, edit your PHP configuration file, located '.
         'here:',
         'To update these values, edit your PHP configuration file, located '.
         'here:',
       ),
 
       'PHP also loaded these configuration file(s):' => array(
         'PHP also loaded this configuration file:',
         'PHP also loaded these configuration files:',
       ),
 
       'You have %d unresolved setup issue(s)...' => array(
         'You have an unresolved setup issue...',
         'You have %d unresolved setup issues...',
       ),
 
       '%s added %d inline comment(s).' => array(
         array(
           '%s added an inline comment.',
           '%s added inline comments.',
         ),
       ),
 
       '%d comment(s)' => array('%d comment', '%d comments'),
       '%d rejection(s)' => array('%d rejection', '%d rejections'),
       '%d update(s)' => array('%d update', '%d updates'),
 
       'This configuration value is defined in these %d '.
       'configuration source(s): %s.' => array(
         'This configuration value is defined in this '.
         'configuration source: %2$s.',
         'This configuration value is defined in these %d '.
         'configuration sources: %s.',
       ),
 
       '%d Open Pull Request(s)' => array(
         '%d Open Pull Request',
         '%d Open Pull Requests',
       ),
 
       'Stale (%s day(s))' => array(
         'Stale (%s day)',
         'Stale (%s days)',
       ),
 
       'Old (%s day(s))' => array(
         'Old (%s day)',
         'Old (%s days)',
       ),
 
       '%s Commit(s)' => array(
         '%s Commit',
         '%s Commits',
       ),
 
       '%s added %d project(s): %s' => array(
         array(
           '%s added a project: %3$s',
           '%s added projects: %3$s',
         ),
       ),
 
       '%s removed %d project(s): %s' => array(
         array(
           '%s removed a project: %3$s',
           '%s removed projects: %3$s',
         ),
       ),
 
       '%s changed project(s), added %d: %s; removed %d: %s' =>
         '%s changed projects, added: %3$s; removed: %5$s',
 
       '%s attached %d file(s): %s' => array(
         array(
           '%s attached a file: %3$s',
           '%s attached files: %3$s',
         ),
       ),
 
       '%s detached %d file(s): %s' => array(
         array(
           '%s detached a file: %3$s',
           '%s detached files: %3$s',
         ),
       ),
 
       '%s changed file(s), attached %d: %s; detached %d: %s' =>
         '%s changed files, attached: %3$s; detached: %5$s',
 
 
       '%s added %d dependencie(s): %s.' => array(
         array(
           '%s added a dependency: %3$s',
           '%s added dependencies: %3$s',
         ),
       ),
 
       '%s added %d dependent task(s): %s.' => array(
         array(
           '%s added a dependent task: %3$s',
           '%s added dependent tasks: %3$s',
         ),
       ),
 
       '%s removed %d dependencie(s): %s.' => array(
         array(
           '%s removed a dependency: %3$s.',
           '%s removed dependencies: %3$s.',
         ),
       ),
 
       '%s removed %d dependent task(s): %s.' => array(
         array(
           '%s removed a dependent task: %3$s.',
           '%s removed dependent tasks: %3$s.',
         ),
       ),
 
       '%s added %d revision(s): %s.' => array(
         array(
           '%s added a revision: %3$s.',
           '%s added revisions: %3$s.',
         ),
       ),
 
       '%s removed %d revision(s): %s.' => array(
         array(
           '%s removed a revision: %3$s.',
           '%s removed revisions: %3$s.',
         ),
       ),
 
       '%s added %d commit(s): %s.' => array(
         array(
           '%s added a commit: %3$s.',
           '%s added commits: %3$s.',
         ),
       ),
 
       '%s removed %d commit(s): %s.' => array(
         array(
           '%s removed a commit: %3$s.',
           '%s removed commits: %3$s.',
         ),
       ),
 
       '%s edited commit(s), added %d: %s; removed %d: %s.' =>
         '%s edited commits, added %3$s; removed %5$s.',
 
       '%s changed project member(s), added %d: %s; removed %d: %s' =>
         '%s changed project members, added %3$s; removed %5$s',
 
       '%s added %d project member(s): %s' => array(
         array(
           '%s added a member: %3$s',
           '%s added members: %3$s',
         ),
       ),
 
       '%s removed %d project member(s): %s' => array(
         array(
           '%s removed a member: %3$s',
           '%s removed members: %3$s',
         ),
       ),
 
       '%d project hashtag(s) are already used: %s' => array(
           'Project hashtag %2$s is already used.',
           '%d project hashtags are already used: %2$s',
       ),
 
       '%s changed project hashtag(s), added %d: %s; removed %d: %s' =>
         '%s changed project hashtags, added %3$s; removed %5$s',
 
       '%s added %d project hashtag(s): %s' => array(
         array(
           '%s added a hashtag: %3$s',
           '%s added hashtags: %3$s',
         ),
       ),
 
       '%s removed %d project hashtag(s): %s' => array(
         array(
           '%s removed a hashtag: %3$s',
           '%s removed hashtags: %3$s',
         ),
       ),
 
       '%d User(s) Need Approval' => array(
         '%d User Needs Approval',
         '%d Users Need Approval',
       ),
 
       'Warning: there are %d signature(s) already for this document. '.
       'Updating the title or text will invalidate these signatures and users '.
       'will need to sign again. Proceed carefully.' => array(
         'Warning: there is %d signature already for this document. '.
         'Updating the title or text will invalidate this signature and the '.
         'user will need to sign again. Proceed carefully.',
         'Warning: there are %d signatures already for this document. '.
         'Updating the title or text will invalidate these signatures and '.
         'users will need to sign again. Proceed carefully.',
       ),
 
       '%s older changes(s) are hidden.' => array(
         '%d older change is hidden.',
         '%d older changes are hidden.',
       ),
 
       '%s, %s line(s)' => array(
         '%s, %s line',
         '%s, %s lines',
       ),
 
       '%s pushed %d commit(s) to %s.' => array(
         array(
           '%s pushed a commit to %3$s.',
           '%s pushed %d commits to %s.',
         ),
       ),
 
       '%s commit(s)' => array(
         '1 commit',
         '%s commits',
       ),
 
       '%s removed %d JIRA issue(s): %s.' => array(
         array(
           '%s removed a JIRA issue: %3$s.',
           '%s removed JIRA issues: %3$s.',
         ),
       ),
 
       '%s added %d JIRA issue(s): %s.' => array(
         array(
           '%s added a JIRA issue: %3$s.',
           '%s added JIRA issues: %3$s.',
         ),
       ),
 
       '%s updated JIRA issue(s): added %d %s; removed %d %s.' =>
         '%s updated JIRA issues: added %3$s; removed %5$s.',
 
     );
   }
 
   }
diff --git a/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php b/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
index 018a15612..c69d8aacb 100644
--- a/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
+++ b/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
@@ -1,280 +1,280 @@
 <?php
 
 final class PhabricatorJavelinLinter extends ArcanistLinter {
 
   private $symbols = array();
 
   private $symbolsBinary;
   private $haveWarnedAboutBinary;
 
   const LINT_PRIVATE_ACCESS = 1;
   const LINT_MISSING_DEPENDENCY = 2;
   const LINT_UNNECESSARY_DEPENDENCY = 3;
   const LINT_UNKNOWN_DEPENDENCY = 4;
   const LINT_MISSING_BINARY = 5;
 
   public function getInfoName() {
     return 'Javelin Linter';
   }
 
   public function getInfoDescription() {
     return pht(
       'This linter is intended for use with the Javelin JS library and '.
       'extensions. Use `javelinsymbols` to run Javelin rules on Javascript '.
       'source files.');
   }
 
   private function getBinaryPath() {
     if ($this->symbolsBinary === null) {
       list($err, $stdout) = exec_manual('which javelinsymbols');
       $this->symbolsBinary = ($err ? false : rtrim($stdout));
     }
     return $this->symbolsBinary;
   }
 
   public function willLintPaths(array $paths) {
     if (!$this->getBinaryPath()) {
       return;
     }
 
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/scripts/__init_script__.php';
 
     $futures = array();
     foreach ($paths as $path) {
       if ($this->shouldIgnorePath($path)) {
         continue;
       }
 
       $future = $this->newSymbolsFuture($path);
       $futures[$path] = $future;
     }
 
     foreach (Futures($futures)->limit(8) as $path => $future) {
       $this->symbols[$path] = $future->resolvex();
     }
   }
 
   public function getLinterName() {
     return 'JAVELIN';
   }
 
   public function getLinterConfigurationName() {
     return 'javelin';
   }
 
   public function getLintSeverityMap() {
     return array(
       self::LINT_MISSING_BINARY => ArcanistLintSeverity::SEVERITY_WARNING,
     );
   }
 
   public function getLintNameMap() {
     return array(
       self::LINT_PRIVATE_ACCESS => 'Private Method/Member Access',
       self::LINT_MISSING_DEPENDENCY => 'Missing Javelin Dependency',
       self::LINT_UNNECESSARY_DEPENDENCY => 'Unnecessary Javelin Dependency',
       self::LINT_UNKNOWN_DEPENDENCY => 'Unknown Javelin Dependency',
       self::LINT_MISSING_BINARY => '`javelinsymbols` Not In Path',
     );
   }
 
   public function getCacheGranularity() {
     return ArcanistLinter::GRANULARITY_REPOSITORY;
   }
 
   public function getCacheVersion() {
     $version = '0';
     $binary_path = $this->getBinaryPath();
     if ($binary_path) {
       $version .= '-'.md5_file($binary_path);
     }
     return $version;
   }
 
   private function shouldIgnorePath($path) {
     return preg_match('@/__tests__/|externals/javelin/docs/@', $path);
   }
 
   public function lintPath($path) {
     if ($this->shouldIgnorePath($path)) {
       return;
     }
 
     if (!$this->symbolsBinary) {
       if (!$this->haveWarnedAboutBinary) {
         $this->haveWarnedAboutBinary = true;
         // TODO: Write build documentation for the Javelin binaries and point
         // the user at it.
         $this->raiseLintAtLine(
           1,
           0,
           self::LINT_MISSING_BINARY,
           "The 'javelinsymbols' binary in the Javelin project is not ".
           "available in \$PATH, so the Javelin linter can't run. This ".
           "isn't a big concern, but means some Javelin problems can't be ".
           "automatically detected.");
       }
       return;
     }
 
     list($uses, $installs) = $this->getUsedAndInstalledSymbolsForPath($path);
     foreach ($uses as $symbol => $line) {
       $parts = explode('.', $symbol);
       foreach ($parts as $part) {
         if ($part[0] == '_' && $part[1] != '_') {
           $base = implode('.', array_slice($parts, 0, 2));
           if (!array_key_exists($base, $installs)) {
             $this->raiseLintAtLine(
               $line,
               0,
               self::LINT_PRIVATE_ACCESS,
               "This file accesses private symbol '{$symbol}' across file ".
               "boundaries. You may only access private members and methods ".
               "from the file where they are defined.");
           }
           break;
         }
       }
     }
 
     if ($this->getEngine()->getCommitHookMode()) {
       // Don't do the dependency checks in commit-hook mode because we won't
       // have an available working copy.
       return;
     }
 
     $external_classes = array();
     foreach ($uses as $symbol => $line) {
       $parts = explode('.', $symbol);
       $class = implode('.', array_slice($parts, 0, 2));
       if (!array_key_exists($class, $external_classes) &&
           !array_key_exists($class, $installs)) {
         $external_classes[$class] = $line;
       }
     }
 
     $celerity = CelerityResourceMap::getNamedInstance('phabricator');
 
     $path = preg_replace(
       '@^externals/javelinjs/src/@',
       'webroot/rsrc/js/javelin/',
       $path);
     $need = $external_classes;
 
     $resource_name = substr($path, strlen('webroot/'));
     $requires = $celerity->getRequiredSymbolsForName($resource_name);
     if (!$requires) {
       $requires = array();
     }
 
     foreach ($requires as $key => $requires_symbol) {
       $requires_name = $celerity->getResourceNameForSymbol($requires_symbol);
       if ($requires_name === null) {
         $this->raiseLintAtLine(
           0,
           0,
           self::LINT_UNKNOWN_DEPENDENCY,
           "This file @requires component '{$requires_symbol}', but it does ".
           "not exist. You may need to rebuild the Celerity map.");
         unset($requires[$key]);
         continue;
       }
 
       if (preg_match('/\\.css$/', $requires_name)) {
         // If JS requires CSS, just assume everything is fine.
         unset($requires[$key]);
       } else {
         $symbol_path = 'webroot/'.$requires_name;
         list($ignored, $req_install) = $this->getUsedAndInstalledSymbolsForPath(
           $symbol_path);
         if (array_intersect_key($req_install, $external_classes)) {
           $need = array_diff_key($need, $req_install);
           unset($requires[$key]);
         }
       }
     }
 
     foreach ($need as $class => $line) {
       $this->raiseLintAtLine(
         $line,
         0,
         self::LINT_MISSING_DEPENDENCY,
         "This file uses '{$class}' but does not @requires the component ".
         "which installs it. You may need to rebuild the Celerity map.");
     }
 
     foreach ($requires as $component) {
       $this->raiseLintAtLine(
         0,
         0,
         self::LINT_UNNECESSARY_DEPENDENCY,
         "This file @requires component '{$component}' but does not use ".
         "anything it provides.");
     }
   }
 
   private function loadSymbols($path) {
     if (empty($this->symbols[$path])) {
       $this->symbols[$path] = $this->newSymbolsFuture($path)->resolvex();
     }
     return $this->symbols[$path];
   }
 
   private function newSymbolsFuture($path) {
     $future = new ExecFuture('javelinsymbols # %s', $path);
     $future->write($this->getData($path));
     return $future;
   }
 
   private function getUsedAndInstalledSymbolsForPath($path) {
     list($symbols) = $this->loadSymbols($path);
     $symbols = trim($symbols);
 
     $uses = array();
     $installs = array();
     if (empty($symbols)) {
       // This file has no symbols.
       return array($uses, $installs);
     }
 
     $symbols = explode("\n", trim($symbols));
     foreach ($symbols as $line) {
       $matches = null;
       if (!preg_match('/^([?+\*])([^:]*):(\d+)$/', $line, $matches)) {
         throw new Exception(
-          "Received malformed output from `javelinsymbols`.");
+          'Received malformed output from `javelinsymbols`.');
       }
       $type = $matches[1];
       $symbol = $matches[2];
       $line = $matches[3];
 
       switch ($type) {
         case '?':
           $uses[$symbol] = $line;
           break;
         case '+':
           $installs['JX.'.$symbol] = $line;
           break;
       }
     }
 
     $contents = $this->getData($path);
 
     $matches = null;
     $count = preg_match_all(
       '/@javelin-installs\W+(\S+)/',
       $contents,
       $matches,
       PREG_PATTERN_ORDER);
 
     if ($count) {
       foreach ($matches[1] as $symbol) {
         $installs[$symbol] = 0;
       }
     }
 
     return array($uses, $installs);
   }
 
 }
diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
index bedbc089d..2f6a03001 100644
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -1,603 +1,603 @@
 <?php
 
 /**
  * Manages markup engine selection, configuration, application, caching and
  * pipelining.
  *
  * @{class:PhabricatorMarkupEngine} can be used to render objects which
  * implement @{interface:PhabricatorMarkupInterface} in a batched, cache-aware
  * way. For example, if you have a list of comments written in remarkup (and
  * the objects implement the correct interface) you can render them by first
  * building an engine and adding the fields with @{method:addObject}.
  *
  *   $field  = 'field:body'; // Field you want to render. Each object exposes
  *                           // one or more fields of markup.
  *
  *   $engine = new PhabricatorMarkupEngine();
  *   foreach ($comments as $comment) {
  *     $engine->addObject($comment, $field);
  *   }
  *
  * Now, call @{method:process} to perform the actual cache/rendering
  * step. This is a heavyweight call which does batched data access and
  * transforms the markup into output.
  *
  *   $engine->process();
  *
  * Finally, do something with the results:
  *
  *   $results = array();
  *   foreach ($comments as $comment) {
  *     $results[] = $engine->getOutput($comment, $field);
  *   }
  *
  * If you have a single object to render, you can use the convenience method
  * @{method:renderOneObject}.
  *
  * @task markup Markup Pipeline
  * @task engine Engine Construction
  */
 final class PhabricatorMarkupEngine {
 
   private $objects = array();
   private $viewer;
   private $version = 8;
 
 
 /* -(  Markup Pipeline  )---------------------------------------------------- */
 
 
   /**
    * Convenience method for pushing a single object through the markup
    * pipeline.
    *
    * @param PhabricatorMarkupInterface  The object to render.
    * @param string                      The field to render.
    * @param PhabricatorUser             User viewing the markup.
    * @return string                     Marked up output.
    * @task markup
    */
   public static function renderOneObject(
     PhabricatorMarkupInterface $object,
     $field,
     PhabricatorUser $viewer) {
     return id(new PhabricatorMarkupEngine())
       ->setViewer($viewer)
       ->addObject($object, $field)
       ->process()
       ->getOutput($object, $field);
   }
 
 
   /**
    * Queue an object for markup generation when @{method:process} is
    * called. You can retrieve the output later with @{method:getOutput}.
    *
    * @param PhabricatorMarkupInterface  The object to render.
    * @param string                      The field to render.
    * @return this
    * @task markup
    */
   public function addObject(PhabricatorMarkupInterface $object, $field) {
     $key = $this->getMarkupFieldKey($object, $field);
     $this->objects[$key] = array(
       'object' => $object,
       'field'  => $field,
     );
 
     return $this;
   }
 
 
   /**
    * Process objects queued with @{method:addObject}. You can then retrieve
    * the output with @{method:getOutput}.
    *
    * @return this
    * @task markup
    */
   public function process() {
     $keys = array();
     foreach ($this->objects as $key => $info) {
       if (!isset($info['markup'])) {
         $keys[] = $key;
       }
     }
 
     if (!$keys) {
       return;
     }
 
     $objects = array_select_keys($this->objects, $keys);
 
     // Build all the markup engines. We need an engine for each field whether
     // we have a cache or not, since we still need to postprocess the cache.
     $engines = array();
     foreach ($objects as $key => $info) {
       $engines[$key] = $info['object']->newMarkupEngine($info['field']);
       $engines[$key]->setConfig('viewer', $this->viewer);
     }
 
     // Load or build the preprocessor caches.
     $blocks = $this->loadPreprocessorCaches($engines, $objects);
     $blocks = mpull($blocks, 'getCacheData');
 
     $this->engineCaches = $blocks;
 
     // Finalize the output.
     foreach ($objects as $key => $info) {
       $engine = $engines[$key];
       $field = $info['field'];
       $object = $info['object'];
 
       $output = $engine->postprocessText($blocks[$key]);
       $output = $object->didMarkupText($field, $output, $engine);
       $this->objects[$key]['output'] = $output;
     }
 
     return $this;
   }
 
 
   /**
    * Get the output of markup processing for a field queued with
    * @{method:addObject}. Before you can call this method, you must call
    * @{method:process}.
    *
    * @param PhabricatorMarkupInterface  The object to retrieve.
    * @param string                      The field to retrieve.
    * @return string                     Processed output.
    * @task markup
    */
   public function getOutput(PhabricatorMarkupInterface $object, $field) {
     $key = $this->getMarkupFieldKey($object, $field);
     $this->requireKeyProcessed($key);
 
     return $this->objects[$key]['output'];
   }
 
 
   /**
    * Retrieve engine metadata for a given field.
    *
    * @param PhabricatorMarkupInterface  The object to retrieve.
    * @param string                      The field to retrieve.
    * @param string                      The engine metadata field to retrieve.
    * @param wild                        Optional default value.
    * @task markup
    */
   public function getEngineMetadata(
     PhabricatorMarkupInterface $object,
     $field,
     $metadata_key,
     $default = null) {
 
     $key = $this->getMarkupFieldKey($object, $field);
     $this->requireKeyProcessed($key);
 
     return idx($this->engineCaches[$key]['metadata'], $metadata_key, $default);
   }
 
 
   /**
    * @task markup
    */
   private function requireKeyProcessed($key) {
     if (empty($this->objects[$key])) {
       throw new Exception(
         "Call addObject() before using results (key = '{$key}').");
     }
 
     if (!isset($this->objects[$key]['output'])) {
       throw new Exception(
-        "Call process() before using results.");
+        'Call process() before using results.');
     }
   }
 
 
   /**
    * @task markup
    */
   private function getMarkupFieldKey(
     PhabricatorMarkupInterface $object,
     $field) {
 
     static $custom;
     if ($custom === null) {
       $custom = array_merge(
         self::loadCustomInlineRules(),
         self::loadCustomBlockRules());
 
       $custom = mpull($custom, 'getRuleVersion', null);
       ksort($custom);
       $custom = PhabricatorHash::digestForIndex(serialize($custom));
     }
 
     return $object->getMarkupFieldKey($field).'@'.$this->version.'@'.$custom;
   }
 
 
   /**
    * @task markup
    */
   private function loadPreprocessorCaches(array $engines, array $objects) {
     $blocks = array();
 
     $use_cache = array();
     foreach ($objects as $key => $info) {
       if ($info['object']->shouldUseMarkupCache($info['field'])) {
         $use_cache[$key] = true;
       }
     }
 
     if ($use_cache) {
       try {
         $blocks = id(new PhabricatorMarkupCache())->loadAllWhere(
           'cacheKey IN (%Ls)',
           array_keys($use_cache));
         $blocks = mpull($blocks, null, 'getCacheKey');
       } catch (Exception $ex) {
         phlog($ex);
       }
     }
 
     foreach ($objects as $key => $info) {
       // False check in case MySQL doesn't support unicode characters
       // in the string (T1191), resulting in unserialize returning false.
       if (isset($blocks[$key]) && $blocks[$key]->getCacheData() !== false) {
         // If we already have a preprocessing cache, we don't need to rebuild
         // it.
         continue;
       }
 
       $text = $info['object']->getMarkupText($info['field']);
       $data = $engines[$key]->preprocessText($text);
 
       // NOTE: This is just debugging information to help sort out cache issues.
       // If one machine is misconfigured and poisoning caches you can use this
       // field to hunt it down.
 
       $metadata = array(
         'host' => php_uname('n'),
       );
 
       $blocks[$key] = id(new PhabricatorMarkupCache())
         ->setCacheKey($key)
         ->setCacheData($data)
         ->setMetadata($metadata);
 
       if (isset($use_cache[$key])) {
         // This is just filling a cache and always safe, even on a read pathway.
         $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
           $blocks[$key]->replace();
         unset($unguarded);
       }
     }
 
     return $blocks;
   }
 
 
   /**
    * Set the viewing user. Used to implement object permissions.
    *
    * @param PhabricatorUser The viewing user.
    * @return this
    * @task markup
    */
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
 
 /* -(  Engine Construction  )------------------------------------------------ */
 
 
 
   /**
    * @task engine
    */
   public static function newManiphestMarkupEngine() {
     return self::newMarkupEngine(array(
     ));
   }
 
 
   /**
    * @task engine
    */
   public static function newPhrictionMarkupEngine() {
     return self::newMarkupEngine(array(
       'header.generate-toc' => true,
     ));
   }
 
 
   /**
    * @task engine
    */
   public static function newPhameMarkupEngine() {
     return self::newMarkupEngine(array(
       'macros' => false,
     ));
   }
 
 
   /**
    * @task engine
    */
   public static function newFeedMarkupEngine() {
     return self::newMarkupEngine(
       array(
         'macros'      => false,
         'youtube'     => false,
 
       ));
   }
 
 
   /**
    * @task engine
    */
   public static function newDifferentialMarkupEngine(array $options = array()) {
     return self::newMarkupEngine(array(
       'differential.diff' => idx($options, 'differential.diff'),
     ));
   }
 
 
   /**
    * @task engine
    */
   public static function newDiffusionMarkupEngine(array $options = array()) {
     return self::newMarkupEngine(array(
       'header.generate-toc' => true,
     ));
   }
 
   /**
    * @task engine
    */
   public static function getEngine($ruleset = 'default') {
     static $engines = array();
     if (isset($engines[$ruleset])) {
       return $engines[$ruleset];
     }
 
     $engine = null;
     switch ($ruleset) {
       case 'default':
         $engine = self::newMarkupEngine(array());
         break;
       case 'nolinebreaks':
         $engine = self::newMarkupEngine(array());
         $engine->setConfig('preserve-linebreaks', false);
         break;
       case 'diffusion-readme':
         $engine = self::newMarkupEngine(array());
         $engine->setConfig('preserve-linebreaks', false);
         $engine->setConfig('header.generate-toc', true);
         break;
       case 'diviner':
         $engine = self::newMarkupEngine(array());
         $engine->setConfig('preserve-linebreaks', false);
   //    $engine->setConfig('diviner.renderer', new DivinerDefaultRenderer());
         $engine->setConfig('header.generate-toc', true);
         break;
       case 'extract':
         // Engine used for reference/edge extraction. Turn off anything which
         // is slow and doesn't change reference extraction.
         $engine = self::newMarkupEngine(array());
         $engine->setConfig('pygments.enabled', false);
         break;
       default:
         throw new Exception("Unknown engine ruleset: {$ruleset}!");
     }
 
     $engines[$ruleset] = $engine;
     return $engine;
   }
 
   /**
    * @task engine
    */
   private static function getMarkupEngineDefaultConfiguration() {
     return array(
       'pygments'      => PhabricatorEnv::getEnvConfig('pygments.enabled'),
       'youtube'       => PhabricatorEnv::getEnvConfig(
         'remarkup.enable-embedded-youtube'),
       'differential.diff' => null,
       'header.generate-toc' => false,
       'macros'        => true,
       'uri.allowed-protocols' => PhabricatorEnv::getEnvConfig(
         'uri.allowed-protocols'),
       'syntax-highlighter.engine' => PhabricatorEnv::getEnvConfig(
         'syntax-highlighter.engine'),
       'preserve-linebreaks' => true,
     );
   }
 
 
   /**
    * @task engine
    */
   public static function newMarkupEngine(array $options) {
 
     $options += self::getMarkupEngineDefaultConfiguration();
 
     $engine = new PhutilRemarkupEngine();
 
     $engine->setConfig('preserve-linebreaks', $options['preserve-linebreaks']);
     $engine->setConfig('pygments.enabled', $options['pygments']);
     $engine->setConfig(
       'uri.allowed-protocols',
       $options['uri.allowed-protocols']);
     $engine->setConfig('differential.diff', $options['differential.diff']);
     $engine->setConfig('header.generate-toc', $options['header.generate-toc']);
     $engine->setConfig(
       'syntax-highlighter.engine',
       $options['syntax-highlighter.engine']);
 
     $rules = array();
     $rules[] = new PhutilRemarkupRuleEscapeRemarkup();
     $rules[] = new PhutilRemarkupRuleMonospace();
 
 
     $rules[] = new PhutilRemarkupRuleDocumentLink();
 
     if ($options['youtube']) {
       $rules[] = new PhabricatorRemarkupRuleYoutube();
     }
 
     $applications = PhabricatorApplication::getAllInstalledApplications();
     foreach ($applications as $application) {
       foreach ($application->getRemarkupRules() as $rule) {
         $rules[] = $rule;
       }
     }
 
     $rules[] = new PhutilRemarkupRuleHyperlink();
 
     if ($options['macros']) {
       $rules[] = new PhabricatorRemarkupRuleImageMacro();
       $rules[] = new PhabricatorRemarkupRuleMeme();
     }
 
     $rules[] = new PhutilRemarkupRuleBold();
     $rules[] = new PhutilRemarkupRuleItalic();
     $rules[] = new PhutilRemarkupRuleDel();
     $rules[] = new PhutilRemarkupRuleUnderline();
 
     foreach (self::loadCustomInlineRules() as $rule) {
       $rules[] = $rule;
     }
 
     $blocks = array();
     $blocks[] = new PhutilRemarkupEngineRemarkupQuotesBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupReplyBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupLiteralBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupHeaderBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupListBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupCodeBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupNoteBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupTableBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupSimpleTableBlockRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupInterpreterRule();
     $blocks[] = new PhutilRemarkupEngineRemarkupDefaultBlockRule();
 
     foreach (self::loadCustomBlockRules() as $rule) {
       $blocks[] = $rule;
     }
 
     foreach ($blocks as $block) {
       $block->setMarkupRules($rules);
     }
 
     $engine->setBlockRules($blocks);
 
     return $engine;
   }
 
   public static function extractPHIDsFromMentions(
     PhabricatorUser $viewer,
     array $content_blocks) {
 
     $mentions = array();
 
     $engine = self::newDifferentialMarkupEngine();
     $engine->setConfig('viewer', $viewer);
 
     foreach ($content_blocks as $content_block) {
       $engine->markupText($content_block);
       $phids = $engine->getTextMetadata(
         PhabricatorRemarkupRuleMention::KEY_MENTIONED,
         array());
       $mentions += $phids;
     }
 
     return $mentions;
   }
 
   public static function extractFilePHIDsFromEmbeddedFiles(
     PhabricatorUser $viewer,
     array $content_blocks) {
     $files = array();
 
     $engine = self::newDifferentialMarkupEngine();
     $engine->setConfig('viewer', $viewer);
 
     foreach ($content_blocks as $content_block) {
       $engine->markupText($content_block);
       $ids = $engine->getTextMetadata(
         PhabricatorRemarkupRuleEmbedFile::KEY_EMBED_FILE_PHIDS,
         array());
       $files += $ids;
     }
 
     return $files;
   }
 
   /**
    * Produce a corpus summary, in a way that shortens the underlying text
    * without truncating it somewhere awkward.
    *
    * TODO: We could do a better job of this.
    *
    * @param string  Remarkup corpus to summarize.
    * @return string Summarized corpus.
    */
   public static function summarize($corpus) {
 
     // Major goals here are:
     //  - Don't split in the middle of a character (utf-8).
     //  - Don't split in the middle of, e.g., **bold** text, since
     //    we end up with hanging '**' in the summary.
     //  - Try not to pick an image macro, header, embedded file, etc.
     //  - Hopefully don't return too much text. We don't explicitly limit
     //    this right now.
 
     $blocks = preg_split("/\n *\n\s*/", trim($corpus));
 
     $best = null;
     foreach ($blocks as $block) {
       // This is a test for normal spaces in the block, i.e. a heuristic to
       // distinguish standard paragraphs from things like image macros. It may
       // not work well for non-latin text. We prefer to summarize with a
       // paragraph of normal words over an image macro, if possible.
       $has_space = preg_match('/\w\s\w/', $block);
 
       // This is a test to find embedded images and headers. We prefer to
       // summarize with a normal paragraph over a header or an embedded object,
       // if possible.
       $has_embed = preg_match('/^[{=]/', $block);
 
       if ($has_space && !$has_embed) {
         // This seems like a good summary, so return it.
         return $block;
       }
 
       if (!$best) {
         // This is the first block we found; if everything is garbage just
         // use the first block.
         $best = $block;
       }
     }
 
     return $best;
   }
 
   private static function loadCustomInlineRules() {
     return id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorRemarkupCustomInlineRule')
       ->loadObjects();
   }
 
   private static function loadCustomBlockRules() {
     return id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorRemarkupCustomBlockRule')
       ->loadObjects();
   }
 
 }
diff --git a/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php
index 34215d03b..4e48c729c 100644
--- a/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php
@@ -1,641 +1,641 @@
 <?php
 
 /**
  * A @{class:PhabricatorQuery} which filters results according to visibility
  * policies for the querying user. Broadly, this class allows you to implement
  * a query that returns only objects the user is allowed to see.
  *
  *   $results = id(new ExampleQuery())
  *     ->setViewer($user)
  *     ->withConstraint($example)
  *     ->execute();
  *
  * Normally, you should extend @{class:PhabricatorCursorPagedPolicyAwareQuery},
  * not this class. @{class:PhabricatorCursorPagedPolicyAwareQuery} provides a
  * more practical interface for building usable queries against most object
  * types.
  *
  * NOTE: Although this class extends @{class:PhabricatorOffsetPagedQuery},
  * offset paging with policy filtering is not efficient. All results must be
  * loaded into the application and filtered here: skipping `N` rows via offset
  * is an `O(N)` operation with a large constant. Prefer cursor-based paging
  * with @{class:PhabricatorCursorPagedPolicyAwareQuery}, which can filter far
  * more efficiently in MySQL.
  *
  * @task config     Query Configuration
  * @task exec       Executing Queries
  * @task policyimpl Policy Query Implementation
  */
 abstract class PhabricatorPolicyAwareQuery extends PhabricatorOffsetPagedQuery {
 
   private $viewer;
   private $raisePolicyExceptions;
   private $parentQuery;
   private $rawResultLimit;
   private $capabilities;
   private $workspace = array();
   private $policyFilteredPHIDs = array();
   private $canUseApplication;
 
 
 /* -(  Query Configuration  )------------------------------------------------ */
 
 
   /**
    * Set the viewer who is executing the query. Results will be filtered
    * according to the viewer's capabilities. You must set a viewer to execute
    * a policy query.
    *
    * @param PhabricatorUser The viewing user.
    * @return this
    * @task config
    */
   final public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
 
   /**
    * Get the query's viewer.
    *
    * @return PhabricatorUser The viewing user.
    * @task config
    */
   final public function getViewer() {
     return $this->viewer;
   }
 
 
   /**
    * Set the parent query of this query. This is useful for nested queries so
    * that configuration like whether or not to raise policy exceptions is
    * seamlessly passed along to child queries.
    *
    * @return this
    * @task config
    */
   final public function setParentQuery(PhabricatorPolicyAwareQuery $query) {
     $this->parentQuery = $query;
     return $this;
   }
 
 
   /**
    * Get the parent query. See @{method:setParentQuery} for discussion.
    *
    * @return PhabricatorPolicyAwareQuery The parent query.
    * @task config
    */
   final public function getParentQuery() {
     return $this->parentQuery;
   }
 
 
   /**
    * Hook to configure whether this query should raise policy exceptions.
    *
    * @return this
    * @task config
    */
   final public function setRaisePolicyExceptions($bool) {
     $this->raisePolicyExceptions = $bool;
     return $this;
   }
 
 
   /**
    * @return bool
    * @task config
    */
   final public function shouldRaisePolicyExceptions() {
     return (bool)$this->raisePolicyExceptions;
   }
 
 
   /**
    * @task config
    */
   final public function requireCapabilities(array $capabilities) {
     $this->capabilities = $capabilities;
     return $this;
   }
 
 
 /* -(  Query Execution  )---------------------------------------------------- */
 
 
   /**
    * Execute the query, expecting a single result. This method simplifies
    * loading objects for detail pages or edit views.
    *
    *   // Load one result by ID.
    *   $obj = id(new ExampleQuery())
    *     ->setViewer($user)
    *     ->withIDs(array($id))
    *     ->executeOne();
    *   if (!$obj) {
    *     return new Aphront404Response();
    *   }
    *
    * If zero results match the query, this method returns `null`.
    * If one result matches the query, this method returns that result.
    *
    * If two or more results match the query, this method throws an exception.
    * You should use this method only when the query constraints guarantee at
    * most one match (e.g., selecting a specific ID or PHID).
    *
    * If one result matches the query but it is caught by the policy filter (for
    * example, the user is trying to view or edit an object which exists but
    * which they do not have permission to see) a policy exception is thrown.
    *
    * @return mixed Single result, or null.
    * @task exec
    */
   final public function executeOne() {
 
     $this->setRaisePolicyExceptions(true);
     try {
       $results = $this->execute();
     } catch (Exception $ex) {
       $this->setRaisePolicyExceptions(false);
       throw $ex;
     }
 
     if (count($results) > 1) {
-      throw new Exception("Expected a single result!");
+      throw new Exception('Expected a single result!');
     }
 
     if (!$results) {
       return null;
     }
 
     return head($results);
   }
 
 
   /**
    * Execute the query, loading all visible results.
    *
    * @return list<PhabricatorPolicyInterface> Result objects.
    * @task exec
    */
   final public function execute() {
     if (!$this->viewer) {
-      throw new Exception("Call setViewer() before execute()!");
+      throw new Exception('Call setViewer() before execute()!');
     }
 
     $parent_query = $this->getParentQuery();
     if ($parent_query) {
       $this->setRaisePolicyExceptions(
         $parent_query->shouldRaisePolicyExceptions());
     }
 
     $results = array();
 
     $filter = $this->getPolicyFilter();
 
     $offset = (int)$this->getOffset();
     $limit  = (int)$this->getLimit();
     $count  = 0;
 
     if ($limit) {
       $need = $offset + $limit;
     } else {
       $need = 0;
     }
 
     $this->willExecute();
 
     do {
       if ($need) {
         $this->rawResultLimit = min($need - $count, 1024);
       } else {
         $this->rawResultLimit = 0;
       }
 
       if ($this->canViewerUseQueryApplication()) {
         try {
           $page = $this->loadPage();
         } catch (PhabricatorEmptyQueryException $ex) {
           $page = array();
         }
       } else {
         $page = array();
       }
 
       if ($page) {
         $maybe_visible = $this->willFilterPage($page);
       } else {
         $maybe_visible = array();
       }
 
       if ($this->shouldDisablePolicyFiltering()) {
         $visible = $maybe_visible;
       } else {
         $visible = $filter->apply($maybe_visible);
 
         $policy_filtered = array();
         foreach ($maybe_visible as $key => $object) {
           if (empty($visible[$key])) {
             $phid = $object->getPHID();
             if ($phid) {
               $policy_filtered[$phid] = $phid;
             }
           }
         }
         $this->addPolicyFilteredPHIDs($policy_filtered);
       }
 
       if ($visible) {
         $this->putObjectsInWorkspace($this->getWorkspaceMapForPage($visible));
         $visible = $this->didFilterPage($visible);
       }
 
       $removed = array();
       foreach ($maybe_visible as $key => $object) {
         if (empty($visible[$key])) {
           $removed[$key] = $object;
         }
       }
 
       $this->didFilterResults($removed);
 
       foreach ($visible as $key => $result) {
         ++$count;
 
         // If we have an offset, we just ignore that many results and start
         // storing them only once we've hit the offset. This reduces memory
         // requirements for large offsets, compared to storing them all and
         // slicing them away later.
         if ($count > $offset) {
           $results[$key] = $result;
         }
 
         if ($need && ($count >= $need)) {
           // If we have all the rows we need, break out of the paging query.
           break 2;
         }
       }
 
       if (!$this->rawResultLimit) {
         // If we don't have a load count, we loaded all the results. We do
         // not need to load another page.
         break;
       }
 
       if (count($page) < $this->rawResultLimit) {
         // If we have a load count but the unfiltered results contained fewer
         // objects, we know this was the last page of objects; we do not need
         // to load another page because we can deduce it would be empty.
         break;
       }
 
       $this->nextPage($page);
     } while (true);
 
     $results = $this->didLoadResults($results);
 
     return $results;
   }
 
   private function getPolicyFilter() {
     $filter = new PhabricatorPolicyFilter();
     $filter->setViewer($this->viewer);
     $capabilities = $this->getRequiredCapabilities();
     $filter->requireCapabilities($capabilities);
     $filter->raisePolicyExceptions($this->shouldRaisePolicyExceptions());
 
     return $filter;
   }
 
   protected function getRequiredCapabilities() {
     if ($this->capabilities) {
       return $this->capabilities;
     }
 
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   protected function applyPolicyFilter(array $objects, array $capabilities) {
     if ($this->shouldDisablePolicyFiltering()) {
       return $objects;
     }
     $filter = $this->getPolicyFilter();
     $filter->requireCapabilities($capabilities);
     return $filter->apply($objects);
   }
 
   protected function didRejectResult(PhabricatorPolicyInterface $object) {
     $this->getPolicyFilter()->rejectObject(
       $object,
       $object->getPolicy(PhabricatorPolicyCapability::CAN_VIEW),
       PhabricatorPolicyCapability::CAN_VIEW);
   }
 
   public function addPolicyFilteredPHIDs(array $phids) {
     $this->policyFilteredPHIDs += $phids;
     if ($this->getParentQuery()) {
       $this->getParentQuery()->addPolicyFilteredPHIDs($phids);
     }
     return $this;
   }
 
   /**
    * Return a map of all object PHIDs which were loaded in the query but
    * filtered out by policy constraints. This allows a caller to distinguish
    * between objects which do not exist (or, at least, were filtered at the
    * content level) and objects which exist but aren't visible.
    *
    * @return map<phid, phid> Map of object PHIDs which were filtered
    *   by policies.
    * @task exec
    */
   public function getPolicyFilteredPHIDs() {
     return $this->policyFilteredPHIDs;
   }
 
 
 /* -(  Query Workspace  )---------------------------------------------------- */
 
 
   /**
    * Put a map of objects into the query workspace. Many queries perform
    * subqueries, which can eventually end up loading the same objects more than
    * once (often to perform policy checks).
    *
    * For example, loading a user may load the user's profile image, which might
    * load the user object again in order to verify that the viewer has
    * permission to see the file.
    *
    * The "query workspace" allows queries to load objects from elsewhere in a
    * query block instead of refetching them.
    *
    * When using the query workspace, it's important to obey two rules:
    *
    * **Never put objects into the workspace which the viewer may not be able
    * to see**. You need to apply all policy filtering //before// putting
    * objects in the workspace. Otherwise, subqueries may read the objects and
    * use them to permit access to content the user shouldn't be able to view.
    *
    * **Fully enrich objects pulled from the workspace.** After pulling objects
    * from the workspace, you still need to load and attach any additional
    * content the query requests. Otherwise, a query might return objects without
    * requested content.
    *
    * Generally, you do not need to update the workspace yourself: it is
    * automatically populated as a side effect of objects surviving policy
    * filtering.
    *
    * @param map<phid, PhabricatorPolicyInterface> Objects to add to the query
    *   workspace.
    * @return this
    * @task workspace
    */
   public function putObjectsInWorkspace(array $objects) {
     assert_instances_of($objects, 'PhabricatorPolicyInterface');
 
     $viewer_phid = $this->getViewer()->getPHID();
 
     // The workspace is scoped per viewer to prevent accidental contamination.
     if (empty($this->workspace[$viewer_phid])) {
       $this->workspace[$viewer_phid] = array();
     }
 
     $this->workspace[$viewer_phid] += $objects;
 
     return $this;
   }
 
 
   /**
    * Retrieve objects from the query workspace. For more discussion about the
    * workspace mechanism, see @{method:putObjectsInWorkspace}. This method
    * searches both the current query's workspace and the workspaces of parent
    * queries.
    *
    * @param list<phid> List of PHIDs to retreive.
    * @return this
    * @task workspace
    */
   public function getObjectsFromWorkspace(array $phids) {
     $viewer_phid = $this->getViewer()->getPHID();
 
     $results = array();
     foreach ($phids as $key => $phid) {
       if (isset($this->workspace[$viewer_phid][$phid])) {
         $results[$phid] = $this->workspace[$viewer_phid][$phid];
         unset($phids[$key]);
       }
     }
 
     if ($phids && $this->getParentQuery()) {
       $results += $this->getParentQuery()->getObjectsFromWorkspace($phids);
     }
 
     return $results;
   }
 
 
   /**
    * Convert a result page to a `<phid, PhabricatorPolicyInterface>` map.
    *
    * @param list<PhabricatorPolicyInterface> Objects.
    * @return map<phid, PhabricatorPolicyInterface> Map of objects which can
    *   be put into the workspace.
    * @task workspace
    */
   protected function getWorkspaceMapForPage(array $results) {
     $map = array();
     foreach ($results as $result) {
       $phid = $result->getPHID();
       if ($phid !== null) {
         $map[$phid] = $result;
       }
     }
 
     return $map;
   }
 
 
 /* -(  Policy Query Implementation  )---------------------------------------- */
 
 
   /**
    * Get the number of results @{method:loadPage} should load. If the value is
    * 0, @{method:loadPage} should load all available results.
    *
    * @return int The number of results to load, or 0 for all results.
    * @task policyimpl
    */
   final protected function getRawResultLimit() {
     return $this->rawResultLimit;
   }
 
 
   /**
    * Hook invoked before query execution. Generally, implementations should
    * reset any internal cursors.
    *
    * @return void
    * @task policyimpl
    */
   protected function willExecute() {
     return;
   }
 
 
   /**
    * Load a raw page of results. Generally, implementations should load objects
    * from the database. They should attempt to return the number of results
    * hinted by @{method:getRawResultLimit}.
    *
    * @return list<PhabricatorPolicyInterface> List of filterable policy objects.
    * @task policyimpl
    */
   abstract protected function loadPage();
 
 
   /**
    * Update internal state so that the next call to @{method:loadPage} will
    * return new results. Generally, you should adjust a cursor position based
    * on the provided result page.
    *
    * @param list<PhabricatorPolicyInterface> The current page of results.
    * @return void
    * @task policyimpl
    */
   abstract protected function nextPage(array $page);
 
 
   /**
    * Hook for applying a page filter prior to the privacy filter. This allows
    * you to drop some items from the result set without creating problems with
    * pagination or cursor updates. You can also load and attach data which is
    * required to perform policy filtering.
    *
    * Generally, you should load non-policy data and perform non-policy filtering
    * later, in @{method:didFilterPage}. Strictly fewer objects will make it that
    * far (so the program will load less data) and subqueries from that context
    * can use the query workspace to further reduce query load.
    *
    * This method will only be called if data is available. Implementations
    * do not need to handle the case of no results specially.
    *
    * @param   list<wild>  Results from `loadPage()`.
    * @return  list<PhabricatorPolicyInterface> Objects for policy filtering.
    * @task policyimpl
    */
   protected function willFilterPage(array $page) {
     return $page;
   }
 
   /**
    * Hook for performing additional non-policy loading or filtering after an
    * object has satisfied all policy checks. Generally, this means loading and
    * attaching related data.
    *
    * Subqueries executed during this phase can use the query workspace, which
    * may improve performance or make circular policies resolvable. Data which
    * is not necessary for policy filtering should generally be loaded here.
    *
    * This callback can still filter objects (for example, if attachable data
    * is discovered to not exist), but should not do so for policy reasons.
    *
    * This method will only be called if data is available. Implementations do
    * not need to handle the case of no results specially.
    *
    * @param list<wild> Results from @{method:willFilterPage()}.
    * @return list<PhabricatorPolicyInterface> Objects after additional
    *   non-policy processing.
    */
   protected function didFilterPage(array $page) {
     return $page;
   }
 
 
   /**
    * Hook for removing filtered results from alternate result sets. This
    * hook will be called with any objects which were returned by the query but
    * filtered for policy reasons. The query should remove them from any cached
    * or partial result sets.
    *
    * @param list<wild>  List of objects that should not be returned by alternate
    *                    result mechanisms.
    * @return void
    * @task policyimpl
    */
   protected function didFilterResults(array $results) {
     return;
   }
 
 
   /**
    * Hook for applying final adjustments before results are returned. This is
    * used by @{class:PhabricatorCursorPagedPolicyAwareQuery} to reverse results
    * that are queried during reverse paging.
    *
    * @param   list<PhabricatorPolicyInterface> Query results.
    * @return  list<PhabricatorPolicyInterface> Final results.
    * @task policyimpl
    */
   protected function didLoadResults(array $results) {
     return $results;
   }
 
 
   /**
    * Allows a subclass to disable policy filtering. This method is dangerous.
    * It should be used only if the query loads data which has already been
    * filtered (for example, because it wraps some other query which uses
    * normal policy filtering).
    *
    * @return bool True to disable all policy filtering.
    * @task policyimpl
    */
   protected function shouldDisablePolicyFiltering() {
     return false;
   }
 
 
   /**
    * If this query belongs to an application, return the application class name
    * here. This will prevent the query from returning results if the viewer can
    * not access the application.
    *
    * If this query does not belong to an application, return `null`.
    *
    * @return string|null Application class name.
    */
   abstract public function getQueryApplicationClass();
 
 
   /**
    * Determine if the viewer has permission to use this query's application.
    * For queries which aren't part of an application, this method always returns
    * true.
    *
    * @return bool True if the viewer has application-level permission to
    *   execute the query.
    */
   public function canViewerUseQueryApplication() {
     if ($this->canUseApplication === null) {
       $class = $this->getQueryApplicationClass();
       if (!$class) {
         $this->canUseApplication = true;
       } else {
         $result = id(new PhabricatorApplicationQuery())
           ->setViewer($this->getViewer())
           ->withClasses(array($class))
           ->execute();
 
         $this->canUseApplication = (bool)$result;
       }
     }
 
     return $this->canUseApplication;
   }
 
 }
diff --git a/src/infrastructure/sms/management/PhabricatorSMSManagementListOutboundWorkflow.php b/src/infrastructure/sms/management/PhabricatorSMSManagementListOutboundWorkflow.php
index fe861d962..b1d0c2b89 100644
--- a/src/infrastructure/sms/management/PhabricatorSMSManagementListOutboundWorkflow.php
+++ b/src/infrastructure/sms/management/PhabricatorSMSManagementListOutboundWorkflow.php
@@ -1,50 +1,50 @@
 <?php
 
 final class PhabricatorSMSManagementListOutboundWorkflow
   extends PhabricatorSMSManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('list-outbound')
       ->setSynopsis('List outbound sms messages sent by Phabricator.')
       ->setExamples(
-        "**list-outbound**")
+        '**list-outbound**')
       ->setArguments(
         array(
           array(
             'name'    => 'limit',
             'param'   => 'N',
             'default' => 100,
             'help'    =>
               'Show a specific number of sms messages (default 100).',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $viewer = $this->getViewer();
 
     $sms_messages = id(new PhabricatorSMS())->loadAllWhere(
       '1 = 1 ORDER BY id DESC LIMIT %d',
       $args->getArg('limit'));
 
     if (!$sms_messages) {
-      $console->writeErr("%s\n", pht("No sent sms."));
+      $console->writeErr("%s\n", pht('No sent sms.'));
       return 0;
     }
 
     foreach (array_reverse($sms_messages) as $sms) {
       $console->writeOut(
         "%s\n",
         sprintf(
-          "% 8d  %-8s  To: %s",
+          '% 8d  %-8s  To: %s',
           $sms->getID(),
           $sms->getSendStatus(),
           $sms->getToNumber()));
     }
 
     return 0;
   }
 
 }
diff --git a/src/infrastructure/sms/management/PhabricatorSMSManagementShowOutboundWorkflow.php b/src/infrastructure/sms/management/PhabricatorSMSManagementShowOutboundWorkflow.php
index 3dd7922b4..d9bd7e65a 100644
--- a/src/infrastructure/sms/management/PhabricatorSMSManagementShowOutboundWorkflow.php
+++ b/src/infrastructure/sms/management/PhabricatorSMSManagementShowOutboundWorkflow.php
@@ -1,69 +1,69 @@
 <?php
 
 final class PhabricatorSMSManagementShowOutboundWorkflow
   extends PhabricatorSMSManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('show-outbound')
       ->setSynopsis('Show diagnostic details about outbound sms.')
       ->setExamples(
-        "**show-outbound** --id 1 --id 2")
+        '**show-outbound** --id 1 --id 2')
       ->setArguments(
         array(
           array(
             'name'    => 'id',
             'param'   => 'id',
             'help'    => 'Show details about outbound sms with given ID.',
             'repeat'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $ids = $args->getArg('id');
     if (!$ids) {
       throw new PhutilArgumentUsageException(
         "Use the '--id' flag to specify one or more sms messages to show.");
     }
 
     $messages = id(new PhabricatorSMS())->loadAllWhere(
       'id IN (%Ld)',
       $ids);
 
     if ($ids) {
       $ids = array_fuse($ids);
       $missing = array_diff_key($ids, $messages);
       if ($missing) {
         throw new PhutilArgumentUsageException(
-          "Some specified sms messages do not exist: ".
+          'Some specified sms messages do not exist: '.
           implode(', ', array_keys($missing)));
       }
     }
 
     $last_key = last_key($messages);
     foreach ($messages as $message_key => $message) {
       $info = array();
 
       $info[] = pht('PROPERTIES');
       $info[] = pht('ID: %d', $message->getID());
       $info[] = pht('Status: %s', $message->getSendStatus());
       $info[] = pht('To: %s', $message->getToNumber());
       $info[] = pht('From: %s', $message->getFromNumber());
 
       $info[] = null;
       $info[] = pht('BODY');
       $info[] = $message->getBody();
       $info[] = null;
 
       $console->writeOut('%s', implode("\n", $info));
 
       if ($message_key != $last_key) {
         $console->writeOut("\n%s\n\n", str_repeat('-', 80));
       }
     }
   }
 
 }
diff --git a/src/infrastructure/ssh/PhabricatorSSHPassthruCommand.php b/src/infrastructure/ssh/PhabricatorSSHPassthruCommand.php
index e05e0c7fa..572472867 100644
--- a/src/infrastructure/ssh/PhabricatorSSHPassthruCommand.php
+++ b/src/infrastructure/ssh/PhabricatorSSHPassthruCommand.php
@@ -1,212 +1,212 @@
 <?php
 
 /**
  * Proxy an IO channel to an underlying command, with optional callbacks. This
  * is a mostly a more general version of @{class:PhutilExecPassthru}. This
  * class is used to proxy Git, SVN and Mercurial traffic to the commands which
  * can actually serve it.
  *
  * Largely, this just reads an IO channel (like stdin from SSH) and writes
  * the results into a command channel (like a command's stdin). Then it reads
  * the command channel (like the command's stdout) and writes it into the IO
  * channel (like stdout from SSH):
  *
  *    IO Channel        Command Channel
  *    stdin       ->    stdin
  *    stdout      <-    stdout
  *    stderr      <-    stderr
  *
  * You can provide **read and write callbacks** which are invoked as data
  * is passed through this class. They allow you to inspect and modify traffic.
  *
  *    IO Channel     Passthru        Command Channel
  *    stdout     ->  willWrite   ->  stdin
  *    stdin      <-  willRead    <-  stdout
  *    stderr     <-  (identity)  <-  stderr
  *
  * Primarily, this means:
  *
  *   - the **IO Channel** can be a @{class:PhutilProtocolChannel} if the
  *     **write callback** can convert protocol messages into strings; and
  *   - the **write callback** can inspect and reject requests over the channel,
  *     e.g. to enforce policies.
  *
  * In practice, this is used when serving repositories to check each command
  * issued over SSH and determine if it is a read command or a write command.
  * Writes can then be checked for appropriate permissions.
  */
 final class PhabricatorSSHPassthruCommand extends Phobject {
 
   private $commandChannel;
   private $ioChannel;
   private $errorChannel;
   private $execFuture;
   private $willWriteCallback;
   private $willReadCallback;
 
   public function setCommandChannelFromExecFuture(ExecFuture $exec_future) {
     $exec_channel = new PhutilExecChannel($exec_future);
     $exec_channel->setStderrHandler(array($this, 'writeErrorIOCallback'));
 
     $this->execFuture = $exec_future;
     $this->commandChannel = $exec_channel;
 
     return $this;
   }
 
   public function setIOChannel(PhutilChannel $io_channel) {
     $this->ioChannel = $io_channel;
     return $this;
   }
 
   public function setErrorChannel(PhutilChannel $error_channel) {
     $this->errorChannel = $error_channel;
     return $this;
   }
 
   public function setWillReadCallback($will_read_callback) {
     $this->willReadCallback = $will_read_callback;
     return $this;
   }
 
   public function setWillWriteCallback($will_write_callback) {
     $this->willWriteCallback = $will_write_callback;
     return $this;
   }
 
   public function writeErrorIOCallback(PhutilChannel $channel, $data) {
     $this->errorChannel->write($data);
   }
 
   public function execute() {
     $command_channel = $this->commandChannel;
     $io_channel = $this->ioChannel;
     $error_channel = $this->errorChannel;
 
     if (!$command_channel) {
-      throw new Exception("Set a command channel before calling execute()!");
+      throw new Exception('Set a command channel before calling execute()!');
     }
 
     if (!$io_channel) {
-      throw new Exception("Set an IO channel before calling execute()!");
+      throw new Exception('Set an IO channel before calling execute()!');
     }
 
     if (!$error_channel) {
-      throw new Exception("Set an error channel before calling execute()!");
+      throw new Exception('Set an error channel before calling execute()!');
     }
 
     $channels = array($command_channel, $io_channel, $error_channel);
 
     // We want to limit the amount of data we'll hold in memory for this
     // process. See T4241 for a discussion of this issue in general.
 
     $buffer_size = (1024 * 1024); // 1MB
     $io_channel->setReadBufferSize($buffer_size);
     $command_channel->setReadBufferSize($buffer_size);
 
     // TODO: This just makes us throw away stderr after the first 1MB, but we
     // don't currently have the support infrastructure to buffer it correctly.
     // It's difficult to imagine this causing problems in practice, though.
     $this->execFuture->getStderrSizeLimit($buffer_size);
 
     while (true) {
       PhutilChannel::waitForAny($channels);
 
       $io_channel->update();
       $command_channel->update();
       $error_channel->update();
 
       // If any channel is blocked on the other end, wait for it to flush before
       // we continue reading. For example, if a user is running `git clone` on
       // a 1GB repository, the underlying `git-upload-pack` may
       // be able to produce data much more quickly than we can send it over
       // the network. If we don't throttle the reads, we may only send a few
       // MB over the I/O channel in the time it takes to read the entire 1GB off
       // the command channel. That leaves us with 1GB of data in memory.
 
       while ($command_channel->isOpen() &&
              $io_channel->isOpenForWriting() &&
              ($command_channel->getWriteBufferSize() >= $buffer_size ||
              $io_channel->getWriteBufferSize() >= $buffer_size ||
              $error_channel->getWriteBufferSize() >= $buffer_size)) {
         PhutilChannel::waitForActivity(array(), $channels);
         $io_channel->update();
         $command_channel->update();
         $error_channel->update();
       }
 
       // If the subprocess has exited and we've read everything from it,
       // we're all done.
       $done = !$command_channel->isOpenForReading() &&
                $command_channel->isReadBufferEmpty();
 
       $in_message = $io_channel->read();
       if ($in_message !== null) {
         $in_message = $this->willWriteData($in_message);
         if ($in_message !== null) {
           $command_channel->write($in_message);
         }
       }
 
       $out_message = $command_channel->read();
       if ($out_message !== null) {
         $out_message = $this->willReadData($out_message);
         if ($out_message !== null) {
           $io_channel->write($out_message);
         }
       }
 
       // If we have nothing left on stdin, close stdin on the subprocess.
       if (!$io_channel->isOpenForReading()) {
         $command_channel->closeWriteChannel();
       }
 
       if ($done) {
         break;
       }
 
       // If the client has disconnected, kill the subprocess and bail.
       if (!$io_channel->isOpenForWriting()) {
         $this->execFuture
           ->setStdoutSizeLimit(0)
           ->setStderrSizeLimit(0)
           ->setReadBufferSize(null)
           ->resolveKill();
         break;
       }
     }
 
     list($err) = $this->execFuture
       ->setStdoutSizeLimit(0)
       ->setStderrSizeLimit(0)
       ->setReadBufferSize(null)
       ->resolve();
 
     return $err;
   }
 
   public function willWriteData($message) {
     if ($this->willWriteCallback) {
       return call_user_func($this->willWriteCallback, $this, $message);
     } else {
       if (strlen($message)) {
         return $message;
       } else {
         return null;
       }
     }
   }
 
   public function willReadData($message) {
     if ($this->willReadCallback) {
       return call_user_func($this->willReadCallback, $this, $message);
     } else {
       if (strlen($message)) {
         return $message;
       } else {
         return null;
       }
     }
   }
 
 }
diff --git a/src/infrastructure/storage/__tests__/QueryFormattingTestCase.php b/src/infrastructure/storage/__tests__/QueryFormattingTestCase.php
index b81484f7b..1e2955bbb 100644
--- a/src/infrastructure/storage/__tests__/QueryFormattingTestCase.php
+++ b/src/infrastructure/storage/__tests__/QueryFormattingTestCase.php
@@ -1,56 +1,56 @@
 <?php
 
 final class QueryFormattingTestCase extends PhabricatorTestCase {
 
   public function testQueryFormatting() {
     $conn_r = id(new PhabricatorUser())->establishConnection('r');
 
     $this->assertEqual(
       'NULL',
       qsprintf($conn_r, '%nd', null));
 
     $this->assertEqual(
       '0',
       qsprintf($conn_r, '%nd', 0));
 
     $this->assertEqual(
       '0',
       qsprintf($conn_r, '%d', 0));
 
     $raised = null;
     try {
       qsprintf($conn_r, '%d', 'derp');
     } catch (Exception $ex) {
       $raised = $ex;
     }
     $this->assertTrue(
       (bool)$raised,
       'qsprintf should raise exception for invalid %d conversion.');
 
     $this->assertEqual(
       "'<S>'",
       qsprintf($conn_r, '%s', null));
 
     $this->assertEqual(
       'NULL',
       qsprintf($conn_r, '%ns', null));
 
     $this->assertEqual(
       "'<S>', '<S>'",
       qsprintf($conn_r, '%Ls', array('x', 'y')));
 
     $this->assertEqual(
       "'<B>'",
       qsprintf($conn_r, '%B', null));
 
     $this->assertEqual(
-      "NULL",
+      'NULL',
       qsprintf($conn_r, '%nB', null));
 
     $this->assertEqual(
       "'<B>', '<B>'",
       qsprintf($conn_r, '%LB', array('x', 'y')));
   }
 
 
 }
diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php
index 040a93c08..9250c8b7d 100644
--- a/src/infrastructure/storage/lisk/LiskDAO.php
+++ b/src/infrastructure/storage/lisk/LiskDAO.php
@@ -1,1826 +1,1826 @@
 <?php
 
 /**
  * Simple object-authoritative data access object that makes it easy to build
  * stuff that you need to save to a database. Basically, it means that the
  * amount of boilerplate code (and, particularly, boilerplate SQL) you need
  * to write is greatly reduced.
  *
  * Lisk makes it fairly easy to build something quickly and end up with
  * reasonably high-quality code when you're done (e.g., getters and setters,
  * objects, transactions, reasonably structured OO code). It's also very thin:
  * you can break past it and use MySQL and other lower-level tools when you
  * need to in those couple of cases where it doesn't handle your workflow
  * gracefully.
  *
  * However, Lisk won't scale past one database and lacks many of the features
  * of modern DAOs like Hibernate: for instance, it does not support joins or
  * polymorphic storage.
  *
  * This means that Lisk is well-suited for tools like Differential, but often a
  * poor choice elsewhere. And it is strictly unsuitable for many projects.
  *
  * Lisk's model is object-authoritative: the PHP class definition is the
  * master authority for what the object looks like.
  *
  * =Building New Objects=
  *
  * To create new Lisk objects, extend @{class:LiskDAO} and implement
  * @{method:establishLiveConnection}. It should return an
  * @{class:AphrontDatabaseConnection}; this will tell Lisk where to save your
  * objects.
  *
  *   class Dog extends LiskDAO {
  *
  *     protected $name;
  *     protected $breed;
  *
  *     public function establishLiveConnection() {
  *       return $some_connection_object;
  *     }
  *   }
  *
  * Now, you should create your table:
  *
  *   lang=sql
  *   CREATE TABLE dog (
  *     id int unsigned not null auto_increment primary key,
  *     name varchar(32) not null,
  *     breed varchar(32) not null,
  *     dateCreated int unsigned not null,
  *     dateModified int unsigned not null
  *   );
  *
  * For each property in your class, add a column with the same name to the table
  * (see @{method:getConfiguration} for information about changing this mapping).
  * Additionally, you should create the three columns `id`,  `dateCreated` and
  * `dateModified`. Lisk will automatically manage these, using them to implement
  * autoincrement IDs and timestamps. If you do not want to use these features,
  * see @{method:getConfiguration} for information on disabling them. At a bare
  * minimum, you must normally have an `id` column which is a primary or unique
  * key with a numeric type, although you can change its name by overriding
  * @{method:getIDKey} or disable it entirely by overriding @{method:getIDKey} to
  * return null. Note that many methods rely on a single-part primary key and
  * will no longer work (they will throw) if you disable it.
  *
  * As you add more properties to your class in the future, remember to add them
  * to the database table as well.
  *
  * Lisk will now automatically handle these operations: getting and setting
  * properties, saving objects, loading individual objects, loading groups
  * of objects, updating objects, managing IDs, updating timestamps whenever
  * an object is created or modified, and some additional specialized
  * operations.
  *
  * = Creating, Retrieving, Updating, and Deleting =
  *
  * To create and persist a Lisk object, use @{method:save}:
  *
  *   $dog = id(new Dog())
  *     ->setName('Sawyer')
  *     ->setBreed('Pug')
  *     ->save();
  *
  * Note that **Lisk automatically builds getters and setters for all of your
  * object's protected properties** via @{method:__call}. If you want to add
  * custom behavior to your getters or setters, you can do so by overriding the
  * @{method:readField} and @{method:writeField} methods.
  *
  * Calling @{method:save} will persist the object to the database. After calling
  * @{method:save}, you can call @{method:getID} to retrieve the object's ID.
  *
  * To load objects by ID, use the @{method:load} method:
  *
  *   $dog = id(new Dog())->load($id);
  *
  * This will load the Dog record with ID $id into $dog, or ##null## if no such
  * record exists (@{method:load} is an instance method rather than a static
  * method because PHP does not support late static binding, at least until PHP
  * 5.3).
  *
  * To update an object, change its properties and save it:
  *
  *   $dog->setBreed('Lab')->save();
  *
  * To delete an object, call @{method:delete}:
  *
  *   $dog->delete();
  *
  * That's Lisk CRUD in a nutshell.
  *
  * = Queries =
  *
  * Often, you want to load a bunch of objects, or execute a more specialized
  * query. Use @{method:loadAllWhere} or @{method:loadOneWhere} to do this:
  *
  *   $pugs = $dog->loadAllWhere('breed = %s', 'Pug');
  *   $sawyer = $dog->loadOneWhere('name = %s', 'Sawyer');
  *
  * These methods work like @{function@libphutil:queryfx}, but only take half of
  * a query (the part after the WHERE keyword). Lisk will handle the connection,
  * columns, and object construction; you are responsible for the rest of it.
  * @{method:loadAllWhere} returns a list of objects, while
  * @{method:loadOneWhere} returns a single object (or `null`).
  *
  * There's also a @{method:loadRelatives} method which helps to prevent the 1+N
  * queries problem.
  *
  * = Managing Transactions =
  *
  * Lisk uses a transaction stack, so code does not generally need to be aware
  * of the transactional state of objects to implement correct transaction
  * semantics:
  *
  *   $obj->openTransaction();
  *     $obj->save();
  *     $other->save();
  *     // ...
  *     $other->openTransaction();
  *       $other->save();
  *       $another->save();
  *     if ($some_condition) {
  *       $other->saveTransaction();
  *     } else {
  *       $other->killTransaction();
  *     }
  *     // ...
  *   $obj->saveTransaction();
  *
  * Assuming ##$obj##, ##$other## and ##$another## live on the same database,
  * this code will work correctly by establishing savepoints.
  *
  * Selects whose data are used later in the transaction should be included in
  * @{method:beginReadLocking} or @{method:beginWriteLocking} block.
  *
  * @task   conn    Managing Connections
  * @task   config  Configuring Lisk
  * @task   load    Loading Objects
  * @task   info    Examining Objects
  * @task   save    Writing Objects
  * @task   hook    Hooks and Callbacks
  * @task   util    Utilities
  * @task   xaction Managing Transactions
  * @task   isolate Isolation for Unit Testing
  *
  * @group storage
  */
 abstract class LiskDAO {
 
   const CONFIG_IDS                  = 'id-mechanism';
   const CONFIG_TIMESTAMPS           = 'timestamps';
   const CONFIG_AUX_PHID             = 'auxiliary-phid';
   const CONFIG_SERIALIZATION        = 'col-serialization';
   const CONFIG_PARTIAL_OBJECTS      = 'partial-objects';
   const CONFIG_BINARY               = 'binary';
 
   const SERIALIZATION_NONE          = 'id';
   const SERIALIZATION_JSON          = 'json';
   const SERIALIZATION_PHP           = 'php';
 
   const IDS_AUTOINCREMENT           = 'ids-auto';
   const IDS_COUNTER                 = 'ids-counter';
   const IDS_MANUAL                  = 'ids-manual';
 
   const COUNTER_TABLE_NAME          = 'lisk_counter';
 
   private $dirtyFields                      = array();
   private $missingFields                    = array();
   private static $processIsolationLevel     = 0;
   private static $transactionIsolationLevel = 0;
 
   private $ephemeral = false;
 
   private static $connections       = array();
 
   private $inSet = null;
 
   protected $id;
   protected $phid;
   protected $dateCreated;
   protected $dateModified;
 
   /**
    *  Build an empty object.
    *
    *  @return obj Empty object.
    */
   public function __construct() {
     $id_key = $this->getIDKey();
     if ($id_key) {
       $this->$id_key = null;
     }
 
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $this->resetDirtyFields();
     }
   }
 
 
 /* -(  Managing Connections  )----------------------------------------------- */
 
 
   /**
    * Establish a live connection to a database service. This method should
    * return a new connection. Lisk handles connection caching and management;
    * do not perform caching deeper in the stack.
    *
    * @param string Mode, either 'r' (reading) or 'w' (reading and writing).
    * @return AphrontDatabaseConnection New database connection.
    * @task conn
    */
   abstract protected function establishLiveConnection($mode);
 
 
   /**
    * Return a namespace for this object's connections in the connection cache.
    * Generally, the database name is appropriate. Two connections are considered
    * equivalent if they have the same connection namespace and mode.
    *
    * @return string Connection namespace for cache
    * @task conn
    */
   abstract protected function getConnectionNamespace();
 
 
   /**
    * Get an existing, cached connection for this object.
    *
    * @param mode Connection mode.
    * @return AprontDatabaseConnection|null  Connection, if it exists in cache.
    * @task conn
    */
   protected function getEstablishedConnection($mode) {
     $key = $this->getConnectionNamespace().':'.$mode;
     if (isset(self::$connections[$key])) {
       return self::$connections[$key];
     }
     return null;
   }
 
 
   /**
    * Store a connection in the connection cache.
    *
    * @param mode Connection mode.
    * @param AphrontDatabaseConnection Connection to cache.
    * @return this
    * @task conn
    */
   protected function setEstablishedConnection(
     $mode,
     AphrontDatabaseConnection $connection,
     $force_unique = false) {
 
     $key = $this->getConnectionNamespace().':'.$mode;
 
     if ($force_unique) {
       $key .= ':unique';
       while (isset(self::$connections[$key])) {
         $key .= '!';
       }
     }
 
     self::$connections[$key] = $connection;
     return $this;
   }
 
 
 /* -(  Configuring Lisk  )--------------------------------------------------- */
 
 
   /**
    * Change Lisk behaviors, like ID configuration and timestamps. If you want
    * to change these behaviors, you should override this method in your child
    * class and change the options you're interested in. For example:
    *
    *   public function getConfiguration() {
    *     return array(
    *       Lisk_DataAccessObject::CONFIG_EXAMPLE => true,
    *     ) + parent::getConfiguration();
    *   }
    *
    * The available options are:
    *
    * CONFIG_IDS
    * Lisk objects need to have a unique identifying ID. The three mechanisms
    * available for generating this ID are IDS_AUTOINCREMENT (default, assumes
    * the ID column is an autoincrement primary key), IDS_MANUAL (you are taking
    * full responsibility for ID management), or IDS_COUNTER (see below).
    *
    * InnoDB does not persist the value of `auto_increment` across restarts,
    * and instead initializes it to `MAX(id) + 1` during startup. This means it
    * may reissue the same autoincrement ID more than once, if the row is deleted
    * and then the database is restarted. To avoid this, you can set an object to
    * use a counter table with IDS_COUNTER. This will generally behave like
    * IDS_AUTOINCREMENT, except that the counter value will persist across
    * restarts and inserts will be slightly slower. If a database stores any
    * DAOs which use this mechanism, you must create a table there with this
    * schema:
    *
    *   CREATE TABLE lisk_counter (
    *     counterName VARCHAR(64) COLLATE utf8_bin PRIMARY KEY,
    *     counterValue BIGINT UNSIGNED NOT NULL
    *   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    *
    * CONFIG_TIMESTAMPS
    * Lisk can automatically handle keeping track of a `dateCreated' and
    * `dateModified' column, which it will update when it creates or modifies
    * an object. If you don't want to do this, you may disable this option.
    * By default, this option is ON.
    *
    * CONFIG_AUX_PHID
    * This option can be enabled by being set to some truthy value. The meaning
    * of this value is defined by your PHID generation mechanism. If this option
    * is enabled, a `phid' property will be populated with a unique PHID when an
    * object is created (or if it is saved and does not currently have one). You
    * need to override generatePHID() and hook it into your PHID generation
    * mechanism for this to work. By default, this option is OFF.
    *
    * CONFIG_SERIALIZATION
    * You can optionally provide a column serialization map that will be applied
    * to values when they are written to the database. For example:
    *
    *   self::CONFIG_SERIALIZATION => array(
    *     'complex' => self::SERIALIZATION_JSON,
    *   )
    *
    * This will cause Lisk to JSON-serialize the 'complex' field before it is
    * written, and unserialize it when it is read.
    *
    * CONFIG_PARTIAL_OBJECTS
    * Sometimes, it is useful to load only some fields of an object (such as
    * when you are loading all objects of a class, but only care about a few
    * fields). Turning on this option (by setting it to a truthy value) allows
    * users of the class to create/use partial objects, but it comes with some
    * side effects: your class cannot override the setters and getters provided
    * by Lisk (use readField and writeField instead), and you should not
    * directly access or assign protected members of your class (use the getters
    * and setters).
    *
    * CONFIG_BINARY
    * You can optionally provide a map of columns to a flag indicating that
    * they store binary data. These columns will not raise an error when
    * handling binary writes.
    *
    * @return dictionary  Map of configuration options to values.
    *
    * @task   config
    */
   protected function getConfiguration() {
     return array(
       self::CONFIG_IDS                      => self::IDS_AUTOINCREMENT,
       self::CONFIG_TIMESTAMPS               => true,
       self::CONFIG_PARTIAL_OBJECTS          => false,
     );
   }
 
 
   /**
    *  Determine the setting of a configuration option for this class of objects.
    *
    *  @param  const       Option name, one of the CONFIG_* constants.
    *  @return mixed       Option value, if configured (null if unavailable).
    *
    *  @task   config
    */
   public function getConfigOption($option_name) {
     static $options = null;
 
     if (!isset($options)) {
       $options = $this->getConfiguration();
     }
 
     return idx($options, $option_name);
   }
 
 
 /* -(  Loading Objects  )---------------------------------------------------- */
 
 
   /**
    * Load an object by ID. You need to invoke this as an instance method, not
    * a class method, because PHP doesn't have late static binding (until
    * PHP 5.3.0). For example:
    *
    *   $dog = id(new Dog())->load($dog_id);
    *
    * @param  int       Numeric ID identifying the object to load.
    * @return obj|null  Identified object, or null if it does not exist.
    *
    * @task   load
    */
   public function load($id) {
     if (is_object($id)) {
       $id = (string)$id;
     }
 
     if (!$id || (!is_int($id) && !ctype_digit($id))) {
       return null;
     }
 
     return $this->loadOneWhere(
       '%C = %d',
       $this->getIDKeyForUse(),
       $id);
   }
 
 
   /**
    * Loads all of the objects, unconditionally.
    *
    * @return dict    Dictionary of all persisted objects of this type, keyed
    *                 on object ID.
    *
    * @task   load
    */
   public function loadAll() {
     return $this->loadAllWhere('1 = 1');
   }
 
   /**
    * Loads all objects, but only fetches the specified columns.
    *
    * @param  array  Array of canonical column names as strings
    * @return dict   Dictionary of all objects, keyed by ID.
    *
    * @task   load
    */
   public function loadColumns(array $columns) {
     return $this->loadColumnsWhere($columns, '1 = 1');
   }
 
 
   /**
    * Load all objects which match a WHERE clause. You provide everything after
    * the 'WHERE'; Lisk handles everything up to it. For example:
    *
    *   $old_dogs = id(new Dog())->loadAllWhere('age > %d', 7);
    *
    * The pattern and arguments are as per queryfx().
    *
    * @param  string  queryfx()-style SQL WHERE clause.
    * @param  ...     Zero or more conversions.
    * @return dict    Dictionary of matching objects, keyed on ID.
    *
    * @task   load
    */
   public function loadAllWhere($pattern/* , $arg, $arg, $arg ... */) {
     $args = func_get_args();
     array_unshift($args, null);
     $data = call_user_func_array(
       array($this, 'loadRawDataWhere'),
       $args);
     return $this->loadAllFromArray($data);
   }
 
   /**
    * Loads selected columns from objects that match a WHERE clause. You must
    * provide everything after the WHERE. See loadAllWhere().
    *
    * @param  array   List of column names.
    * @param  string  queryfx()-style SQL WHERE clause.
    * @param  ...     Zero or more conversions.
    * @return dict    Dictionary of matching objecks, keyed by ID.
    *
    * @task   load
    */
   public function loadColumnsWhere(array $columns, $pattern/* , $args... */) {
     if (!$this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       throw new BadMethodCallException(
-        "This class does not support partial objects.");
+        'This class does not support partial objects.');
     }
     $args = func_get_args();
     $data = call_user_func_array(
       array($this, 'loadRawDataWhere'),
       $args);
     return $this->loadAllFromArray($data);
   }
 
 
   /**
    * Load a single object identified by a 'WHERE' clause. You provide
    * everything  after the 'WHERE', and Lisk builds the first half of the
    * query. See loadAllWhere(). This method is similar, but returns a single
    * result instead of a list.
    *
    * @param  string    queryfx()-style SQL WHERE clause.
    * @param  ...       Zero or more conversions.
    * @return obj|null  Matching object, or null if no object matches.
    *
    * @task   load
    */
   public function loadOneWhere($pattern/* , $arg, $arg, $arg ... */) {
     $args = func_get_args();
     array_unshift($args, null);
     $data = call_user_func_array(
       array($this, 'loadRawDataWhere'),
       $args);
 
     if (count($data) > 1) {
       throw new AphrontQueryCountException(
-        "More than 1 result from loadOneWhere()!");
+        'More than 1 result from loadOneWhere()!');
     }
 
     $data = reset($data);
     if (!$data) {
       return null;
     }
 
     return $this->loadFromArray($data);
   }
 
 
   protected function loadRawDataWhere($columns, $pattern/* , $args... */) {
     $connection = $this->establishConnection('r');
 
     $lock_clause = '';
     if ($connection->isReadLocking()) {
       $lock_clause = 'FOR UPDATE';
     } else if ($connection->isWriteLocking()) {
       $lock_clause = 'LOCK IN SHARE MODE';
     }
 
     $args = func_get_args();
     $args = array_slice($args, 2);
 
     if (!$columns) {
       $column = '*';
     } else {
       $column = '%LC';
       $columns[] = $this->getIDKey();
 
       $properties = $this->getProperties();
       $this->missingFields = array_diff_key(
         array_flip($properties),
         array_flip($columns));
     }
 
     $pattern = 'SELECT '.$column.' FROM %T WHERE '.$pattern.' %Q';
     array_unshift($args, $this->getTableName());
     if ($columns) {
       array_unshift($args, $columns);
     }
     array_push($args, $lock_clause);
     array_unshift($args, $pattern);
 
     return call_user_func_array(
       array($connection, 'queryData'),
       $args);
   }
 
 
   /**
    * Reload an object from the database, discarding any changes to persistent
    * properties. This is primarily useful after entering a transaction but
    * before applying changes to an object.
    *
    * @return this
    *
    * @task   load
    */
   public function reload() {
 
     if (!$this->getID()) {
       throw new Exception("Unable to reload object that hasn't been loaded!");
     }
 
     $result = $this->loadOneWhere(
       '%C = %d',
       $this->getIDKeyForUse(),
       $this->getID());
 
     if (!$result) {
       throw new AphrontQueryObjectMissingException();
     }
 
     return $this;
   }
 
 
   /**
    * Initialize this object's properties from a dictionary. Generally, you
    * load single objects with loadOneWhere(), but sometimes it may be more
    * convenient to pull data from elsewhere directly (e.g., a complicated
    * join via queryData()) and then load from an array representation.
    *
    * @param  dict  Dictionary of properties, which should be equivalent to
    *               selecting a row from the table or calling getProperties().
    * @return this
    *
    * @task   load
    */
   public function loadFromArray(array $row) {
     static $valid_properties = array();
 
     $map = array();
     foreach ($row as $k => $v) {
       // We permit (but ignore) extra properties in the array because a
       // common approach to building the array is to issue a raw SELECT query
       // which may include extra explicit columns or joins.
 
       // This pathway is very hot on some pages, so we're inlining a cache
       // and doing some microoptimization to avoid a strtolower() call for each
       // assignment. The common path (assigning a valid property which we've
       // already seen) always incurs only one empty(). The second most common
       // path (assigning an invalid property which we've already seen) costs
       // an empty() plus an isset().
 
       if (empty($valid_properties[$k])) {
         if (isset($valid_properties[$k])) {
           // The value is set but empty, which means it's false, so we've
           // already determined it's not valid. We don't need to check again.
           continue;
         }
         $valid_properties[$k] = $this->hasProperty($k);
         if (!$valid_properties[$k]) {
           continue;
         }
       }
 
       $map[$k] = $v;
     }
 
     $this->willReadData($map);
 
     foreach ($map as $prop => $value) {
       $this->$prop = $value;
     }
 
     $this->didReadData();
 
     return $this;
   }
 
 
   /**
    * Initialize a list of objects from a list of dictionaries. Usually you
    * load lists of objects with loadAllWhere(), but sometimes that isn't
    * flexible enough. One case is if you need to do joins to select the right
    * objects:
    *
    *   function loadAllWithOwner($owner) {
    *     $data = $this->queryData(
    *       'SELECT d.*
    *         FROM owner o
    *           JOIN owner_has_dog od ON o.id = od.ownerID
    *           JOIN dog d ON od.dogID = d.id
    *         WHERE o.id = %d',
    *       $owner);
    *     return $this->loadAllFromArray($data);
    *   }
    *
    * This is a lot messier than loadAllWhere(), but more flexible.
    *
    * @param  list  List of property dictionaries.
    * @return dict  List of constructed objects, keyed on ID.
    *
    * @task   load
    */
   public function loadAllFromArray(array $rows) {
     $result = array();
 
     $id_key = $this->getIDKey();
 
     foreach ($rows as $row) {
       $obj = clone $this;
       if ($id_key && isset($row[$id_key])) {
         $result[$row[$id_key]] = $obj->loadFromArray($row);
       } else {
         $result[] = $obj->loadFromArray($row);
       }
       if ($this->inSet) {
         $this->inSet->addToSet($obj);
       }
     }
 
     return $result;
   }
 
   /**
    * This method helps to prevent the 1+N queries problem. It happens when you
    * execute a query for each row in a result set. Like in this code:
    *
    *   COUNTEREXAMPLE, name=Easy to write but expensive to execute
    *   $diffs = id(new DifferentialDiff())->loadAllWhere(
    *     'revisionID = %d',
    *     $revision->getID());
    *   foreach ($diffs as $diff) {
    *     $changesets = id(new DifferentialChangeset())->loadAllWhere(
    *       'diffID = %d',
    *       $diff->getID());
    *     // Do something with $changesets.
    *   }
    *
    * One can solve this problem by reading all the dependent objects at once and
    * assigning them later:
    *
    *   COUNTEREXAMPLE, name=Cheaper to execute but harder to write and maintain
    *   $diffs = id(new DifferentialDiff())->loadAllWhere(
    *     'revisionID = %d',
    *     $revision->getID());
    *   $all_changesets = id(new DifferentialChangeset())->loadAllWhere(
    *     'diffID IN (%Ld)',
    *     mpull($diffs, 'getID'));
    *   $all_changesets = mgroup($all_changesets, 'getDiffID');
    *   foreach ($diffs as $diff) {
    *     $changesets = idx($all_changesets, $diff->getID(), array());
    *     // Do something with $changesets.
    *   }
    *
    * The method @{method:loadRelatives} abstracts this approach which allows
    * writing a code which is simple and efficient at the same time:
    *
    *   name=Easy to write and cheap to execute
    *   $diffs = $revision->loadRelatives(new DifferentialDiff(), 'revisionID');
    *   foreach ($diffs as $diff) {
    *     $changesets = $diff->loadRelatives(
    *       new DifferentialChangeset(),
    *       'diffID');
    *     // Do something with $changesets.
    *   }
    *
    * This will load dependent objects for all diffs in the first call of
    * @{method:loadRelatives} and use this result for all following calls.
    *
    * The method supports working with set of sets, like in this code:
    *
    *   $diffs = $revision->loadRelatives(new DifferentialDiff(), 'revisionID');
    *   foreach ($diffs as $diff) {
    *     $changesets = $diff->loadRelatives(
    *       new DifferentialChangeset(),
    *       'diffID');
    *     foreach ($changesets as $changeset) {
    *       $hunks = $changeset->loadRelatives(
    *         new DifferentialHunk(),
    *         'changesetID');
    *       // Do something with hunks.
    *     }
    *   }
    *
    * This code will execute just three queries - one to load all diffs, one to
    * load all their related changesets and one to load all their related hunks.
    * You can try to write an equivalent code without using this method as
    * a homework.
    *
    * The method also supports retrieving referenced objects, for example authors
    * of all diffs (using shortcut @{method:loadOneRelative}):
    *
    *   foreach ($diffs as $diff) {
    *     $author = $diff->loadOneRelative(
    *       new PhabricatorUser(),
    *       'phid',
    *       'getAuthorPHID');
    *     // Do something with author.
    *   }
    *
    * It is also possible to specify additional conditions for the `WHERE`
    * clause. Similarly to @{method:loadAllWhere}, you can specify everything
    * after `WHERE` (except `LIMIT`). Contrary to @{method:loadAllWhere}, it is
    * allowed to pass only a constant string (`%` doesn't have a special
    * meaning). This is intentional to avoid mistakes with using data from one
    * row in retrieving other rows. Example of a correct usage:
    *
    *   $status = $author->loadOneRelative(
    *     new PhabricatorCalendarEvent(),
    *     'userPHID',
    *     'getPHID',
    *     '(UNIX_TIMESTAMP() BETWEEN dateFrom AND dateTo)');
    *
    * @param  LiskDAO  Type of objects to load.
    * @param  string   Name of the column in target table.
    * @param  string   Method name in this table.
    * @param  string   Additional constraints on returned rows. It supports no
    *                  placeholders and requires putting the WHERE part into
    *                  parentheses. It's not possible to use LIMIT.
    * @return list     Objects of type $object.
    *
    * @task   load
    */
   public function loadRelatives(
     LiskDAO $object,
     $foreign_column,
     $key_method = 'getID',
     $where = '') {
 
     if (!$this->inSet) {
       id(new LiskDAOSet())->addToSet($this);
     }
     $relatives = $this->inSet->loadRelatives(
       $object,
       $foreign_column,
       $key_method,
       $where);
     return idx($relatives, $this->$key_method(), array());
   }
 
   /**
    * Load referenced row. See @{method:loadRelatives} for details.
    *
    * @param  LiskDAO  Type of objects to load.
    * @param  string   Name of the column in target table.
    * @param  string   Method name in this table.
    * @param  string   Additional constraints on returned rows. It supports no
    *                  placeholders and requires putting the WHERE part into
    *                  parentheses. It's not possible to use LIMIT.
    * @return LiskDAO  Object of type $object or null if there's no such object.
    *
    * @task   load
    */
   final public function loadOneRelative(
     LiskDAO $object,
     $foreign_column,
     $key_method = 'getID',
     $where = '') {
 
     $relatives = $this->loadRelatives(
       $object,
       $foreign_column,
       $key_method,
       $where);
 
     if (!$relatives) {
       return null;
     }
 
     if (count($relatives) > 1) {
       throw new AphrontQueryCountException(
-        "More than 1 result from loadOneRelative()!");
+        'More than 1 result from loadOneRelative()!');
     }
 
     return reset($relatives);
   }
 
   final public function putInSet(LiskDAOSet $set) {
     $this->inSet = $set;
     return $this;
   }
 
   final protected function getInSet() {
     return $this->inSet;
   }
 
 
 /* -(  Examining Objects  )-------------------------------------------------- */
 
 
   /**
    * Set unique ID identifying this object. You normally don't need to call this
    * method unless with `IDS_MANUAL`.
    *
    * @param  mixed   Unique ID.
    * @return this
    * @task   save
    */
   public function setID($id) {
     static $id_key = null;
     if ($id_key === null) {
       $id_key = $this->getIDKeyForUse();
     }
     $this->$id_key = $id;
     return $this;
   }
 
 
   /**
    * Retrieve the unique ID identifying this object. This value will be null if
    * the object hasn't been persisted and you didn't set it manually.
    *
    * @return mixed   Unique ID.
    *
    * @task   info
    */
   public function getID() {
     static $id_key = null;
     if ($id_key === null) {
       $id_key = $this->getIDKeyForUse();
     }
     return $this->$id_key;
   }
 
 
   public function getPHID() {
     return $this->phid;
   }
 
 
   /**
    * Test if a property exists.
    *
    * @param   string    Property name.
    * @return  bool      True if the property exists.
    * @task info
    */
   public function hasProperty($property) {
     return (bool)$this->checkProperty($property);
   }
 
 
   /**
    * Retrieve a list of all object properties. This list only includes
    * properties that are declared as protected, and it is expected that
    * all properties returned by this function should be persisted to the
    * database.
    * Properties that should not be persisted must be declared as private.
    *
    * @return dict  Dictionary of normalized (lowercase) to canonical (original
    *               case) property names.
    *
    * @task   info
    */
   protected function getProperties() {
     static $properties = null;
     if (!isset($properties)) {
       $class = new ReflectionClass(get_class($this));
       $properties = array();
       foreach ($class->getProperties(ReflectionProperty::IS_PROTECTED) as $p) {
         $properties[strtolower($p->getName())] = $p->getName();
       }
 
       $id_key = $this->getIDKey();
       if ($id_key != 'id') {
         unset($properties['id']);
       }
 
       if (!$this->getConfigOption(self::CONFIG_TIMESTAMPS)) {
         unset($properties['datecreated']);
         unset($properties['datemodified']);
       }
 
       if ($id_key != 'phid' && !$this->getConfigOption(self::CONFIG_AUX_PHID)) {
         unset($properties['phid']);
       }
     }
     return $properties;
   }
 
 
   /**
    * Check if a property exists on this object.
    *
    * @return string|null   Canonical property name, or null if the property
    *                       does not exist.
    *
    * @task   info
    */
   protected function checkProperty($property) {
     static $properties = null;
     if ($properties === null) {
       $properties = $this->getProperties();
     }
 
     $property = strtolower($property);
     if (empty($properties[$property])) {
       return null;
     }
 
     return $properties[$property];
   }
 
 
   /**
    * Get or build the database connection for this object.
    *
    * @param  string 'r' for read, 'w' for read/write.
    * @param  bool True to force a new connection. The connection will not
    *              be retrieved from or saved into the connection cache.
    * @return LiskDatabaseConnection   Lisk connection object.
    *
    * @task   info
    */
   public function establishConnection($mode, $force_new = false) {
     if ($mode != 'r' && $mode != 'w') {
       throw new Exception("Unknown mode '{$mode}', should be 'r' or 'w'.");
     }
 
     if (self::shouldIsolateAllLiskEffectsToCurrentProcess()) {
       $mode = 'isolate-'.$mode;
 
       $connection = $this->getEstablishedConnection($mode);
       if (!$connection) {
         $connection = $this->establishIsolatedConnection($mode);
         $this->setEstablishedConnection($mode, $connection);
       }
 
       return $connection;
     }
 
     if (self::shouldIsolateAllLiskEffectsToTransactions()) {
       // If we're doing fixture transaction isolation, force the mode to 'w'
       // so we always get the same connection for reads and writes, and thus
       // can see the writes inside the transaction.
       $mode = 'w';
     }
 
     // TODO: There is currently no protection on 'r' queries against writing.
 
     $connection = null;
     if (!$force_new) {
       if ($mode == 'r') {
         // If we're requesting a read connection but already have a write
         // connection, reuse the write connection so that reads can take place
         // inside transactions.
         $connection = $this->getEstablishedConnection('w');
       }
 
       if (!$connection) {
         $connection = $this->getEstablishedConnection($mode);
       }
     }
 
     if (!$connection) {
       $connection = $this->establishLiveConnection($mode);
       if (self::shouldIsolateAllLiskEffectsToTransactions()) {
         $connection->openTransaction();
       }
       $this->setEstablishedConnection(
         $mode,
         $connection,
         $force_unique = $force_new);
     }
 
     return $connection;
   }
 
 
   /**
    * Convert this object into a property dictionary. This dictionary can be
    * restored into an object by using loadFromArray() (unless you're using
    * legacy features with CONFIG_CONVERT_CAMELCASE, but in that case you should
    * just go ahead and die in a fire).
    *
    * @return dict  Dictionary of object properties.
    *
    * @task   info
    */
   protected function getPropertyValues() {
     $map = array();
     foreach ($this->getProperties() as $p) {
       // We may receive a warning here for properties we've implicitly added
       // through configuration; squelch it.
       $map[$p] = @$this->$p;
     }
     return $map;
   }
 
 
 /* -(  Writing Objects  )---------------------------------------------------- */
 
 
   /**
    * Make an object read-only.
    *
    * Making an object ephemeral indicates that you will be changing state in
    * such a way that you would never ever want it to be written back to the
    * storage.
    */
   public function makeEphemeral() {
     $this->ephemeral = true;
     return $this;
   }
 
   private function isEphemeralCheck() {
     if ($this->ephemeral) {
       throw new LiskEphemeralObjectException();
     }
   }
 
   /**
    * Persist this object to the database. In most cases, this is the only
    * method you need to call to do writes. If the object has not yet been
    * inserted this will do an insert; if it has, it will do an update.
    *
    * @return this
    *
    * @task   save
    */
   public function save() {
     if ($this->shouldInsertWhenSaved()) {
       return $this->insert();
     } else {
       return $this->update();
     }
   }
 
 
   /**
    * Save this object, forcing the query to use REPLACE regardless of object
    * state.
    *
    * @return this
    *
    * @task   save
    */
   public function replace() {
     $this->isEphemeralCheck();
     return $this->insertRecordIntoDatabase('REPLACE');
   }
 
 
   /**
    *  Save this object, forcing the query to use INSERT regardless of object
    *  state.
    *
    *  @return this
    *
    *  @task   save
    */
   public function insert() {
     $this->isEphemeralCheck();
     return $this->insertRecordIntoDatabase('INSERT');
   }
 
 
   /**
    *  Save this object, forcing the query to use UPDATE regardless of object
    *  state.
    *
    *  @return this
    *
    *  @task   save
    */
   public function update() {
     $this->isEphemeralCheck();
 
     $this->willSaveObject();
     $data = $this->getPropertyValues();
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $data = array_intersect_key($data, $this->dirtyFields);
     }
     $this->willWriteData($data);
 
     $map = array();
     foreach ($data as $k => $v) {
       $map[$k] = $v;
     }
 
     $conn = $this->establishConnection('w');
     $binary = $this->getBinaryColumns();
 
     foreach ($map as $key => $value) {
       if (!empty($binary[$key])) {
         $map[$key] = qsprintf($conn, '%C = %nB', $key, $value);
       } else {
         $map[$key] = qsprintf($conn, '%C = %ns', $key, $value);
       }
     }
     $map = implode(', ', $map);
 
     $id = $this->getID();
     $conn->query(
       'UPDATE %T SET %Q WHERE %C = '.(is_int($id) ? '%d' : '%s'),
       $this->getTableName(),
       $map,
       $this->getIDKeyForUse(),
       $id);
     // We can't detect a missing object because updating an object without
     // changing any values doesn't affect rows. We could jiggle timestamps
     // to catch this for objects which track them if we wanted.
 
     $this->didWriteData();
 
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $this->resetDirtyFields();
     }
 
     return $this;
   }
 
 
   /**
    * Delete this object, permanently.
    *
    * @return this
    *
    * @task   save
    */
   public function delete() {
     $this->isEphemeralCheck();
     $this->willDelete();
 
     $conn = $this->establishConnection('w');
     $conn->query(
       'DELETE FROM %T WHERE %C = %d',
       $this->getTableName(),
       $this->getIDKeyForUse(),
       $this->getID());
 
     $this->didDelete();
 
     return $this;
   }
 
   /**
    * Internal implementation of INSERT and REPLACE.
    *
    * @param  const   Either "INSERT" or "REPLACE", to force the desired mode.
    *
    * @task   save
    */
   protected function insertRecordIntoDatabase($mode) {
     $this->willSaveObject();
     $data = $this->getPropertyValues();
 
     $conn = $this->establishConnection('w');
 
     $id_mechanism = $this->getConfigOption(self::CONFIG_IDS);
     switch ($id_mechanism) {
       case self::IDS_AUTOINCREMENT:
         // If we are using autoincrement IDs, let MySQL assign the value for the
         // ID column, if it is empty. If the caller has explicitly provided a
         // value, use it.
         $id_key = $this->getIDKeyForUse();
         if (empty($data[$id_key])) {
           unset($data[$id_key]);
         }
         break;
       case self::IDS_COUNTER:
         // If we are using counter IDs, assign a new ID if we don't already have
         // one.
         $id_key = $this->getIDKeyForUse();
         if (empty($data[$id_key])) {
           $counter_name = $this->getTableName();
           $id = self::loadNextCounterID($conn, $counter_name);
           $this->setID($id);
           $data[$id_key] = $id;
         }
         break;
       case self::IDS_MANUAL:
         break;
       default:
         throw new Exception('Unknown CONFIG_IDs mechanism!');
     }
 
     $this->willWriteData($data);
 
     $columns = array_keys($data);
     $binary = $this->getBinaryColumns();
 
     foreach ($data as $key => $value) {
       try {
         if (!empty($binary[$key])) {
           $data[$key] = qsprintf($conn, '%nB', $value);
         } else {
           $data[$key] = qsprintf($conn, '%ns', $value);
         }
       } catch (AphrontQueryParameterException $parameter_exception) {
         throw new PhutilProxyException(
           pht(
             "Unable to insert or update object of class %s, field '%s' ".
             "has a nonscalar value.",
             get_class($this),
             $key),
           $parameter_exception);
       }
     }
     $data = implode(', ', $data);
 
     $conn->query(
       '%Q INTO %T (%LC) VALUES (%Q)',
       $mode,
       $this->getTableName(),
       $columns,
       $data);
 
     // Only use the insert id if this table is using auto-increment ids
     if ($id_mechanism === self::IDS_AUTOINCREMENT) {
       $this->setID($conn->getInsertID());
     }
 
     $this->didWriteData();
 
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $this->resetDirtyFields();
     }
 
     return $this;
   }
 
 
   /**
    * Method used to determine whether to insert or update when saving.
    *
    * @return bool true if the record should be inserted
    */
   protected function shouldInsertWhenSaved() {
     $key_type = $this->getConfigOption(self::CONFIG_IDS);
 
     if ($key_type == self::IDS_MANUAL) {
       throw new Exception(
         'You are using manual IDs. You must override the '.
         'shouldInsertWhenSaved() method to properly detect '.
         'when to insert a new record.');
     } else {
       return !$this->getID();
     }
   }
 
 
 /* -(  Hooks and Callbacks  )------------------------------------------------ */
 
 
   /**
    * Retrieve the database table name. By default, this is the class name.
    *
    * @return string  Table name for object storage.
    *
    * @task   hook
    */
   public function getTableName() {
     return get_class($this);
   }
 
 
   /**
    * Retrieve the primary key column, "id" by default. If you can not
    * reasonably name your ID column "id", override this method.
    *
    * @return string  Name of the ID column.
    *
    * @task   hook
    */
   public function getIDKey() {
     return 'id';
   }
 
 
   protected function getIDKeyForUse() {
     $id_key = $this->getIDKey();
     if (!$id_key) {
       throw new Exception(
-        "This DAO does not have a single-part primary key. The method you ".
-        "called requires a single-part primary key.");
+        'This DAO does not have a single-part primary key. The method you '.
+        'called requires a single-part primary key.');
     }
     return $id_key;
   }
 
 
   /**
    * Generate a new PHID, used by CONFIG_AUX_PHID.
    *
    * @return phid    Unique, newly allocated PHID.
    *
    * @task   hook
    */
   protected function generatePHID() {
     throw new Exception(
-      "To use CONFIG_AUX_PHID, you need to overload ".
-      "generatePHID() to perform PHID generation.");
+      'To use CONFIG_AUX_PHID, you need to overload '.
+      'generatePHID() to perform PHID generation.');
   }
 
 
   /**
    * Hook to apply serialization or validation to data before it is written to
    * the database. See also willReadData().
    *
    * @task hook
    */
   protected function willWriteData(array &$data) {
     $this->applyLiskDataSerialization($data, false);
   }
 
 
   /**
    * Hook to perform actions after data has been written to the database.
    *
    * @task hook
    */
   protected function didWriteData() {}
 
 
   /**
    * Hook to make internal object state changes prior to INSERT, REPLACE or
    * UPDATE.
    *
    * @task hook
    */
   protected function willSaveObject() {
     $use_timestamps = $this->getConfigOption(self::CONFIG_TIMESTAMPS);
 
     if ($use_timestamps) {
       if (!$this->getDateCreated()) {
         $this->setDateCreated(time());
       }
       $this->setDateModified(time());
     }
 
     if ($this->getConfigOption(self::CONFIG_AUX_PHID) && !$this->getPHID()) {
       $this->setPHID($this->generatePHID());
     }
   }
 
 
   /**
    * Hook to apply serialization or validation to data as it is read from the
    * database. See also willWriteData().
    *
    * @task hook
    */
   protected function willReadData(array &$data) {
     $this->applyLiskDataSerialization($data, $deserialize = true);
   }
 
   /**
    * Hook to perform an action on data after it is read from the database.
    *
    * @task hook
    */
   protected function didReadData() {}
 
   /**
    * Hook to perform an action before the deletion of an object.
    *
    * @task hook
    */
   protected function willDelete() {}
 
   /**
    * Hook to perform an action after the deletion of an object.
    *
    * @task hook
    */
   protected function didDelete() {}
 
   /**
    * Reads the value from a field. Override this method for custom behavior
    * of getField() instead of overriding getField directly.
    *
    * @param  string  Canonical field name
    * @return mixed   Value of the field
    *
    * @task hook
    */
   protected function readField($field) {
     if (isset($this->$field)) {
       return $this->$field;
     }
     return null;
   }
 
   /**
    * Writes a value to a field. Override this method for custom behavior of
    * setField($value) instead of overriding setField directly.
    *
    * @param  string  Canonical field name
    * @param  mixed   Value to write
    *
    * @task hook
    */
   protected function writeField($field, $value) {
     $this->$field = $value;
   }
 
 
 /* -(  Manging Transactions  )----------------------------------------------- */
 
 
   /**
    * Increase transaction stack depth.
    *
    * @return this
    */
   public function openTransaction() {
     $this->establishConnection('w')->openTransaction();
     return $this;
   }
 
 
   /**
    * Decrease transaction stack depth, saving work.
    *
    * @return this
    */
   public function saveTransaction() {
     $this->establishConnection('w')->saveTransaction();
     return $this;
   }
 
 
   /**
    * Decrease transaction stack depth, discarding work.
    *
    * @return this
    */
   public function killTransaction() {
     $this->establishConnection('w')->killTransaction();
     return $this;
   }
 
 
   /**
    * Begins read-locking selected rows with SELECT ... FOR UPDATE, so that
    * other connections can not read them (this is an enormous oversimplification
    * of FOR UPDATE semantics; consult the MySQL documentation for details). To
    * end read locking, call @{method:endReadLocking}. For example:
    *
    *   $beach->openTransaction();
    *     $beach->beginReadLocking();
    *
    *       $beach->reload();
    *       $beach->setGrainsOfSand($beach->getGrainsOfSand() + 1);
    *       $beach->save();
    *
    *     $beach->endReadLocking();
    *   $beach->saveTransaction();
    *
    * @return this
    * @task xaction
    */
   public function beginReadLocking() {
     $this->establishConnection('w')->beginReadLocking();
     return $this;
   }
 
 
   /**
    * Ends read-locking that began at an earlier @{method:beginReadLocking} call.
    *
    * @return this
    * @task xaction
    */
   public function endReadLocking() {
     $this->establishConnection('w')->endReadLocking();
     return $this;
   }
 
   /**
    * Begins write-locking selected rows with SELECT ... LOCK IN SHARE MODE, so
    * that other connections can not update or delete them (this is an
    * oversimplification of LOCK IN SHARE MODE semantics; consult the
    * MySQL documentation for details). To end write locking, call
    * @{method:endWriteLocking}.
    *
    * @return this
    * @task xaction
    */
   public function beginWriteLocking() {
     $this->establishConnection('w')->beginWriteLocking();
     return $this;
   }
 
 
   /**
    * Ends write-locking that began at an earlier @{method:beginWriteLocking}
    * call.
    *
    * @return this
    * @task xaction
    */
   public function endWriteLocking() {
     $this->establishConnection('w')->endWriteLocking();
     return $this;
   }
 
 
 /* -(  Isolation  )---------------------------------------------------------- */
 
 
   /**
    * @task isolate
    */
   public static function beginIsolateAllLiskEffectsToCurrentProcess() {
     self::$processIsolationLevel++;
   }
 
   /**
    * @task isolate
    */
   public static function endIsolateAllLiskEffectsToCurrentProcess() {
     self::$processIsolationLevel--;
     if (self::$processIsolationLevel < 0) {
       throw new Exception(
-        "Lisk process isolation level was reduced below 0.");
+        'Lisk process isolation level was reduced below 0.');
     }
   }
 
   /**
    * @task isolate
    */
   public static function shouldIsolateAllLiskEffectsToCurrentProcess() {
     return (bool)self::$processIsolationLevel;
   }
 
   /**
    * @task isolate
    */
   private function establishIsolatedConnection($mode) {
     $config = array();
     return new AphrontIsolatedDatabaseConnection($config);
   }
 
   /**
    * @task isolate
    */
   public static function beginIsolateAllLiskEffectsToTransactions() {
     if (self::$transactionIsolationLevel === 0) {
       self::closeAllConnections();
     }
     self::$transactionIsolationLevel++;
   }
 
   /**
    * @task isolate
    */
   public static function endIsolateAllLiskEffectsToTransactions() {
     self::$transactionIsolationLevel--;
     if (self::$transactionIsolationLevel < 0) {
       throw new Exception(
-        "Lisk transaction isolation level was reduced below 0.");
+        'Lisk transaction isolation level was reduced below 0.');
     } else if (self::$transactionIsolationLevel == 0) {
       foreach (self::$connections as $key => $conn) {
         if ($conn) {
           $conn->killTransaction();
         }
       }
       self::closeAllConnections();
     }
   }
 
   /**
    * @task isolate
    */
   public static function shouldIsolateAllLiskEffectsToTransactions() {
     return (bool)self::$transactionIsolationLevel;
   }
 
   public static function closeAllConnections() {
     self::$connections = array();
   }
 
 /* -(  Utilities  )---------------------------------------------------------- */
 
 
   /**
    * Applies configured serialization to a dictionary of values.
    *
    * @task util
    */
   protected function applyLiskDataSerialization(array &$data, $deserialize) {
     $serialization = $this->getConfigOption(self::CONFIG_SERIALIZATION);
     if ($serialization) {
       foreach (array_intersect_key($serialization, $data) as $col => $format) {
         switch ($format) {
           case self::SERIALIZATION_NONE:
             break;
           case self::SERIALIZATION_PHP:
             if ($deserialize) {
               $data[$col] = unserialize($data[$col]);
             } else {
               $data[$col] = serialize($data[$col]);
             }
             break;
           case self::SERIALIZATION_JSON:
             if ($deserialize) {
               $data[$col] = json_decode($data[$col], true);
             } else {
               $data[$col] = json_encode($data[$col]);
             }
             break;
           default:
             throw new Exception("Unknown serialization format '{$format}'.");
         }
       }
     }
   }
 
   /**
    * Resets the dirty fields (fields which need to be written on next save/
    * update/insert/replace). If this DAO has timestamps, the modified time
    * is always a dirty field.
    *
    * @task util
    */
   private function resetDirtyFields() {
     $this->dirtyFields = array();
     if ($this->getConfigOption(self::CONFIG_TIMESTAMPS)) {
       $this->dirtyFields['dateModified'] = true;
     }
   }
 
   /**
    * Black magic. Builds implied get*() and set*() for all properties.
    *
    * @param  string  Method name.
    * @param  list    Argument vector.
    * @return mixed   get*() methods return the property value. set*() methods
    *                 return $this.
    * @task   util
    */
   public function __call($method, $args) {
 
     // NOTE: PHP has a bug that static variables defined in __call() are shared
     // across all children classes. Call a different method to work around this
     // bug.
     return $this->call($method, $args);
   }
 
   /**
    * @task   util
    */
   final protected function call($method, $args) {
     // NOTE: This method is very performance-sensitive (many thousands of calls
     // per page on some pages), and thus has some silliness in the name of
     // optimizations.
 
     static $dispatch_map = array();
     static $partial = null;
     if ($partial === null) {
       $partial = $this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS);
     }
 
     if ($method[0] === 'g') {
       if (isset($dispatch_map[$method])) {
         $property = $dispatch_map[$method];
       } else {
         if (substr($method, 0, 3) !== 'get') {
           throw new Exception("Unable to resolve method '{$method}'!");
         }
         $property = substr($method, 3);
         if (!($property = $this->checkProperty($property))) {
           throw new Exception("Bad getter call: {$method}");
         }
         $dispatch_map[$method] = $property;
       }
 
       if ($partial && isset($this->missingFields[$property])) {
         throw new Exception("Cannot get field that wasn't loaded: {$property}");
       }
 
       return $this->readField($property);
     }
 
     if ($method[0] === 's') {
       if (isset($dispatch_map[$method])) {
         $property = $dispatch_map[$method];
       } else {
         if (substr($method, 0, 3) !== 'set') {
           throw new Exception("Unable to resolve method '{$method}'!");
         }
         $property = substr($method, 3);
         $property = $this->checkProperty($property);
         if (!$property) {
           throw new Exception("Bad setter call: {$method}");
         }
         $dispatch_map[$method] = $property;
       }
       if ($partial) {
         // Accept writes to fields that weren't initially loaded
         unset($this->missingFields[$property]);
         $this->dirtyFields[$property] = true;
       }
 
       $this->writeField($property, $args[0]);
 
       return $this;
     }
 
     throw new Exception("Unable to resolve method '{$method}'.");
   }
 
   /**
    * Warns against writing to undeclared property.
    *
    * @task   util
    */
   public function __set($name, $value) {
     phlog('Wrote to undeclared property '.get_class($this).'::$'.$name.'.');
     $this->$name = $value;
   }
 
   /**
    * Increments a named counter and returns the next value.
    *
    * @param   AphrontDatabaseConnection   Database where the counter resides.
    * @param   string                      Counter name to create or increment.
    * @return  int                         Next counter value.
    *
    * @task util
    */
   public static function loadNextCounterID(
     AphrontDatabaseConnection $conn_w,
     $counter_name) {
 
     // NOTE: If an insert does not touch an autoincrement row or call
     // LAST_INSERT_ID(), MySQL normally does not change the value of
     // LAST_INSERT_ID(). This can cause a counter's value to leak to a
     // new counter if the second counter is created after the first one is
     // updated. To avoid this, we insert LAST_INSERT_ID(1), to ensure the
     // LAST_INSERT_ID() is always updated and always set correctly after the
     // query completes.
 
     queryfx(
       $conn_w,
       'INSERT INTO %T (counterName, counterValue) VALUES
           (%s, LAST_INSERT_ID(1))
         ON DUPLICATE KEY UPDATE
           counterValue = LAST_INSERT_ID(counterValue + 1)',
       self::COUNTER_TABLE_NAME,
       $counter_name);
 
     return $conn_w->getInsertID();
   }
 
   private function getBinaryColumns() {
     return $this->getConfigOption(self::CONFIG_BINARY);
   }
 
 }
diff --git a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
index e9abf0496..0b96ba168 100644
--- a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
+++ b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
@@ -1,199 +1,199 @@
 <?php
 
 /**
  * @task config Configuring Storage
  */
 abstract class PhabricatorLiskDAO extends LiskDAO {
 
   private static $namespaceStack = array();
 
-  const ATTACHABLE = "<attachable>";
+  const ATTACHABLE = '<attachable>';
 
 /* -(  Configuring Storage  )------------------------------------------------ */
 
   /**
    * @task config
    */
   public static function pushStorageNamespace($namespace) {
     self::$namespaceStack[] = $namespace;
   }
 
   /**
    * @task config
    */
   public static function popStorageNamespace() {
     array_pop(self::$namespaceStack);
   }
 
   /**
    * @task config
    */
   public static function getDefaultStorageNamespace() {
     return PhabricatorEnv::getEnvConfig('storage.default-namespace');
   }
 
   /**
    * @task config
    */
   public static function getStorageNamespace() {
     $namespace = end(self::$namespaceStack);
     if (!strlen($namespace)) {
       $namespace = self::getDefaultStorageNamespace();
     }
     if (!strlen($namespace)) {
-      throw new Exception("No storage namespace configured!");
+      throw new Exception('No storage namespace configured!');
     }
     return $namespace;
   }
 
   /**
    * @task config
    */
   public function establishLiveConnection($mode) {
     $namespace = self::getStorageNamespace();
 
     $conf = PhabricatorEnv::newObjectFromConfig(
       'mysql.configuration-provider',
       array($this, $mode, $namespace));
 
     return PhabricatorEnv::newObjectFromConfig(
       'mysql.implementation',
       array(
         array(
           'user'      => $conf->getUser(),
           'pass'      => $conf->getPassword(),
           'host'      => $conf->getHost(),
           'port'      => $conf->getPort(),
           'database'  => $conf->getDatabase(),
           'retries'   => 3,
         ),
       ));
   }
 
   /**
    * @task config
    */
   public function getTableName() {
     $str = 'phabricator';
     $len = strlen($str);
 
     $class = strtolower(get_class($this));
     if (!strncmp($class, $str, $len)) {
       $class = substr($class, $len);
     }
     $app = $this->getApplicationName();
     if (!strncmp($class, $app, strlen($app))) {
       $class = substr($class, strlen($app));
     }
 
     if (strlen($class)) {
       return $app.'_'.$class;
     } else {
       return $app;
     }
   }
 
   /**
    * @task config
    */
   abstract public function getApplicationName();
 
   protected function getConnectionNamespace() {
     return self::getStorageNamespace().'_'.$this->getApplicationName();
   }
 
 
   /**
    * Break a list of escaped SQL statement fragments (e.g., VALUES lists for
    * INSERT, previously built with @{function:qsprintf}) into chunks which will
    * fit under the MySQL 'max_allowed_packet' limit.
    *
    * Chunks are glued together with `$glue`, by default ", ".
    *
    * If a statement is too large to fit within the limit, it is broken into
    * its own chunk (but might fail when the query executes).
    */
   public static function chunkSQL(
     array $fragments,
     $glue = ', ',
     $limit = null) {
 
     if ($limit === null) {
       // NOTE: Hard-code this at 1MB for now, minus a 10% safety buffer.
       // Eventually we could query MySQL or let the user configure it.
       $limit = (int)((1024 * 1024) * 0.90);
     }
 
     $result = array();
 
     $chunk = array();
     $len = 0;
     $glue_len = strlen($glue);
     foreach ($fragments as $fragment) {
       $this_len = strlen($fragment);
 
       if ($chunk) {
         // Chunks after the first also imply glue.
         $this_len += $glue_len;
       }
 
       if ($len + $this_len <= $limit) {
         $len += $this_len;
         $chunk[] = $fragment;
       } else {
         if ($chunk) {
           $result[] = $chunk;
         }
         $len = strlen($fragment);
         $chunk = array($fragment);
       }
     }
 
     if ($chunk) {
       $result[] = $chunk;
     }
 
     foreach ($result as $key => $fragment_list) {
       $result[$key] = implode($glue, $fragment_list);
     }
 
     return $result;
   }
 
   protected function assertAttached($property) {
     if ($property === self::ATTACHABLE) {
       throw new PhabricatorDataNotAttachedException($this);
     }
     return $property;
   }
 
   protected function assertAttachedKey($value, $key) {
     $this->assertAttached($value);
     if (!array_key_exists($key, $value)) {
       throw new PhabricatorDataNotAttachedException($this);
     }
     return $value[$key];
   }
 
   protected function detectEncodingForStorage($string) {
     return phutil_is_utf8($string) ? 'utf8' : null;
   }
 
   protected function getUTF8StringFromStorage($string, $encoding) {
     if ($encoding == 'utf8') {
       return $string;
     }
     return phutil_utf8ize($string);
   }
 
   public function delete() {
 
     // TODO: We should make some reasonable effort to destroy related
     // infrastructure objects here, like edges, transactions, custom field
     // storage, flags, Phrequent tracking, tokens, etc. This doesn't need to
     // be exhaustive, but we can get a lot of it pretty easily.
 
     return parent::delete();
   }
 
 }
diff --git a/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
index 0aae94d44..c65a9af3c 100644
--- a/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
+++ b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
@@ -1,133 +1,133 @@
 <?php
 
 final class LiskFixtureTestCase extends PhabricatorTestCase {
 
   public function getPhabricatorTestCaseConfiguration() {
     return array(
       self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
     );
   }
 
   public function testTransactionalIsolation1of2() {
     // NOTE: These tests are verifying that data is destroyed between tests.
     // If the user from either test persists, the other test will fail.
     $this->assertEqual(
       0,
       count(id(new HarbormasterScratchTable())->loadAll()));
 
     id(new HarbormasterScratchTable())
       ->setData('alincoln')
       ->save();
   }
 
   public function testTransactionalIsolation2of2() {
     $this->assertEqual(
       0,
       count(id(new HarbormasterScratchTable())->loadAll()));
 
     id(new HarbormasterScratchTable())
       ->setData('ugrant')
       ->save();
   }
 
   public function testFixturesBasicallyWork() {
     $this->assertEqual(
       0,
       count(id(new HarbormasterScratchTable())->loadAll()));
 
     id(new HarbormasterScratchTable())
       ->setData('gwashington')
       ->save();
 
     $this->assertEqual(
       1,
       count(id(new HarbormasterScratchTable())->loadAll()));
   }
 
   public function testReadableTransactions() {
     // TODO: When we have semi-durable fixtures, use those instead. This is
     // extremely hacky.
 
     LiskDAO::endIsolateAllLiskEffectsToTransactions();
     try {
 
       $data = Filesystem::readRandomCharacters(32);
 
       $obj = new HarbormasterScratchTable();
       $obj->openTransaction();
 
         $obj->setData($data);
         $obj->save();
 
         $loaded = id(new HarbormasterScratchTable())->loadOneWhere(
           'data = %s',
           $data);
 
       $obj->killTransaction();
 
       $this->assertTrue(
         ($loaded !== null),
-        "Reads inside transactions should have transaction visibility.");
+        'Reads inside transactions should have transaction visibility.');
 
       LiskDAO::beginIsolateAllLiskEffectsToTransactions();
     } catch (Exception $ex) {
       LiskDAO::beginIsolateAllLiskEffectsToTransactions();
       throw $ex;
     }
   }
 
   public function testGarbageLoadCalls() {
     $obj = new HarbormasterObject();
     $obj->save();
     $id = $obj->getID();
 
     $load = new HarbormasterObject();
 
     $this->assertEqual(null, $load->load(0));
     $this->assertEqual(null, $load->load(-1));
     $this->assertEqual(null, $load->load(9999));
     $this->assertEqual(null, $load->load(''));
     $this->assertEqual(null, $load->load('cow'));
-    $this->assertEqual(null, $load->load($id."cow"));
+    $this->assertEqual(null, $load->load($id.'cow'));
 
     $this->assertTrue((bool)$load->load((int)$id));
     $this->assertTrue((bool)$load->load((string)$id));
   }
 
   public function testCounters() {
     $obj = new HarbormasterObject();
     $conn_w = $obj->establishConnection('w');
 
     // Test that the counter bascially behaves as expected.
     $this->assertEqual(1, LiskDAO::loadNextCounterID($conn_w, 'a'));
     $this->assertEqual(2, LiskDAO::loadNextCounterID($conn_w, 'a'));
     $this->assertEqual(3, LiskDAO::loadNextCounterID($conn_w, 'a'));
 
     // This first insert is primarily a test that the previous LAST_INSERT_ID()
     // value does not bleed into the creation of a new counter.
     $this->assertEqual(1, LiskDAO::loadNextCounterID($conn_w, 'b'));
     $this->assertEqual(2, LiskDAO::loadNextCounterID($conn_w, 'b'));
 
     // These inserts alternate database connections. Since unit tests are
     // transactional by default, we need to break out of them or we'll deadlock
     // since the transactions don't normally close until we exit the test.
     LiskDAO::endIsolateAllLiskEffectsToTransactions();
     try {
 
       $conn_1 = $obj->establishConnection('w', $force_new = true);
       $conn_2 = $obj->establishConnection('w', $force_new = true);
 
       $this->assertEqual(1, LiskDAO::loadNextCounterID($conn_1, 'z'));
       $this->assertEqual(2, LiskDAO::loadNextCounterID($conn_2, 'z'));
       $this->assertEqual(3, LiskDAO::loadNextCounterID($conn_1, 'z'));
       $this->assertEqual(4, LiskDAO::loadNextCounterID($conn_2, 'z'));
       $this->assertEqual(5, LiskDAO::loadNextCounterID($conn_1, 'z'));
 
       LiskDAO::beginIsolateAllLiskEffectsToTransactions();
     } catch (Exception $ex) {
       LiskDAO::beginIsolateAllLiskEffectsToTransactions();
       throw $ex;
     }
   }
 
 }
diff --git a/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php
index 844f3ffc0..ad289c146 100644
--- a/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php
+++ b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php
@@ -1,110 +1,110 @@
 <?php
 
 final class LiskIsolationTestCase extends PhabricatorTestCase {
 
   public function testIsolatedWrites() {
     $dao = new LiskIsolationTestDAO();
 
     $this->assertEqual(null, $dao->getID(), 'Expect no ID.');
     $this->assertEqual(null, $dao->getPHID(), 'Expect no PHID.');
 
     $dao->save(); // Effects insert
 
     $id = $dao->getID();
     $phid = $dao->getPHID();
 
     $this->assertTrue((bool)$id, 'Expect ID generated.');
     $this->assertTrue((bool)$phid, 'Expect PHID generated.');
 
     $dao->save(); // Effects update
 
     $this->assertEqual($id, $dao->getID(), 'Expect ID unchanged.');
     $this->assertEqual($phid, $dao->getPHID(), 'Expect PHID unchanged.');
   }
 
   public function testEphemeral() {
     $dao = new LiskIsolationTestDAO();
     $dao->save();
     $dao->makeEphemeral();
 
     $this->tryTestCases(
       array(
         $dao,
       ),
       array(
         false,
       ),
       array($this, 'saveDAO'));
   }
 
   public function saveDAO($dao) {
     $dao->save();
   }
 
   public function testIsolationContainment() {
     $dao = new LiskIsolationTestDAO();
 
     try {
       $dao->establishLiveConnection('r');
 
       $this->assertFailure(
-        "LiskIsolationTestDAO did not throw an exception when instructed to ".
-        "explicitly connect to an external database.");
+        'LiskIsolationTestDAO did not throw an exception when instructed to '.
+        'explicitly connect to an external database.');
     } catch (LiskIsolationTestDAOException $ex) {
       // Expected, pass.
     }
 
     $this->assertTrue(true);
   }
 
   public function testMagicMethods() {
 
     $dao = new LiskIsolationTestDAO();
 
     $this->assertEqual(
       null,
       $dao->getName(),
       'getName() on empty object');
 
     $this->assertEqual(
       $dao,
       $dao->setName('x'),
       'setName() returns $this');
 
     $this->assertEqual(
       'y',
       $dao->setName('y')->getName(),
       'setName() has an effect');
 
     $ex = null;
     try {
       $dao->gxxName();
     } catch (Exception $thrown) {
       $ex = $thrown;
     }
     $this->assertTrue(
       (bool)$ex,
       'Typoing "get" should throw.');
 
     $ex = null;
     try {
       $dao->sxxName('z');
     } catch (Exception $thrown) {
       $ex = $thrown;
     }
     $this->assertTrue(
       (bool)$ex,
       'Typoing "set" should throw.');
 
     $ex = null;
     try {
       $dao->madeUpMethod();
     } catch (Exception $thrown) {
       $ex = $thrown;
     }
     $this->assertTrue(
       (bool)$ex,
       'Made up method should throw.');
   }
 
 }
diff --git a/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php
index 545accbe6..392978717 100644
--- a/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php
+++ b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php
@@ -1,32 +1,32 @@
 <?php
 
 final class LiskIsolationTestDAO extends LiskDAO {
 
   protected $name;
   protected $phid;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID('TISO');
   }
 
   public function establishLiveConnection($mode) {
     throw new LiskIsolationTestDAOException(
-      "Isolation failure! DAO is attempting to connect to an external ".
-      "resource!");
+      'Isolation failure! DAO is attempting to connect to an external '.
+      'resource!');
   }
 
   public function getConnectionNamespace() {
     return 'test';
   }
 
   public function getTableName() {
     return 'test';
   }
 
 }
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php
index d26625e5c..46ef6d3cf 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php
@@ -1,80 +1,80 @@
 <?php
 
 final class PhabricatorStorageManagementDestroyWorkflow
   extends PhabricatorStorageManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('destroy')
       ->setExamples('**destroy** [__options__]')
       ->setSynopsis('Permanently destroy all storage and data.')
       ->setArguments(
         array(
           array(
             'name'  => 'unittest-fixtures',
-            'help'  => "Restrict **destroy** operations to databases created ".
-                       "by PhabricatorTestCase test fixtures.",
+            'help'  => 'Restrict **destroy** operations to databases created '.
+                       'by PhabricatorTestCase test fixtures.',
           )));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $is_dry = $args->getArg('dryrun');
     $is_force = $args->getArg('force');
 
     if (!$is_dry && !$is_force) {
       echo phutil_console_wrap(
-        "Are you completely sure you really want to permanently destroy all ".
-        "storage for Phabricator data? This operation can not be undone and ".
-        "your data will not be recoverable if you proceed.");
+        'Are you completely sure you really want to permanently destroy all '.
+        'storage for Phabricator data? This operation can not be undone and '.
+        'your data will not be recoverable if you proceed.');
 
       if (!phutil_console_confirm('Permanently destroy all data?')) {
         echo "Cancelled.\n";
         exit(1);
       }
 
       if (!phutil_console_confirm('Really destroy all data forever?')) {
         echo "Cancelled.\n";
         exit(1);
       }
     }
 
     $api = $this->getAPI();
     $patches = $this->getPatches();
 
     if ($args->getArg('unittest-fixtures')) {
       $conn = $api->getConn(null);
       $databases = queryfx_all(
         $conn,
         'SELECT DISTINCT(TABLE_SCHEMA) AS db '.
         'FROM INFORMATION_SCHEMA.TABLES '.
         'WHERE TABLE_SCHEMA LIKE %>',
         PhabricatorTestCase::NAMESPACE_PREFIX);
       $databases = ipull($databases, 'db');
     } else {
       $databases = $api->getDatabaseList($patches);
       $databases[] = $api->getDatabaseName('meta_data');
       // These are legacy databases that were dropped long ago. See T2237.
       $databases[] = $api->getDatabaseName('phid');
       $databases[] = $api->getDatabaseName('directory');
     }
 
     foreach ($databases as $database) {
       if ($is_dry) {
         echo "DRYRUN: Would drop database '{$database}'.\n";
       } else {
         echo "Dropping database '{$database}'...\n";
         queryfx(
           $api->getConn(null),
           'DROP DATABASE IF EXISTS %T',
           $database);
       }
     }
 
     if (!$is_dry) {
       echo "Storage was destroyed.\n";
     }
 
     return 0;
   }
 
 }
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php
index d40d1e94a..416b3893d 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php
@@ -1,78 +1,78 @@
 <?php
 
 final class PhabricatorStorageManagementProbeWorkflow
   extends PhabricatorStorageManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('probe')
       ->setExamples('**probe**')
       ->setSynopsis('Show approximate table sizes.');
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
     $console->writeErr(
       "%s\n",
-      pht("Analyzing table sizes (this may take a moment)..."));
+      pht('Analyzing table sizes (this may take a moment)...'));
 
     $api = $this->getAPI();
     $patches = $this->getPatches();
     $databases = $api->getDatabaseList($patches, $only_living = true);
 
     $conn_r = $api->getConn(null);
 
     $data = array();
     foreach ($databases as $database) {
       queryfx($conn_r, 'USE %C', $database);
       $tables = queryfx_all(
         $conn_r,
         'SHOW TABLE STATUS');
       $tables = ipull($tables, null, 'Name');
       $data[$database] = $tables;
     }
 
     $totals = array_fill_keys(array_keys($data), 0);
     $overall = 0;
 
     foreach ($data as $db => $tables) {
       foreach ($tables as $table => $info) {
         $table_size = $info['Data_length'] + $info['Index_length'];
 
         $data[$db][$table]['_totalSize'] = $table_size;
         $totals[$db] += $table_size;
         $overall += $table_size;
       }
     }
 
-    $console->writeOut("%s\n", pht("APPROXIMATE TABLE SIZES"));
+    $console->writeOut("%s\n", pht('APPROXIMATE TABLE SIZES'));
     asort($totals);
     foreach ($totals as $db => $size) {
       $database_size = $this->formatSize($totals[$db], $overall);
       $console->writeOut(
         "**%s**\n",
-        sprintf("%-32.32s %18s", $db, $database_size));
+        sprintf('%-32.32s %18s', $db, $database_size));
       $data[$db] = isort($data[$db], '_totalSize');
       foreach ($data[$db] as $table => $info) {
         $table_size = $this->formatSize($info['_totalSize'], $overall);
         $console->writeOut(
           "%s\n",
-          sprintf("    %-28.28s %18s", $table, $table_size));
+          sprintf('    %-28.28s %18s', $table, $table_size));
       }
     }
     $overall_size = $this->formatSize($overall, $overall);
     $console->writeOut(
       "**%s**\n",
-      sprintf("%-32.32s %18s", pht('TOTAL'), $overall_size));
+      sprintf('%-32.32s %18s', pht('TOTAL'), $overall_size));
 
     return 0;
   }
 
   private function formatSize($n, $o) {
     return sprintf(
       '%8.8s MB  %5.5s%%',
       number_format($n / (1024 * 1024), 1),
       sprintf('%3.1f', 100 * ($n / $o)));
   }
 
 }
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php
index ee583e810..2a259b928 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php
@@ -1,51 +1,51 @@
 <?php
 
 final class PhabricatorStorageManagementStatusWorkflow
   extends PhabricatorStorageManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('status')
       ->setExamples('**status** [__options__]')
       ->setSynopsis('Show patch application status.');
   }
 
   public function execute(PhutilArgumentParser $args) {
     $api = $this->getAPI();
     $patches = $this->getPatches();
 
     $applied = $api->getAppliedPatches();
 
     if ($applied === null) {
       echo phutil_console_format(
         "**Database Not Initialized**: Run **storage upgrade** to ".
         "initialize.\n");
 
       return 1;
     }
 
     $len = 0;
     foreach ($patches as $patch) {
       $len = max($len, strlen($patch->getFullKey()));
     }
 
     foreach ($patches as $patch) {
       printf(
 
         "% -".($len + 2)."s ".
-        "%-".strlen("Not Applied")."s   ".
+        "%-".strlen('Not Applied')."s   ".
         "%-4s   ".
         "%s\n",
 
         $patch->getFullKey(),
         in_array($patch->getFullKey(), $applied)
           ? 'Applied'
           : 'Not Applied',
         $patch->getType(),
         $patch->getName());
     }
 
     return 0;
   }
 
 }
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
index 86f35882c..8479a4e92 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
@@ -1,193 +1,193 @@
 <?php
 
 final class PhabricatorStorageManagementUpgradeWorkflow
   extends PhabricatorStorageManagementWorkflow {
 
   public function didConstruct() {
     $this
       ->setName('upgrade')
       ->setExamples('**upgrade** [__options__]')
-      ->setSynopsis("Upgrade database schemata.")
+      ->setSynopsis('Upgrade database schemata.')
       ->setArguments(
         array(
           array(
             'name'  => 'apply',
             'param' => 'patch',
             'help'  => 'Apply __patch__ explicitly. This is an advanced '.
                        'feature for development and debugging; you should '.
                        'not normally use this flag.',
           ),
           array(
             'name'  => 'no-quickstart',
             'help'  => 'Build storage patch-by-patch from scatch, even if it '.
                        'could be loaded from the quickstart template.',
           ),
           array(
             'name'  => 'init-only',
             'help'  => 'Initialize storage only; do not apply patches.',
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $is_dry = $args->getArg('dryrun');
     $is_force = $args->getArg('force');
 
     $api = $this->getAPI();
     $patches = $this->getPatches();
 
     if (!$is_dry && !$is_force) {
       echo phutil_console_wrap(
-        "Before running storage upgrades, you should take down the ".
-        "Phabricator web interface and stop any running Phabricator ".
-        "daemons (you can disable this warning with --force).");
+        'Before running storage upgrades, you should take down the '.
+        'Phabricator web interface and stop any running Phabricator '.
+        'daemons (you can disable this warning with --force).');
 
       if (!phutil_console_confirm('Are you ready to continue?')) {
         echo "Cancelled.\n";
         return 1;
       }
     }
 
     $apply_only = $args->getArg('apply');
     if ($apply_only) {
       if (empty($patches[$apply_only])) {
         throw new PhutilArgumentUsageException(
           "--apply argument '{$apply_only}' is not a valid patch. Use ".
           "'storage status' to show patch status.");
       }
     }
 
     $no_quickstart = $args->getArg('no-quickstart');
     $init_only = $args->getArg('init-only');
 
     $applied = $api->getAppliedPatches();
     if ($applied === null) {
 
       if ($is_dry) {
         echo "DRYRUN: Patch metadata storage doesn't exist yet, it would ".
              "be created.\n";
         return 0;
       }
 
       if ($apply_only) {
         throw new PhutilArgumentUsageException(
-          "Storage has not been initialized yet, you must initialize storage ".
-          "before selectively applying patches.");
+          'Storage has not been initialized yet, you must initialize storage '.
+          'before selectively applying patches.');
         return 1;
       }
 
       $legacy = $api->getLegacyPatches($patches);
       if ($legacy || $no_quickstart || $init_only) {
 
         // If we have legacy patches, we can't quickstart.
 
         $api->createDatabase('meta_data');
         $api->createTable(
           'meta_data',
           'patch_status',
           array(
             'patch VARCHAR(255) NOT NULL PRIMARY KEY COLLATE utf8_general_ci',
             'applied INT UNSIGNED NOT NULL',
           ));
 
         foreach ($legacy as $patch) {
           $api->markPatchApplied($patch);
         }
       } else {
         echo "Loading quickstart template...\n";
         $root = dirname(phutil_get_library_root('phabricator'));
         $sql  = $root.'/resources/sql/quickstart.sql';
         $api->applyPatchSQL($sql);
       }
     }
 
     if ($init_only) {
       echo "Storage initialized.\n";
       return 0;
     }
 
     $applied = $api->getAppliedPatches();
     $applied = array_fuse($applied);
 
     $skip_mark = false;
     if ($apply_only) {
       if (isset($applied[$apply_only])) {
 
         unset($applied[$apply_only]);
         $skip_mark = true;
 
         if (!$is_force && !$is_dry) {
           echo phutil_console_wrap(
             "Patch '{$apply_only}' has already been applied. Are you sure ".
             "you want to apply it again? This may put your storage in a state ".
             "that the upgrade scripts can not automatically manage.");
           if (!phutil_console_confirm('Apply patch again?')) {
             echo "Cancelled.\n";
             return 1;
           }
         }
       }
     }
 
     while (true) {
       $applied_something = false;
       foreach ($patches as $key => $patch) {
         if (isset($applied[$key])) {
           unset($patches[$key]);
           continue;
         }
 
         if ($apply_only && $apply_only != $key) {
           unset($patches[$key]);
           continue;
         }
 
         $can_apply = true;
         foreach ($patch->getAfter() as $after) {
           if (empty($applied[$after])) {
             if ($apply_only) {
               echo "Unable to apply patch '{$apply_only}' because it depends ".
                    "on patch '{$after}', which has not been applied.\n";
               return 1;
             }
             $can_apply = false;
             break;
           }
         }
 
         if (!$can_apply) {
           continue;
         }
 
         $applied_something = true;
 
         if ($is_dry) {
           echo "DRYRUN: Would apply patch '{$key}'.\n";
         } else {
           echo "Applying patch '{$key}'...\n";
           $api->applyPatch($patch);
           if (!$skip_mark) {
             $api->markPatchApplied($key);
           }
         }
 
         unset($patches[$key]);
         $applied[$key] = true;
       }
 
       if (!$applied_something) {
         if (count($patches)) {
           throw new Exception(
-            "Some patches could not be applied: ".
+            'Some patches could not be applied: '.
             implode(', ', array_keys($patches)));
         } else if (!$is_dry && !$apply_only) {
           echo "Storage is up to date. Use 'storage status' for details.\n";
         }
         break;
       }
     }
 
     return 0;
   }
 
 }
diff --git a/src/infrastructure/testing/PhabricatorTestCase.php b/src/infrastructure/testing/PhabricatorTestCase.php
index e4d586846..a2e322b38 100644
--- a/src/infrastructure/testing/PhabricatorTestCase.php
+++ b/src/infrastructure/testing/PhabricatorTestCase.php
@@ -1,215 +1,215 @@
 <?php
 
 abstract class PhabricatorTestCase extends ArcanistPhutilTestCase {
 
   const NAMESPACE_PREFIX = 'phabricator_unittest_';
 
   /**
    * If true, put Lisk in process-isolated mode for the duration of the tests so
    * that it will establish only isolated, side-effect-free database
    * connections. Defaults to true.
    *
    * NOTE: You should disable this only in rare circumstances. Unit tests should
    * not rely on external resources like databases, and should not produce
    * side effects.
    */
   const PHABRICATOR_TESTCONFIG_ISOLATE_LISK           = 'isolate-lisk';
 
   /**
    * If true, build storage fixtures before running tests, and connect to them
    * during test execution. This will impose a performance penalty on test
    * execution (currently, it takes roughly one second to build the fixture)
    * but allows you to perform tests which require data to be read from storage
    * after writes. The fixture is shared across all test cases in this process.
    * Defaults to false.
    *
    * NOTE: All connections to fixture storage open transactions when established
    * and roll them back when tests complete. Each test must independently
    * write data it relies on; data will not persist across tests.
    *
    * NOTE: Enabling this implies disabling process isolation.
    */
   const PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES = 'storage-fixtures';
 
   private $configuration;
   private $env;
 
   private static $storageFixtureReferences = 0;
   private static $storageFixture;
   private static $storageFixtureObjectSeed = 0;
   private static $testsAreRunning = 0;
 
   protected function getPhabricatorTestCaseConfiguration() {
     return array();
   }
 
   private function getComputedConfiguration() {
     $config = $this->getPhabricatorTestCaseConfiguration() + array(
       self::PHABRICATOR_TESTCONFIG_ISOLATE_LISK             => true,
       self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES   => false,
     );
 
     if ($config[self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES]) {
       // Fixtures don't make sense with process isolation.
       $config[self::PHABRICATOR_TESTCONFIG_ISOLATE_LISK] = false;
     }
 
     return $config;
   }
 
   public function willRunTestCases(array $test_cases) {
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/scripts/__init_script__.php';
 
     $config = $this->getComputedConfiguration();
 
     if ($config[self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES]) {
       ++self::$storageFixtureReferences;
       if (!self::$storageFixture) {
         self::$storageFixture = $this->newStorageFixture();
       }
     }
 
     ++self::$testsAreRunning;
   }
 
   public function didRunTestCases(array $test_cases) {
     if (self::$storageFixture) {
       self::$storageFixtureReferences--;
       if (!self::$storageFixtureReferences) {
         self::$storageFixture = null;
       }
     }
 
     --self::$testsAreRunning;
   }
 
   protected function willRunTests() {
     $config = $this->getComputedConfiguration();
 
     if ($config[self::PHABRICATOR_TESTCONFIG_ISOLATE_LISK]) {
       LiskDAO::beginIsolateAllLiskEffectsToCurrentProcess();
     }
 
     $this->env = PhabricatorEnv::beginScopedEnv();
 
     // NOTE: While running unit tests, we act as though all applications are
     // installed, regardless of the install's configuration. Tests which need
     // to uninstall applications are responsible for adjusting state themselves
     // (such tests are exceedingly rare).
 
     $this->env->overrideEnvConfig(
       'phabricator.uninstalled-applications',
       array());
     $this->env->overrideEnvConfig(
       'phabricator.show-beta-applications',
       true);
 
     // Reset application settings to defaults, particularly policies.
     $this->env->overrideEnvConfig(
       'phabricator.application-settings',
       array());
 
     // TODO: Remove this when we remove "releeph.installed".
     $this->env->overrideEnvConfig('releeph.installed', true);
   }
 
   protected function didRunTests() {
     $config = $this->getComputedConfiguration();
 
     if ($config[self::PHABRICATOR_TESTCONFIG_ISOLATE_LISK]) {
       LiskDAO::endIsolateAllLiskEffectsToCurrentProcess();
     }
 
     try {
       if (phutil_is_hiphop_runtime()) {
         $this->env->__destruct();
       }
       unset($this->env);
     } catch (Exception $ex) {
       throw new Exception(
-        "Some test called PhabricatorEnv::beginScopedEnv(), but is still ".
-        "holding a reference to the scoped environment!");
+        'Some test called PhabricatorEnv::beginScopedEnv(), but is still '.
+        'holding a reference to the scoped environment!');
     }
   }
 
   protected function willRunOneTest($test) {
     $config = $this->getComputedConfiguration();
 
     if ($config[self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES]) {
       LiskDAO::beginIsolateAllLiskEffectsToTransactions();
     }
   }
 
   protected function didRunOneTest($test) {
     $config = $this->getComputedConfiguration();
 
     if ($config[self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES]) {
       LiskDAO::endIsolateAllLiskEffectsToTransactions();
     }
   }
 
   protected function newStorageFixture() {
     $bytes = Filesystem::readRandomCharacters(24);
     $name = self::NAMESPACE_PREFIX.$bytes;
 
     return new PhabricatorStorageFixtureScopeGuard($name);
   }
 
   protected function getLink($method) {
     $phabricator_project = 'PHID-APRJ-3f1fc779edeab89b2171';
     return
       'https://secure.phabricator.com/diffusion/symbol/'.$method.
       '/?lang=php&projects='.$phabricator_project.
       '&jump=true&context='.get_class($this);
   }
 
   /**
    * Returns an integer seed to use when building unique identifiers (e.g.,
    * non-colliding usernames). The seed is unstable and its value will change
    * between test runs, so your tests must not rely on it.
    *
    * @return int A unique integer.
    */
   protected function getNextObjectSeed() {
     self::$storageFixtureObjectSeed += mt_rand(1, 100);
     return self::$storageFixtureObjectSeed;
   }
 
   protected function generateNewTestUser() {
     $seed = $this->getNextObjectSeed();
 
     $user = id(new PhabricatorUser())
       ->setRealName("Test User {$seed}}")
       ->setUserName("test{$seed}")
       ->setIsApproved(1);
 
     $email = id(new PhabricatorUserEmail())
       ->setAddress("testuser{$seed}@example.com")
       ->setIsVerified(1);
 
     $editor = new PhabricatorUserEditor();
     $editor->setActor($user);
     $editor->createNewUser($user, $email);
 
     return $user;
   }
 
 
   /**
    * Throws unless tests are currently executing. This method can be used to
    * guard code which is specific to unit tests and should not normally be
    * reachable.
    *
    * If tests aren't currently being executed, throws an exception.
    */
   public static function assertExecutingUnitTests() {
     if (!self::$testsAreRunning) {
       throw new Exception(
-        "Executing test code outside of test execution! This code path can ".
-        "only be run during unit tests.");
+        'Executing test code outside of test execution! This code path can '.
+        'only be run during unit tests.');
     }
   }
 
 
 }
diff --git a/src/infrastructure/time/PhabricatorTime.php b/src/infrastructure/time/PhabricatorTime.php
index ec5680331..d1eb281e1 100644
--- a/src/infrastructure/time/PhabricatorTime.php
+++ b/src/infrastructure/time/PhabricatorTime.php
@@ -1,61 +1,61 @@
 <?php
 
 final class PhabricatorTime {
 
   private static $stack = array();
   private static $originalZone;
 
   public static function pushTime($epoch, $timezone) {
     if (empty(self::$stack)) {
       self::$originalZone = date_default_timezone_get();
     }
 
     $ok = date_default_timezone_set($timezone);
     if (!$ok) {
       throw new Exception("Invalid timezone '{$timezone}'!");
     }
 
     self::$stack[] = array(
       'epoch'       => $epoch,
       'timezone'    => $timezone,
     );
 
     return new PhabricatorTimeGuard(last_key(self::$stack));
   }
 
   public static function popTime($key) {
     if ($key !== last_key(self::$stack)) {
-      throw new Exception("PhabricatorTime::popTime with bad key.");
+      throw new Exception('PhabricatorTime::popTime with bad key.');
     }
     array_pop(self::$stack);
 
     if (empty(self::$stack)) {
       date_default_timezone_set(self::$originalZone);
     } else {
       $frame = end(self::$stack);
       date_default_timezone_set($frame['timezone']);
     }
   }
 
   public static function getNow() {
     if (self::$stack) {
       $frame = end(self::$stack);
       return $frame['epoch'];
     }
     return time();
   }
 
   public static function parseLocalTime($time, PhabricatorUser $user) {
     $old_zone = date_default_timezone_get();
 
     date_default_timezone_set($user->getTimezoneIdentifier());
       $timestamp = (int)strtotime($time, PhabricatorTime::getNow());
       if ($timestamp <= 0) {
         $timestamp = null;
       }
     date_default_timezone_set($old_zone);
 
     return $timestamp;
   }
 
 }
diff --git a/src/infrastructure/util/PhabricatorHash.php b/src/infrastructure/util/PhabricatorHash.php
index 1ba1bde4f..64f02b867 100644
--- a/src/infrastructure/util/PhabricatorHash.php
+++ b/src/infrastructure/util/PhabricatorHash.php
@@ -1,78 +1,78 @@
 <?php
 
 final class PhabricatorHash {
 
 
   /**
    * Digest a string for general use, including use which relates to security.
    *
    * @param   string  Input string.
    * @return  string  32-byte hexidecimal SHA1+HMAC hash.
    */
   public static function digest($string, $key = null) {
     if ($key === null) {
       $key = PhabricatorEnv::getEnvConfig('security.hmac-key');
     }
 
     if (!$key) {
       throw new Exception(
         "Set a 'security.hmac-key' in your Phabricator configuration!");
     }
 
     return hash_hmac('sha1', $string, $key);
   }
 
 
   /**
    * Digest a string into a password hash. This is similar to @{method:digest},
    * but requires a salt and iterates the hash to increase cost.
    */
   public static function digestPassword(PhutilOpaqueEnvelope $envelope, $salt) {
     $result = $envelope->openEnvelope();
     if (!$result) {
-      throw new Exception("Trying to digest empty password!");
+      throw new Exception('Trying to digest empty password!');
     }
 
     for ($ii = 0; $ii < 1000; $ii++) {
       $result = PhabricatorHash::digest($result, $salt);
     }
 
     return $result;
   }
 
 
   /**
    * Digest a string for use in, e.g., a MySQL index. This produces a short
    * (12-byte), case-sensitive alphanumeric string with 72 bits of entropy,
    * which is generally safe in most contexts (notably, URLs).
    *
    * This method emphasizes compactness, and should not be used for security
    * related hashing (for general purpose hashing, see @{method:digest}).
    *
    * @param   string  Input string.
    * @return  string  12-byte, case-sensitive alphanumeric hash of the string
    *                  which
    */
   public static function digestForIndex($string) {
     $hash = sha1($string, $raw_output = true);
 
     static $map;
     if ($map === null) {
-      $map = "0123456789".
-             "abcdefghij".
-             "klmnopqrst".
-             "uvwxyzABCD".
-             "EFGHIJKLMN".
-             "OPQRSTUVWX".
-             "YZ._";
+      $map = '0123456789'.
+             'abcdefghij'.
+             'klmnopqrst'.
+             'uvwxyzABCD'.
+             'EFGHIJKLMN'.
+             'OPQRSTUVWX'.
+             'YZ._';
     }
 
     $result = '';
     for ($ii = 0; $ii < 12; $ii++) {
       $result .= $map[(ord($hash[$ii]) & 0x3F)];
     }
 
     return $result;
   }
 
 }
diff --git a/src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php b/src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php
index 29d371d2e..faefb5138 100644
--- a/src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php
+++ b/src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php
@@ -1,70 +1,70 @@
 <?php
 
 final class PhabricatorSlugTestCase extends PhabricatorTestCase {
 
   public function testSlugNormalization() {
     $slugs = array(
       ''                  => '/',
       '/'                 => '/',
       '//'                => '/',
       '&&&'               => '/',
       '/derp/'            => 'derp/',
       'derp'              => 'derp/',
       'derp//derp'        => 'derp/derp/',
       'DERP//DERP'        => 'derp/derp/',
       'a B c'             => 'a_b_c/',
       '-1~2.3abcd'        => '-1~2.3abcd/',
-      "T\x00O\x00D\x00O"  => "t_o_d_o/",
+      "T\x00O\x00D\x00O"  => 't_o_d_o/',
       'x#%&+=\\?<> y'     => 'x_y/',
       "\xE2\x98\x83"      => "\xE2\x98\x83/",
       '..'                => 'dotdot/',
       '../'               => 'dotdot/',
       '/../'              => 'dotdot/',
       'a/b'               => 'a/b/',
       'a//b'              => 'a/b/',
       'a/../b/'           => 'a/dotdot/b/',
       '/../a'             => 'dotdot/a/',
       '../a'              => 'dotdot/a/',
       'a/..'              => 'a/dotdot/',
       'a/../'             => 'a/dotdot/',
     );
 
     foreach ($slugs as $slug => $normal) {
       $this->assertEqual(
         $normal,
         PhabricatorSlug::normalize($slug),
         "Normalization of '{$slug}'");
     }
   }
 
   public function testSlugAncestry() {
     $slugs = array(
       '/'                   => array(),
       'pokemon/'            => array('/'),
       'pokemon/squirtle/'   => array('/', 'pokemon/'),
     );
 
     foreach ($slugs as $slug => $ancestry) {
       $this->assertEqual(
         $ancestry,
         PhabricatorSlug::getAncestry($slug),
         "Ancestry of '{$slug}'");
     }
   }
 
   public function testSlugDepth() {
     $slugs = array(
       '/'       => 0,
       'a/'      => 1,
       'a/b/'    => 2,
       'a////b/' => 2,
     );
 
     foreach ($slugs as $slug => $depth) {
       $this->assertEqual(
         $depth,
         PhabricatorSlug::getDepth($slug),
         "Depth of '{$slug}'");
     }
   }
 }
diff --git a/src/infrastructure/util/password/PhabricatorBcryptPasswordHasher.php b/src/infrastructure/util/password/PhabricatorBcryptPasswordHasher.php
index cc8dacfc8..941d02207 100644
--- a/src/infrastructure/util/password/PhabricatorBcryptPasswordHasher.php
+++ b/src/infrastructure/util/password/PhabricatorBcryptPasswordHasher.php
@@ -1,75 +1,75 @@
 <?php
 
 final class PhabricatorBcryptPasswordHasher
   extends PhabricatorPasswordHasher {
 
   public function getHumanReadableName() {
     return pht('bcrypt');
   }
 
   public function getHashName() {
     return 'bcrypt';
   }
 
   public function getHashLength() {
     return 60;
   }
 
   public function canHashPasswords() {
     return function_exists('password_hash');
   }
 
   public function getInstallInstructions() {
     return pht('Upgrade to PHP 5.5.0 or newer.');
   }
 
   public function getStrength() {
     return 2.0;
   }
 
   public function getHumanReadableStrength() {
-    return pht("Good");
+    return pht('Good');
   }
 
   protected function getPasswordHash(PhutilOpaqueEnvelope $envelope) {
     $raw_input = $envelope->openEnvelope();
 
     $options = array(
       'cost' => $this->getBcryptCost(),
     );
 
     $raw_hash = password_hash($raw_input, PASSWORD_BCRYPT, $options);
 
     return new PhutilOpaqueEnvelope($raw_hash);
   }
 
   protected function verifyPassword(
     PhutilOpaqueEnvelope $password,
     PhutilOpaqueEnvelope $hash) {
     return password_verify($password->openEnvelope(), $hash->openEnvelope());
   }
 
   protected function canUpgradeInternalHash(PhutilOpaqueEnvelope $hash) {
     $info = password_get_info($hash->openEnvelope());
 
     // NOTE: If the costs don't match -- even if the new cost is lower than
     // the old cost -- count this as an upgrade. This allows costs to be
     // adjusted down and hashing to be migrated toward the new cost if costs
     // are ever configured too high for some reason.
 
     $cost = idx($info['options'], 'cost');
     if ($cost != $this->getBcryptCost()) {
       return true;
     }
 
     return false;
   }
 
   private function getBcryptCost() {
     // NOTE: The default cost is "10", but my laptop can do a hash of cost
     // "12" in about 300ms. Since server hardware is often virtualized or old,
     // just split the difference.
     return 11;
   }
 
 }
diff --git a/src/infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php b/src/infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php
index 2847352f0..5ab335b7a 100644
--- a/src/infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php
+++ b/src/infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php
@@ -1,46 +1,46 @@
 <?php
 
 final class PhabricatorIteratedMD5PasswordHasher
   extends PhabricatorPasswordHasher {
 
   public function getHumanReadableName() {
     return pht('Iterated MD5');
   }
 
   public function getHashName() {
     return 'md5';
   }
 
   public function getHashLength() {
     return 32;
   }
 
   public function canHashPasswords() {
     return function_exists('md5');
   }
 
   public function getInstallInstructions() {
     // This should always be available, but do something useful anyway.
     return pht('To use iterated MD5, make the md5() function available.');
   }
 
   public function getStrength() {
     return 1.0;
   }
 
   public function getHumanReadableStrength() {
-    return pht("Okay");
+    return pht('Okay');
   }
 
   protected function getPasswordHash(PhutilOpaqueEnvelope $envelope) {
     $raw_input = $envelope->openEnvelope();
 
     $hash = $raw_input;
     for ($ii = 0; $ii < 1000; $ii++) {
       $hash = md5($hash);
     }
 
     return new PhutilOpaqueEnvelope($hash);
   }
 
 }
diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php
index 96d7ac311..9a7135013 100644
--- a/src/view/AphrontDialogView.php
+++ b/src/view/AphrontDialogView.php
@@ -1,326 +1,326 @@
 <?php
 
 final class AphrontDialogView extends AphrontView {
 
   private $title;
   private $shortTitle;
   private $submitButton;
   private $cancelURI;
   private $cancelText = 'Cancel';
   private $submitURI;
   private $hidden = array();
   private $class;
   private $renderAsForm = true;
   private $formID;
   private $headerColor = PhabricatorActionHeaderView::HEADER_LIGHTBLUE;
   private $footers = array();
   private $isStandalone;
   private $method = 'POST';
   private $disableWorkflowOnSubmit;
   private $disableWorkflowOnCancel;
   private $width      = 'default';
   private $errors;
   private $flush;
 
   const WIDTH_DEFAULT = 'default';
   const WIDTH_FORM    = 'form';
   const WIDTH_FULL    = 'full';
 
   public function setMethod($method) {
     $this->method = $method;
     return $this;
   }
 
   public function setIsStandalone($is_standalone) {
     $this->isStandalone = $is_standalone;
     return $this;
   }
 
   public function setErrors(array $errors) {
     $this->errors = $errors;
     return $this;
   }
 
   public function getIsStandalone() {
     return $this->isStandalone;
   }
 
   public function setSubmitURI($uri) {
     $this->submitURI = $uri;
     return $this;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function getTitle() {
     return $this->title;
   }
 
   public function setShortTitle($short_title) {
     $this->shortTitle = $short_title;
     return $this;
   }
 
   public function getShortTitle() {
     return $this->shortTitle;
   }
 
   public function addSubmitButton($text = null) {
     if (!$text) {
       $text = pht('Okay');
     }
 
     $this->submitButton = $text;
     return $this;
   }
 
   public function addCancelButton($uri, $text = null) {
     if (!$text) {
       $text = pht('Cancel');
     }
 
     $this->cancelURI = $uri;
     $this->cancelText = $text;
     return $this;
   }
 
   public function addFooter($footer) {
     $this->footers[] = $footer;
     return $this;
   }
 
   public function addHiddenInput($key, $value) {
     if (is_array($value)) {
       foreach ($value as $hidden_key => $hidden_value) {
         $this->hidden[] = array($key.'['.$hidden_key.']', $hidden_value);
       }
     } else {
       $this->hidden[] = array($key, $value);
     }
     return $this;
   }
 
   public function setClass($class) {
     $this->class = $class;
     return $this;
   }
 
   public function setFlush($flush) {
     $this->flush = $flush;
     return $this;
   }
 
   public function setRenderDialogAsDiv() {
     // TODO: This API is awkward.
     $this->renderAsForm = false;
     return $this;
   }
 
   public function setFormID($id) {
     $this->formID = $id;
     return $this;
   }
 
   public function setWidth($width) {
     $this->width = $width;
     return $this;
   }
 
   public function setHeaderColor($color) {
     $this->headerColor = $color;
     return $this;
   }
 
   public function appendParagraph($paragraph) {
     return $this->appendChild(
       phutil_tag(
         'p',
         array(
           'class' => 'aphront-dialog-view-paragraph',
         ),
         $paragraph));
   }
 
   public function setDisableWorkflowOnSubmit($disable_workflow_on_submit) {
     $this->disableWorkflowOnSubmit = $disable_workflow_on_submit;
     return $this;
   }
 
   public function getDisableWorkflowOnSubmit() {
     return $this->disableWorkflowOnSubmit;
   }
 
   public function setDisableWorkflowOnCancel($disable_workflow_on_cancel) {
     $this->disableWorkflowOnCancel = $disable_workflow_on_cancel;
     return $this;
   }
 
   public function getDisableWorkflowOnCancel() {
     return $this->disableWorkflowOnCancel;
   }
 
   final public function render() {
     require_celerity_resource('aphront-dialog-view-css');
 
     $buttons = array();
     if ($this->submitButton) {
       $meta = array();
       if ($this->disableWorkflowOnSubmit) {
         $meta['disableWorkflow'] = true;
       }
 
       $buttons[] = javelin_tag(
         'button',
         array(
           'name' => '__submit__',
           'sigil' => '__default__',
           'type' => 'submit',
           'meta' => $meta,
         ),
         $this->submitButton);
     }
 
     if ($this->cancelURI) {
       $meta = array();
       if ($this->disableWorkflowOnCancel) {
         $meta['disableWorkflow'] = true;
       }
 
       $buttons[] = javelin_tag(
         'a',
         array(
           'href'  => $this->cancelURI,
           'class' => 'button grey',
           'name'  => '__cancel__',
           'sigil' => 'jx-workflow-button',
           'meta' => $meta,
         ),
         $this->cancelText);
     }
 
     if (!$this->user) {
       throw new Exception(
-        pht("You must call setUser() when rendering an AphrontDialogView."));
+        pht('You must call setUser() when rendering an AphrontDialogView.'));
     }
 
     $more = $this->class;
     if ($this->flush) {
       $more .= ' aphront-dialog-flush';
     }
 
     switch ($this->width) {
       case self::WIDTH_FORM:
       case self::WIDTH_FULL:
         $more .= ' aphront-dialog-view-width-'.$this->width;
         break;
       case self::WIDTH_DEFAULT:
         break;
       default:
         throw new Exception("Unknown dialog width '{$this->width}'!");
     }
 
     if ($this->isStandalone) {
       $more .= ' aphront-dialog-view-standalone';
     }
 
     $attributes = array(
       'class'   => 'aphront-dialog-view '.$more,
       'sigil'   => 'jx-dialog',
     );
 
     $form_attributes = array(
       'action'  => $this->submitURI,
       'method'  => $this->method,
       'id'      => $this->formID,
     );
 
     $hidden_inputs = array();
     $hidden_inputs[] = phutil_tag(
       'input',
       array(
         'type' => 'hidden',
         'name' => '__dialog__',
         'value' => '1',
       ));
 
     foreach ($this->hidden as $desc) {
       list($key, $value) = $desc;
       $hidden_inputs[] = javelin_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => $key,
           'value' => $value,
           'sigil' => 'aphront-dialog-application-input'
         ));
     }
 
     if (!$this->renderAsForm) {
       $buttons = array(phabricator_form(
         $this->user,
         $form_attributes,
         array_merge($hidden_inputs, $buttons)));
     }
 
     $children = $this->renderChildren();
 
     if ($this->errors) {
       $children = array(
         id(new AphrontErrorView())->setErrors($this->errors),
         $children);
     }
 
     $header = new PhabricatorActionHeaderView();
     $header->setHeaderTitle($this->title);
     $header->setHeaderColor($this->headerColor);
 
     $footer = null;
     if ($this->footers) {
       $footer = phutil_tag(
         'div',
         array(
           'class' => 'aphront-dialog-foot',
         ),
         $this->footers);
     }
 
     $content = array(
       phutil_tag(
         'div',
         array(
           'class' => 'aphront-dialog-head',
         ),
         $header),
       phutil_tag('div',
         array(
           'class' => 'aphront-dialog-body grouped',
         ),
         $children),
       phutil_tag(
         'div',
         array(
           'class' => 'aphront-dialog-tail grouped',
         ),
         array(
           $buttons,
           $footer,
         )),
     );
 
     if ($this->renderAsForm) {
       return phabricator_form(
         $this->user,
         $form_attributes + $attributes,
         array($hidden_inputs, $content));
     } else {
       return javelin_tag(
         'div',
         $attributes,
         $content);
     }
   }
 
 }
diff --git a/src/view/__tests__/PhabricatorAphrontViewTestCase.php b/src/view/__tests__/PhabricatorAphrontViewTestCase.php
index 4d0d67c69..d0cc0d40f 100644
--- a/src/view/__tests__/PhabricatorAphrontViewTestCase.php
+++ b/src/view/__tests__/PhabricatorAphrontViewTestCase.php
@@ -1,25 +1,25 @@
 <?php
 
 final class PhabricatorAphrontViewTestCase extends PhabricatorTestCase {
 
   public function testHasChildren() {
     $view = new AphrontNullView();
     $this->assertFalse($view->hasChildren());
 
     $values = array(
       null,
       '',
       array(),
       array(null, ''),
     );
 
     foreach ($values as $value) {
       $view->appendChild($value);
       $this->assertFalse($view->hasChildren());
     }
 
-    $view->appendChild("!");
+    $view->appendChild('!');
     $this->assertTrue($view->hasChildren());
   }
 
 }
diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php
index 1cc2dc847..59fc86493 100644
--- a/src/view/control/AphrontCursorPagerView.php
+++ b/src/view/control/AphrontCursorPagerView.php
@@ -1,178 +1,178 @@
 <?php
 
 final class AphrontCursorPagerView extends AphrontView {
 
   private $afterID;
   private $beforeID;
 
   private $pageSize = 100;
 
   private $nextPageID;
   private $prevPageID;
   private $moreResults;
 
   private $uri;
 
   final public function setPageSize($page_size) {
     $this->pageSize = max(1, $page_size);
     return $this;
   }
 
   final public function getPageSize() {
     return $this->pageSize;
   }
 
   final public function setURI(PhutilURI $uri) {
     $this->uri = $uri;
     return $this;
   }
 
   final public function readFromRequest(AphrontRequest $request) {
     $this->uri = $request->getRequestURI();
     $this->afterID = $request->getStr('after');
     $this->beforeID = $request->getStr('before');
     return $this;
   }
 
   final public function setAfterID($after_id) {
     $this->afterID = $after_id;
     return $this;
   }
 
   final public function getAfterID() {
     return $this->afterID;
   }
 
   final public function setBeforeID($before_id) {
     $this->beforeID = $before_id;
     return $this;
   }
 
   final public function getBeforeID() {
     return $this->beforeID;
   }
 
   final public function setNextPageID($next_page_id) {
     $this->nextPageID = $next_page_id;
     return $this;
   }
 
   final public function getNextPageID() {
     return $this->nextPageID;
   }
 
   final public function setPrevPageID($prev_page_id) {
     $this->prevPageID = $prev_page_id;
     return $this;
   }
 
   final public function getPrevPageID() {
     return $this->prevPageID;
   }
 
   final public function sliceResults(array $results) {
     if (count($results) > $this->getPageSize()) {
       $offset = ($this->beforeID ? count($results) - $this->getPageSize() : 0);
       $results = array_slice($results, $offset, $this->getPageSize(), true);
       $this->moreResults = true;
     }
     return $results;
   }
 
   public function willShowPagingControls() {
     return $this->prevPageID ||
            $this->nextPageID ||
            $this->afterID ||
            ($this->beforeID && $this->moreResults);
   }
 
   public function getFirstPageURI() {
     if (!$this->uri) {
       throw new Exception(
-        pht("You must call setURI() before you can call getFirstPageURI()."));
+        pht('You must call setURI() before you can call getFirstPageURI().'));
     }
 
     if (!$this->afterID && !($this->beforeID && $this->moreResults)) {
       return null;
     }
 
     return $this->uri
       ->alter('before', null)
       ->alter('after', null);
   }
 
   public function getPrevPageURI() {
     if (!$this->uri) {
       throw new Exception(
-        pht("You must call setURI() before you can call getPrevPageURI()."));
+        pht('You must call setURI() before you can call getPrevPageURI().'));
     }
 
     if (!$this->prevPageID) {
       return null;
     }
 
     return $this->uri
       ->alter('after', null)
       ->alter('before', $this->prevPageID);
   }
 
   public function getNextPageURI() {
     if (!$this->uri) {
       throw new Exception(
-        pht("You must call setURI() before you can call getNextPageURI()."));
+        pht('You must call setURI() before you can call getNextPageURI().'));
     }
 
     if (!$this->nextPageID) {
       return null;
     }
 
     return $this->uri
       ->alter('after', $this->nextPageID)
       ->alter('before', null);
   }
 
   public function render() {
     if (!$this->uri) {
       throw new Exception(
-        pht("You must call setURI() before you can call render()."));
+        pht('You must call setURI() before you can call render().'));
     }
 
     $links = array();
 
     $first_uri = $this->getFirstPageURI();
     if ($first_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $first_uri,
         ),
-        "\xC2\xAB ". pht("First"));
+        "\xC2\xAB ". pht('First'));
     }
 
     $prev_uri = $this->getPrevPageURI();
     if ($prev_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $prev_uri,
         ),
-        "\xE2\x80\xB9 " . pht("Prev"));
+        "\xE2\x80\xB9 " . pht('Prev'));
     }
 
     $next_uri = $this->getNextPageURI();
     if ($next_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $next_uri,
         ),
-        pht("Next") . " \xE2\x80\xBA");
+        pht('Next') . " \xE2\x80\xBA");
     }
 
     return phutil_tag(
       'div',
       array('class' => 'aphront-pager-view'),
       $links);
   }
 
 }
diff --git a/src/view/control/AphrontPagerView.php b/src/view/control/AphrontPagerView.php
index b80b91692..ba6a98736 100644
--- a/src/view/control/AphrontPagerView.php
+++ b/src/view/control/AphrontPagerView.php
@@ -1,229 +1,229 @@
 <?php
 
 final class AphrontPagerView extends AphrontView {
 
   private $offset;
   private $pageSize = 100;
 
   private $count;
   private $hasMorePages;
 
   private $uri;
   private $pagingParameter;
   private $surroundingPages = 2;
   private $enableKeyboardShortcuts;
 
   final public function setPageSize($page_size) {
     $this->pageSize = max(1, $page_size);
     return $this;
   }
 
   final public function setOffset($offset) {
     $this->offset = max(0, $offset);
     return $this;
   }
 
   final public function getOffset() {
     return $this->offset;
   }
 
   final public function getPageSize() {
     return $this->pageSize;
   }
 
   final public function setCount($count) {
     $this->count = $count;
     return $this;
   }
 
   final public function setHasMorePages($has_more) {
     $this->hasMorePages = $has_more;
     return $this;
   }
 
   final public function setURI(PhutilURI $uri, $paging_parameter) {
     $this->uri = $uri;
     $this->pagingParameter = $paging_parameter;
     return $this;
   }
 
   final public function readFromRequest(AphrontRequest $request) {
     $this->uri = $request->getRequestURI();
     $this->pagingParameter = 'offset';
     $this->offset = $request->getInt($this->pagingParameter);
     return $this;
   }
 
   final public function willShowPagingControls() {
     return $this->hasMorePages;
   }
 
   final public function setSurroundingPages($pages) {
     $this->surroundingPages = max(0, $pages);
     return $this;
   }
 
   private function computeCount() {
     if ($this->count !== null) {
       return $this->count;
     }
     return $this->getOffset()
       + $this->getPageSize()
       + ($this->hasMorePages ? 1 : 0);
   }
 
   private function isExactCountKnown() {
     return $this->count !== null;
   }
 
   /**
    * A common paging strategy is to select one extra record and use that to
    * indicate that there's an additional page (this doesn't give you a
    * complete page count but is often faster than counting the total number
    * of items). This method will take a result array, slice it down to the
    * page size if necessary, and call setHasMorePages() if there are more than
    * one page of results.
    *
    *    $results = queryfx_all(
    *      $conn,
    *      'SELECT ... LIMIT %d, %d',
    *      $pager->getOffset(),
    *      $pager->getPageSize() + 1);
    *    $results = $pager->sliceResults($results);
    *
    * @param   list  Result array.
    * @return  list  One page of results.
    */
   public function sliceResults(array $results) {
     if (count($results) > $this->getPageSize()) {
       $results = array_slice($results, 0, $this->getPageSize(), true);
       $this->setHasMorePages(true);
     }
     return $results;
   }
 
   public function setEnableKeyboardShortcuts($enable) {
     $this->enableKeyboardShortcuts = $enable;
     return $this;
   }
 
   public function render() {
     if (!$this->uri) {
       throw new Exception(
-        pht("You must call setURI() before you can call render()."));
+        pht('You must call setURI() before you can call render().'));
     }
 
     require_celerity_resource('aphront-pager-view-css');
 
     $page = (int)floor($this->getOffset() / $this->getPageSize());
     $last = ((int)ceil($this->computeCount() / $this->getPageSize())) - 1;
     $near = $this->surroundingPages;
 
     $min = $page - $near;
     $max = $page + $near;
 
     // Limit the window size to no larger than the number of available pages.
     if ($max - $min > $last) {
       $max = $min + $last;
       if ($max == $min) {
         return phutil_tag('div', array('class' => 'aphront-pager-view'), '');
       }
     }
 
     // Slide the window so it is entirely over displayable pages.
     if ($min < 0) {
       $max += 0 - $min;
       $min += 0 - $min;
     }
 
     if ($max > $last) {
       $min -= $max - $last;
       $max -= $max - $last;
     }
 
 
     // Build up a list of <index, label, css-class> tuples which describe the
     // links we'll display, then render them all at once.
 
     $links = array();
 
     $prev_index = null;
     $next_index = null;
 
     if ($min > 0) {
       $links[] = array(0, pht('First'), null);
     }
 
     if ($page > 0) {
       $links[] = array($page - 1, pht('Prev'), null);
       $prev_index = $page - 1;
     }
 
     for ($ii = $min; $ii <= $max; $ii++) {
       $links[] = array($ii, $ii + 1, ($ii == $page) ? 'current' : null);
     }
 
     if ($page < $last && $last > 0) {
       $links[] = array($page + 1, pht('Next'), null);
       $next_index = $page + 1;
     }
 
     if ($max < ($last - 1)) {
       $links[] = array($last, pht('Last'), null);
     }
 
     $base_uri = $this->uri;
     $parameter = $this->pagingParameter;
 
     if ($this->enableKeyboardShortcuts) {
       $pager_links = array();
       $pager_index = array(
         'prev' => $prev_index,
         'next' => $next_index,
       );
       foreach ($pager_index as $key => $index) {
         if ($index !== null) {
           $display_index = $this->getDisplayIndex($index);
           $pager_links[$key] = (string)$base_uri->alter(
             $parameter,
             $display_index);
         }
       }
       Javelin::initBehavior('phabricator-keyboard-pager', $pager_links);
     }
 
     // Convert tuples into rendered nodes.
     $rendered_links = array();
     foreach ($links as $link) {
       list($index, $label, $class) = $link;
       $display_index = $this->getDisplayIndex($index);
       $link = $base_uri->alter($parameter, $display_index);
       $rendered_links[] = phutil_tag(
         'a',
         array(
           'href' => $link,
           'class' => $class,
         ),
         $label);
     }
 
     return phutil_tag(
       'div',
       array('class' => 'aphront-pager-view'),
       $rendered_links);
   }
 
   private function getDisplayIndex($page_index) {
     $page_size = $this->getPageSize();
     // Use a 1-based sequence for display so that the number in the URI is
     // the same as the page number you're on.
     if ($page_index == 0) {
       // No need for the first page to say page=1.
       $display_index = null;
     } else {
       $display_index = $page_index * $page_size;
     }
     return $display_index;
   }
 
 }
diff --git a/src/view/form/PHUIFormLayoutView.php b/src/view/form/PHUIFormLayoutView.php
index 3ff5f0267..fa05a72a5 100644
--- a/src/view/form/PHUIFormLayoutView.php
+++ b/src/view/form/PHUIFormLayoutView.php
@@ -1,55 +1,55 @@
 <?php
 
 /**
  * This provides the layout of an AphrontFormView without actually providing
  * the <form /> tag. Useful on its own for creating forms in other forms (like
  * dialogs) or forms which aren't submittable.
  */
 final class PHUIFormLayoutView extends AphrontView {
 
   private $fullWidth;
 
   public function setFullWidth($width) {
     $this->fullWidth = $width;
     return $this;
   }
 
   public function appendInstructions($text) {
     return $this->appendChild(
       phutil_tag(
         'div',
         array(
           'class' => 'aphront-form-instructions',
         ),
         $text));
   }
 
   public function appendRemarkupInstructions($remarkup) {
     if ($this->getUser() === null) {
       throw new Exception(
-        "Call `setUser` before appending Remarkup to PHUIFormLayoutView.");
+        'Call `setUser` before appending Remarkup to PHUIFormLayoutView.');
     }
 
     return $this->appendInstructions(
       PhabricatorMarkupEngine::renderOneObject(
         id(new PhabricatorMarkupOneOff())->setContent($remarkup),
         'default',
         $this->getUser()));
   }
 
   public function render() {
     $classes = array('phui-form-view');
 
     if ($this->fullWidth) {
       $classes[] = 'phui-form-full-width';
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => implode(' ', $classes),
       ),
       $this->renderChildren());
 
   }
 }
diff --git a/src/view/form/PHUIFormPageView.php b/src/view/form/PHUIFormPageView.php
index c94509495..7b45edb25 100644
--- a/src/view/form/PHUIFormPageView.php
+++ b/src/view/form/PHUIFormPageView.php
@@ -1,224 +1,224 @@
 <?php
 
 /**
  * @concrete-extensible
  */
 class PHUIFormPageView extends AphrontView {
 
   private $key;
   private $form;
   private $controls = array();
   private $content = array();
   private $values = array();
   private $isValid;
   private $validateFormPageCallback;
   private $adjustFormPageCallback;
   private $pageErrors = array();
   private $pageName;
 
 
   public function setPageName($page_name) {
     $this->pageName = $page_name;
     return $this;
   }
 
   public function getPageName() {
     return $this->pageName;
   }
 
   public function addPageError($page_error) {
     $this->pageErrors[] = $page_error;
     return $this;
   }
 
   public function getPageErrors() {
     return $this->pageErrors;
   }
 
   public function setAdjustFormPageCallback($adjust_form_page_callback) {
     $this->adjustFormPageCallback = $adjust_form_page_callback;
     return $this;
   }
 
   public function setValidateFormPageCallback($validate_form_page_callback) {
     $this->validateFormPageCallback = $validate_form_page_callback;
     return $this;
   }
 
   public function addInstructions($text, $before = null) {
     $tag = phutil_tag(
       'div',
       array(
         'class' => 'aphront-form-instructions',
       ),
       $text);
 
     $append = true;
     if ($before !== null) {
       for ($ii = 0; $ii < count($this->content); $ii++) {
         if ($this->content[$ii] instanceof AphrontFormControl) {
           if ($this->content[$ii]->getName() == $before) {
             array_splice($this->content, $ii, 0, array($tag));
             $append = false;
             break;
           }
         }
       }
     }
 
     if ($append) {
       $this->content[] = $tag;
     }
 
     return $this;
   }
 
   public function addRemarkupInstructions($remarkup, $before = null) {
     return $this->addInstructions(
       PhabricatorMarkupEngine::renderOneObject(
         id(new PhabricatorMarkupOneOff())->setContent($remarkup),
         'default',
         $this->getUser()), $before);
   }
 
   public function addControl(AphrontFormControl $control) {
     $name = $control->getName();
 
     if (!strlen($name)) {
-      throw new Exception("Form control has no name!");
+      throw new Exception('Form control has no name!');
     }
 
     if (isset($this->controls[$name])) {
       throw new Exception(
         "Form page contains duplicate control with name '{$name}'!");
     }
 
     $this->controls[$name] = $control;
     $this->content[] = $control;
     $control->setFormPage($this);
 
     return $this;
   }
 
   public function getControls() {
     return $this->controls;
   }
 
   public function getControl($name) {
     if (empty($this->controls[$name])) {
       throw new Exception("No page control '{$name}'!");
     }
     return $this->controls[$name];
   }
 
   protected function canAppendChild() {
     return false;
   }
 
   public function setPagedFormView(PHUIPagedFormView $view, $key) {
     if ($this->key) {
-      throw new Exception("This page is already part of a form!");
+      throw new Exception('This page is already part of a form!');
     }
     $this->form = $view;
     $this->key = $key;
     return $this;
   }
 
   public function adjustFormPage() {
     if ($this->adjustFormPageCallback) {
       call_user_func($this->adjustFormPageCallback, $this);
     }
     return $this;
   }
 
   protected function validateFormPage() {
     if ($this->validateFormPageCallback) {
       return call_user_func($this->validateFormPageCallback, $this);
     }
     return true;
   }
 
   public function getKey() {
     return $this->key;
   }
 
   public function render() {
     return $this->content;
   }
 
   public function getForm() {
     return $this->form;
   }
 
   public function getRequestKey($key) {
     return $this->getForm()->getRequestKey('p:'.$this->key.':'.$key);
   }
 
   public function validateObjectType($object) {
     return true;
   }
 
   public function validateResponseType($response) {
     return true;
   }
 
   protected function validateControls() {
     $result = true;
     foreach ($this->getControls() as $name => $control) {
       if (!$control->isValid()) {
         $result = false;
         break;
       }
     }
 
     return $result;
   }
 
   public function isValid() {
     if ($this->isValid === null) {
       $this->isValid = $this->validateControls() && $this->validateFormPage();
     }
     return $this->isValid;
   }
 
   public function readFromRequest(AphrontRequest $request) {
     foreach ($this->getControls() as $name => $control) {
       $control->readValueFromRequest($request);
     }
 
     return $this;
   }
 
   public function readFromObject($object) {
     foreach ($this->getControls() as $name => $control) {
       if (is_array($object)) {
         $control->readValueFromDictionary($object);
       }
     }
 
     return $this;
   }
 
   public function writeToResponse($response) {
     return $this;
   }
 
   public function readSerializedValues(AphrontRequest $request) {
     foreach ($this->getControls() as $name => $control) {
       $key = $this->getRequestKey($name);
       $control->readSerializedValue($request->getStr($key));
     }
 
     return $this;
   }
 
   public function getSerializedValues() {
     $dict = array();
     foreach ($this->getControls() as $name => $control) {
       $key = $this->getRequestKey($name);
       $dict[$key] = $control->getSerializedValue();
     }
     return $dict;
   }
 
 }
diff --git a/src/view/form/PHUIPagedFormView.php b/src/view/form/PHUIPagedFormView.php
index 034c86a1e..11b1db944 100644
--- a/src/view/form/PHUIPagedFormView.php
+++ b/src/view/form/PHUIPagedFormView.php
@@ -1,278 +1,278 @@
 <?php
 
 /**
  * @task page   Managing Pages
  */
 final class PHUIPagedFormView extends AphrontTagView {
 
   private $name = 'pages';
   private $pages = array();
   private $selectedPage;
   private $choosePage;
   private $nextPage;
   private $prevPage;
   private $complete;
   private $cancelURI;
 
   protected function canAppendChild() {
     return false;
   }
 
 
 /* -(  Managing Pages  )----------------------------------------------------- */
 
 
   /**
    * @task page
    */
   public function addPage($key, PHUIFormPageView $page) {
     if (isset($this->pages[$key])) {
       throw new Exception("Duplicate page with key '{$key}'!");
     }
     $this->pages[$key] = $page;
     $page->setPagedFormView($this, $key);
 
     $this->selectedPage = null;
     $this->complete = null;
 
     return $this;
   }
 
 
   /**
    * @task page
    */
   public function getPage($key) {
     if (!$this->pageExists($key)) {
       throw new Exception("No page '{$key}' exists!");
     }
     return $this->pages[$key];
   }
 
 
   /**
    * @task page
    */
   public function pageExists($key) {
     return isset($this->pages[$key]);
   }
 
 
   /**
    * @task page
    */
   protected function getPageIndex($key) {
     $page = $this->getPage($key);
 
     $index = 0;
     foreach ($this->pages as $target_page) {
       if ($page === $target_page) {
         break;
       }
       $index++;
     }
 
     return $index;
   }
 
 
   /**
    * @task page
    */
   protected function getPageByIndex($index) {
     foreach ($this->pages as $page) {
       if (!$index) {
         return $page;
       }
       $index--;
     }
 
     throw new Exception("Requesting out-of-bounds page '{$index}'.");
   }
 
   protected function getLastIndex() {
     return count($this->pages) - 1;
   }
 
   protected function isFirstPage(PHUIFormPageView $page) {
     return ($this->getPageIndex($page->getKey()) === 0);
 
   }
 
   protected function isLastPage(PHUIFormPageView $page) {
     return ($this->getPageIndex($page->getKey()) === (count($this->pages) - 1));
   }
 
   public function getSelectedPage() {
     return $this->selectedPage;
   }
 
   public function readFromObject($object) {
     return $this->processForm($is_request = false, $object);
   }
 
   public function writeToResponse($response) {
     foreach ($this->pages as $page) {
       $page->validateResponseType($response);
       $response = $page->writeToResponse($page);
     }
 
     return $response;
   }
 
   public function readFromRequest(AphrontRequest $request) {
     $this->choosePage = $request->getStr($this->getRequestKey('page'));
     $this->nextPage = $request->getStr('__submit__');
     $this->prevPage = $request->getStr('__back__');
 
     return $this->processForm($is_request = true, $request);
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
 
   public function getValue($page, $key, $default = null) {
     return $this->getPage($page)->getValue($key, $default);
   }
 
   public function setValue($page, $key, $value) {
     $this->getPage($page)->setValue($key, $value);
     return $this;
   }
 
   private function processForm($is_request, $source) {
     if ($this->pageExists($this->choosePage)) {
       $selected = $this->getPage($this->choosePage);
     } else {
       $selected = $this->getPageByIndex(0);
     }
 
     $is_attempt_complete = false;
     if ($this->prevPage) {
       $prev_index = $this->getPageIndex($selected->getKey()) - 1;;
       $index = max(0, $prev_index);
       $selected = $this->getPageByIndex($index);
     } else if ($this->nextPage) {
       $next_index = $this->getPageIndex($selected->getKey()) + 1;
       if ($next_index > $this->getLastIndex()) {
         $is_attempt_complete = true;
       }
       $index = min($this->getLastIndex(), $next_index);
       $selected = $this->getPageByIndex($index);
     }
 
     $validation_error = false;
     $found_selected = false;
     foreach ($this->pages as $key => $page) {
       if ($is_request) {
         if ($key === $this->choosePage) {
           $page->readFromRequest($source);
         } else {
           $page->readSerializedValues($source);
         }
       } else {
         $page->readFromObject($source);
       }
 
       if (!$found_selected) {
         $page->adjustFormPage();
       }
 
       if ($page === $selected) {
         $found_selected = true;
       }
 
       if (!$found_selected || $is_attempt_complete) {
         if (!$page->isValid()) {
           $selected = $page;
           $validation_error = true;
           break;
         }
       }
     }
 
     if ($is_attempt_complete && !$validation_error) {
       $this->complete = true;
     } else {
       $this->selectedPage = $selected;
     }
 
     return $this;
   }
 
   public function isComplete() {
     return $this->complete;
   }
 
   public function getRequestKey($key) {
     return $this->name.':'.$key;
   }
 
   public function setCancelURI($cancel_uri) {
     $this->cancelURI = $cancel_uri;
     return $this;
   }
 
   public function getCancelURI() {
     return $this->cancelURI;
   }
 
   public function getTagContent() {
     $form = id(new AphrontFormView())
       ->setUser($this->getUser());
 
     $selected_page = $this->getSelectedPage();
     if (!$selected_page) {
-      throw new Exception("No selected page!");
+      throw new Exception('No selected page!');
     }
 
     $form->addHiddenInput(
       $this->getRequestKey('page'),
       $selected_page->getKey());
 
     $errors = array();
 
     foreach ($this->pages as $page) {
       if ($page == $selected_page) {
         $errors = $page->getPageErrors();
         continue;
       }
       foreach ($page->getSerializedValues() as $key => $value) {
         $form->addHiddenInput($key, $value);
       }
     }
 
     $submit = id(new PHUIFormMultiSubmitControl());
 
     if (!$this->isFirstPage($selected_page)) {
       $submit->addBackButton();
     } else if ($this->getCancelURI()) {
       $submit->addCancelButton($this->getCancelURI());
     }
 
     if ($this->isLastPage($selected_page)) {
-      $submit->addSubmitButton(pht("Save"));
+      $submit->addSubmitButton(pht('Save'));
     } else {
       $submit->addSubmitButton(pht("Continue \xC2\xBB"));
     }
 
     $form->appendChild($selected_page);
     $form->appendChild($submit);
 
     $box = id(new PHUIObjectBoxView())
       ->setFormErrors($errors)
       ->setForm($form);
 
     if ($selected_page->getPageName()) {
       $header = id(new PHUIHeaderView())
         ->setHeader($selected_page->getPageName());
       $box->setHeader($header);
     }
 
     return $box;
   }
 
 }
diff --git a/src/view/form/control/AphrontFormControl.php b/src/view/form/control/AphrontFormControl.php
index bdb0513c8..ab4022a14 100644
--- a/src/view/form/control/AphrontFormControl.php
+++ b/src/view/form/control/AphrontFormControl.php
@@ -1,249 +1,249 @@
 <?php
 
 abstract class AphrontFormControl extends AphrontView {
 
   private $label;
   private $caption;
   private $error;
   private $name;
   private $value;
   private $disabled;
   private $id;
   private $controlID;
   private $controlStyle;
   private $formPage;
   private $required;
   private $hidden;
 
   public function setHidden($hidden) {
     $this->hidden = $hidden;
     return $this;
   }
 
   public function setID($id) {
     $this->id = $id;
     return $this;
   }
 
   public function getID() {
     return $this->id;
   }
 
   public function setControlID($control_id) {
     $this->controlID = $control_id;
     return $this;
   }
 
   public function getControlID() {
     return $this->controlID;
   }
 
   public function setControlStyle($control_style) {
     $this->controlStyle = $control_style;
     return $this;
   }
 
   public function getControlStyle() {
     return $this->controlStyle;
   }
 
   public function setLabel($label) {
     $this->label = $label;
     return $this;
   }
 
   public function getLabel() {
     return $this->label;
   }
 
   public function setCaption($caption) {
     $this->caption = $caption;
     return $this;
   }
 
   public function getCaption() {
     return $this->caption;
   }
 
   public function setError($error) {
     $this->error = $error;
     return $this;
   }
 
   public function getError() {
     return $this->error;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->name;
   }
 
   public function setValue($value) {
     $this->value = $value;
     return $this;
   }
 
   public function getValue() {
     return $this->value;
   }
 
   public function isValid() {
     if ($this->error && $this->error !== true) {
       return false;
     }
 
     if ($this->isRequired() && $this->isEmpty()) {
       return false;
     }
 
     return true;
   }
 
   public function isRequired() {
     return $this->required;
   }
 
   public function isEmpty() {
     return !strlen($this->getValue());
   }
 
   public function getSerializedValue() {
     return $this->getValue();
   }
 
   public function readSerializedValue($value) {
     $this->setValue($value);
     return $this;
   }
 
   public function readValueFromRequest(AphrontRequest $request) {
     $this->setValue($request->getStr($this->getName()));
     return $this;
   }
 
   public function readValueFromDictionary(array $dictionary) {
     $this->setValue(idx($dictionary, $this->getName()));
     return $this;
   }
 
   public function setFormPage(PHUIFormPageView $page) {
     if ($this->formPage) {
-      throw new Exception("This control is already a member of a page!");
+      throw new Exception('This control is already a member of a page!');
     }
     $this->formPage = $page;
     return $this;
   }
 
   public function getFormPage() {
     if ($this->formPage === null) {
-      throw new Exception("This control does not have a page!");
+      throw new Exception('This control does not have a page!');
     }
     return $this->formPage;
   }
 
   public function setDisabled($disabled) {
     $this->disabled = $disabled;
     return $this;
   }
 
   public function getDisabled() {
     return $this->disabled;
   }
 
   abstract protected function renderInput();
   abstract protected function getCustomControlClass();
 
   protected function shouldRender() {
     return true;
   }
 
   final public function render() {
     if (!$this->shouldRender()) {
       return null;
     }
 
     $custom_class = $this->getCustomControlClass();
 
     // If we don't have an ID yet, assign an automatic one so we can associate
     // the label with the control. This allows assistive technologies to read
     // form labels.
     if (!$this->getID()) {
       $this->setID(celerity_generate_unique_node_id());
     }
 
     $input = phutil_tag(
       'div',
       array('class' => 'aphront-form-input'),
       $this->renderInput());
 
     if (strlen($this->getLabel())) {
       $label = phutil_tag(
         'label',
         array(
           'class' => 'aphront-form-label',
           'for' => $this->getID(),
         ),
         $this->getLabel());
     } else {
       $label = null;
       $custom_class .= ' aphront-form-control-nolabel';
     }
 
     if (strlen($this->getError())) {
       $error = $this->getError();
       if ($error === true) {
         $error = phutil_tag(
           'div',
           array('class' => 'aphront-form-error aphront-form-required'),
           pht('Required'));
       } else {
         $error = phutil_tag(
           'div',
           array('class' => 'aphront-form-error'),
           $error);
       }
     } else {
       $error = null;
     }
 
     if (strlen($this->getCaption())) {
       $caption = phutil_tag(
         'div',
         array('class' => 'aphront-form-caption'),
         $this->getCaption());
     } else {
       $caption = null;
     }
 
     $classes = array();
     $classes[] = 'aphront-form-control';
     $classes[] = $custom_class;
 
     $style = $this->controlStyle;
     if ($this->hidden) {
       $style = 'display: none; '.$style;
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => implode(' ', $classes),
         'id' => $this->controlID,
         'style' => $style,
       ),
       array(
         $label,
         $error,
         $input,
         $caption,
 
         // TODO: Remove this once the redesign finishes up.
         phutil_tag('div', array('style' => 'clear: both;'), ''),
       ));
   }
 }
diff --git a/src/view/form/control/AphrontFormDateControl.php b/src/view/form/control/AphrontFormDateControl.php
index b8c781f2b..38c96b886 100644
--- a/src/view/form/control/AphrontFormDateControl.php
+++ b/src/view/form/control/AphrontFormDateControl.php
@@ -1,329 +1,329 @@
 <?php
 
 final class AphrontFormDateControl extends AphrontFormControl {
 
   private $initialTime;
   private $zone;
 
   private $valueDay;
   private $valueMonth;
   private $valueYear;
   private $valueTime;
   private $allowNull;
 
   public function setAllowNull($allow_null) {
     $this->allowNull = $allow_null;
     return $this;
   }
 
   const TIME_START_OF_DAY         = 'start-of-day';
   const TIME_END_OF_DAY           = 'end-of-day';
   const TIME_START_OF_BUSINESS    = 'start-of-business';
   const TIME_END_OF_BUSINESS      = 'end-of-business';
 
   public function setInitialTime($time) {
     $this->initialTime = $time;
     return $this;
   }
 
   public function readValueFromRequest(AphrontRequest $request) {
     $day = $request->getInt($this->getDayInputName());
     $month = $request->getInt($this->getMonthInputName());
     $year = $request->getInt($this->getYearInputName());
     $time = $request->getStr($this->getTimeInputName());
     $enabled = $request->getBool($this->getCheckboxInputName());
 
     if ($this->allowNull && !$enabled) {
       $this->setError(null);
       $this->setValue(null);
       return;
     }
 
     $err = $this->getError();
 
     if ($day || $month || $year || $time) {
       $this->valueDay = $day;
       $this->valueMonth = $month;
       $this->valueYear = $year;
       $this->valueTime = $time;
 
       // Assume invalid.
       $err = 'Invalid';
 
       $zone = $this->getTimezone();
 
       try {
         $date = new DateTime("{$year}-{$month}-{$day} {$time}", $zone);
         $value = $date->format('U');
       } catch (Exception $ex) {
         $value = null;
       }
 
       if ($value) {
         $this->setValue($value);
         $err = null;
       } else {
         $this->setValue(null);
       }
     } else {
       $value = $this->getInitialValue();
       if ($value) {
         $this->setValue($value);
       } else {
         $this->setValue(null);
       }
     }
 
     $this->setError($err);
 
     return $this->getValue();
   }
 
   protected function getCustomControlClass() {
     return 'aphront-form-control-date';
   }
 
   public function setValue($epoch) {
     $result = parent::setValue($epoch);
 
     if ($epoch === null) {
       return $result;
     }
 
     $readable = $this->formatTime($epoch, 'Y!m!d!g:i A');
     $readable = explode('!', $readable, 4);
 
     $this->valueYear  = $readable[0];
     $this->valueMonth = $readable[1];
     $this->valueDay   = $readable[2];
     $this->valueTime  = $readable[3];
 
     return $result;
   }
 
   private function getMinYear() {
     $cur_year = $this->formatTime(
       time(),
       'Y');
     $val_year = $this->getYearInputValue();
 
     return min($cur_year, $val_year) - 3;
   }
 
   private function getMaxYear() {
     $cur_year = $this->formatTime(
       time(),
       'Y');
     $val_year = $this->getYearInputValue();
 
     return max($cur_year, $val_year) + 3;
   }
 
   private function getDayInputValue() {
     return $this->valueDay;
   }
 
   private function getMonthInputValue() {
     return $this->valueMonth;
   }
 
   private function getYearInputValue() {
     return $this->valueYear;
   }
 
   private function getTimeInputValue() {
     return $this->valueTime;
   }
 
   private function formatTime($epoch, $fmt) {
     return phabricator_format_local_time(
       $epoch,
       $this->user,
       $fmt);
   }
 
   private function getDayInputName() {
     return $this->getName().'_d';
   }
 
   private function getMonthInputName() {
     return $this->getName().'_m';
   }
 
   private function getYearInputName() {
     return $this->getName().'_y';
   }
 
   private function getTimeInputName() {
     return $this->getName().'_t';
   }
 
   private function getCheckboxInputName() {
     return $this->getName().'_e';
   }
 
   protected function renderInput() {
 
     $disabled = null;
     if ($this->getValue() === null) {
       $this->setValue($this->getInitialValue());
       if ($this->allowNull) {
         $disabled = 'disabled';
       }
     }
 
     $min_year = $this->getMinYear();
     $max_year = $this->getMaxYear();
 
     $days = range(1, 31);
     $days = array_fuse($days);
 
     $months = array(
       1 => pht('Jan'),
       2 => pht('Feb'),
       3 => pht('Mar'),
       4 => pht('Apr'),
       5 => pht('May'),
       6 => pht('Jun'),
       7 => pht('Jul'),
       8 => pht('Aug'),
       9 => pht('Sep'),
       10 => pht('Oct'),
       11 => pht('Nov'),
       12 => pht('Dec'),
     );
 
     $checkbox = null;
     if ($this->allowNull) {
       $checkbox = javelin_tag(
         'input',
         array(
           'type' => 'checkbox',
           'name' => $this->getCheckboxInputName(),
           'sigil' => 'calendar-enable',
           'class' => 'aphront-form-date-enabled-input',
           'value' => 1,
           'checked' => ($disabled === null ? 'checked' : null),
         ));
     }
 
     $years = range($this->getMinYear(), $this->getMaxYear());
     $years = array_fuse($years);
 
     $days_sel = AphrontFormSelectControl::renderSelectTag(
       $this->getDayInputValue(),
       $days,
       array(
         'name' => $this->getDayInputName(),
         'sigil' => 'day-input',
         'disabled' => $disabled,
       ));
 
     $months_sel = AphrontFormSelectControl::renderSelectTag(
       $this->getMonthInputValue(),
       $months,
       array(
         'name' => $this->getMonthInputName(),
         'sigil' => 'month-input',
         'disabled' => $disabled,
       ));
 
     $years_sel = AphrontFormSelectControl::renderSelectTag(
       $this->getYearInputValue(),
       $years,
       array(
         'name'  => $this->getYearInputName(),
         'sigil' => 'year-input',
         'disabled' => $disabled,
       ));
 
     $cal_icon = javelin_tag(
       'a',
       array(
         'href'  => '#',
         'class' => 'calendar-button',
         'sigil' => 'calendar-button',
       ),
       '');
 
     $time_sel = javelin_tag(
       'input',
       array(
         'name'  => $this->getTimeInputName(),
         'sigil' => 'time-input',
         'value' => $this->getTimeInputValue(),
         'type'  => 'text',
         'class' => 'aphront-form-date-time-input',
         'disabled' => $disabled,
       ),
       '');
 
     Javelin::initBehavior('fancy-datepicker', array());
 
     return javelin_tag(
       'div',
       array(
         'class' => 'aphront-form-date-container',
         'sigil' => 'phabricator-date-control',
         'meta'  => array(
           'disabled' => (bool)$disabled,
         ),
       ),
       array(
         $checkbox,
         $days_sel,
         $months_sel,
         $years_sel,
         $cal_icon,
         $time_sel,
       ));
   }
 
   private function getTimezone() {
     if ($this->zone) {
       return $this->zone;
     }
 
     $user = $this->getUser();
     if (!$this->getUser()) {
-      throw new Exception("Call setUser() before getTimezone()!");
+      throw new Exception('Call setUser() before getTimezone()!');
     }
 
     $user_zone = $user->getTimezoneIdentifier();
     $this->zone = new DateTimeZone($user_zone);
     return $this->zone;
   }
 
   private function getInitialValue() {
     $zone = $this->getTimezone();
 
     // TODO: We could eventually allow these to be customized per install or
     // per user or both, but let's wait and see.
     switch ($this->initialTime) {
       case self::TIME_START_OF_DAY:
       default:
         $time = '12:00 AM';
         break;
       case self::TIME_START_OF_BUSINESS:
         $time = '9:00 AM';
         break;
       case self::TIME_END_OF_BUSINESS:
         $time = '5:00 PM';
         break;
       case self::TIME_END_OF_DAY:
         $time = '11:59 PM';
         break;
     }
 
     $today = $this->formatTime(time(), 'Y-m-d');
     try {
       $date = new DateTime("{$today} {$time}", $zone);
       $value = $date->format('U');
     } catch (Exception $ex) {
       $value = null;
     }
 
     return $value;
   }
 
 }
diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
index ee7d8edf1..0009e4836 100644
--- a/src/view/form/control/AphrontFormPolicyControl.php
+++ b/src/view/form/control/AphrontFormPolicyControl.php
@@ -1,230 +1,230 @@
 <?php
 
 final class AphrontFormPolicyControl extends AphrontFormControl {
 
   private $object;
   private $capability;
   private $policies;
 
   public function setPolicyObject(PhabricatorPolicyInterface $object) {
     $this->object = $object;
     return $this;
   }
 
   public function setPolicies(array $policies) {
     assert_instances_of($policies, 'PhabricatorPolicy');
     $this->policies = $policies;
     return $this;
   }
 
   public function setCapability($capability) {
     $this->capability = $capability;
 
     $labels = array(
       PhabricatorPolicyCapability::CAN_VIEW => pht('Visible To'),
       PhabricatorPolicyCapability::CAN_EDIT => pht('Editable By'),
       PhabricatorPolicyCapability::CAN_JOIN => pht('Joinable By'),
     );
 
     if (isset($labels[$capability])) {
       $label = $labels[$capability];
     } else {
       $capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
       if ($capobj) {
         $label = $capobj->getCapabilityName();
       } else {
         $label = pht('Capability "%s"', $capability);
       }
     }
 
     $this->setLabel($label);
 
     return $this;
   }
 
   protected function getCustomControlClass() {
     return 'aphront-form-control-policy';
   }
 
   protected function getOptions() {
     $capability = $this->capability;
 
     $options = array();
     foreach ($this->policies as $policy) {
       if ($policy->getPHID() == PhabricatorPolicies::POLICY_PUBLIC) {
         // Never expose "Public" for capabilities which don't support it.
         $capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
         if (!$capobj || !$capobj->shouldAllowPublicPolicySetting()) {
           continue;
         }
       }
 
       $options[$policy->getType()][$policy->getPHID()] = array(
         'name' => phutil_utf8_shorten($policy->getName(), 28),
         'full' => $policy->getName(),
         'icon' => $policy->getIcon(),
       );
     }
 
     // If we were passed several custom policy options, throw away the ones
     // which aren't the value for this capability. For example, an object might
     // have a custom view pollicy and a custom edit policy. When we render
     // the selector for "Can View", we don't want to show the "Can Edit"
     // custom policy -- if we did, the menu would look like this:
     //
     //   Custom
     //     Custom Policy
     //     Custom Policy
     //
     // ...where one is the "view" custom policy, and one is the "edit" custom
     // policy.
 
     $type_custom = PhabricatorPolicyType::TYPE_CUSTOM;
     if (!empty($options[$type_custom])) {
       $options[$type_custom] = array_select_keys(
         $options[$type_custom],
         array($this->getValue()));
     }
 
     // If there aren't any custom policies, add a placeholder policy so we
     // render a menu item. This allows the user to switch to a custom policy.
 
     if (empty($options[$type_custom])) {
       $placeholder = new PhabricatorPolicy();
       $placeholder->setName(pht('Custom Policy...'));
       $options[$type_custom][$this->getCustomPolicyPlaceholder()] = array(
         'name' => $placeholder->getName(),
         'full' => $placeholder->getName(),
         'icon' => $placeholder->getIcon(),
       );
     }
 
     $options = array_select_keys(
       $options,
       array(
         PhabricatorPolicyType::TYPE_GLOBAL,
         PhabricatorPolicyType::TYPE_USER,
         PhabricatorPolicyType::TYPE_CUSTOM,
         PhabricatorPolicyType::TYPE_PROJECT,
       ));
 
     return $options;
   }
 
   protected function renderInput() {
     if (!$this->object) {
-      throw new Exception(pht("Call setPolicyObject() before rendering!"));
+      throw new Exception(pht('Call setPolicyObject() before rendering!'));
     }
     if (!$this->capability) {
-      throw new Exception(pht("Call setCapability() before rendering!"));
+      throw new Exception(pht('Call setCapability() before rendering!'));
     }
 
     $policy = $this->object->getPolicy($this->capability);
     if (!$policy) {
       // TODO: Make this configurable.
       $policy = PhabricatorPolicies::POLICY_USER;
     }
 
     if (!$this->getValue()) {
       $this->setValue($policy);
     }
 
     $control_id = celerity_generate_unique_node_id();
     $input_id = celerity_generate_unique_node_id();
 
     $caret = phutil_tag(
       'span',
       array(
         'class' => 'caret',
       ));
 
     $input = phutil_tag(
       'input',
       array(
         'type' => 'hidden',
         'id' => $input_id,
         'name' => $this->getName(),
         'value' => $this->getValue(),
       ));
 
     $options = $this->getOptions();
 
     $order = array();
     $labels = array();
     foreach ($options as $key => $values) {
       $order[$key] = array_keys($values);
       $labels[$key] = PhabricatorPolicyType::getPolicyTypeName($key);
     }
 
     $flat_options = array_mergev($options);
 
     $icons = array();
     foreach (igroup($flat_options, 'icon') as $icon => $ignored) {
       $icons[$icon] = id(new PHUIIconView())
         ->setIconFont($icon);
     }
 
 
     Javelin::initBehavior(
       'policy-control',
       array(
         'controlID' => $control_id,
         'inputID' => $input_id,
         'options' => $flat_options,
         'groups' => array_keys($options),
         'order' => $order,
         'icons' => $icons,
         'labels' => $labels,
         'value' => $this->getValue(),
         'customPlaceholder' => $this->getCustomPolicyPlaceholder(),
       ));
 
     $selected = idx($flat_options, $this->getValue(), array());
     $selected_icon = idx($selected, 'icon');
     $selected_name = idx($selected, 'name');
 
     return phutil_tag(
       'div',
       array(
       ),
       array(
         javelin_tag(
           'a',
           array(
             'class' => 'grey button dropdown has-icon policy-control',
             'href' => '#',
             'mustcapture' => true,
             'sigil' => 'policy-control',
             'id' => $control_id,
           ),
           array(
             $caret,
             javelin_tag(
               'span',
               array(
                 'sigil' => 'policy-label',
                 'class' => 'phui-button-text',
               ),
               array(
                 idx($icons, $selected_icon),
                 $selected_name,
               )),
           )),
         $input,
       ));
 
     return AphrontFormSelectControl::renderSelectTag(
       $this->getValue(),
       $this->getOptions(),
       array(
         'name'      => $this->getName(),
         'disabled'  => $this->getDisabled() ? 'disabled' : null,
         'id'        => $this->getID(),
       ));
   }
 
   private function getCustomPolicyPlaceholder() {
     return 'custom:placeholder';
   }
 
 }
diff --git a/src/view/layout/AphrontMultiColumnView.php b/src/view/layout/AphrontMultiColumnView.php
index ec784f466..07997c6ee 100644
--- a/src/view/layout/AphrontMultiColumnView.php
+++ b/src/view/layout/AphrontMultiColumnView.php
@@ -1,150 +1,150 @@
 <?php
 
 final class AphrontMultiColumnView extends AphrontView {
 
   const GUTTER_SMALL = 'msr';
   const GUTTER_MEDIUM = 'mmr';
   const GUTTER_LARGE = 'mlr';
 
   private $id;
   private $columns = array();
   private $fluidLayout = false;
   private $fluidishLayout = false;
   private $gutter;
   private $border;
 
   public function setID($id) {
     $this->id = $id;
     return $this;
   }
 
   public function getID() {
     return $this->id;
   }
 
   public function addColumn(
     $column,
     $class = null,
     $sigil = null,
     $metadata = null) {
     $this->columns[] = array(
       'column' => $column,
       'class' => $class,
       'sigil' => $sigil,
       'metadata' => $metadata);
     return $this;
   }
 
   public function setFluidlayout($layout) {
     $this->fluidLayout = $layout;
     return $this;
   }
 
   public function setFluidishLayout($layout) {
     $this->fluidLayout = true;
     $this->fluidishLayout = $layout;
     return $this;
   }
 
   public function setGutter($gutter) {
     $this->gutter = $gutter;
     return $this;
   }
 
   public function setBorder($border) {
     $this->border = $border;
     return $this;
   }
 
   public function render() {
     require_celerity_resource('aphront-multi-column-view-css');
 
     $classes = array();
     $classes[] = 'aphront-multi-column-inner';
     $classes[] = 'grouped';
 
     if ($this->fluidishLayout || $this->fluidLayout) {
       // we only support seven columns for now for fluid views; see T4054
       if (count($this->columns) > 7) {
-        throw new Exception("No more than 7 columns per view.");
+        throw new Exception('No more than 7 columns per view.');
       }
     }
 
     $classes[] = 'aphront-multi-column-'.count($this->columns).'-up';
 
     $columns = array();
     $i = 0;
     foreach ($this->columns as $column_data) {
       $column_class = array('aphront-multi-column-column');
       if ($this->gutter) {
         $column_class[] = $this->gutter;
       }
       $outer_class = array('aphront-multi-column-column-outer');
       if (++$i === count($this->columns)) {
         $column_class[] = 'aphront-multi-column-column-last';
         $outer_class[] = 'aphront-multi-colum-column-outer-last';
       }
       $column = $column_data['column'];
       if ($column_data['class']) {
         $outer_class[] = $column_data['class'];
       }
       $column_sigil = idx($column_data, 'sigil');
       $column_metadata = idx($column_data, 'metadata');
       $column_inner = javelin_tag(
         'div',
         array(
           'class' => implode(' ', $column_class),
           'sigil' => $column_sigil,
           'meta'  => $column_metadata),
         $column);
       $columns[] = phutil_tag(
         'div',
         array(
           'class' => implode(' ', $outer_class)),
         $column_inner);
     }
 
     $view = phutil_tag(
       'div',
       array(
         'class' => implode(' ', $classes),
       ),
       array(
         $columns,
       ));
 
     $classes = array();
     $classes[] = 'aphront-multi-column-outer';
     if ($this->fluidLayout) {
       $classes[] = 'aphront-multi-column-fluid';
       if ($this->fluidishLayout) {
         $classes[] = 'aphront-multi-column-fluidish';
       }
     } else {
       $classes[] = 'aphront-multi-column-fixed';
     }
 
     $board = phutil_tag(
       'div',
         array(
           'class' => implode(' ', $classes)
         ),
         $view);
 
     if ($this->border) {
       $board = id(new PHUIBoxView())
         ->setBorder(true)
         ->appendChild($board)
         ->addPadding(PHUI::PADDING_MEDIUM_TOP)
         ->addPadding(PHUI::PADDING_MEDIUM_BOTTOM);
     }
 
     return phutil_tag(
       'div',
         array(
           'class' => 'aphront-multi-column-view',
           'id' => $this->getID(),
         ),
         $board);
   }
 }
diff --git a/src/view/layout/AphrontPanelView.php b/src/view/layout/AphrontPanelView.php
index 066d538de..43905b4c1 100644
--- a/src/view/layout/AphrontPanelView.php
+++ b/src/view/layout/AphrontPanelView.php
@@ -1,106 +1,106 @@
 <?php
 
 final class AphrontPanelView extends AphrontView {
 
   const WIDTH_FULL = 'full';
   const WIDTH_FORM = 'form';
   const WIDTH_WIDE = 'wide';
 
   private $buttons = array();
   private $header;
   private $caption;
   private $width;
   private $classes = array();
   private $id;
 
   public function setCreateButton($create_button, $href) {
     $this->addButton(
       phutil_tag(
         'a',
         array(
           'href' => $href,
           'class' => 'button green',
         ),
         $create_button));
 
     return $this;
   }
 
   public function addClass($class) {
     $this->classes[] = $class;
     return $this;
   }
 
   public function addButton($button) {
     $this->buttons[] = $button;
     return $this;
   }
 
   public function setHeader($header) {
     $this->header = $header;
     return $this;
   }
 
   public function setWidth($width) {
     $this->width = $width;
     return $this;
   }
 
   public function setID($id) {
     $this->id = $id;
     return $this;
   }
 
   public function setCaption($caption) {
     $this->caption = $caption;
     return $this;
   }
 
   public function setNoBackground() {
     $this->classes[] = 'aphront-panel-plain';
     return $this;
   }
 
   public function render() {
     if ($this->header !== null) {
       $header = phutil_tag('h1', array(), $this->header);
     } else {
       $header = null;
     }
 
     if ($this->caption !== null) {
       $caption = phutil_tag_div('aphront-panel-view-caption', $this->caption);
     } else {
       $caption = null;
     }
 
     $buttons = null;
     if ($this->buttons) {
       $buttons = phutil_tag_div(
         'aphront-panel-view-buttons',
-        phutil_implode_html(" ", $this->buttons));
+        phutil_implode_html(' ', $this->buttons));
     }
     $header_elements = phutil_tag_div(
       'aphront-panel-header',
       array($buttons, $header, $caption));
 
     $table = phutil_implode_html('', $this->renderChildren());
 
     require_celerity_resource('aphront-panel-view-css');
 
     $classes = $this->classes;
     $classes[] = 'aphront-panel-view';
     if ($this->width) {
       $classes[] = 'aphront-panel-width-'.$this->width;
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => implode(' ', $classes),
         'id'    => $this->id,
       ),
       array($header_elements, $table));
   }
 
 }
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
index 57ca64060..058ff15e9 100644
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -1,301 +1,301 @@
 <?php
 
 /**
  * Provides a navigation sidebar. For example:
  *
  *    $nav = new AphrontSideNavFilterView();
  *    $nav
  *      ->setBaseURI($some_uri)
  *      ->addLabel('Cats')
  *      ->addFilter('meow', 'Meow')
  *      ->addFilter('purr', 'Purr')
  *      ->addLabel('Dogs')
  *      ->addFilter('woof', 'Woof')
  *      ->addFilter('bark', 'Bark');
  *    $valid_filter = $nav->selectFilter($user_selection, $default = 'meow');
  *
  */
 final class AphrontSideNavFilterView extends AphrontView {
 
   private $items = array();
   private $baseURI;
   private $selectedFilter = false;
   private $flexible;
   private $collapsed = false;
   private $active;
   private $menu;
   private $crumbs;
   private $classes = array();
   private $menuID;
 
   public function setMenuID($menu_id) {
     $this->menuID = $menu_id;
     return $this;
   }
   public function getMenuID() {
     return $this->menuID;
   }
 
   public function __construct() {
     $this->menu = new PHUIListView();
   }
 
   public function addClass($class) {
     $this->classes[] = $class;
     return $this;
   }
 
   public static function newFromMenu(PHUIListView $menu) {
     $object = new AphrontSideNavFilterView();
     $object->setBaseURI(new PhutilURI('/'));
     $object->menu = $menu;
     return $object;
   }
 
   public function setCrumbs(PhabricatorCrumbsView $crumbs) {
     $this->crumbs = $crumbs;
     return $this;
   }
 
   public function getCrumbs() {
     return $this->crumbs;
   }
 
   public function setActive($active) {
     $this->active = $active;
     return $this;
   }
 
   public function setFlexible($flexible) {
     $this->flexible = $flexible;
     return $this;
   }
 
   public function setCollapsed($collapsed) {
     $this->collapsed = $collapsed;
     return $this;
   }
 
   public function getMenuView() {
     return $this->menu;
   }
 
   public function addMenuItem(PHUIListItemView $item) {
     $this->menu->addMenuItem($item);
     return $this;
   }
 
   public function getMenu() {
     return $this->menu;
   }
 
   public function addFilter($key, $name, $uri = null) {
     return $this->addThing(
       $key, $name, $uri, PHUIListItemView::TYPE_LINK);
   }
 
   public function addButton($key, $name, $uri = null) {
     return $this->addThing(
       $key, $name, $uri, PHUIListItemView::TYPE_BUTTON);
   }
 
   private function addThing(
     $key,
     $name,
     $uri = null,
     $type) {
 
     $item = id(new PHUIListItemView())
       ->setName($name)
       ->setType($type);
 
     if (strlen($key)) {
       $item->setKey($key);
     }
 
     if ($uri) {
       $item->setHref($uri);
     } else {
       $href = clone $this->baseURI;
       $href->setPath(rtrim($href->getPath().$key, '/').'/');
       $href = (string)$href;
 
       $item->setHref($href);
     }
 
     return $this->addMenuItem($item);
   }
 
   public function addCustomBlock($block) {
     $this->menu->addMenuItem(
       id(new PHUIListItemView())
         ->setType(PHUIListItemView::TYPE_CUSTOM)
         ->appendChild($block));
     return $this;
   }
 
   public function addLabel($name) {
     return $this->addMenuItem(
       id(new PHUIListItemView())
         ->setType(PHUIListItemView::TYPE_LABEL)
         ->setName($name));
   }
 
   public function setBaseURI(PhutilURI $uri) {
     $this->baseURI = $uri;
     return $this;
   }
 
   public function getBaseURI() {
     return $this->baseURI;
   }
 
   public function selectFilter($key, $default = null) {
     $this->selectedFilter = $default;
     if ($this->menu->getItem($key) && strlen($key)) {
       $this->selectedFilter = $key;
     }
     return $this->selectedFilter;
   }
 
   public function getSelectedFilter() {
     return $this->selectedFilter;
   }
 
   public function render() {
     if ($this->menu->getItems()) {
       if (!$this->baseURI) {
-        throw new Exception(pht("Call setBaseURI() before render()!"));
+        throw new Exception(pht('Call setBaseURI() before render()!'));
       }
       if ($this->selectedFilter === false) {
-        throw new Exception(pht("Call selectFilter() before render()!"));
+        throw new Exception(pht('Call selectFilter() before render()!'));
       }
     }
 
     if ($this->selectedFilter !== null) {
       $selected_item = $this->menu->getItem($this->selectedFilter);
       if ($selected_item) {
         $selected_item->addClass('phui-list-item-selected');
       }
     }
 
     require_celerity_resource('phabricator-side-menu-view-css');
 
     return $this->renderFlexNav();
   }
 
   private function renderFlexNav() {
 
     $user = $this->user;
 
     require_celerity_resource('phabricator-nav-view-css');
 
     $nav_classes = array();
     $nav_classes[] = 'phabricator-nav';
 
     $nav_id = null;
     $drag_id = null;
     $content_id = celerity_generate_unique_node_id();
     $local_id = null;
     $background_id = null;
     $local_menu = null;
     $main_id = celerity_generate_unique_node_id();
 
     if ($this->flexible) {
       $drag_id = celerity_generate_unique_node_id();
       $flex_bar = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-nav-drag',
           'id' => $drag_id,
         ),
         '');
     } else {
       $flex_bar = null;
     }
 
     $nav_menu = null;
     if ($this->menu->getItems()) {
       $local_id = celerity_generate_unique_node_id();
       $background_id = celerity_generate_unique_node_id();
 
       if (!$this->collapsed) {
         $nav_classes[] = 'has-local-nav';
       }
 
       $menu_background = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-nav-column-background',
           'id'    => $background_id,
         ),
         '');
 
       $local_menu = array(
         $menu_background,
         phutil_tag(
           'div',
           array(
             'class' => 'phabricator-nav-local phabricator-side-menu',
             'id'    => $local_id,
           ),
           $this->menu->setID($this->getMenuID())),
       );
     }
 
     $crumbs = null;
     if ($this->crumbs) {
       $crumbs = $this->crumbs->render();
       $nav_classes[] = 'has-crumbs';
     }
 
     if ($this->flexible) {
       if (!$this->collapsed) {
         $nav_classes[] = 'has-drag-nav';
       }
 
       Javelin::initBehavior(
         'phabricator-nav',
         array(
           'mainID'        => $main_id,
           'localID'       => $local_id,
           'dragID'        => $drag_id,
           'contentID'     => $content_id,
           'backgroundID'  => $background_id,
           'collapsed'     => $this->collapsed,
         ));
 
       if ($this->active) {
         Javelin::initBehavior(
           'phabricator-active-nav',
           array(
             'localID' => $local_id,
           ));
       }
     }
 
     $nav_classes = array_merge($nav_classes, $this->classes);
 
     return phutil_tag(
       'div',
       array(
         'class' => implode(' ', $nav_classes),
         'id'    => $main_id,
       ),
       array(
         $local_menu,
         $flex_bar,
         phutil_tag(
           'div',
           array(
             'class' => 'phabricator-nav-content mlb',
             'id' => $content_id,
           ),
           array(
             $crumbs,
             $this->renderChildren(),
           ))
       ));
   }
 
 }
diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
index c5f156bb0..866cd4549 100644
--- a/src/view/layout/PhabricatorActionListView.php
+++ b/src/view/layout/PhabricatorActionListView.php
@@ -1,66 +1,66 @@
 <?php
 
 final class PhabricatorActionListView extends AphrontView {
 
   private $actions = array();
   private $object;
   private $objectURI;
   private $id = null;
 
   public function setObject(PhabricatorLiskDAO $object) {
     $this->object = $object;
     return $this;
   }
 
   public function setObjectURI($uri) {
     $this->objectURI = $uri;
     return $this;
   }
 
   public function addAction(PhabricatorActionView $view) {
     $this->actions[] = $view;
     return $this;
   }
 
   public function setID($id) {
     $this->id = $id;
     return $this;
   }
 
   public function render() {
     if (!$this->user) {
-      throw new Exception(pht("Call setUser() before render()!"));
+      throw new Exception(pht('Call setUser() before render()!'));
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS,
       array(
         'object'  => $this->object,
         'actions' => $this->actions,
       ));
     $event->setUser($this->user);
     PhutilEventEngine::dispatchEvent($event);
 
     $actions = $event->getValue('actions');
     if (!$actions) {
       return null;
     }
 
     foreach ($actions as $action) {
       $action->setObjectURI($this->objectURI);
       $action->setUser($this->user);
     }
 
     require_celerity_resource('phabricator-action-list-view-css');
 
     return phutil_tag(
       'ul',
       array(
         'class' => 'phabricator-action-list-view',
         'id' => $this->id
       ),
       $actions);
   }
 
 
 }
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index bc8a9c81e..05fab2301 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -1,131 +1,131 @@
 <?php
 
 final class PhabricatorSourceCodeView extends AphrontView {
 
   private $lines;
   private $limit;
   private $uri;
   private $highlights = array();
   private $canClickHighlight = true;
 
   public function setLimit($limit) {
     $this->limit = $limit;
     return $this;
   }
 
   public function setLines(array $lines) {
     $this->lines = $lines;
     return $this;
   }
 
   public function setURI(PhutilURI $uri) {
     $this->uri = $uri;
     return $this;
   }
 
   public function setHighlights(array $array) {
     $this->highlights = array_fuse($array);
     return $this;
   }
 
   public function disableHighlightOnClick() {
     $this->canClickHighlight = false;
     return $this;
   }
 
   public function render() {
     require_celerity_resource('phabricator-source-code-view-css');
     require_celerity_resource('syntax-highlighting-css');
 
     Javelin::initBehavior('phabricator-oncopy', array());
     if ($this->canClickHighlight) {
       Javelin::initBehavior('phabricator-line-linker');
     }
 
     $line_number = 1;
 
     $rows = array();
 
     foreach ($this->lines as $line) {
       $hit_limit = $this->limit &&
                    ($line_number == $this->limit) &&
                    (count($this->lines) != $this->limit);
 
       if ($hit_limit) {
         $content_number = '';
         $content_line = phutil_tag(
           'span',
           array(
             'class' => 'c',
           ),
           pht('...'));
       } else {
         $content_number = $line_number;
         // NOTE: See phabricator-oncopy behavior.
         $content_line = hsprintf("\xE2\x80\x8B%s", $line);
       }
 
       $row_attributes = array();
       if (isset($this->highlights[$line_number])) {
         $row_attributes['class'] = 'phabricator-source-highlight';
       }
 
       if ($this->canClickHighlight) {
-        $line_uri = $this->uri . "$" . $line_number;
+        $line_uri = $this->uri . '$' . $line_number;
         $line_href = (string) new PhutilURI($line_uri);
 
         $tag_number = javelin_tag(
           'a',
           array(
                'href' => $line_href
           ),
           $line_number);
       } else {
         $tag_number = javelin_tag(
           'span',
           array(),
           $line_number);
       }
 
       $rows[] = phutil_tag(
         'tr',
         $row_attributes,
         array(
           javelin_tag(
             'th',
             array(
               'class' => 'phabricator-source-line',
               'sigil' => 'phabricator-source-line'
             ),
             $tag_number),
           phutil_tag(
             'td',
             array(
               'class' => 'phabricator-source-code'
             ),
             $content_line)));
 
       if ($hit_limit) {
         break;
       }
 
       $line_number++;
     }
 
     $classes = array();
     $classes[] = 'phabricator-source-code-view';
     $classes[] = 'remarkup-code';
     $classes[] = 'PhabricatorMonospaced';
 
     return phutil_tag_div(
       'phabricator-source-code-container',
       javelin_tag(
         'table',
         array(
           'class' => implode(' ', $classes),
           'sigil' => 'phabricator-source'
         ),
         phutil_implode_html('', $rows)));
   }
 
 }
diff --git a/src/view/layout/PhabricatorTransactionView.php b/src/view/layout/PhabricatorTransactionView.php
index f87a1f3df..f0eeb4296 100644
--- a/src/view/layout/PhabricatorTransactionView.php
+++ b/src/view/layout/PhabricatorTransactionView.php
@@ -1,146 +1,146 @@
 <?php
 
 final class PhabricatorTransactionView extends AphrontView {
 
   private $imageURI;
   private $actions = array();
   private $epoch;
   private $contentSource;
   private $anchorName;
   private $anchorText;
   private $isPreview;
   private $classes = array();
 
   public function setImageURI($uri) {
     $this->imageURI = $uri;
     return $this;
   }
 
   public function setActions(array $actions) {
     $this->actions = $actions;
     return $this;
   }
 
   public function setEpoch($epoch) {
     $this->epoch = $epoch;
     return $this;
   }
 
   public function setContentSource(PhabricatorContentSource $source) {
     $this->contentSource = $source;
     return $this;
   }
 
   public function setAnchor($anchor_name, $anchor_text) {
     $this->anchorName = $anchor_name;
     $this->anchorText = $anchor_text;
     return $this;
   }
 
   public function addClass($class) {
     $this->classes[] = $class;
     return $this;
   }
 
   public function setIsPreview($preview) {
     $this->isPreview = $preview;
     return $this;
   }
 
   public function render() {
     if (!$this->user) {
-      throw new Exception(pht("Call setUser() before render()!"));
+      throw new Exception(pht('Call setUser() before render()!'));
     }
 
     require_celerity_resource('phabricator-transaction-view-css');
 
     $info = $this->renderTransactionInfo();
     $actions = $this->renderTransactionActions();
     $style = $this->renderTransactionStyle();
     $content = $this->renderTransactionContent();
     $classes = implode(' ', $this->classes);
 
     $transaction_id = $this->anchorName ? 'anchor-'.$this->anchorName : null;
 
     $header = phutil_tag_div(
       'phabricator-transaction-header',
       array($info, $actions));
 
     return phutil_tag(
       'div',
       array(
         'class' => 'phabricator-transaction-view',
         'id'    => $transaction_id,
         'style' => $style,
       ),
       phutil_tag_div(
         'phabricator-transaction-detail '.$classes,
         array($header, $content)));
 
   }
 
   private function renderTransactionInfo() {
     $info = array();
 
     if ($this->contentSource) {
       $content_source = new PhabricatorContentSourceView();
       $content_source->setContentSource($this->contentSource);
       $content_source->setUser($this->user);
       $source = $content_source->render();
       if ($source) {
         $info[] = $source;
       }
     }
 
     if ($this->isPreview) {
       $info[] = 'PREVIEW';
     } else if ($this->epoch) {
       $info[] = phabricator_datetime($this->epoch, $this->user);
     }
 
     if ($this->anchorName) {
       Javelin::initBehavior('phabricator-watch-anchor');
 
       $anchor = id(new PhabricatorAnchorView())
         ->setAnchorName($this->anchorName)
         ->render();
 
       $info[] = hsprintf(
         '%s%s',
         $anchor,
         phutil_tag(
           'a',
           array('href'  => '#'.$this->anchorName),
           $this->anchorText));
     }
 
     $info = phutil_implode_html(" \xC2\xB7 ", $info);
 
     return phutil_tag(
       'span',
       array('class' => 'phabricator-transaction-info'),
       $info);
   }
 
   private function renderTransactionActions() {
     return $this->actions;
   }
 
   private function renderTransactionStyle() {
     if ($this->imageURI) {
       return 'background-image: url('.$this->imageURI.');';
     } else {
       return null;
     }
   }
 
   private function renderTransactionContent() {
     if (!$this->hasChildren()) {
       return null;
     }
     return phutil_tag_div(
       'phabricator-transaction-content',
       $this->renderChildren());
   }
 
 }
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 093287eb6..8ea05e8fd 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -1,453 +1,453 @@
 <?php
 
 /**
  * This is a standard Phabricator page with menus, Javelin, DarkConsole, and
  * basic styles.
  *
  */
 final class PhabricatorStandardPageView extends PhabricatorBarePageView {
 
   private $baseURI;
   private $applicationName;
   private $glyph;
   private $menuContent;
   private $showChrome = true;
   private $disableConsole;
   private $pageObjects = array();
   private $applicationMenu;
 
   public function setApplicationMenu(PHUIListView $application_menu) {
     $this->applicationMenu = $application_menu;
     return $this;
   }
 
   public function getApplicationMenu() {
     return $this->applicationMenu;
   }
 
   public function setApplicationName($application_name) {
     $this->applicationName = $application_name;
     return $this;
   }
 
   public function setDisableConsole($disable) {
     $this->disableConsole = $disable;
     return $this;
   }
 
   public function getApplicationName() {
     return $this->applicationName;
   }
 
   public function setBaseURI($base_uri) {
     $this->baseURI = $base_uri;
     return $this;
   }
 
   public function getBaseURI() {
     return $this->baseURI;
   }
 
   public function setShowChrome($show_chrome) {
     $this->showChrome = $show_chrome;
     return $this;
   }
 
   public function getShowChrome() {
     return $this->showChrome;
   }
 
   public function appendPageObjects(array $objs) {
     foreach ($objs as $obj) {
       $this->pageObjects[] = $obj;
     }
   }
 
   public function getTitle() {
     $use_glyph = true;
 
     $request = $this->getRequest();
     if ($request) {
       $user = $request->getUser();
       if ($user && $user->loadPreferences()->getPreference(
             PhabricatorUserPreferences::PREFERENCE_TITLES) !== 'glyph') {
         $use_glyph = false;
       }
     }
 
     $title = parent::getTitle();
 
     $prefix = null;
     if ($use_glyph) {
       $prefix = $this->getGlyph();
     } else {
       $application_name = $this->getApplicationName();
       if (strlen($application_name)) {
         $prefix = '['.$application_name.']';
       }
     }
 
     if (strlen($prefix)) {
       $title = $prefix.' '.$title;
     }
 
     return $title;
   }
 
 
   protected function willRenderPage() {
     parent::willRenderPage();
 
     if (!$this->getRequest()) {
       throw new Exception(
         pht(
-          "You must set the Request to render a PhabricatorStandardPageView."));
+          'You must set the Request to render a PhabricatorStandardPageView.'));
     }
 
     $console = $this->getConsole();
 
     require_celerity_resource('phabricator-core-css');
     require_celerity_resource('phabricator-zindex-css');
     require_celerity_resource('phui-button-css');
     require_celerity_resource('phui-spacing-css');
     require_celerity_resource('phui-form-css');
     require_celerity_resource('sprite-gradient-css');
     require_celerity_resource('phabricator-standard-page-view');
 
     Javelin::initBehavior('workflow', array());
 
     $request = $this->getRequest();
     $user = null;
     if ($request) {
       $user = $request->getUser();
     }
 
     if ($user) {
       $default_img_uri =
         PhabricatorEnv::getCDNURI(
           '/rsrc/image/icon/fatcow/document_black.png');
       $download_form = phabricator_form(
         $user,
         array(
           'action' => '#',
           'method' => 'POST',
           'class'  => 'lightbox-download-form',
           'sigil'  => 'download',
         ),
         phutil_tag(
           'button',
           array(),
           pht('Download')));
 
       Javelin::initBehavior(
         'lightbox-attachments',
         array(
           'defaultImageUri' => $default_img_uri,
           'downloadForm'    => $download_form,
         ));
     }
 
     Javelin::initBehavior('aphront-form-disable-on-submit');
     Javelin::initBehavior('toggle-class', array());
     Javelin::initBehavior('konami', array());
     Javelin::initBehavior('history-install');
     Javelin::initBehavior('phabricator-gesture');
 
     $current_token = null;
     if ($user) {
       $current_token = $user->getCSRFToken();
     }
 
     Javelin::initBehavior(
       'refresh-csrf',
       array(
         'tokenName' => AphrontRequest::getCSRFTokenName(),
         'header'    => AphrontRequest::getCSRFHeaderName(),
         'current'   => $current_token,
       ));
 
     Javelin::initBehavior('device');
 
     if ($user->hasSession()) {
       $hisec = ($user->getSession()->getHighSecurityUntil() - time());
       if ($hisec > 0) {
         $remaining_time = phabricator_format_relative_time($hisec);
         Javelin::initBehavior(
           'high-security-warning',
           array(
             'uri' => '/auth/session/downgrade/',
             'message' => pht(
               'Your session is in high security mode. When you '.
               'finish using it, click here to leave.',
               $remaining_time),
           ));
       }
     }
 
     if ($console) {
       require_celerity_resource('aphront-dark-console-css');
 
       $headers = array();
       if (DarkConsoleXHProfPluginAPI::isProfilerStarted()) {
         $headers[DarkConsoleXHProfPluginAPI::getProfilerHeader()] = 'page';
       }
       if (DarkConsoleServicesPlugin::isQueryAnalyzerRequested()) {
         $headers[DarkConsoleServicesPlugin::getQueryAnalyzerHeader()] = true;
       }
 
       Javelin::initBehavior(
         'dark-console',
         array(
           // NOTE: We use a generic label here to prevent input reflection
           // and mitigate compression attacks like BREACH. See discussion in
           // T3684.
           'uri' => pht('Main Request'),
           'selected' => $user ? $user->getConsoleTab() : null,
           'visible'  => $user ? (int)$user->getConsoleVisible() : true,
           'headers' => $headers,
         ));
 
       // Change this to initBehavior when there is some behavior to initialize
       require_celerity_resource('javelin-behavior-error-log');
     }
 
     if ($user) {
       $viewer = $user;
     } else {
       $viewer = new PhabricatorUser();
     }
 
     $menu = id(new PhabricatorMainMenuView())
       ->setUser($viewer);
 
     if ($this->getController()) {
       $menu->setController($this->getController());
     }
 
     if ($this->getApplicationMenu()) {
       $menu->setApplicationMenu($this->getApplicationMenu());
     }
 
     $this->menuContent = $menu->render();
   }
 
 
   protected function getHead() {
     $monospaced = PhabricatorEnv::getEnvConfig('style.monospace');
     $monospaced_win = PhabricatorEnv::getEnvConfig('style.monospace.windows');
 
     $request = $this->getRequest();
     if ($request) {
       $user = $request->getUser();
       if ($user) {
         $pref = $user->loadPreferences()->getPreference(
             PhabricatorUserPreferences::PREFERENCE_MONOSPACED);
         $monospaced = nonempty($pref, $monospaced);
         $monospaced_win = nonempty($pref, $monospaced_win);
       }
     }
 
     $response = CelerityAPI::getStaticResourceResponse();
 
     return hsprintf(
       '%s<style type="text/css">'.
       '.PhabricatorMonospaced, '.
       '.phabricator-remarkup .remarkup-code-block { font: %s; } '.
       '.platform-windows .PhabricatorMonospaced, '.
       '.platform-windows .phabricator-remarkup '.
         '.remarkup-code-block { font: %s; }'.
       '</style>%s',
       parent::getHead(),
       phutil_safe_html($monospaced),
       phutil_safe_html($monospaced_win),
       $response->renderSingleResource('javelin-magical-init', 'phabricator'));
   }
 
   public function setGlyph($glyph) {
     $this->glyph = $glyph;
     return $this;
   }
 
   public function getGlyph() {
     return $this->glyph;
   }
 
   protected function willSendResponse($response) {
     $request = $this->getRequest();
     $response = parent::willSendResponse($response);
 
     $console = $request->getApplicationConfiguration()->getConsole();
 
     if ($console) {
       $response = PhutilSafeHTML::applyFunction(
         'str_replace',
         hsprintf('<darkconsole />'),
         $console->render($request),
         $response);
     }
 
     return $response;
   }
 
   protected function getBody() {
     $console = $this->getConsole();
 
     $user = null;
     $request = $this->getRequest();
     if ($request) {
       $user = $request->getUser();
     }
 
     $header_chrome = null;
     if ($this->getShowChrome()) {
       $header_chrome = $this->menuContent;
     }
 
     $developer_warning = null;
     if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode') &&
         DarkConsoleErrorLogPluginAPI::getErrors()) {
       $developer_warning = phutil_tag_div(
         'aphront-developer-error-callout',
         pht(
           'This page raised PHP errors. Find them in DarkConsole '.
           'or the error log.'));
     }
 
     // Render the "you have unresolved setup issues..." warning.
     $setup_warning = null;
     if ($user && $user->getIsAdmin()) {
       $open = PhabricatorSetupCheck::getOpenSetupIssueCount();
       if ($open) {
         $setup_warning = phutil_tag_div(
           'setup-warning-callout',
           phutil_tag(
             'a',
             array(
               'href' => '/config/issue/',
             ),
             pht('You have %d unresolved setup issue(s)...', $open)));
       }
     }
 
     return
       phutil_tag(
         'div',
         array(
           'id' => 'base-page',
           'class' => 'phabricator-standard-page',
         ),
         array(
           $developer_warning,
           $setup_warning,
           $header_chrome,
           phutil_tag_div('phabricator-standard-page-body', array(
             ($console ? hsprintf('<darkconsole />') : null),
             parent::getBody(),
             phutil_tag('div', array('style' => 'clear: both;')),
           )),
         ));
   }
 
   protected function getTail() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $tail = array(
       parent::getTail(),
     );
 
     $response = CelerityAPI::getStaticResourceResponse();
 
     if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
       if ($user && $user->isLoggedIn()) {
 
         $aphlict_object_id = celerity_generate_unique_node_id();
         $aphlict_container_id = celerity_generate_unique_node_id();
 
         $client_uri = PhabricatorEnv::getEnvConfig('notification.client-uri');
         $client_uri = new PhutilURI($client_uri);
         if ($client_uri->getDomain() == 'localhost') {
           $this_host = $this->getRequest()->getHost();
           $this_host = new PhutilURI('http://'.$this_host.'/');
           $client_uri->setDomain($this_host->getDomain());
         }
 
         $map = CelerityResourceMap::getNamedInstance('phabricator');
         $swf_uri = $response->getURI($map, 'rsrc/swf/aphlict.swf');
 
         $enable_debug = PhabricatorEnv::getEnvConfig('notification.debug');
         Javelin::initBehavior(
           'aphlict-listen',
           array(
             'id'           => $aphlict_object_id,
             'containerID'  => $aphlict_container_id,
             'server'       => $client_uri->getDomain(),
             'port'         => $client_uri->getPort(),
             'debug'        => $enable_debug,
             'swfURI'       => $swf_uri,
             'pageObjects'  => array_fill_keys($this->pageObjects, true),
           ));
 
         $tail[] = phutil_tag(
           'div',
           array(
             'id' => $aphlict_container_id,
             'style' =>
               'position: absolute; width: 0; height: 0; overflow: hidden;',
           ),
           '');
       }
     }
 
     $tail[] = $response->renderHTMLFooter();
 
     return $tail;
   }
 
   protected function getBodyClasses() {
     $classes = array();
 
     if (!$this->getShowChrome()) {
       $classes[] = 'phabricator-chromeless-page';
     }
 
     $agent = AphrontRequest::getHTTPHeader('User-Agent');
 
     // Try to guess the device resolution based on UA strings to avoid a flash
     // of incorrectly-styled content.
     $device_guess = 'device-desktop';
     if (preg_match('@iPhone|iPod|(Android.*Chrome/[.0-9]* Mobile)@', $agent)) {
       $device_guess = 'device-phone device';
     } else if (preg_match('@iPad|(Android.*Chrome/)@', $agent)) {
       $device_guess = 'device-tablet device';
     }
 
     $classes[] = $device_guess;
 
     if (preg_match('@Windows@', $agent)) {
       $classes[] = 'platform-windows';
     } else if (preg_match('@Macintosh@', $agent)) {
       $classes[] = 'platform-mac';
     } else if (preg_match('@X11@', $agent)) {
       $classes[] = 'platform-linux';
     }
 
     if ($this->getRequest()->getStr('__print__')) {
       $classes[] = 'printable';
     }
 
     if ($this->getRequest()->getStr('__aural__')) {
       $classes[] = 'audible';
     }
 
     return implode(' ', $classes);
   }
 
   private function getConsole() {
     if ($this->disableConsole) {
       return null;
     }
     return $this->getRequest()->getApplicationConfiguration()->getConsole();
   }
 
 }
diff --git a/src/view/phui/PHUIButtonBarView.php b/src/view/phui/PHUIButtonBarView.php
index 5e644a29b..861ea34eb 100644
--- a/src/view/phui/PHUIButtonBarView.php
+++ b/src/view/phui/PHUIButtonBarView.php
@@ -1,42 +1,42 @@
 <?php
 
 final class PHUIButtonBarView extends AphrontTagView {
 
   private $buttons = array();
 
   public function addButton($button) {
     $this->buttons[] = $button;
     return $this;
   }
 
   protected function getTagAttributes() {
     return array('class' => 'phui-button-bar');
   }
 
   public function getTagName() {
     return 'div';
   }
 
   public function getTagContent() {
     require_celerity_resource('phui-button-css');
 
     $i = 1;
     $j = count($this->buttons);
     foreach ($this->buttons as $button) {
       // LeeLoo Dallas Multi-Pass
       if ($j > 1) {
         if ($i == 1) {
           $button->addClass('phui-button-bar-first');
-        } elseif ($i == $j) {
+        } else if ($i == $j) {
           $button->addClass('phui-button-bar-last');
-        } elseif ($j > 1) {
+        } else if ($j > 1) {
           $button->addClass('phui-button-bar-middle');
         }
       }
       $this->appendChild($button);
       $i++;
     }
 
     return $this->renderChildren();
   }
 }
diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php
index 5fc874547..9c4c95dfc 100644
--- a/src/view/phui/PHUIFeedStoryView.php
+++ b/src/view/phui/PHUIFeedStoryView.php
@@ -1,275 +1,275 @@
 <?php
 
 final class PHUIFeedStoryView extends AphrontView {
 
   private $title;
   private $image;
   private $imageHref;
   private $appIcon;
   private $phid;
   private $epoch;
   private $viewed;
   private $href;
   private $pontification = null;
   private $tokenBar = array();
   private $projects = array();
   private $actions = array();
   private $chronologicalKey;
 
   public function setChronologicalKey($chronological_key) {
     $this->chronologicalKey = $chronological_key;
     return $this;
   }
 
   public function getChronologicalKey() {
     return $this->chronologicalKey;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function getTitle() {
     return $this->title;
   }
 
   public function setEpoch($epoch) {
     $this->epoch = $epoch;
     return $this;
   }
 
   public function setImage($image) {
     $this->image = $image;
     return $this;
   }
 
   public function setImageHref($image_href) {
     $this->imageHref = $image_href;
     return $this;
   }
 
   public function setAppIcon($icon) {
     $this->appIcon = $icon;
     return $this;
   }
 
   public function setViewed($viewed) {
     $this->viewed = $viewed;
     return $this;
   }
 
   public function getViewed() {
     return $this->viewed;
   }
 
   public function setHref($href) {
     $this->href = $href;
     return $this;
   }
 
   public function setTokenBar(array $tokens) {
     $this->tokenBar = $tokens;
     return $this;
   }
 
   public function addProject($project) {
     $this->projects[] = $project;
     return $this;
   }
 
   public function addAction(PHUIIconView $action) {
     $this->actions[] = $action;
     return $this;
   }
 
   public function setPontification($text, $title = null) {
     if ($title) {
       $title = phutil_tag('h3', array(), $title);
     }
     $copy = phutil_tag(
       'div',
         array(
           'class' => 'phui-feed-story-bigtext-post',
         ),
         array(
           $title,
           $text));
     $this->appendChild($copy);
     return $this;
   }
 
   public function getHref() {
     return $this->href;
   }
 
   public function renderNotification($user) {
     $classes = array(
       'phabricator-notification',
     );
 
     if (!$this->viewed) {
       $classes[] = 'phabricator-notification-unread';
     }
     if ($this->epoch) {
       if ($user) {
         $foot = phabricator_datetime($this->epoch, $user);
         $foot = phutil_tag(
           'span',
           array(
             'class' => 'phabricator-notification-date'),
           $foot);
       } else {
         $foot = null;
       }
     } else {
       $foot = pht('No time specified.');
     }
 
     return javelin_tag(
       'div',
       array(
         'class' => implode(' ', $classes),
         'sigil' => 'notification',
         'meta' => array(
           'href' => $this->getHref(),
         ),
       ),
       array($this->title, $foot));
   }
 
   public function render() {
 
     require_celerity_resource('phui-feed-story-css');
     Javelin::initBehavior('phabricator-hovercards');
 
     $body = null;
     $foot = null;
     $image_style = null;
     $actor = '';
 
     if ($this->image) {
       $actor = new PHUIIconView();
       $actor->setImage($this->image);
       $actor->addClass('phui-feed-story-actor-image');
       if ($this->imageHref) {
         $actor->setHref($this->imageHref);
       }
     }
 
     if ($this->epoch) {
       // TODO: This is really bad; when rendering through Conduit and via
       // renderText() we don't have a user.
       if ($this->user) {
         $foot = phabricator_datetime($this->epoch, $this->user);
       } else {
         $foot = null;
       }
     } else {
       $foot = pht('No time specified.');
     }
 
     if ($this->chronologicalKey) {
       $foot = phutil_tag(
         'a',
         array(
           'href' => '/feed/'.$this->chronologicalKey.'/',
         ),
         $foot);
     }
 
     $icon = null;
     if ($this->appIcon) {
       $icon = new PHUIIconView();
       $icon->setSpriteIcon($this->appIcon);
       $icon->setSpriteSheet(PHUIIconView::SPRITE_APPS);
     }
 
     $action_list = array();
     $icons = null;
     foreach ($this->actions as $action) {
       $action_list[] = phutil_tag(
         'li',
           array(
           'class' => 'phui-feed-story-action-item'
         ),
         $action);
     }
     if (!empty($action_list)) {
       $icons = phutil_tag(
         'ul',
           array(
             'class' => 'phui-feed-story-action-list'
           ),
           $action_list);
     }
 
     $head = phutil_tag(
       'div',
       array(
         'class' => 'phui-feed-story-head',
       ),
       array(
         $actor,
         nonempty($this->title, pht('Untitled Story')),
         $icons,
       ));
 
     if (!empty($this->tokenBar)) {
       $tokenview = phutil_tag(
         'div',
           array(
             'class' => 'phui-feed-token-bar'
           ),
         $this->tokenBar);
       $this->appendChild($tokenview);
     }
 
     $body_content = $this->renderChildren();
     if ($body_content) {
       $body = phutil_tag(
         'div',
         array(
           'class' => 'phui-feed-story-body',
         ),
         $body_content);
     }
 
     $foot = phutil_tag(
       'div',
       array(
         'class' => 'phui-feed-story-foot',
       ),
       array(
         $icon,
         $foot));
 
     $classes = array('phui-feed-story');
 
     return id(new PHUIBoxView())
       ->addClass(implode(' ', $classes))
       ->setBorder(true)
       ->addMargin(PHUI::MARGIN_MEDIUM_BOTTOM)
       ->appendChild(array($head, $body, $foot));
   }
 
   public function setAppIconFromPHID($phid) {
     switch (phid_get_type($phid)) {
       case PholioPHIDTypeMock::TYPECONST:
-        $this->setAppIcon("pholio-dark");
+        $this->setAppIcon('pholio-dark');
         break;
       case PhabricatorMacroPHIDTypeMacro::TYPECONST:
-        $this->setAppIcon("macro-dark");
+        $this->setAppIcon('macro-dark');
         break;
       case ManiphestPHIDTypeTask::TYPECONST:
         $this->setAppIcon('maniphest-dark');
         break;
       case DifferentialPHIDTypeRevision::TYPECONST:
         $this->setAppIcon('differential-dark');
         break;
       case PhabricatorCalendarPHIDTypeEvent::TYPECONST:
         $this->setAppIcon('calendar-dark');
         break;
     }
   }
 }
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
index 77091e9e9..c950f08d3 100644
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -1,113 +1,113 @@
 <?php
 
 final class PHUIIconView extends AphrontTagView {
 
   const SPRITE_MINICONS = 'minicons';
   const SPRITE_APPS = 'apps';
   const SPRITE_TOKENS = 'tokens';
   const SPRITE_PAYMENTS = 'payments';
   const SPRITE_LOGIN = 'login';
   const SPRITE_PROJECTS = 'projects';
 
   const HEAD_SMALL = 'phuihead-small';
   const HEAD_MEDIUM = 'phuihead-medium';
 
   private $href = null;
   private $image;
   private $text;
   private $headSize = null;
 
   private $spriteIcon;
   private $spriteSheet;
   private $iconFont;
 
   public function setHref($href) {
     $this->href = $href;
     return $this;
   }
 
   public function setImage($image) {
     $this->image = $image;
     return $this;
   }
 
   public function setText($text) {
     $this->text = $text;
     return $this;
   }
 
   public function setHeadSize($size) {
     $this->headSize = $size;
     return $this;
   }
 
   public function setSpriteIcon($sprite) {
     $this->spriteIcon = $sprite;
     return $this;
   }
 
   public function setSpriteSheet($sheet) {
     $this->spriteSheet = $sheet;
     return $this;
   }
 
   public function setIconFont($icon) {
     $this->iconFont = $icon;
     return $this;
   }
 
   public function getTagName() {
     $tag = 'span';
     if ($this->href) {
       $tag = 'a';
     }
     return $tag;
   }
 
   public function getTagAttributes() {
     require_celerity_resource('phui-icon-view-css');
 
     $style = null;
     $classes = array();
     $classes[] = 'phui-icon-view';
 
     if ($this->spriteIcon) {
       require_celerity_resource('sprite-'.$this->spriteSheet.'-css');
       $classes[] = 'sprite-'.$this->spriteSheet;
       $classes[] = $this->spriteSheet.'-'.$this->spriteIcon;
 
-    } elseif ($this->iconFont) {
+    } else if ($this->iconFont) {
       require_celerity_resource('phui-font-icon-base-css');
       require_celerity_resource('font-fontawesome');
       $classes[] = 'phui-font-fa';
       $classes[] = $this->iconFont;
 
     } else {
       if ($this->headSize) {
         $classes[] = $this->headSize;
       }
       $style = 'background-image: url('.$this->image.');';
     }
 
     if ($this->text) {
       $classes[] = 'phui-icon-has-text';
       $this->appendChild($this->text);
     }
 
     return array(
       'href' => $this->href,
       'style' => $style,
       'aural' => false,
       'class' => $classes,
     );
   }
 
   public static function getSheetManifest($sheet) {
     $root = dirname(phutil_get_library_root('phabricator'));
     $path = $root.'/resources/sprite/manifest/'.$sheet.'.json';
     $data = Filesystem::readFile($path);
     return idx(json_decode($data, true), 'sprites');
   }
 
 
 }
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
index 80592fe5f..6dd6c99b8 100644
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -1,647 +1,647 @@
 <?php
 
 final class PHUIObjectItemView extends AphrontTagView {
 
   private $objectName;
   private $header;
   private $subhead;
   private $href;
   private $attributes = array();
   private $icons = array();
   private $barColor;
   private $object;
   private $effect;
   private $footIcons = array();
   private $handleIcons = array();
   private $bylines = array();
   private $grippable;
   private $actions = array();
   private $headIcons = array();
   private $disabled;
   private $imageURI;
   private $state;
   private $fontIcon;
   private $imageIcon;
 
   const AGE_FRESH = 'fresh';
   const AGE_STALE = 'stale';
   const AGE_OLD   = 'old';
 
   const STATE_SUCCESS = 'green';
   const STATE_FAIL = 'red';
   const STATE_WARN = 'yellow';
   const STATE_NOTE = 'blue';
   const STATE_BUILD = 'sky';
 
   public function setDisabled($disabled) {
     $this->disabled = $disabled;
     return $this;
   }
 
   public function getDisabled() {
     return $this->disabled;
   }
 
   public function addHeadIcon($icon) {
     $this->headIcons[] = $icon;
     return $this;
   }
 
   public function setObjectName($name) {
     $this->objectName = $name;
     return $this;
   }
 
   public function setGrippable($grippable) {
     $this->grippable = $grippable;
     return $this;
   }
 
   public function getGrippable() {
     return $this->grippable;
   }
 
   public function setEffect($effect) {
     $this->effect = $effect;
     return $this;
   }
 
   public function getEffect() {
     return $this->effect;
   }
 
   public function setObject($object) {
     $this->object = $object;
     return $this;
   }
 
   public function getObject() {
     return $this->object;
   }
 
   public function setHref($href) {
     $this->href = $href;
     return $this;
   }
 
   public function getHref() {
     return $this->href;
   }
 
   public function setHeader($header) {
     $this->header = $header;
     return $this;
   }
 
   public function setSubHead($subhead) {
     $this->subhead = $subhead;
     return $this;
   }
 
   public function getHeader() {
     return $this->header;
   }
 
   public function addByline($byline) {
     $this->bylines[] = $byline;
     return $this;
   }
 
   public function setImageURI($image_uri) {
     $this->imageURI = $image_uri;
     return $this;
   }
 
   public function getImageURI() {
     return $this->imageURI;
   }
 
   public function setImageIcon($image_icon) {
     $this->imageIcon = $image_icon;
     return $this;
   }
 
   public function getImageIcon() {
     return $this->imageIcon;
   }
 
   public function setState($state) {
     $this->state = $state;
     switch ($state) {
       case self::STATE_SUCCESS:
         $fi = 'fa-check-circle green';
       break;
       case self::STATE_FAIL:
         $fi = 'fa-times-circle red';
       break;
       case self::STATE_WARN:
         $fi = 'fa-exclamation-circle yellow';
       break;
       case self::STATE_NOTE:
         $fi = 'fa-info-circle blue';
       break;
       case self::STATE_BUILD:
         $fi = 'fa-refresh ph-spin sky';
       break;
     }
     $this->fontIcon = id(new PHUIIconView())
       ->setIconFont($fi.' fa-2x');
     return $this;
   }
 
   public function setEpoch($epoch, $age = self::AGE_FRESH) {
     $date = phabricator_datetime($epoch, $this->getUser());
 
     $days = floor((time() - $epoch) / 60 / 60 / 24);
 
     switch ($age) {
       case self::AGE_FRESH:
         $this->addIcon('none', $date);
         break;
       case self::AGE_STALE:
         $attr = array(
           'tip' => pht('Stale (%s day(s))', new PhutilNumber($days)),
           'class' => 'icon-age-stale',
         );
 
         $this->addIcon('fa-clock-o yellow', $date, $attr);
         break;
       case self::AGE_OLD:
         $attr = array(
           'tip' =>  pht('Old (%s day(s))', new PhutilNumber($days)),
           'class' => 'icon-age-old',
         );
         $this->addIcon('fa-clock-o red', $date, $attr);
         break;
       default:
         throw new Exception("Unknown age '{$age}'!");
     }
 
     return $this;
   }
 
   public function addAction(PHUIListItemView $action) {
     if (count($this->actions) >= 3) {
-      throw new Exception("Limit 3 actions per item.");
+      throw new Exception('Limit 3 actions per item.');
     }
     $this->actions[] = $action;
     return $this;
   }
 
   public function addIcon($icon, $label = null, $attributes = array()) {
     $this->icons[] = array(
       'icon'  => $icon,
       'label' => $label,
       'attributes' => $attributes,
     );
     return $this;
   }
 
   public function addFootIcon($icon, $label = null) {
     $this->footIcons[] = array(
       'icon' => $icon,
       'label' => $label,
     );
     return $this;
   }
 
   public function addHandleIcon(
     PhabricatorObjectHandle $handle,
     $label = null) {
     $this->handleIcons[] = array(
       'icon' => $handle,
       'label' => $label,
     );
     return $this;
   }
 
   public function setBarColor($bar_color) {
     $this->barColor = $bar_color;
     return $this;
   }
 
   public function getBarColor() {
     return $this->barColor;
   }
 
   public function addAttribute($attribute) {
     if (!empty($attribute)) {
       $this->attributes[] = $attribute;
     }
     return $this;
   }
 
   protected function getTagName() {
     return 'li';
   }
 
   protected function getTagAttributes() {
     $item_classes = array();
     $item_classes[] = 'phui-object-item';
 
     if ($this->icons) {
       $item_classes[] = 'phui-object-item-with-icons';
     }
 
     if ($this->attributes) {
       $item_classes[] = 'phui-object-item-with-attrs';
     }
 
     if ($this->handleIcons) {
       $item_classes[] = 'phui-object-item-with-handle-icons';
     }
 
     if ($this->barColor) {
       $item_classes[] = 'phui-object-item-bar-color-'.$this->barColor;
     }
 
     if ($this->footIcons) {
       $item_classes[] = 'phui-object-item-with-foot-icons';
     }
 
     if ($this->bylines) {
       $item_classes[] = 'phui-object-item-with-bylines';
     }
 
     if ($this->actions) {
       $n = count($this->actions);
       $item_classes[] = 'phui-object-item-with-actions';
       $item_classes[] = 'phui-object-item-with-'.$n.'-actions';
     }
 
     if ($this->disabled) {
       $item_classes[] = 'phui-object-item-disabled';
     }
 
     if ($this->state) {
       $item_classes[] = 'phui-object-item-state-'.$this->state;
     }
 
     switch ($this->effect) {
       case 'highlighted':
         $item_classes[] = 'phui-object-item-highlighted';
         break;
       case 'selected':
         $item_classes[] = 'phui-object-item-selected';
         break;
       case null:
         break;
       default:
-        throw new Exception(pht("Invalid effect!"));
+        throw new Exception(pht('Invalid effect!'));
     }
 
     if ($this->getGrippable()) {
       $item_classes[] = 'phui-object-item-grippable';
     }
 
     if ($this->getImageURI()) {
       $item_classes[] = 'phui-object-item-with-image';
     }
 
     if ($this->getImageIcon()) {
       $item_classes[] = 'phui-object-item-with-image-icon';
     }
 
     if ($this->fontIcon) {
       $item_classes[] = 'phui-object-item-with-ficon';
     }
 
     return array(
       'class' => $item_classes,
     );
   }
 
   public function getTagContent() {
     $content_classes = array();
     $content_classes[] = 'phui-object-item-content';
 
     $header_name = null;
     if ($this->objectName) {
       $header_name = array(
         phutil_tag(
           'span',
           array(
             'class' => 'phui-object-item-objname',
           ),
           $this->objectName),
         ' ',
       );
     }
 
     $header_link = phutil_tag(
       $this->href ? 'a' : 'div',
       array(
         'href' => $this->href,
         'class' => 'phui-object-item-link',
       ),
       $this->header);
 
     $header = javelin_tag(
       'div',
       array(
         'class' => 'phui-object-item-name',
         'sigil' => 'slippery',
       ),
       array(
         $this->headIcons,
         $header_name,
         $header_link,
       ));
 
     $icons = array();
     if ($this->icons) {
       $icon_list = array();
       foreach ($this->icons as $spec) {
         $icon = $spec['icon'];
         $icon = id(new PHUIIconView())
           ->setIconFont($icon)
           ->addClass('phui-object-item-icon-image');
 
         if (isset($spec['attributes']['tip'])) {
           $sigil = 'has-tooltip';
           $meta = array(
             'tip' => $spec['attributes']['tip'],
             'align' => 'W',
           );
           $icon->addSigil($sigil);
           $icon->setMetadata($meta);
         }
 
         $label = phutil_tag(
           'span',
           array(
             'class' => 'phui-object-item-icon-label',
           ),
           $spec['label']);
 
         if (isset($spec['attributes']['href'])) {
           $icon_href = phutil_tag(
             'a',
             array('href' => $spec['attributes']['href']),
             array($label, $icon));
         } else {
           $icon_href = array($label, $icon);
         }
 
         $classes = array();
         $classes[] = 'phui-object-item-icon';
         if ($spec['icon'] == 'none') {
           $classes[] = 'phui-object-item-icon-none';
         }
         if (isset($spec['attributes']['class'])) {
           $classes[] = $spec['attributes']['class'];
         }
 
         $icon_list[] = javelin_tag(
           'li',
           array(
             'class' => implode(' ', $classes),
           ),
           $icon_href);
       }
 
       $icons[] = phutil_tag(
         'ul',
         array(
           'class' => 'phui-object-item-icons',
         ),
         $icon_list);
     }
 
     if ($this->handleIcons) {
       $handle_bar = array();
       foreach ($this->handleIcons as $icon) {
         $handle_bar[] = $this->renderHandleIcon($icon['icon'], $icon['label']);
       }
       $icons[] = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-handle-icons',
         ),
         $handle_bar);
     }
 
     $bylines = array();
     if ($this->bylines) {
       foreach ($this->bylines as $byline) {
         $bylines[] = phutil_tag(
           'div',
           array(
             'class' => 'phui-object-item-byline',
           ),
           $byline);
       }
       $bylines = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-bylines',
         ),
         $bylines);
     }
 
     $subhead = null;
     if ($this->subhead) {
       $subhead = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-subhead',
         ),
         $this->subhead);
     }
 
     if ($icons) {
       $icons = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-icon-pane',
         ),
         $icons);
     }
 
     $attrs = null;
     if ($this->attributes) {
       $attrs = array();
       $spacer = phutil_tag(
         'span',
         array(
           'class' => 'phui-object-item-attribute-spacer',
         ),
         "\xC2\xB7");
       $first = true;
       foreach ($this->attributes as $attribute) {
         $attrs[] = phutil_tag(
           'li',
           array(
             'class' => 'phui-object-item-attribute',
           ),
           array(
             ($first ? null : $spacer),
             $attribute,
           ));
         $first = false;
       }
 
       $attrs = phutil_tag(
         'ul',
         array(
           'class' => 'phui-object-item-attributes',
         ),
         $attrs);
     }
 
     $foot = null;
     if ($this->footIcons) {
       $foot_bar = array();
       foreach ($this->footIcons as $icon) {
         $foot_bar[] = $this->renderFootIcon($icon['icon'], $icon['label']);
       }
       $foot = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-foot-icons',
         ),
         $foot_bar);
     }
 
     $grippable = null;
     if ($this->getGrippable()) {
       $grippable = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-grip',
         ),
         '');
     }
 
     $content = phutil_tag(
       'div',
       array(
         'class' => implode(' ', $content_classes),
       ),
       array(
         $subhead,
         $attrs,
         $this->renderChildren(),
         $foot,
       ));
 
     $image = null;
     if ($this->getImageURI()) {
       $image = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-image',
           'style' => 'background-image: url('.$this->getImageURI().')',
         ),
         '');
     } else if ($this->getImageIcon()) {
       $image = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-image-icon',
         ),
         $this->getImageIcon());
     }
 
     if ($image && $this->href) {
       $image = phutil_tag(
         'a',
         array(
           'href' => $this->href,
         ),
         $image);
     }
 
     $ficon = null;
     if ($this->fontIcon) {
       $image = phutil_tag(
         'div',
         array(
           'class' => 'phui-object-item-ficon',
         ),
         $this->fontIcon);
     }
 
     $box = phutil_tag(
       'div',
       array(
         'class' => 'phui-object-item-content-box',
       ),
       array(
         $grippable,
         $header,
         $icons,
         $bylines,
         $content,
       ));
 
     $actions = array();
     if ($this->actions) {
       Javelin::initBehavior('phabricator-tooltips');
 
       foreach (array_reverse($this->actions) as $action) {
         $action->setRenderNameAsTooltip(true);
         $actions[] = $action;
       }
       $actions = phutil_tag(
         'ul',
         array(
           'class' => 'phui-object-item-actions',
         ),
         $actions);
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => 'phui-object-item-frame',
       ),
       array(
         $actions,
         $image,
         $box,
       ));
   }
 
   private function renderFootIcon($icon, $label) {
 
     $icon = id(new PHUIIconView())
       ->setIconFont($icon);
 
     $label = phutil_tag(
       'span',
       array(
       ),
       $label);
 
     return phutil_tag(
       'span',
       array(
         'class' => 'phui-object-item-foot-icon',
       ),
       array($icon, $label));
   }
 
 
   private function renderHandleIcon(PhabricatorObjectHandle $handle, $label) {
     Javelin::initBehavior('phabricator-tooltips');
 
     $options = array(
       'class' => 'phui-object-item-handle-icon',
       'style' => 'background-image: url('.$handle->getImageURI().')',
     );
 
     if (strlen($label)) {
       $options['sigil'] = 'has-tooltip';
       $options['meta']  = array('tip' => $label);
     }
 
     return javelin_tag(
       'span',
       $options,
       '');
   }
 
 
 
 }
diff --git a/src/view/phui/PHUIRemarkupPreviewPanel.php b/src/view/phui/PHUIRemarkupPreviewPanel.php
index 0a98f1dec..3cf49b793 100644
--- a/src/view/phui/PHUIRemarkupPreviewPanel.php
+++ b/src/view/phui/PHUIRemarkupPreviewPanel.php
@@ -1,134 +1,134 @@
 <?php
 
 /**
  * Render a simple preview panel for a bound Remarkup text control.
  */
 final class PHUIRemarkupPreviewPanel extends AphrontTagView {
 
   private $header;
   private $loadingText;
   private $controlID;
   private $previewURI;
   private $skin = 'default';
 
   protected function canAppendChild() {
     return false;
   }
 
   public function setPreviewURI($preview_uri) {
     $this->previewURI = $preview_uri;
     return $this;
   }
 
   public function setControlID($control_id) {
     $this->controlID = $control_id;
     return $this;
   }
 
   public function setHeader($header) {
     $this->header = $header;
     return $this;
   }
 
   public function setLoadingText($loading_text) {
     $this->loadingText = $loading_text;
     return $this;
   }
 
   public function setSkin($skin) {
     static $skins = array(
       'default' => true,
       'document' => true,
     );
 
     if (empty($skins[$skin])) {
       $valid = implode(', ', array_keys($skins));
       throw new Exception("Invalid skin '{$skin}'. Valid skins are: {$valid}.");
     }
 
     $this->skin = $skin;
     return $this;
   }
 
   public function getTagName() {
     return 'div';
   }
 
   public function getTagAttributes() {
     $classes = array();
     $classes[] = 'phui-remarkup-preview';
 
     if ($this->skin) {
       $classes[] = 'phui-remarkup-preview-skin-'.$this->skin;
     }
 
     return array(
       'class' => $classes,
     );
   }
 
   protected function getTagContent() {
     if ($this->previewURI === null) {
-      throw new Exception("Call setPreviewURI() before rendering!");
+      throw new Exception('Call setPreviewURI() before rendering!');
     }
     if ($this->controlID === null) {
-      throw new Exception("Call setControlID() before rendering!");
+      throw new Exception('Call setControlID() before rendering!');
     }
 
     $preview_id = celerity_generate_unique_node_id();
 
     require_celerity_resource('phui-remarkup-preview-css');
     Javelin::initBehavior(
       'remarkup-preview',
       array(
         'previewID' => $preview_id,
         'controlID' => $this->controlID,
         'uri' => $this->previewURI,
       ));
 
     $loading = phutil_tag(
       'div',
       array(
         'class' => 'phui-preview-loading-text',
       ),
       nonempty($this->loadingText, pht('Loading preview...')));
 
     $header = null;
     if ($this->header) {
       $header = phutil_tag(
         'div',
         array(
           'class' => 'phui-preview-header',
         ),
         $this->header);
     }
 
     $preview = phutil_tag(
       'div',
       array(
         'id' => $preview_id,
         'class' => 'phabricator-remarkup',
       ),
       $loading);
 
     $content = array($header, $preview);
 
     switch ($this->skin) {
       case 'document':
         $content = id(new PHUIDocumentView())
           ->appendChild($content);
         break;
       default:
         $content = id(new PHUIBoxView())
           ->appendChild($content)
           ->setBorder(true)
           ->addMargin(PHUI::MARGIN_LARGE)
           ->addPadding(PHUI::PADDING_LARGE)
           ->addClass('phui-panel-preview');
         break;
     }
 
     return $content;
   }
 
 }
diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php
index 5c8c46960..4ab4fa781 100644
--- a/src/view/phui/PHUITagView.php
+++ b/src/view/phui/PHUITagView.php
@@ -1,208 +1,208 @@
 <?php
 
 final class PHUITagView extends AphrontView {
 
   const TYPE_PERSON         = 'person';
   const TYPE_OBJECT         = 'object';
   const TYPE_STATE          = 'state';
 
   const COLOR_RED           = 'red';
   const COLOR_ORANGE        = 'orange';
   const COLOR_YELLOW        = 'yellow';
   const COLOR_BLUE          = 'blue';
   const COLOR_INDIGO        = 'indigo';
   const COLOR_VIOLET        = 'violet';
   const COLOR_GREEN         = 'green';
   const COLOR_BLACK         = 'black';
   const COLOR_GREY          = 'grey';
   const COLOR_WHITE         = 'white';
 
   const COLOR_OBJECT        = 'object';
   const COLOR_PERSON        = 'person';
 
   private $type;
   private $href;
   private $name;
   private $phid;
   private $backgroundColor;
   private $dotColor;
   private $closed;
   private $external;
   private $id;
   private $icon;
 
   public function setID($id) {
     $this->id = $id;
     return $this;
   }
 
   public function getID() {
     return $this->id;
   }
 
   public function setType($type) {
     $this->type = $type;
     switch ($type) {
       case self::TYPE_OBJECT:
         $this->setBackgroundColor(self::COLOR_OBJECT);
         break;
       case self::TYPE_PERSON:
         $this->setBackgroundColor(self::COLOR_PERSON);
         break;
     }
     return $this;
   }
 
   public function setDotColor($dot_color) {
     $this->dotColor = $dot_color;
     return $this;
   }
 
   public function setBackgroundColor($background_color) {
     $this->backgroundColor = $background_color;
     return $this;
   }
 
   public function setPHID($phid) {
     $this->phid = $phid;
     return $this;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function setHref($href) {
     $this->href = $href;
     return $this;
   }
 
   public function setClosed($closed) {
     $this->closed = $closed;
     return $this;
   }
 
   public function setIcon($icon) {
     $icon_view = id(new PHUIIconView())
       ->setIconFont($icon);
     $this->icon = $icon_view;
     return $this;
   }
 
   public function render() {
     if (!$this->type) {
-      throw new Exception(pht("You must call setType() before render()!"));
+      throw new Exception(pht('You must call setType() before render()!'));
     }
 
     require_celerity_resource('phui-tag-view-css');
     $classes = array(
       'phui-tag-view',
       'phui-tag-type-'.$this->type,
     );
 
     $color = null;
     if ($this->backgroundColor) {
       $color = 'phui-tag-color-'.$this->backgroundColor;
     }
 
     if ($this->dotColor) {
       $dotcolor = 'phui-tag-color-'.$this->dotColor;
       $dot = phutil_tag(
         'span',
         array(
           'class' => 'phui-tag-dot '.$dotcolor,
         ),
         '');
     } else {
       $dot = null;
     }
 
     if ($this->icon) {
       $icon = $this->icon;
       $classes[] = 'phui-tag-icon-view';
     } else {
       $icon = null;
     }
 
     $content = phutil_tag(
       'span',
       array(
         'class' => 'phui-tag-core '.$color,
       ),
       array($dot, $this->name));
 
     if ($this->closed) {
       $content = phutil_tag(
         'span',
         array(
           'class' => 'phui-tag-core-closed',
         ),
         $content);
     }
 
     if ($this->phid) {
       Javelin::initBehavior('phabricator-hovercards');
 
       return javelin_tag(
         'a',
         array(
           'id' => $this->id,
           'href'  => $this->href,
           'class' => implode(' ', $classes),
           'sigil' => 'hovercard',
           'meta'  => array(
             'hoverPHID' => $this->phid,
           ),
           'target' => $this->external ? '_blank' : null,
         ),
         array($icon, $content));
     } else {
       return phutil_tag(
         $this->href ? 'a' : 'span',
         array(
           'id' => $this->id,
           'href'  => $this->href,
           'class' => implode(' ', $classes),
           'target' => $this->external ? '_blank' : null,
         ),
         array($icon, $content));
     }
   }
 
   public static function getTagTypes() {
     return array(
       self::TYPE_PERSON,
       self::TYPE_OBJECT,
       self::TYPE_STATE,
     );
   }
 
   public static function getColors() {
     return array(
       self::COLOR_RED,
       self::COLOR_ORANGE,
       self::COLOR_YELLOW,
       self::COLOR_BLUE,
       self::COLOR_INDIGO,
       self::COLOR_VIOLET,
       self::COLOR_GREEN,
       self::COLOR_BLACK,
       self::COLOR_GREY,
       self::COLOR_WHITE,
 
       self::COLOR_OBJECT,
       self::COLOR_PERSON,
     );
   }
 
   public function setExternal($external) {
     $this->external = $external;
     return $this;
   }
 
   public function getExternal() {
     return $this->external;
   }
 
 }
diff --git a/src/view/phui/calendar/PHUICalendarMonthView.php b/src/view/phui/calendar/PHUICalendarMonthView.php
index 69be7720c..0b63643af 100644
--- a/src/view/phui/calendar/PHUICalendarMonthView.php
+++ b/src/view/phui/calendar/PHUICalendarMonthView.php
@@ -1,308 +1,308 @@
 <?php
 
 final class PHUICalendarMonthView extends AphrontView {
 
   private $day;
   private $month;
   private $year;
   private $holidays = array();
   private $events   = array();
   private $browseURI;
   private $image;
 
   public function setBrowseURI($browse_uri) {
     $this->browseURI = $browse_uri;
     return $this;
   }
   private function getBrowseURI() {
     return $this->browseURI;
   }
 
   public function addEvent(AphrontCalendarEventView $event) {
     $this->events[] = $event;
     return $this;
   }
 
   public function setImage($uri) {
     $this->image = $uri;
     return $this;
   }
 
   public function setHolidays(array $holidays) {
     assert_instances_of($holidays, 'PhabricatorCalendarHoliday');
     $this->holidays = mpull($holidays, null, 'getDay');
     return $this;
   }
 
   public function __construct($month, $year, $day = null) {
     $this->day = $day;
     $this->month = $month;
     $this->year = $year;
   }
 
   public function render() {
     if (empty($this->user)) {
-      throw new Exception("Call setUser() before render()!");
+      throw new Exception('Call setUser() before render()!');
     }
 
     $events = msort($this->events, 'getEpochStart');
 
     $days = $this->getDatesInMonth();
 
     require_celerity_resource('phui-calendar-month-css');
 
     $first = reset($days);
     $empty = $first->format('w');
 
     $markup = array();
 
     $empty_box = phutil_tag(
       'div',
       array('class' => 'phui-calendar-day phui-calendar-empty'),
       '');
 
     for ($ii = 0; $ii < $empty; $ii++) {
       $markup[] = $empty_box;
     }
 
     $show_events = array();
 
     foreach ($days as $day) {
       $day_number = $day->format('j');
 
       $holiday = idx($this->holidays, $day->format('Y-m-d'));
       $class = 'phui-calendar-day';
       $weekday = $day->format('w');
 
       if ($day_number == $this->day) {
         $class .= ' phui-calendar-today';
       }
 
       if ($holiday || $weekday == 0 || $weekday == 6) {
         $class .= ' phui-calendar-not-work-day';
       }
 
       $day->setTime(0, 0, 0);
       $epoch_start = $day->format('U');
 
       $day->modify('+1 day');
       $epoch_end = $day->format('U');
 
       if ($weekday == 0) {
         $show_events = array();
       } else {
         $show_events = array_fill_keys(
           array_keys($show_events),
           phutil_tag_div(
             'phui-calendar-event phui-calendar-event-empty',
             "\xC2\xA0")); // &nbsp;
       }
 
       $list_events = array();
       foreach ($events as $event) {
         if ($event->getEpochStart() >= $epoch_end) {
           // This list is sorted, so we can stop looking.
           break;
         }
         if ($event->getEpochStart() < $epoch_end &&
             $event->getEpochEnd() > $epoch_start) {
           $list_events[] = $event;
         }
       }
 
       $list = new PHUICalendarListView();
       $list->setUser($this->user);
       foreach ($list_events as $item) {
         $list->addEvent($item);
       }
 
       $holiday_markup = null;
       if ($holiday) {
         $name = $holiday->getName();
         $holiday_markup = phutil_tag(
           'div',
           array(
             'class' => 'phui-calendar-holiday',
             'title' => $name,
           ),
           $name);
       }
 
       $markup[] = phutil_tag_div(
         $class,
         array(
           phutil_tag_div('phui-calendar-date-number', $day_number),
           $holiday_markup,
           $list,
         ));
     }
 
     $table = array();
     $rows = array_chunk($markup, 7);
     foreach ($rows as $row) {
       $cells = array();
       while (count($row) < 7) {
         $row[] = $empty_box;
       }
       $j = 0;
       foreach ($row as $cell) {
         if ($j == 0) {
           $cells[] = phutil_tag(
             'td',
             array(
               'class' => 'phui-calendar-month-weekstart'),
             $cell);
         } else {
           $cells[] = phutil_tag('td', array(), $cell);
         }
         $j++;
       }
       $table[] = phutil_tag('tr', array(), $cells);
     }
 
     $header = phutil_tag(
       'tr',
       array('class' => 'phui-calendar-day-of-week-header'),
       array(
         phutil_tag('th', array(), pht('Sun')),
         phutil_tag('th', array(), pht('Mon')),
         phutil_tag('th', array(), pht('Tue')),
         phutil_tag('th', array(), pht('Wed')),
         phutil_tag('th', array(), pht('Thu')),
         phutil_tag('th', array(), pht('Fri')),
         phutil_tag('th', array(), pht('Sat')),
       ));
 
     $table = phutil_tag(
       'table',
       array('class' => 'phui-calendar-view'),
       array(
         $header,
         phutil_implode_html("\n", $table),
       ));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($this->renderCalendarHeader($first))
       ->appendChild($table);
 
     return $box;
   }
 
   private function renderCalendarHeader(DateTime $date) {
     $button_bar = null;
 
     // check for a browseURI, which means we need "fancy" prev / next UI
     $uri = $this->getBrowseURI();
     if ($uri) {
       $uri = new PhutilURI($uri);
       list($prev_year, $prev_month) = $this->getPrevYearAndMonth();
       $query = array('year' => $prev_year, 'month' => $prev_month);
       $prev_uri = (string) $uri->setQueryParams($query);
 
       list($next_year, $next_month) = $this->getNextYearAndMonth();
       $query = array('year' => $next_year, 'month' => $next_month);
       $next_uri = (string) $uri->setQueryParams($query);
 
       $button_bar = new PHUIButtonBarView();
 
       $left_icon = id(new PHUIIconView())
           ->setIconFont('fa-chevron-left bluegrey');
       $left = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
         ->setHref($prev_uri)
         ->setTitle(pht('Previous Month'))
         ->setIcon($left_icon);
 
       $right_icon = id(new PHUIIconView())
           ->setIconFont('fa-chevron-right bluegrey');
       $right = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
         ->setHref($next_uri)
         ->setTitle(pht('Next Month'))
         ->setIcon($right_icon);
 
       $button_bar->addButton($left);
       $button_bar->addButton($right);
 
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader($date->format('F Y'));
 
     if ($button_bar) {
       $header->setButtonBar($button_bar);
     }
 
     if ($this->image) {
       $header->setImage($this->image);
     }
 
     return $header;
   }
 
   private function getNextYearAndMonth() {
     $month = $this->month;
     $year = $this->year;
 
     $next_year = $year;
     $next_month = $month + 1;
     if ($next_month == 13) {
       $next_year = $year + 1;
       $next_month = 1;
     }
 
     return array($next_year, $next_month);
   }
 
   private function getPrevYearAndMonth() {
     $month = $this->month;
     $year = $this->year;
 
     $prev_year = $year;
     $prev_month = $month - 1;
     if ($prev_month == 0) {
       $prev_year = $year - 1;
       $prev_month = 12;
     }
 
     return array($prev_year, $prev_month);
   }
 
   /**
    * Return a DateTime object representing the first moment in each day in the
    * month, according to the user's locale.
    *
    * @return list List of DateTimes, one for each day.
    */
   private function getDatesInMonth() {
     $user = $this->user;
 
     $timezone = new DateTimeZone($user->getTimezoneIdentifier());
 
     $month = $this->month;
     $year = $this->year;
 
     // Get the year and month numbers of the following month, so we can
     // determine when this month ends.
     list($next_year, $next_month) = $this->getNextYearAndMonth();
 
     $end_date = new DateTime("{$next_year}-{$next_month}-01", $timezone);
     $end_epoch = $end_date->format('U');
 
     $days = array();
     for ($day = 1; $day <= 31; $day++) {
       $day_date = new DateTime("{$year}-{$month}-{$day}", $timezone);
       $day_epoch = $day_date->format('U');
       if ($day_epoch >= $end_epoch) {
         break;
       } else {
         $days[] = $day_date;
       }
     }
 
     return $days;
   }
 
 }
diff --git a/src/view/widget/hovercard/PhabricatorHovercardView.php b/src/view/widget/hovercard/PhabricatorHovercardView.php
index 8af99ab9b..8a417452f 100644
--- a/src/view/widget/hovercard/PhabricatorHovercardView.php
+++ b/src/view/widget/hovercard/PhabricatorHovercardView.php
@@ -1,170 +1,170 @@
 <?php
 
 /**
  * The default one-for-all hovercard. We may derive from this one to create
  * more specialized ones
  */
 final class PhabricatorHovercardView extends AphrontView {
 
   /**
    * @var PhabricatorObjectHandle
    */
   private $handle;
 
   private $title = array();
   private $detail;
   private $tags = array();
   private $fields = array();
   private $actions = array();
 
   private $color = 'lightblue';
   public function setObjectHandle(PhabricatorObjectHandle $handle) {
     $this->handle = $handle;
     return $this;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function setDetail($detail) {
     $this->detail = $detail;
     return $this;
   }
 
   public function addField($label, $value) {
     $this->fields[] = array(
       'label' => $label,
       'value' => $value,
     );
     return $this;
   }
 
   public function addAction($label, $uri, $workflow = false) {
     $this->actions[] = array(
       'label'    => $label,
       'uri'      => $uri,
       'workflow' => $workflow,
     );
     return $this;
   }
 
   public function addTag(PHUITagView $tag) {
     $this->tags[] = $tag;
     return $this;
   }
 
   public function setColor($color) {
     $this->color = $color;
     return $this;
   }
 
   public function render() {
     if (!$this->handle) {
-      throw new Exception("Call setObjectHandle() before calling render()!");
+      throw new Exception('Call setObjectHandle() before calling render()!');
     }
 
     $handle = $this->handle;
 
-    require_celerity_resource("phabricator-hovercard-view-css");
+    require_celerity_resource('phabricator-hovercard-view-css');
 
-    $title = pht("%s: %s",
+    $title = pht('%s: %s',
       $handle->getTypeName(),
       $this->title ? $this->title : $handle->getName());
 
     $header = new PhabricatorActionHeaderView();
     $header->setHeaderColor($this->color);
     $header->setHeaderTitle($title);
     if ($this->tags) {
       foreach ($this->tags as $tag) {
         $header->setTag($tag);
       }
     }
 
     $body = array();
 
     if ($this->detail) {
       $body_title = $this->detail;
     } else {
       // Fallback for object handles
       $body_title = $handle->getFullName();
     }
 
     $body[] = phutil_tag_div('phabricator-hovercard-body-header', $body_title);
 
     foreach ($this->fields as $field) {
       $item = array(
         phutil_tag('strong', array(), $field['label']),
         ' ',
         phutil_tag('span', array(), $field['value']),
       );
       $body[] = phutil_tag_div('phabricator-hovercard-body-item', $item);
     }
 
     if ($handle->getImageURI()) {
       // Probably a user, we don't need to assume something else
       // "Prepend" the image by appending $body
       $body = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-hovercard-body-image'),
           phutil_tag(
             'div',
             array(
               'class' => 'profile-header-picture-frame',
               'style' => 'background-image: url('.$handle->getImageURI().');',
             ),
             ''))
         ->appendHTML(
           phutil_tag(
             'div',
             array(
               'class' => 'phabricator-hovercard-body-details',
             ),
             $body));
     }
 
     $buttons = array();
 
     foreach ($this->actions as $action) {
       $options = array(
         'class' => 'button grey',
         'href'  => $action['uri'],
       );
 
       if ($action['workflow']) {
         $options['sigil'] = 'workflow';
         $buttons[] = javelin_tag(
           'a',
           $options,
           $action['label']);
       } else {
         $buttons[] = phutil_tag(
           'a',
           $options,
           $action['label']);
       }
     }
 
     $tail = null;
     if ($buttons) {
       $tail = phutil_tag_div('phabricator-hovercard-tail', $buttons);
     }
 
     // Assemble container
     // TODO: Add color support
     $hovercard = phutil_tag_div(
       'phabricator-hovercard-container',
       array(
         phutil_tag_div('phabricator-hovercard-head', $header),
         phutil_tag_div('phabricator-hovercard-body', $body),
         $tail,
       ));
 
     // Wrap for thick border
     // and later the tip at the bottom
     return phutil_tag_div('phabricator-hovercard-wrapper', $hovercard);
   }
 
 }
diff --git a/support/PhabricatorStartup.php b/support/PhabricatorStartup.php
index c600de1be..b39d94785 100644
--- a/support/PhabricatorStartup.php
+++ b/support/PhabricatorStartup.php
@@ -1,780 +1,780 @@
 <?php
 
 /**
  * Handle request startup, before loading the environment or libraries. This
  * class bootstraps the request state up to the point where we can enter
  * Phabricator code.
  *
  * NOTE: This class MUST NOT have any dependencies. It runs before libraries
  * load.
  *
  * Rate Limiting
  * =============
  *
  * Phabricator limits the rate at which clients can request pages, and issues
  * HTTP 429 "Too Many Requests" responses if clients request too many pages too
  * quickly. Although this is not a complete defense against high-volume attacks,
  * it can  protect an install against aggressive crawlers, security scanners,
  * and some types of malicious activity.
  *
  * To perform rate limiting, each page increments a score counter for the
  * requesting user's IP. The page can give the IP more points for an expensive
  * request, or fewer for an authetnicated request.
  *
  * Score counters are kept in buckets, and writes move to a new bucket every
  * minute. After a few minutes (defined by @{method:getRateLimitBucketCount}),
  * the oldest bucket is discarded. This provides a simple mechanism for keeping
  * track of scores without needing to store, access, or read very much data.
  *
  * Users are allowed to accumulate up to 1000 points per minute, averaged across
  * all of the tracked buckets.
  *
  * @task info         Accessing Request Information
  * @task hook         Startup Hooks
  * @task apocalypse   In Case Of Apocalypse
  * @task validation   Validation
  * @task ratelimit    Rate Limiting
  */
 final class PhabricatorStartup {
 
   private static $startTime;
   private static $globals = array();
   private static $capturingOutput;
   private static $rawInput;
 
   // TODO: For now, disable rate limiting entirely by default. We need to
   // iterate on it a bit for Conduit, some of the specific score levels, and
   // to deal with NAT'd offices.
   private static $maximumRate = 0;
 
 
 /* -(  Accessing Request Information  )-------------------------------------- */
 
 
   /**
    * @task info
    */
   public static function getStartTime() {
     return self::$startTime;
   }
 
 
   /**
    * @task info
    */
   public static function getMicrosecondsSinceStart() {
     return (int)(1000000 * (microtime(true) - self::getStartTime()));
   }
 
 
   /**
    * @task info
    */
   public static function setGlobal($key, $value) {
     self::validateGlobal($key);
 
     self::$globals[$key] = $value;
   }
 
 
   /**
    * @task info
    */
   public static function getGlobal($key, $default = null) {
     self::validateGlobal($key);
 
     if (!array_key_exists($key, self::$globals)) {
       return $default;
     }
 
     return self::$globals[$key];
   }
 
   /**
    * @task info
    */
   public static function getRawInput() {
     return self::$rawInput;
   }
 
 
 /* -(  Startup Hooks  )------------------------------------------------------ */
 
 
   /**
    * @task hook
    */
   public static function didStartup() {
     self::$startTime = microtime(true);
     self::$globals = array();
 
     static $registered;
     if (!$registered) {
       // NOTE: This protects us against multiple calls to didStartup() in the
       // same request, but also against repeated requests to the same
       // interpreter state, which we may implement in the future.
       register_shutdown_function(array(__CLASS__, 'didShutdown'));
       $registered = true;
     }
 
     self::setupPHP();
     self::verifyPHP();
 
     if (isset($_SERVER['REMOTE_ADDR'])) {
       self::rateLimitRequest($_SERVER['REMOTE_ADDR']);
     }
 
     self::normalizeInput();
 
     self::verifyRewriteRules();
 
     self::detectPostMaxSizeTriggered();
 
     self::beginOutputCapture();
 
     self::$rawInput = (string)file_get_contents('php://input');
   }
 
 
   /**
    * @task hook
    */
   public static function didShutdown() {
     $event = error_get_last();
 
     if (!$event) {
       return;
     }
 
     switch ($event['type']) {
       case E_ERROR:
       case E_PARSE:
       case E_COMPILE_ERROR:
         break;
       default:
         return;
     }
 
     $msg = ">>> UNRECOVERABLE FATAL ERROR <<<\n\n";
     if ($event) {
       // Even though we should be emitting this as text-plain, escape things
       // just to be sure since we can't really be sure what the program state
       // is when we get here.
       $msg .= htmlspecialchars(
         $event['message']."\n\n".$event['file'].':'.$event['line'],
         ENT_QUOTES,
         'UTF-8');
     }
 
     // flip dem tables
     $msg .= "\n\n\n";
     $msg .= "\xe2\x94\xbb\xe2\x94\x81\xe2\x94\xbb\x20\xef\xb8\xb5\x20\xc2\xaf".
             "\x5c\x5f\x28\xe3\x83\x84\x29\x5f\x2f\xc2\xaf\x20\xef\xb8\xb5\x20".
             "\xe2\x94\xbb\xe2\x94\x81\xe2\x94\xbb";
 
     self::didFatal($msg);
   }
 
   public static function loadCoreLibraries() {
     $phabricator_root = dirname(dirname(__FILE__));
     $libraries_root = dirname($phabricator_root);
 
     $root = null;
     if (!empty($_SERVER['PHUTIL_LIBRARY_ROOT'])) {
       $root = $_SERVER['PHUTIL_LIBRARY_ROOT'];
     }
 
     ini_set(
       'include_path',
       $libraries_root.PATH_SEPARATOR.ini_get('include_path'));
 
     @include_once $root.'libphutil/src/__phutil_library_init__.php';
     if (!@constant('__LIBPHUTIL__')) {
       self::didFatal(
         "Unable to load libphutil. Put libphutil/ next to phabricator/, or ".
         "update your PHP 'include_path' to include the parent directory of ".
         "libphutil/.");
     }
 
     phutil_load_library('arcanist/src');
 
     // Load Phabricator itself using the absolute path, so we never end up doing
     // anything surprising (loading index.php and libraries from different
     // directories).
     phutil_load_library($phabricator_root.'/src');
   }
 
 /* -(  Output Capture  )----------------------------------------------------- */
 
 
   public static function beginOutputCapture() {
     if (self::$capturingOutput) {
-      self::didFatal("Already capturing output!");
+      self::didFatal('Already capturing output!');
     }
     self::$capturingOutput = true;
     ob_start();
   }
 
 
   public static function endOutputCapture() {
     if (!self::$capturingOutput) {
       return null;
     }
     self::$capturingOutput = false;
     return ob_get_clean();
   }
 
 
 /* -(  In Case of Apocalypse  )---------------------------------------------- */
 
 
   /**
    * Fatal the request completely in response to an exception, sending a plain
    * text message to the client. Calls @{method:didFatal} internally.
    *
    * @param   string    Brief description of the exception context, like
    *                    `"Rendering Exception"`.
    * @param   Exception The exception itself.
    * @param   bool      True if it's okay to show the exception's stack trace
    *                    to the user. The trace will always be logged.
    * @return  exit      This method **does not return**.
    *
    * @task apocalypse
    */
   public static function didEncounterFatalException(
     $note,
     Exception $ex,
     $show_trace) {
 
     $message = '['.$note.'/'.get_class($ex).'] '.$ex->getMessage();
 
     $full_message = $message;
     $full_message .= "\n\n";
     $full_message .= $ex->getTraceAsString();
 
     if ($show_trace) {
       $message = $full_message;
     }
 
     self::didFatal($message, $full_message);
   }
 
 
   /**
    * Fatal the request completely, sending a plain text message to the client.
    *
    * @param   string  Plain text message to send to the client.
    * @param   string  Plain text message to send to the error log. If not
    *                  provided, the client message is used. You can pass a more
    *                  detailed message here (e.g., with stack traces) to avoid
    *                  showing it to users.
    * @return  exit    This method **does not return**.
    *
    * @task apocalypse
    */
   public static function didFatal($message, $log_message = null) {
     if ($log_message === null) {
       $log_message = $message;
     }
 
     self::endOutputCapture();
     $access_log = self::getGlobal('log.access');
 
     if ($access_log) {
       // We may end up here before the access log is initialized, e.g. from
       // verifyPHP().
       $access_log->setData(
         array(
           'c' => 500,
         ));
       $access_log->write();
     }
 
     header(
       'Content-Type: text/plain; charset=utf-8',
       $replace = true,
       $http_error = 500);
 
     error_log($log_message);
     echo $message;
 
     exit(1);
   }
 
 
 /* -(  Validation  )--------------------------------------------------------- */
 
 
   /**
    * @task validation
    */
   private static function setupPHP() {
     error_reporting(E_ALL | E_STRICT);
     ini_set('memory_limit', -1);
 
     // If we have libxml, disable the incredibly dangerous entity loader.
     if (function_exists('libxml_disable_entity_loader')) {
       libxml_disable_entity_loader(true);
     }
   }
 
   /**
    * @task validation
    */
   private static function normalizeInput() {
     // Replace superglobals with unfiltered versions, disrespect php.ini (we
     // filter ourselves)
     $filter = array(INPUT_GET, INPUT_POST,
       INPUT_SERVER, INPUT_ENV, INPUT_COOKIE);
     foreach ($filter as $type) {
       $filtered = filter_input_array($type, FILTER_UNSAFE_RAW);
       if (!is_array($filtered)) {
         continue;
       }
       switch ($type) {
         case INPUT_SERVER:
           $_SERVER = array_merge($_SERVER, $filtered);
           break;
         case INPUT_GET:
           $_GET = array_merge($_GET, $filtered);
           break;
         case INPUT_COOKIE:
           $_COOKIE = array_merge($_COOKIE, $filtered);
           break;
         case INPUT_POST:
           $_POST = array_merge($_POST, $filtered);
           break;
         case INPUT_ENV;
           $_ENV = array_merge($_ENV, $filtered);
           break;
       }
     }
 
     // rebuild $_REQUEST, respecting order declared in ini files
     $order = ini_get('request_order');
     if (!$order) {
       $order = ini_get('variables_order');
     }
     if (!$order) {
       // $_REQUEST will be empty, leave it alone
       return;
     }
     $_REQUEST = array();
     for ($i = 0; $i < strlen($order); $i++) {
       switch ($order[$i]) {
         case 'G':
           $_REQUEST = array_merge($_REQUEST, $_GET);
           break;
         case 'P':
           $_REQUEST = array_merge($_REQUEST, $_POST);
           break;
         case 'C':
           $_REQUEST = array_merge($_REQUEST, $_COOKIE);
           break;
         default:
           // $_ENV and $_SERVER never go into $_REQUEST
           break;
       }
     }
   }
 
   /**
    * @task validation
    */
   private static function verifyPHP() {
     $required_version = '5.2.3';
     if (version_compare(PHP_VERSION, $required_version) < 0) {
       self::didFatal(
         "You are running PHP version '".PHP_VERSION."', which is older than ".
         "the minimum version, '{$required_version}'. Update to at least ".
         "'{$required_version}'.");
     }
 
     if (get_magic_quotes_gpc()) {
       self::didFatal(
         "Your server is configured with PHP 'magic_quotes_gpc' enabled. This ".
         "feature is 'highly discouraged' by PHP's developers and you must ".
         "disable it to run Phabricator. Consult the PHP manual for ".
         "instructions.");
     }
 
     if (extension_loaded('apc')) {
       $apc_version = phpversion('apc');
       $known_bad = array(
         '3.1.14' => true,
         '3.1.15' => true,
         '3.1.15-dev' => true,
       );
       if (isset($known_bad[$apc_version])) {
         self::didFatal(
           "You have APC {$apc_version} installed. This version of APC is ".
           "known to be bad, and does not work with Phabricator (it will ".
           "cause Phabricator to fatal unrecoverably with nonsense errors). ".
           "Downgrade to version 3.1.13.");
       }
     }
   }
 
 
   /**
    * @task validation
    */
   private static function verifyRewriteRules() {
     if (isset($_REQUEST['__path__']) && strlen($_REQUEST['__path__'])) {
       return;
     }
 
     if (php_sapi_name() == 'cli-server') {
       // Compatibility with PHP 5.4+ built-in web server.
       $url = parse_url($_SERVER['REQUEST_URI']);
       $_REQUEST['__path__'] = $url['path'];
       return;
     }
 
     if (!isset($_REQUEST['__path__'])) {
       self::didFatal(
         "Request parameter '__path__' is not set. Your rewrite rules ".
         "are not configured correctly.");
     }
 
     if (!strlen($_REQUEST['__path__'])) {
       self::didFatal(
         "Request parameter '__path__' is set, but empty. Your rewrite rules ".
         "are not configured correctly. The '__path__' should always ".
         "begin with a '/'.");
     }
   }
 
 
   /**
    * @task validation
    */
   private static function validateGlobal($key) {
     static $globals = array(
       'log.access' => true,
       'csrf.salt'  => true,
     );
 
     if (empty($globals[$key])) {
       throw new Exception("Access to unknown startup global '{$key}'!");
     }
   }
 
 
   /**
    * Detect if this request has had its POST data stripped by exceeding the
    * 'post_max_size' PHP configuration limit.
    *
    * PHP has a setting called 'post_max_size'. If a POST request arrives with
    * a body larger than the limit, PHP doesn't generate $_POST but processes
    * the request anyway, and provides no formal way to detect that this
    * happened.
    *
    * We can still read the entire body out of `php://input`. However according
    * to the documentation the stream isn't available for "multipart/form-data"
    * (on nginx + php-fpm it appears that it is available, though, at least) so
    * any attempt to generate $_POST would be fragile.
    *
    * @task validation
    */
   private static function detectPostMaxSizeTriggered() {
     // If this wasn't a POST, we're fine.
     if ($_SERVER['REQUEST_METHOD'] != 'POST') {
       return;
     }
 
     // If there's POST data, clearly we're in good shape.
     if ($_POST) {
       return;
     }
 
     // For HTML5 drag-and-drop file uploads, Safari submits the data as
     // "application/x-www-form-urlencoded". For most files this generates
     // something in POST because most files decode to some nonempty (albeit
     // meaningless) value. However, some files (particularly small images)
     // don't decode to anything. If we know this is a drag-and-drop upload,
     // we can skip this check.
     if (isset($_REQUEST['__upload__'])) {
       return;
     }
 
     // PHP generates $_POST only for two content types. This routing happens
     // in `main/php_content_types.c` in PHP. Normally, all forms use one of
     // these content types, but some requests may not -- for example, Firefox
     // submits files sent over HTML5 XMLHTTPRequest APIs with the Content-Type
     // of the file itself. If we don't have a recognized content type, we
     // don't need $_POST.
     //
     // NOTE: We use strncmp() because the actual content type may be something
     // like "multipart/form-data; boundary=...".
     //
     // NOTE: Chrome sometimes omits this header, see some discussion in T1762
     // and http://code.google.com/p/chromium/issues/detail?id=6800
     $content_type = isset($_SERVER['CONTENT_TYPE'])
       ? $_SERVER['CONTENT_TYPE']
       : '';
 
     $parsed_types = array(
       'application/x-www-form-urlencoded',
       'multipart/form-data',
     );
 
     $is_parsed_type = false;
     foreach ($parsed_types as $parsed_type) {
       if (strncmp($content_type, $parsed_type, strlen($parsed_type)) === 0) {
         $is_parsed_type = true;
         break;
       }
     }
 
     if (!$is_parsed_type) {
       return;
     }
 
     // Check for 'Content-Length'. If there's no data, we don't expect $_POST
     // to exist.
     $length = (int)$_SERVER['CONTENT_LENGTH'];
     if (!$length) {
       return;
     }
 
     // Time to fatal: we know this was a POST with data that should have been
     // populated into $_POST, but it wasn't.
 
     $config = ini_get('post_max_size');
     PhabricatorStartup::didFatal(
       "As received by the server, this request had a nonzero content length ".
       "but no POST data.\n\n".
       "Normally, this indicates that it exceeds the 'post_max_size' setting ".
       "in the PHP configuration on the server. Increase the 'post_max_size' ".
       "setting or reduce the size of the request.\n\n".
       "Request size according to 'Content-Length' was '{$length}', ".
       "'post_max_size' is set to '{$config}'.");
   }
 
 
 /* -(  Rate Limiting  )------------------------------------------------------ */
 
 
   /**
    * Adjust the permissible rate limit score.
    *
    * By default, the limit is `1000`. You can use this method to set it to
    * a larger or smaller value. If you set it to `2000`, users may make twice
    * as many requests before rate limiting.
    *
    * @param int Maximum score before rate limiting.
    * @return void
    * @task ratelimit
    */
   public static function setMaximumRate($rate) {
     self::$maximumRate = $rate;
   }
 
 
   /**
    * Check if the user (identified by `$user_identity`) has issued too many
    * requests recently. If they have, end the request with a 429 error code.
    *
    * The key just needs to identify the user. Phabricator uses both user PHIDs
    * and user IPs as keys, tracking logged-in and logged-out users separately
    * and enforcing different limits.
    *
    * @param   string  Some key which identifies the user making the request.
    * @return  void    If the user has exceeded the rate limit, this method
    *                  does not return.
    * @task ratelimit
    */
   public static function rateLimitRequest($user_identity) {
     if (!self::canRateLimit()) {
       return;
     }
 
     $score = self::getRateLimitScore($user_identity);
     if ($score > (self::$maximumRate * self::getRateLimitBucketCount())) {
       // Give the user some bonus points for getting rate limited. This keeps
       // bad actors who keep slamming the 429 page locked out completely,
       // instead of letting them get a burst of requests through every minute
       // after a bucket expires.
       self::addRateLimitScore($user_identity, 50);
       self::didRateLimit($user_identity);
     }
   }
 
 
   /**
    * Add points to the rate limit score for some user.
    *
    * If users have earned more than 1000 points per minute across all the
    * buckets they'll be locked out of the application, so awarding 1 point per
    * request roughly corresponds to allowing 1000 requests per second, while
    * awarding 50 points roughly corresponds to allowing 20 requests per second.
    *
    * @param string  Some key which identifies the user making the request.
    * @param float   The cost for this request; more points pushes them toward
    *                the limit faster.
    * @return void
    * @task ratelimit
    */
   public static function addRateLimitScore($user_identity, $score) {
     if (!self::canRateLimit()) {
       return;
     }
 
     $current = self::getRateLimitBucket();
 
     // There's a bit of a race here, if a second process reads the bucket before
     // this one writes it, but it's fine if we occasionally fail to record a
     // user's score. If they're making requests fast enough to hit rate
     // limiting, we'll get them soon.
 
     $bucket_key = self::getRateLimitBucketKey($current);
     $bucket = apc_fetch($bucket_key);
     if (!is_array($bucket)) {
       $bucket = array();
     }
 
     if (empty($bucket[$user_identity])) {
       $bucket[$user_identity] = 0;
     }
 
     $bucket[$user_identity] += $score;
     apc_store($bucket_key, $bucket);
   }
 
 
   /**
    * Determine if rate limiting is available.
    *
    * Rate limiting depends on APC, and isn't available unless the APC user
    * cache is available.
    *
    * @return bool True if rate limiting is available.
    * @task ratelimit
    */
   private static function canRateLimit() {
     if (!self::$maximumRate) {
       return false;
     }
 
     if (!function_exists('apc_fetch')) {
       return false;
     }
 
     return true;
   }
 
 
   /**
    * Get the current bucket for storing rate limit scores.
    *
    * @return int The current bucket.
    * @task ratelimit
    */
   private static function getRateLimitBucket() {
     return (int)(time() / 60);
   }
 
 
   /**
    * Get the total number of rate limit buckets to retain.
    *
    * @return int Total number of rate limit buckets to retain.
    * @task ratelimit
    */
   private static function getRateLimitBucketCount() {
     return 5;
   }
 
 
   /**
    * Get the APC key for a given bucket.
    *
    * @param int Bucket to get the key for.
    * @return string APC key for the bucket.
    * @task ratelimit
    */
   private static function getRateLimitBucketKey($bucket) {
     return 'rate:bucket:'.$bucket;
   }
 
 
   /**
    * Get the APC key for the smallest stored bucket.
    *
    * @return string APC key for the smallest stored bucket.
    * @task ratelimit
    */
   private static function getRateLimitMinKey() {
     return 'rate:min';
   }
 
 
   /**
    * Get the current rate limit score for a given user.
    *
    * @param string Unique key identifying the user.
    * @return float The user's current score.
    * @task ratelimit
    */
   private static function getRateLimitScore($user_identity) {
     $min_key = self::getRateLimitMinKey();
 
     // Identify the oldest bucket stored in APC.
     $cur = self::getRateLimitBucket();
     $min = apc_fetch($min_key);
 
     // If we don't have any buckets stored yet, store the current bucket as
     // the oldest bucket.
     if (!$min) {
       apc_store($min_key, $cur);
       $min = $cur;
     }
 
     // Destroy any buckets that are older than the minimum bucket we're keeping
     // track of. Under load this normally shouldn't do anything, but will clean
     // up an old bucket once per minute.
     $count = self::getRateLimitBucketCount();
     for ($cursor = $min; $cursor < ($cur - $count); $cursor++) {
       apc_delete(self::getRateLimitBucketKey($cursor));
       apc_store($min_key, $cursor + 1);
     }
 
     // Now, sum up the user's scores in all of the active buckets.
     $score = 0;
     for (; $cursor <= $cur; $cursor++) {
       $bucket = apc_fetch(self::getRateLimitBucketKey($cursor));
       if (isset($bucket[$user_identity])) {
         $score += $bucket[$user_identity];
       }
     }
 
     return $score;
   }
 
 
   /**
    * Emit an HTTP 429 "Too Many Requests" response (indicating that the user
    * has exceeded application rate limits) and exit.
    *
    * @return exit This method **does not return**.
    * @task ratelimit
    */
   private static function didRateLimit() {
     $message =
       "TOO MANY REQUESTS\n".
       "You are issuing too many requests too quickly.\n".
       "To adjust limits, see \"Configuring a Preamble Script\" in the ".
       "documentation.";
 
     header(
       'Content-Type: text/plain; charset=utf-8',
       $replace = true,
       $http_error = 429);
 
     echo $message;
 
     exit(1);
   }
 
 }
diff --git a/webroot/index.php b/webroot/index.php
index 0adaf7322..8ce3bc5a3 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -1,175 +1,175 @@
 <?php
 
 $phabricator_root = dirname(dirname(__FILE__));
 require_once $phabricator_root.'/support/PhabricatorStartup.php';
 
 // If the preamble script exists, load it.
 $preamble_path = $phabricator_root.'/support/preamble.php';
 if (file_exists($preamble_path)) {
   require_once $preamble_path;
 }
 
 PhabricatorStartup::didStartup();
 
 $show_unexpected_traces = false;
 try {
   PhabricatorStartup::loadCoreLibraries();
 
   PhabricatorEnv::initializeWebEnvironment();
   $show_unexpected_traces = PhabricatorEnv::getEnvConfig(
     'phabricator.developer-mode');
 
   // This is the earliest we can get away with this, we need env config first.
   PhabricatorAccessLog::init();
   $access_log = PhabricatorAccessLog::getLog();
   PhabricatorStartup::setGlobal('log.access', $access_log);
   $access_log->setData(
     array(
       'R' => AphrontRequest::getHTTPHeader('Referer', '-'),
       'r' => idx($_SERVER, 'REMOTE_ADDR', '-'),
       'M' => idx($_SERVER, 'REQUEST_METHOD', '-'),
     ));
 
   DarkConsoleXHProfPluginAPI::hookProfiler();
   DarkConsoleErrorLogPluginAPI::registerErrorHandler();
 
   $sink = new AphrontPHPHTTPSink();
 
   $response = PhabricatorSetupCheck::willProcessRequest();
   if ($response) {
     PhabricatorStartup::endOutputCapture();
     $sink->writeResponse($response);
     return;
   }
 
   $host = AphrontRequest::getHTTPHeader('Host');
   $path = $_REQUEST['__path__'];
 
   switch ($host) {
     default:
       $config_key = 'aphront.default-application-configuration-class';
       $application = PhabricatorEnv::newObjectFromConfig($config_key);
       break;
   }
 
   $application->setHost($host);
   $application->setPath($path);
   $application->willBuildRequest();
   $request = $application->buildRequest();
 
   // Until an administrator sets "phabricator.base-uri", assume it is the same
   // as the request URI. This will work fine in most cases, it just breaks down
   // when daemons need to do things.
   $request_protocol = ($request->isHTTPS() ? 'https' : 'http');
   $request_base_uri = "{$request_protocol}://{$host}/";
   PhabricatorEnv::setRequestBaseURI($request_base_uri);
 
   $write_guard = new AphrontWriteGuard(array($request, 'validateCSRF'));
 
   $application->setRequest($request);
   list($controller, $uri_data) = $application->buildController();
 
   $access_log->setData(
     array(
       'U' => (string)$request->getRequestURI()->getPath(),
       'C' => get_class($controller),
     ));
 
   // If execution throws an exception and then trying to render that exception
   // throws another exception, we want to show the original exception, as it is
   // likely the root cause of the rendering exception.
   $original_exception = null;
   try {
     $response = $controller->willBeginExecution();
 
     if ($request->getUser() && $request->getUser()->getPHID()) {
       $access_log->setData(
         array(
           'u' => $request->getUser()->getUserName(),
           'P' => $request->getUser()->getPHID(),
         ));
     }
 
     if (!$response) {
       $controller->willProcessRequest($uri_data);
       $response = $controller->processRequest();
     }
   } catch (Exception $ex) {
     $original_exception = $ex;
     $response = $application->handleException($ex);
   }
 
   try {
     $response = $controller->didProcessRequest($response);
     $response = $application->willSendResponse($response, $controller);
     $response->setRequest($request);
 
     $unexpected_output = PhabricatorStartup::endOutputCapture();
     if ($unexpected_output) {
       $unexpected_output = "Unexpected output:\n\n{$unexpected_output}";
       phlog($unexpected_output);
 
       if ($response instanceof AphrontWebpageResponse) {
         echo phutil_tag(
           'div',
           array('style' =>
             'background: #eeddff;'.
             'white-space: pre-wrap;'.
             'z-index: 200000;'.
             'position: relative;'.
             'padding: 8px;'.
             'font-family: monospace'),
           $unexpected_output);
       }
     }
 
     $sink->writeResponse($response);
   } catch (Exception $ex) {
     $write_guard->dispose();
     $access_log->write();
     if ($original_exception) {
       $ex = new PhutilAggregateException(
-        "Multiple exceptions during processing and rendering.",
+        'Multiple exceptions during processing and rendering.',
         array(
           $original_exception,
           $ex,
         ));
     }
     PhabricatorStartup::didEncounterFatalException(
       'Rendering Exception',
       $ex,
       $show_unexpected_traces);
   }
 
   $write_guard->dispose();
 
   $access_log->setData(
     array(
       'c' => $response->getHTTPResponseCode(),
       'T' => PhabricatorStartup::getMicrosecondsSinceStart(),
     ));
 
   DarkConsoleXHProfPluginAPI::saveProfilerSample($access_log);
 
   // Add points to the rate limits for this request.
   if (isset($_SERVER['REMOTE_ADDR'])) {
     $user_ip = $_SERVER['REMOTE_ADDR'];
 
     // The base score for a request allows users to make 30 requests per
     // minute.
     $score = (1000 / 30);
 
     // If the user was logged in, let them make more requests.
     if ($request->getUser() && $request->getUser()->getPHID()) {
       $score = $score / 5;
     }
 
     PhabricatorStartup::addRateLimitScore($user_ip, $score);
   }
 
 } catch (Exception $ex) {
   PhabricatorStartup::didEncounterFatalException(
     'Core Exception',
     $ex,
     $show_unexpected_traces);
 }