Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13190173
D20151.id48117.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D20151.id48117.diff
View Options
diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
--- a/src/applications/almanac/controller/AlmanacController.php
+++ b/src/applications/almanac/controller/AlmanacController.php
@@ -67,19 +67,13 @@
$is_builtin = isset($builtins[$key]);
$is_persistent = (bool)$property->getID();
- $delete_uri = id(new PhutilURI($delete_base))
- ->setQueryParams(
- array(
- 'key' => $key,
- 'objectPHID' => $object->getPHID(),
- ));
+ $params = array(
+ 'key' => $key,
+ 'objectPHID' => $object->getPHID(),
+ );
- $edit_uri = id(new PhutilURI($edit_base))
- ->setQueryParams(
- array(
- 'key' => $key,
- 'objectPHID' => $object->getPHID(),
- ));
+ $delete_uri = new PhutilURI($delete_base, $params);
+ $edit_uri = new PhutilURI($edit_base, $params);
$delete = javelin_tag(
'a',
diff --git a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
--- a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
@@ -204,11 +204,11 @@
$request->setTemporaryCookie(PhabricatorCookies::COOKIE_HISEC, 'yes');
- return (string)id(new PhutilURI($panel_uri))
- ->setQueryParams(
- array(
- 'key' => $key,
- ));
+ $params = array(
+ 'key' => $key,
+ );
+
+ return (string)new PhutilURI($panel_uri, $params);
}
$providers = id(new PhabricatorAuthProviderConfigQuery())
diff --git a/src/applications/auth/future/PhabricatorDuoFuture.php b/src/applications/auth/future/PhabricatorDuoFuture.php
--- a/src/applications/auth/future/PhabricatorDuoFuture.php
+++ b/src/applications/auth/future/PhabricatorDuoFuture.php
@@ -80,11 +80,6 @@
$host = $this->apiHostname;
$host = phutil_utf8_strtolower($host);
- $uri = id(new PhutilURI(''))
- ->setProtocol('https')
- ->setDomain($host)
- ->setPath($path);
-
$data = $this->parameters;
$date = date('r');
@@ -109,11 +104,19 @@
$signature = new PhutilOpaqueEnvelope($signature);
if ($http_method === 'GET') {
- $uri->setQueryParams($data);
- $data = array();
+ $uri_data = $data;
+ $body_data = array();
+ } else {
+ $uri_data = array();
+ $body_data = $data;
}
- $future = id(new HTTPSFuture($uri, $data))
+ $uri = id(new PhutilURI('', $uri_data))
+ ->setProtocol('https')
+ ->setDomain($host)
+ ->setPath($path);
+
+ $future = id(new HTTPSFuture($uri, $body_data))
->setHTTPBasicAuthCredentials($this->integrationKey, $signature)
->setMethod($http_method)
->addHeader('Accept', 'application/json')
diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
--- a/src/applications/diffusion/view/DiffusionView.php
+++ b/src/applications/diffusion/view/DiffusionView.php
@@ -81,12 +81,12 @@
}
if (isset($details['external'])) {
- $href = id(new PhutilURI('/diffusion/external/'))
- ->setQueryParams(
- array(
- 'uri' => idx($details, 'external'),
- 'id' => idx($details, 'hash'),
- ));
+ $params = array(
+ 'uri' => idx($details, 'external'),
+ 'id' => idx($details, 'hash'),
+ );
+
+ $href = new PhutilURI('/diffusion/external/', $params);
$tip = pht('Browse External');
} else {
$href = $this->getDiffusionRequest()->generateURI(
diff --git a/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php b/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php
--- a/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php
+++ b/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php
@@ -111,15 +111,15 @@
// Here, we're generating comment text or something like that. Just
// link to Diviner and let it sort things out.
- $href = id(new PhutilURI('/diviner/find/'))
- ->setQueryParams(
- array(
- 'book' => $ref->getBook(),
- 'name' => $ref->getName(),
- 'type' => $ref->getType(),
- 'context' => $ref->getContext(),
- 'jump' => true,
- ));
+ $params = array(
+ 'book' => $ref->getBook(),
+ 'name' => $ref->getName(),
+ 'type' => $ref->getType(),
+ 'context' => $ref->getContext(),
+ 'jump' => true,
+ );
+
+ $href = new PhutilURI('/diviner/find/', $params);
}
// TODO: This probably is not the best place to do this. Move it somewhere
diff --git a/src/applications/herald/controller/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php
--- a/src/applications/herald/controller/HeraldNewController.php
+++ b/src/applications/herald/controller/HeraldNewController.php
@@ -81,13 +81,13 @@
}
if (!$errors && $done) {
- $uri = id(new PhutilURI('edit/'))
- ->setQueryParams(
- array(
- 'content_type' => $content_type,
- 'rule_type' => $rule_type,
- 'targetPHID' => $target_phid,
- ));
+ $params = array(
+ 'content_type' => $content_type,
+ 'rule_type' => $rule_type,
+ 'targetPHID' => $target_phid,
+ );
+
+ $uri = new PhutilURI('edit/', $params);
$uri = $this->getApplicationURI($uri);
return id(new AphrontRedirectResponse())->setURI($uri);
}
@@ -126,13 +126,13 @@
->addHiddenInput('step', 2)
->appendChild($rule_types);
+ $params = array(
+ 'content_type' => $content_type,
+ 'step' => '0',
+ );
+
$cancel_text = pht('Back');
- $cancel_uri = id(new PhutilURI('new/'))
- ->setQueryParams(
- array(
- 'content_type' => $content_type,
- 'step' => 0,
- ));
+ $cancel_uri = new PhutilURI('new/', $params);
$cancel_uri = $this->getApplicationURI($cancel_uri);
$title = pht('Create Herald Rule: %s',
idx($content_type_map, $content_type));
@@ -173,14 +173,14 @@
->setValue($request->getStr('objectName'))
->setLabel(pht('Object')));
+ $params = array(
+ 'content_type' => $content_type,
+ 'rule_type' => $rule_type,
+ 'step' => 1,
+ );
+
$cancel_text = pht('Back');
- $cancel_uri = id(new PhutilURI('new/'))
- ->setQueryParams(
- array(
- 'content_type' => $content_type,
- 'rule_type' => $rule_type,
- 'step' => 1,
- ));
+ $cancel_uri = new PhutilURI('new/', $params);
$cancel_uri = $this->getApplicationURI($cancel_uri);
$title = pht('Create Herald Rule: %s',
idx($content_type_map, $content_type));
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
@@ -65,11 +65,11 @@
$commit_views = array();
- $commit_uri = id(new PhutilURI('/diffusion/commit/'))
- ->setQueryParams(
- array(
- 'package' => $package->getPHID(),
- ));
+ $params = array(
+ 'package' => $package->getPHID(),
+ );
+
+ $commit_uri = new PhutilURI('/diffusion/commit/', $params);
$status_concern = DiffusionCommitAuditStatus::CONCERN_RAISED;
diff --git a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
--- a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
+++ b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
@@ -134,13 +134,13 @@
$account_id = $account->getID();
+ $params = array(
+ 'merchantID' => $merchant->getID(),
+ 'cartID' => $cart->getID(),
+ );
+
$payment_method_uri = $this->getApplicationURI("{$account_id}/card/new/");
- $payment_method_uri = new PhutilURI($payment_method_uri);
- $payment_method_uri->setQueryParams(
- array(
- 'merchantID' => $merchant->getID(),
- 'cartID' => $cart->getID(),
- ));
+ $payment_method_uri = new PhutilURI($payment_method_uri, $params);
$form = id(new AphrontFormView())
->setUser($viewer)
diff --git a/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php b/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php
--- a/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php
+++ b/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php
@@ -348,12 +348,14 @@
->setRawPayPalQuery('SetExpressCheckout', $params)
->resolve();
- $uri = new PhutilURI('https://www.sandbox.paypal.com/cgi-bin/webscr');
- $uri->setQueryParams(
- array(
- 'cmd' => '_express-checkout',
- 'token' => $result['TOKEN'],
- ));
+ $params = array(
+ 'cmd' => '_express-checkout',
+ 'token' => $result['TOKEN'],
+ );
+
+ $uri = new PhutilURI(
+ 'https://www.sandbox.paypal.com/cgi-bin/webscr',
+ $params);
$cart->setMetadataValue('provider.checkoutURI', (string)$uri);
$cart->save();
diff --git a/src/applications/phortune/provider/PhortunePaymentProvider.php b/src/applications/phortune/provider/PhortunePaymentProvider.php
--- a/src/applications/phortune/provider/PhortunePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortunePaymentProvider.php
@@ -273,8 +273,7 @@
$app = PhabricatorApplication::getByClass('PhabricatorPhortuneApplication');
$path = $app->getBaseURI().'provider/'.$id.'/'.$action.'/';
- $uri = new PhutilURI($path);
- $uri->setQueryParams($params);
+ $uri = new PhutilURI($path, $params);
if ($local) {
return $uri;
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -820,8 +820,6 @@
return $uri;
}
- $uri = new PhutilURI($uri);
-
if (isset($params['lint'])) {
$params['params'] = idx($params, 'params', array()) + array(
'lint' => $params['lint'],
@@ -830,11 +828,7 @@
$query = idx($params, 'params', array()) + $query;
- if ($query) {
- $uri->setQueryParams($query);
- }
-
- return $uri;
+ return new PhutilURI($uri, $query);
}
public function updateURIIndex() {
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1541,8 +1541,7 @@
$config_uri = $config->getCreateURI();
if ($parameters) {
- $config_uri = (string)id(new PhutilURI($config_uri))
- ->setQueryParams($parameters);
+ $config_uri = (string)new PhutilURI($config_uri, $parameters);
}
$specs[] = array(
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
@@ -99,8 +99,8 @@
}
public function getDatasourceURI() {
- $uri = new PhutilURI('/typeahead/class/'.get_class($this).'/');
- $uri->setQueryParams($this->newURIParameters());
+ $params = $this->newURIParameters();
+ $uri = new PhutilURI('/typeahead/class/'.get_class($this).'/', $params);
return phutil_string_cast($uri);
}
@@ -109,8 +109,8 @@
return null;
}
- $uri = new PhutilURI('/typeahead/browse/'.get_class($this).'/');
- $uri->setQueryParams($this->newURIParameters());
+ $params = $this->newURIParameters();
+ $uri = new PhutilURI('/typeahead/browse/'.get_class($this).'/', $params);
return phutil_string_cast($uri);
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, May 12, 8:01 AM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6290966
Default Alt Text
D20151.id48117.diff (12 KB)
Attached To
Mode
D20151: Replace "URI->setQueryParams()" after initialization with a constructor argument
Attached
Detach File
Event Timeline
Log In to Comment