Various linter fixes

Summary: Apply various linter fixes.

Test Plan: Unit tests + eyeballing.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: hach-que, Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D12390

src/aphront/AphrontRequest.php

@@ -28,44 +28,44 @@ final class AphrontRequest {
   private $applicationConfiguration;
   private $uriData;
 
-  final public function __construct($host, $path) {
+  public function __construct($host, $path) {
     $this->host = $host;
     $this->path = $path;
   }
 
-  final public function setURIMap(array $uri_data) {
+  public function setURIMap(array $uri_data) {
     $this->uriData = $uri_data;
     return $this;
   }
 
-  final public function getURIMap() {
+  public function getURIMap() {
     return $this->uriData;
   }
 
-  final public function getURIData($key, $default = null) {
+  public function getURIData($key, $default = null) {
     return idx($this->uriData, $key, $default);
   }
 
-  final public function setApplicationConfiguration(
+  public function setApplicationConfiguration(
     $application_configuration) {
     $this->applicationConfiguration = $application_configuration;
     return $this;
   }
 
-  final public function getApplicationConfiguration() {
+  public function getApplicationConfiguration() {
     return $this->applicationConfiguration;
   }
 
-  final public function setPath($path) {
+  public function setPath($path) {
     $this->path = $path;
     return $this;
   }
 
-  final public function getPath() {
+  public function getPath() {
     return $this->path;
   }
 
-  final public function getHost() {
+  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
@@ -83,7 +83,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function setRequestData(array $request_data) {
+  public function setRequestData(array $request_data) {
     $this->requestData = $request_data;
     return $this;
   }
@@ -92,7 +92,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getRequestData() {
+  public function getRequestData() {
     return $this->requestData;
   }
 
@@ -100,7 +100,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getInt($name, $default = null) {
+  public function getInt($name, $default = null) {
     if (isset($this->requestData[$name])) {
       return (int)$this->requestData[$name];
     } else {
@@ -112,7 +112,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getBool($name, $default = null) {
+  public function getBool($name, $default = null) {
     if (isset($this->requestData[$name])) {
       if ($this->requestData[$name] === 'true') {
         return true;
@@ -130,7 +130,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getStr($name, $default = null) {
+  public function getStr($name, $default = null) {
     if (isset($this->requestData[$name])) {
       $str = (string)$this->requestData[$name];
       // Normalize newline craziness.
@@ -148,7 +148,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getArr($name, $default = array()) {
+  public function getArr($name, $default = array()) {
     if (isset($this->requestData[$name]) &&
         is_array($this->requestData[$name])) {
       return $this->requestData[$name];
@@ -161,7 +161,7 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getStrList($name, $default = array()) {
+  public function getStrList($name, $default = array()) {
     if (!isset($this->requestData[$name])) {
       return $default;
     }
@@ -174,36 +174,36 @@ final class AphrontRequest {
   /**
    * @task data
    */
-  final public function getExists($name) {
+  public function getExists($name) {
     return array_key_exists($name, $this->requestData);
   }
 
-  final public function getFileExists($name) {
+  public function getFileExists($name) {
     return isset($_FILES[$name]) &&
            (idx($_FILES[$name], 'error') !== UPLOAD_ERR_NO_FILE);
   }
 
-  final public function isHTTPGet() {
+  public function isHTTPGet() {
     return ($_SERVER['REQUEST_METHOD'] == 'GET');
   }
 
-  final public function isHTTPPost() {
+  public function isHTTPPost() {
     return ($_SERVER['REQUEST_METHOD'] == 'POST');
   }
 
-  final public function isAjax() {
+  public function isAjax() {
     return $this->getExists(self::TYPE_AJAX) && !$this->isQuicksand();
   }
 
-  final public function isWorkflow() {
+  public function isWorkflow() {
     return $this->getExists(self::TYPE_WORKFLOW) && !$this->isQuicksand();
   }
 
-  final public function isQuicksand() {
+  public function isQuicksand() {
     return $this->getExists(self::TYPE_QUICKSAND);
   }
 
-  final public function isConduit() {
+  public function isConduit() {
     return $this->getExists(self::TYPE_CONDUIT);
   }
 
@@ -215,7 +215,7 @@ final class AphrontRequest {
     return 'X-Phabricator-Csrf';
   }
 
-  final public function validateCSRF() {
+  public function validateCSRF() {
     $token_name = self::getCSRFTokenName();
     $token = $this->getStr($token_name);
 
@@ -281,7 +281,7 @@ final class AphrontRequest {
     return true;
   }
 
-  final public function isFormPost() {
+  public function isFormPost() {
     $post = $this->getExists(self::TYPE_FORM) &&
             !$this->getExists(self::TYPE_HISEC) &&
             $this->isHTTPPost();
@@ -293,7 +293,7 @@ final class AphrontRequest {
     return $this->validateCSRF();
   }
 
-  final public function isFormOrHisecPost() {
+  public function isFormOrHisecPost() {
     $post = $this->getExists(self::TYPE_FORM) &&
             $this->isHTTPPost();
 
@@ -305,12 +305,12 @@ final class AphrontRequest {
   }
 
 
-  final public function setCookiePrefix($prefix) {
+  public function setCookiePrefix($prefix) {
     $this->cookiePrefix = $prefix;
     return $this;
   }
 
-  final private function getPrefixedCookieName($name) {
+  private function getPrefixedCookieName($name) {
     if (strlen($this->cookiePrefix)) {
       return $this->cookiePrefix.'_'.$name;
     } else {
@@ -318,7 +318,7 @@ final class AphrontRequest {
     }
   }
 
-  final public function getCookie($name, $default = null) {
+  public function getCookie($name, $default = null) {
     $name = $this->getPrefixedCookieName($name);
     $value = idx($_COOKIE, $name, $default);
 
@@ -337,7 +337,7 @@ final class AphrontRequest {
     return $value;
   }
 
-  final public function clearCookie($name) {
+  public function clearCookie($name) {
     $this->setCookieWithExpiration($name, '', time() - (60 * 60 * 24 * 30));
     unset($_COOKIE[$name]);
   }
@@ -390,7 +390,7 @@ final class AphrontRequest {
    *
    * @task cookie
    */
-  final public function canSetCookies() {
+  public function canSetCookies() {
     return (bool)$this->getCookieDomainURI();
   }
 
@@ -405,7 +405,7 @@ final class AphrontRequest {
    * @return this
    * @task cookie
    */
-  final public function setCookie($name, $value) {
+  public function setCookie($name, $value) {
     $far_future = time() + (60 * 60 * 24 * 365 * 5);
     return $this->setCookieWithExpiration($name, $value, $far_future);
   }
@@ -421,7 +421,7 @@ final class AphrontRequest {
    * @return this
    * @task cookie
    */
-  final public function setTemporaryCookie($name, $value) {
+  public function setTemporaryCookie($name, $value) {
     return $this->setCookieWithExpiration($name, $value, 0);
   }
 
@@ -435,7 +435,7 @@ final class AphrontRequest {
    * @return this
    * @task cookie
    */
-  final private function setCookieWithExpiration(
+  private function setCookieWithExpiration(
     $name,
     $value,
     $expire) {
@@ -485,31 +485,31 @@ final class AphrontRequest {
     return $this;
   }
 
-  final public function setUser($user) {
+  public function setUser($user) {
     $this->user = $user;
     return $this;
   }
 
-  final public function getUser() {
+  public function getUser() {
     return $this->user;
   }
 
-  final public function getViewer() {
+  public function getViewer() {
     return $this->user;
   }
 
-  final public function getRequestURI() {
+  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() {
+  public function isDialogFormPost() {
     return $this->isFormPost() && $this->getStr('__dialog__');
   }
 
-  final public function getRemoteAddr() {
+  public function getRemoteAddr() {
     return $_SERVER['REMOTE_ADDR'];
   }
 

src/aphront/AphrontURIMapper.php

@@ -4,11 +4,11 @@ final class AphrontURIMapper {
 
   private $map;
 
-  final public function __construct(array $map) {
+  public function __construct(array $map) {
     $this->map = $map;
   }
 
-  final public function mapPath($path) {
+  public function mapPath($path) {
     $map = $this->map;
     foreach ($map as $rule => $value) {
       list($controller, $data) = $this->tryRule($rule, $value, $path);
@@ -25,7 +25,7 @@ final class AphrontURIMapper {
     return array(null, null);
   }
 
-  final private function tryRule($rule, $value, $path) {
+  private function tryRule($rule, $value, $path) {
     $match = null;
     $pattern = '#^'.$rule.(is_array($value) ? '' : '$').'#';
     if (!preg_match($pattern, $path, $match)) {

src/applications/celerity/CelerityResourceGraph.php

@@ -18,7 +18,7 @@ final class CelerityResourceGraph extends AbstractDirectedGraph {
     return $edges;
   }
 
-  final public function setResourceGraph(array $graph) {
+  public function setResourceGraph(array $graph) {
     $this->resourceGraph = $graph;
     $this->graphSet = true;
     return $this;

src/applications/diffusion/data/DiffusionPathChange.php

@@ -13,12 +13,12 @@ final class DiffusionPathChange {
   private $targetCommitIdentifier;
   private $awayPaths = array();
 
-  final public function setPath($path) {
+  public function setPath($path) {
     $this->path = $path;
     return $this;
   }
 
-  final public function getPath() {
+  public function getPath() {
     return $this->path;
   }
 
@@ -58,58 +58,58 @@ final class DiffusionPathChange {
     return $this->awayPaths;
   }
 
-  final public function setCommitIdentifier($commit) {
+  public function setCommitIdentifier($commit) {
     $this->commitIdentifier = $commit;
     return $this;
   }
 
-  final public function getCommitIdentifier() {
+  public function getCommitIdentifier() {
     return $this->commitIdentifier;
   }
 
-  final public function setTargetCommitIdentifier($target_commit_identifier) {
+  public function setTargetCommitIdentifier($target_commit_identifier) {
     $this->targetCommitIdentifier = $target_commit_identifier;
     return $this;
   }
 
-  final public function getTargetCommitIdentifier() {
+  public function getTargetCommitIdentifier() {
     return $this->targetCommitIdentifier;
   }
 
-  final public function setCommit($commit) {
+  public function setCommit($commit) {
     $this->commit = $commit;
     return $this;
   }
 
-  final public function getCommit() {
+  public function getCommit() {
     return $this->commit;
   }
 
-  final public function setCommitData($commit_data) {
+  public function setCommitData($commit_data) {
     $this->commitData = $commit_data;
     return $this;
   }
 
-  final public function getCommitData() {
+  public function getCommitData() {
     return $this->commitData;
   }
 
 
-  final public function getEpoch() {
+  public function getEpoch() {
     if ($this->getCommit()) {
       return $this->getCommit()->getEpoch();
     }
     return null;
   }
 
-  final public function getAuthorName() {
+  public function getAuthorName() {
     if ($this->getCommitData()) {
       return $this->getCommitData()->getAuthorName();
     }
     return null;
   }
 
-  final public function getSummary() {
+  public function getSummary() {
     if (!$this->getCommitData()) {
       return null;
     }
@@ -118,7 +118,7 @@ final class DiffusionPathChange {
     return substr($first, 0, 80);
   }
 
-  final public static function convertToArcanistChanges(array $changes) {
+  public static function convertToArcanistChanges(array $changes) {
     assert_instances_of($changes, __CLASS__);
     $direct = array();
     $result = array();
@@ -142,7 +142,7 @@ final class DiffusionPathChange {
     return array_select_keys($result, $direct);
   }
 
-  final public static function convertToDifferentialChangesets(
+  public static function convertToDifferentialChangesets(
     PhabricatorUser $user,
     array $changes) {
     assert_instances_of($changes, __CLASS__);

src/applications/diffusion/query/DiffusionRenameHistoryQuery.php

@@ -30,7 +30,7 @@ final class DiffusionRenameHistoryQuery {
     return $this->oldCommit;
   }
 
-  final public function loadOldFilename() {
+  public function loadOldFilename() {
     $drequest = $this->request;
     $repository_id = $drequest->getRepository()->getID();
     $conn_r = id(new PhabricatorRepository())->establishConnection('r');

src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php

@@ -14,11 +14,11 @@ final class DiffusionPathChangeQuery {
     return $this->limit;
   }
 
-  final private function __construct() {
+  private function __construct() {
     // <private>
   }
 
-  final public static function newFromDiffusionRequest(
+  public static function newFromDiffusionRequest(
     DiffusionRequest $request) {
     $query = new DiffusionPathChangeQuery();
     $query->request = $request;
@@ -26,11 +26,11 @@ final class DiffusionPathChangeQuery {
     return $query;
   }
 
-  final protected function getRequest() {
+  protected function getRequest() {
     return $this->request;
   }
 
-  final public function loadChanges() {
+  public function loadChanges() {
     return $this->executeQuery();
   }
 

src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

@@ -90,7 +90,7 @@ final class PhabricatorMetaMTAReceivedMail extends PhabricatorMetaMTADAO {
     return $this->loadPHIDsFromAddresses($addresses);
   }
 
-  final public function loadCCPHIDs() {
+  public function loadCCPHIDs() {
     return $this->loadPHIDsFromAddresses($this->getCCAddresses());
   }
 

src/applications/people/controller/PhabricatorPeopleController.php

@@ -45,10 +45,6 @@ abstract class PhabricatorPeopleController extends PhabricatorController {
     return $this->buildSideNavView(true)->getMenu();
   }
 
-  protected function buildApplicationCrumbs() {
-    return parent::buildApplicationCrumbs();
-  }
-
   public function buildIconNavView(PhabricatorUser $user) {
     $viewer = $this->getViewer();
     $picture = $user->getProfileImageURI();

src/applications/releeph/storage/ReleephRequest.php

@@ -293,13 +293,6 @@ final class ReleephRequest extends ReleephDAO
     throw new Exception('`status` is now deprecated!');
   }
 
-/* -(  Make magic Lisk methods private  )------------------------------------ */
-
-  private function setUserIntents(array $ar) {
-    return parent::setUserIntents($ar);
-  }
-
-
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 

src/applications/releeph/storage/ReleephRequestTransaction.php

@@ -146,10 +146,6 @@ final class ReleephRequestTransaction
     }
   }
 
-  public function getActionStrength() {
-    return parent::getActionStrength();
-  }
-
   public function getActionName() {
     switch ($this->getTransactionType()) {
       case self::TYPE_REQUEST:

src/applications/tokens/query/PhabricatorTokenCountQuery.php

@@ -10,7 +10,7 @@ final class PhabricatorTokenCountQuery
     return $this;
   }
 
-  final public function execute() {
+  public function execute() {
     $table = new PhabricatorTokenCount();
     $conn_r = $table->establishConnection('r');
 

src/infrastructure/events/PhabricatorEvent.php

@@ -6,10 +6,6 @@ final class PhabricatorEvent extends PhutilEvent {
   private $aphrontRequest;
   private $conduitRequest;
 
-  public function __construct($type, array $data = array()) {
-    parent::__construct($type, $data);
-  }
-
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;

src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php

@@ -40,7 +40,7 @@ final class DefaultDatabaseConfigurationProvider
     return $this->namespace.'_'.$this->getDao()->getApplicationName();
   }
 
-  final protected function getDao() {
+  protected function getDao() {
     return $this->dao;
   }
 

src/infrastructure/storage/lisk/LiskDAOSet.php

@@ -38,7 +38,7 @@ final class LiskDAOSet {
    * The main purpose of this method is to break cyclic dependency.
    * It removes all objects from this set and all subsets created by it.
    */
-  final public function clearSet() {
+  public function clearSet() {
     $this->daos = array();
     $this->relatives = array();
     foreach ($this->subsets as $set) {

src/view/AphrontDialogView.php

@@ -174,7 +174,7 @@ final class AphrontDialogView extends AphrontView {
     return $this;
   }
 
-  final public function render() {
+  public function render() {
     require_celerity_resource('aphront-dialog-view-css');
 
     $buttons = array();

src/view/AphrontJavelinView.php

@@ -46,7 +46,7 @@ final class AphrontJavelinView extends AphrontView {
     return $this->name;
   }
 
-  final public function setName($template_name) {
+  public function setName($template_name) {
     $this->name = $template_name;
     return $this;
   }
@@ -55,7 +55,7 @@ final class AphrontJavelinView extends AphrontView {
     return $this->parameters;
   }
 
-  final public function setParameters($template_parameters) {
+  public function setParameters($template_parameters) {
     $this->parameters = $template_parameters;
     return $this;
   }
@@ -64,7 +64,7 @@ final class AphrontJavelinView extends AphrontView {
     return $this->celerityResource;
   }
 
-  final public function setCelerityResource($celerity_resource) {
+  public function setCelerityResource($celerity_resource) {
     $this->celerityResource = $celerity_resource;
     return $this;
   }

src/view/control/AphrontCursorPagerView.php

@@ -13,64 +13,64 @@ final class AphrontCursorPagerView extends AphrontView {
 
   private $uri;
 
-  final public function setPageSize($page_size) {
+  public function setPageSize($page_size) {
     $this->pageSize = max(1, $page_size);
     return $this;
   }
 
-  final public function getPageSize() {
+  public function getPageSize() {
     return $this->pageSize;
   }
 
-  final public function setURI(PhutilURI $uri) {
+  public function setURI(PhutilURI $uri) {
     $this->uri = $uri;
     return $this;
   }
 
-  final public function readFromRequest(AphrontRequest $request) {
+  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) {
+  public function setAfterID($after_id) {
     $this->afterID = $after_id;
     return $this;
   }
 
-  final public function getAfterID() {
+  public function getAfterID() {
     return $this->afterID;
   }
 
-  final public function setBeforeID($before_id) {
+  public function setBeforeID($before_id) {
     $this->beforeID = $before_id;
     return $this;
   }
 
-  final public function getBeforeID() {
+  public function getBeforeID() {
     return $this->beforeID;
   }
 
-  final public function setNextPageID($next_page_id) {
+  public function setNextPageID($next_page_id) {
     $this->nextPageID = $next_page_id;
     return $this;
   }
 
-  final public function getNextPageID() {
+  public function getNextPageID() {
     return $this->nextPageID;
   }
 
-  final public function setPrevPageID($prev_page_id) {
+  public function setPrevPageID($prev_page_id) {
     $this->prevPageID = $prev_page_id;
     return $this;
   }
 
-  final public function getPrevPageID() {
+  public function getPrevPageID() {
     return $this->prevPageID;
   }
 
-  final public function sliceResults(array $results) {
+  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);
@@ -79,7 +79,7 @@ final class AphrontCursorPagerView extends AphrontView {
     return $results;
   }
 
-  final public function getHasMoreResults() {
+  public function getHasMoreResults() {
     return $this->moreResults;
   }
 

src/view/control/AphrontPagerView.php

@@ -13,52 +13,52 @@ final class AphrontPagerView extends AphrontView {
   private $surroundingPages = 2;
   private $enableKeyboardShortcuts;
 
-  final public function setPageSize($page_size) {
+  public function setPageSize($page_size) {
     $this->pageSize = max(1, $page_size);
     return $this;
   }
 
-  final public function setOffset($offset) {
+  public function setOffset($offset) {
     $this->offset = max(0, $offset);
     return $this;
   }
 
-  final public function getOffset() {
+  public function getOffset() {
     return $this->offset;
   }
 
-  final public function getPageSize() {
+  public function getPageSize() {
     return $this->pageSize;
   }
 
-  final public function setCount($count) {
+  public function setCount($count) {
     $this->count = $count;
     return $this;
   }
 
-  final public function setHasMorePages($has_more) {
+  public function setHasMorePages($has_more) {
     $this->hasMorePages = $has_more;
     return $this;
   }
 
-  final public function setURI(PhutilURI $uri, $paging_parameter) {
+  public function setURI(PhutilURI $uri, $paging_parameter) {
     $this->uri = $uri;
     $this->pagingParameter = $paging_parameter;
     return $this;
   }
 
-  final public function readFromRequest(AphrontRequest $request) {
+  public function readFromRequest(AphrontRequest $request) {
     $this->uri = $request->getRequestURI();
     $this->pagingParameter = 'offset';
     $this->offset = $request->getInt($this->pagingParameter);
     return $this;
   }
 
-  final public function willShowPagingControls() {
+  public function willShowPagingControls() {
     return $this->hasMorePages;
   }
 
-  final public function setSurroundingPages($pages) {
+  public function setSurroundingPages($pages) {
     $this->surroundingPages = max(0, $pages);
     return $this;
   }

src/view/form/PHUIInfoView.php

@@ -40,7 +40,7 @@ final class PHUIInfoView extends AphrontView {
     return $this;
   }
 
-  final public function render() {
+  public function render() {
     require_celerity_resource('phui-info-view-css');
 
     $errors = $this->errors;