diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php index cffb1f34a1..90056969f5 100644 --- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php +++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php @@ -136,7 +136,10 @@ final class DifferentialDiffTableOfContentsView extends AphrontView { $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); diff --git a/src/docs/contributor/database.diviner b/src/docs/contributor/database.diviner index 99ee5aeb68..48e2c20b79 100644 --- a/src/docs/contributor/database.diviner +++ b/src/docs/contributor/database.diviner @@ -155,7 +155,8 @@ There are three simple steps to update the schema: such as PHID columns. Otherwise, use `COLLATE utf8_general_ci`. - Name all indexes so it is possible to delete them later. # Edit `src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php` and - add your patch to @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}. + add your patch to + @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}. # Run `bin/storage upgrade`. It is also possible to create more complex patches in PHP for data migration diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php index e5f4b872d4..25df41bedd 100644 --- a/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php +++ b/src/infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php @@ -21,7 +21,8 @@ final class PhabricatorBotFlowdockProtocolAdapter $ssl = $this->getConfig('ssl'); $url = ($ssl) ? 'https://' : 'http://'; - $url .= "{$this->authtoken}@stream.flowdock.com/flows/{$organization}/{$channel}"; + $url .= "{$this->authtoken}@stream.flowdock.com"; + $url .= "/flows/{$organization}/{$channel}"; return $url; } diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php index 9bdc0d0253..a5766fde93 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php @@ -123,8 +123,8 @@ final class PhabricatorBotObjectNameHandler extends PhabricatorBotHandler { array( 'id' => $file_id, )); - $output[$file['phid']] = $file['objectName'].': '.$file['uri'].' - '. - $file['name']; + $output[$file['phid']] = $file['objectName'].': '. + $file['uri'].' - '.$file['name']; } }