D12390.diff
No OneTemporary
Actions

Size

36 KB

Referenced Files

None

Subscribers

None

D12390.diff
View Options

	diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
	--- a/src/aphront/AphrontRequest.php
	+++ b/src/aphront/AphrontRequest.php
	@@ -28,44 +28,44 @@
	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 @@
	/**
	* @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 @@
	/**
	* @task data
	*/
	- final public function getRequestData() {
	+ public function getRequestData() {
	return $this->requestData;
	}

	@@ -100,7 +100,7 @@
	/**
	* @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 @@
	/**
	* @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 @@
	/**
	* @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 @@
	/**
	* @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 @@
	/**
	* @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 @@
	/**
	* @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 @@
	return 'X-Phabricator-Csrf';
	}

	- final public function validateCSRF() {
	+ public function validateCSRF() {
	$token_name = self::getCSRFTokenName();
	$token = $this->getStr($token_name);

	@@ -281,7 +281,7 @@
	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 @@
	return $this->validateCSRF();
	}

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

	@@ -305,12 +305,12 @@
	}


	- 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 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 @@
	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 @@
	*
	* @task cookie
	*/
	- final public function canSetCookies() {
	+ public function canSetCookies() {
	return (bool)$this->getCookieDomainURI();
	}

	@@ -405,7 +405,7 @@
	* @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 @@
	* @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 @@
	* @return this
	* @task cookie
	*/
	- final private function setCookieWithExpiration(
	+ private function setCookieWithExpiration(
	$name,
	$value,
	$expire) {
	@@ -485,31 +485,31 @@
	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'];
	}

	diff --git a/src/aphront/AphrontURIMapper.php b/src/aphront/AphrontURIMapper.php
	--- a/src/aphront/AphrontURIMapper.php
	+++ b/src/aphront/AphrontURIMapper.php
	@@ -4,11 +4,11 @@

	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 @@
	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)) {
	diff --git a/src/aphront/response/AphrontJSONResponse.php b/src/aphront/response/AphrontJSONResponse.php
	--- a/src/aphront/response/AphrontJSONResponse.php
	+++ b/src/aphront/response/AphrontJSONResponse.php
	@@ -19,7 +19,7 @@
	if ($this->addJSONShield === null) {
	return true;
	}
	- return (bool) $this->addJSONShield;
	+ return (bool)$this->addJSONShield;
	}

	public function buildResponseString() {
	diff --git a/src/applications/celerity/CelerityResourceGraph.php b/src/applications/celerity/CelerityResourceGraph.php
	--- a/src/applications/celerity/CelerityResourceGraph.php
	+++ b/src/applications/celerity/CelerityResourceGraph.php
	@@ -18,7 +18,7 @@
	return $edges;
	}

	- final public function setResourceGraph(array $graph) {
	+ public function setResourceGraph(array $graph) {
	$this->resourceGraph = $graph;
	$this->graphSet = true;
	return $this;
	diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php
	--- a/src/applications/conpherence/controller/ConpherenceUpdateController.php
	+++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php
	@@ -550,7 +550,7 @@
	$content = array(
	'non_update' => $non_update,
	'transactions' => hsprintf('%s', $rendered_transactions),
	- 'conpherence_title' => (string) $data['title'],
	+ 'conpherence_title' => (string)$data['title'],
	'latest_transaction_id' => $new_latest_transaction_id,
	'nav_item' => $nav_item,
	'conpherence_phid' => $conpherence->getPHID(),
	diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	@@ -246,7 +246,7 @@
	$action_edit = id(new PHUIIconView())
	->setIconFont('fa-pencil')
	->setWorkflow(true)
	- ->setHref((string) $edit_uri);
	+ ->setHref((string)$edit_uri);
	$header->addAction($action_edit);

	if ($dashboard_id) {
	@@ -255,7 +255,7 @@
	->setQueryParam('panelPHID', $panel->getPHID());
	$action_remove = id(new PHUIIconView())
	->setIconFont('fa-trash-o')
	- ->setHref((string) $uri)
	+ ->setHref((string)$uri)
	->setWorkflow(true);
	$header->addAction($action_remove);
	}
	diff --git a/src/applications/diffusion/data/DiffusionPathChange.php b/src/applications/diffusion/data/DiffusionPathChange.php
	--- a/src/applications/diffusion/data/DiffusionPathChange.php
	+++ b/src/applications/diffusion/data/DiffusionPathChange.php
	@@ -13,12 +13,12 @@
	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 @@
	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 @@
	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 @@
	return array_select_keys($result, $direct);
	}

	- final public static function convertToDifferentialChangesets(
	+ public static function convertToDifferentialChangesets(
	PhabricatorUser $user,
	array $changes) {
	assert_instances_of($changes, __CLASS__);
	diff --git a/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php b/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php
	--- a/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php
	+++ b/src/applications/diffusion/query/DiffusionRenameHistoryQuery.php
	@@ -30,7 +30,7 @@
	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');
	diff --git a/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
	--- a/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
	+++ b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
	@@ -14,11 +14,11 @@
	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 @@
	return $query;
	}

	- final protected function getRequest() {
	+ protected function getRequest() {
	return $this->request;
	}

	- final public function loadChanges() {
	+ public function loadChanges() {
	return $this->executeQuery();
	}

	diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
	--- a/src/applications/files/storage/PhabricatorFile.php
	+++ b/src/applications/files/storage/PhabricatorFile.php
	@@ -758,7 +758,7 @@
	public function getDownloadURI() {
	$uri = id(new PhutilURI($this->getViewURI()))
	->setQueryParam('download', true);
	- return (string) $uri;
	+ return (string)$uri;
	}

	public function getURIForTransform(PhabricatorFileTransform $transform) {
	diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
	--- a/src/applications/herald/adapter/HeraldAdapter.php
	+++ b/src/applications/herald/adapter/HeraldAdapter.php
	@@ -166,7 +166,7 @@
	throw new Exception(pht('You must setIsNewObject to a boolean first!'));
	}
	public function setIsNewObject($new) {
	- $this->isNewObject = (bool) $new;
	+ $this->isNewObject = (bool)$new;
	return $this;
	}

	@@ -681,9 +681,9 @@
	}
	return $result;
	case self::CONDITION_HAS_BIT:
	- return (($condition_value & $field_value) === (int) $condition_value);
	+ return (($condition_value & $field_value) === (int)$condition_value);
	case self::CONDITION_NOT_BIT:
	- return (($condition_value & $field_value) !== (int) $condition_value);
	+ return (($condition_value & $field_value) !== (int)$condition_value);
	default:
	throw new HeraldInvalidConditionException(
	"Unknown condition '{$condition_type}'.");
	diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	@@ -199,7 +199,7 @@
	$next_uri = '/'.$document->getMonogram();
	if ($document->getRequireSignature()) {
	$request_uri = $request->getRequestURI();
	- $next_uri = (string) $request_uri;
	+ $next_uri = (string)$request_uri;
	}
	} else {
	$this->sendVerifySignatureEmail(
	diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
	--- a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
	+++ b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
	@@ -90,7 +90,7 @@
	return $this->loadPHIDsFromAddresses($addresses);
	}

	- final public function loadCCPHIDs() {
	+ public function loadCCPHIDs() {
	return $this->loadPHIDsFromAddresses($this->getCCAddresses());
	}

	diff --git a/src/applications/notification/controller/PhabricatorNotificationPanelController.php b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
	--- a/src/applications/notification/controller/PhabricatorNotificationPanelController.php
	+++ b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
	@@ -34,7 +34,7 @@
	'a',
	array(
	'sigil' => 'workflow',
	- 'href' => (string) $clear_uri,
	+ 'href' => (string)$clear_uri,
	'class' => $clear_ui_class,
	),
	pht('Mark All Read'));
	diff --git a/src/applications/oauthserver/PhabricatorOAuthServer.php b/src/applications/oauthserver/PhabricatorOAuthServer.php
	--- a/src/applications/oauthserver/PhabricatorOAuthServer.php
	+++ b/src/applications/oauthserver/PhabricatorOAuthServer.php
	@@ -112,7 +112,7 @@
	$authorization_code->setClientPHID($client->getPHID());
	$authorization_code->setClientSecret($client->getSecret());
	$authorization_code->setUserPHID($this->getUser()->getPHID());
	- $authorization_code->setRedirectURI((string) $redirect_uri);
	+ $authorization_code->setRedirectURI((string)$redirect_uri);
	$authorization_code->save();

	return $authorization_code;
	diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	@@ -92,7 +92,7 @@
	$path_link = phutil_tag(
	'a',
	array(
	- 'href' => (string) $href,
	+ 'href' => (string)$href,
	),
	$path->getPath());
	$path_links[] = hsprintf(
	diff --git a/src/applications/owners/controller/PhabricatorOwnersListController.php b/src/applications/owners/controller/PhabricatorOwnersListController.php
	--- a/src/applications/owners/controller/PhabricatorOwnersListController.php
	+++ b/src/applications/owners/controller/PhabricatorOwnersListController.php
	@@ -285,7 +285,7 @@
	phutil_tag(
	'a',
	array(
	- 'href' => (string) $href,
	+ 'href' => (string)$href,
	),
	$path->getPath()));
	} else {
	diff --git a/src/applications/people/controller/PhabricatorPeopleController.php b/src/applications/people/controller/PhabricatorPeopleController.php
	--- a/src/applications/people/controller/PhabricatorPeopleController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleController.php
	@@ -45,10 +45,6 @@
	return $this->buildSideNavView(true)->getMenu();
	}

	- protected function buildApplicationCrumbs() {
	- return parent::buildApplicationCrumbs();
	- }
	-
	public function buildIconNavView(PhabricatorUser $user) {
	$viewer = $this->getViewer();
	$picture = $user->getProfileImageURI();
	diff --git a/src/applications/pholio/editor/PholioMockEditor.php b/src/applications/pholio/editor/PholioMockEditor.php
	--- a/src/applications/pholio/editor/PholioMockEditor.php
	+++ b/src/applications/pholio/editor/PholioMockEditor.php
	@@ -260,19 +260,19 @@
	break;
	case PholioTransactionType::TYPE_IMAGE_NAME:
	$image = $this->getImageForXaction($object, $xaction);
	- $value = (string) head($xaction->getNewValue());
	+ $value = (string)head($xaction->getNewValue());
	$image->setName($value);
	$image->save();
	break;
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	$image = $this->getImageForXaction($object, $xaction);
	- $value = (string) head($xaction->getNewValue());
	+ $value = (string)head($xaction->getNewValue());
	$image->setDescription($value);
	$image->save();
	break;
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	$image = $this->getImageForXaction($object, $xaction);
	- $value = (int) head($xaction->getNewValue());
	+ $value = (int)head($xaction->getNewValue());
	$image->setSequence($value);
	$image->save();
	break;
	diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
	--- a/src/applications/pholio/view/PholioMockImagesView.php
	+++ b/src/applications/pholio/view/PholioMockImagesView.php
	@@ -137,7 +137,7 @@
	);

	$login_uri = id(new PhutilURI('/login/'))
	- ->setQueryParam('next', (string) $this->getRequestURI());
	+ ->setQueryParam('next', (string)$this->getRequestURI());

	$config = array(
	'mockID' => $mock->getID(),
	@@ -147,7 +147,7 @@
	'images' => $images,
	'selectedID' => $selected_id,
	'loggedIn' => $this->getUser()->isLoggedIn(),
	- 'logInLink' => (string) $login_uri,
	+ 'logInLink' => (string)$login_uri,
	'navsequence' => $navsequence,
	'fullIcon' => hsprintf('%s', $full_icon),
	'downloadIcon' => hsprintf('%s', $download_icon),
	diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	@@ -51,7 +51,7 @@
	case PhabricatorProjectTransaction::TYPE_COLOR:
	return $object->getColor();
	case PhabricatorProjectTransaction::TYPE_LOCKED:
	- return (int) $object->getIsMembershipLocked();
	+ return (int)$object->getIsMembershipLocked();
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	diff --git a/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php b/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php
	@@ -177,7 +177,7 @@
	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();
	+ $ordinal = (int)$rq->loadPhabricatorRepositoryCommit()->getID();
	$surrogate[$ordinal] = $rq;
	}
	ksort($surrogate);
	diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
	--- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
	+++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
	@@ -180,7 +180,7 @@
	"Releeph request token '{$token}'!");
	}

	- $id = (int) $match[1];
	+ $id = (int)$match[1];
	$releeph_request = id(new ReleephRequest())->load($id);

	if (!$releeph_request) {
	diff --git a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
	--- a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
	+++ b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
	@@ -114,7 +114,7 @@
	break;

	case ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH:
	- $object->setInBranch((int) $new);
	+ $object->setInBranch((int)$new);
	break;
	}
	}
	diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php
	--- a/src/applications/releeph/storage/ReleephRequest.php
	+++ b/src/applications/releeph/storage/ReleephRequest.php
	@@ -293,13 +293,6 @@
	throw new Exception('`status` is now deprecated!');
	}

	-/* -( Make magic Lisk methods private )------------------------------------ */
	-
	- private function setUserIntents(array $ar) {
	- return parent::setUserIntents($ar);
	- }
	-
	-
	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	diff --git a/src/applications/releeph/storage/ReleephRequestTransaction.php b/src/applications/releeph/storage/ReleephRequestTransaction.php
	--- a/src/applications/releeph/storage/ReleephRequestTransaction.php
	+++ b/src/applications/releeph/storage/ReleephRequestTransaction.php
	@@ -146,10 +146,6 @@
	}
	}

	- public function getActionStrength() {
	- return parent::getActionStrength();
	- }
	-
	public function getActionName() {
	switch ($this->getTransactionType()) {
	case self::TYPE_REQUEST:
	diff --git a/src/applications/tokens/query/PhabricatorTokenCountQuery.php b/src/applications/tokens/query/PhabricatorTokenCountQuery.php
	--- a/src/applications/tokens/query/PhabricatorTokenCountQuery.php
	+++ b/src/applications/tokens/query/PhabricatorTokenCountQuery.php
	@@ -10,7 +10,7 @@
	return $this;
	}

	- final public function execute() {
	+ public function execute() {
	$table = new PhabricatorTokenCount();
	$conn_r = $table->establishConnection('r');

	diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	@@ -83,7 +83,7 @@
	$user = $this->getUser();
	if (!$user->isLoggedIn()) {
	$uri = id(new PhutilURI('/login/'))
	- ->setQueryParam('next', (string) $this->getRequestURI());
	+ ->setQueryParam('next', (string)$this->getRequestURI());
	return id(new PHUIObjectBoxView())
	->setFlush(true)
	->setHeaderText(pht('Add Comment'))
	diff --git a/src/infrastructure/events/PhabricatorEvent.php b/src/infrastructure/events/PhabricatorEvent.php
	--- a/src/infrastructure/events/PhabricatorEvent.php
	+++ b/src/infrastructure/events/PhabricatorEvent.php
	@@ -6,10 +6,6 @@
	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;
	diff --git a/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php b/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php
	--- a/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php
	+++ b/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php
	@@ -40,7 +40,7 @@
	return $this->namespace.'_'.$this->getDao()->getApplicationName();
	}

	- final protected function getDao() {
	+ protected function getDao() {
	return $this->dao;
	}

	diff --git a/src/infrastructure/storage/lisk/LiskDAOSet.php b/src/infrastructure/storage/lisk/LiskDAOSet.php
	--- a/src/infrastructure/storage/lisk/LiskDAOSet.php
	+++ b/src/infrastructure/storage/lisk/LiskDAOSet.php
	@@ -38,7 +38,7 @@
	* 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) {
	diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php
	--- a/src/view/AphrontDialogView.php
	+++ b/src/view/AphrontDialogView.php
	@@ -174,7 +174,7 @@
	return $this;
	}

	- final public function render() {
	+ public function render() {
	require_celerity_resource('aphront-dialog-view-css');

	$buttons = array();
	diff --git a/src/view/AphrontJavelinView.php b/src/view/AphrontJavelinView.php
	--- a/src/view/AphrontJavelinView.php
	+++ b/src/view/AphrontJavelinView.php
	@@ -46,7 +46,7 @@
	return $this->name;
	}

	- final public function setName($template_name) {
	+ public function setName($template_name) {
	$this->name = $template_name;
	return $this;
	}
	@@ -55,7 +55,7 @@
	return $this->parameters;
	}

	- final public function setParameters($template_parameters) {
	+ public function setParameters($template_parameters) {
	$this->parameters = $template_parameters;
	return $this;
	}
	@@ -64,7 +64,7 @@
	return $this->celerityResource;
	}

	- final public function setCelerityResource($celerity_resource) {
	+ public function setCelerityResource($celerity_resource) {
	$this->celerityResource = $celerity_resource;
	return $this;
	}
	diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php
	--- a/src/view/control/AphrontCursorPagerView.php
	+++ b/src/view/control/AphrontCursorPagerView.php
	@@ -13,64 +13,64 @@

	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 @@
	return $results;
	}

	- final public function getHasMoreResults() {
	+ public function getHasMoreResults() {
	return $this->moreResults;
	}

	diff --git a/src/view/control/AphrontPagerView.php b/src/view/control/AphrontPagerView.php
	--- a/src/view/control/AphrontPagerView.php
	+++ b/src/view/control/AphrontPagerView.php
	@@ -13,52 +13,52 @@
	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;
	}
	diff --git a/src/view/form/PHUIInfoView.php b/src/view/form/PHUIInfoView.php
	--- a/src/view/form/PHUIInfoView.php
	+++ b/src/view/form/PHUIInfoView.php
	@@ -40,7 +40,7 @@
	return $this;
	}

	- final public function render() {
	+ public function render() {
	require_celerity_resource('phui-info-view-css');

	$errors = $this->errors;
	diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
	--- a/src/view/layout/PhabricatorSourceCodeView.php
	+++ b/src/view/layout/PhabricatorSourceCodeView.php
	@@ -72,7 +72,7 @@

	if ($this->canClickHighlight) {
	$line_uri = $this->uri.'$'.$line_number;
	- $line_href = (string) new PhutilURI($line_uri);
	+ $line_href = (string)new PhutilURI($line_uri);

	$tag_number = javelin_tag(
	'a',
	diff --git a/src/view/phui/PHUITimelineView.php b/src/view/phui/PHUITimelineView.php
	--- a/src/view/phui/PHUITimelineView.php
	+++ b/src/view/phui/PHUITimelineView.php
	@@ -132,7 +132,7 @@
	javelin_tag(
	'a',
	array(
	- 'href' => (string) $uri,
	+ 'href' => (string)$uri,
	'mustcapture' => true,
	'sigil' => 'show-older-link',
	),

File Metadata

Mime Type: text/plain
Expires: Wed, Jul 16, 7:12 PM (4 d, 9 h ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/da/sh/a77wd25zavdsswvb
Default Alt Text: D12390.diff (36 KB)

D12390.diffNo OneTemporaryActions

D12390.diffView Options

File Metadata

Event Timeline

D12390.diff
No OneTemporary
Actions

D12390.diff
View Options