diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php --- a/src/aphront/configuration/AphrontApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontApplicationConfiguration.php @@ -523,6 +523,7 @@ return array($result->getController(), $result->getURIData()); } } + return null; } private function buildSiteForRequest(AphrontRequest $request) { diff --git a/src/applications/people/storage/PhabricatorUserEmail.php b/src/applications/people/storage/PhabricatorUserEmail.php --- a/src/applications/people/storage/PhabricatorUserEmail.php +++ b/src/applications/people/storage/PhabricatorUserEmail.php @@ -231,7 +231,6 @@ * * @param PhabricatorUser The user sending the notification. * @param PhabricatorUserEmail New primary email address. - * @return this * @task email */ public function sendOldPrimaryEmail( diff --git a/src/applications/phame/storage/PhamePost.php b/src/applications/phame/storage/PhamePost.php --- a/src/applications/phame/storage/PhamePost.php +++ b/src/applications/phame/storage/PhamePost.php @@ -268,6 +268,7 @@ case self::MARKUP_FIELD_BODY: return $this->getBody(); } + return null; } public function didMarkupText( diff --git a/src/infrastructure/daemon/workers/PhabricatorWorker.php b/src/infrastructure/daemon/workers/PhabricatorWorker.php --- a/src/infrastructure/daemon/workers/PhabricatorWorker.php +++ b/src/infrastructure/daemon/workers/PhabricatorWorker.php @@ -262,7 +262,6 @@ * you are using queues to improve locking behavior). * * @param map Optional default options. - * @return this */ final public function flushTaskQueue($defaults = array()) { foreach ($this->getQueuedTasks() as $task) { diff --git a/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php b/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php --- a/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php +++ b/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php @@ -90,7 +90,6 @@ * (e.g., adds followed by removals) if their outcomes are not dependent, * since transactions will not be held open as long. * - * @return this * @task edit */ public function save() { diff --git a/support/startup/PhabricatorStartup.php b/support/startup/PhabricatorStartup.php --- a/support/startup/PhabricatorStartup.php +++ b/support/startup/PhabricatorStartup.php @@ -317,7 +317,6 @@ * @param Throwable 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 */