Skip to content
Permalink
Browse files

Remove deprecated url() calls

  • Loading branch information...
cleptric committed Jul 27, 2017
1 parent c6fdaf6 commit d2141c3df8c06e060dcb7be6d6d9bf8faffb999d
Showing with 5 additions and 5 deletions.
  1. +3 −3 src/Http/Client/Adapter/Stream.php
  2. +1 −1 src/Http/Client/Auth/Digest.php
  3. +1 −1 src/Http/Client/Auth/Oauth.php
@@ -124,7 +124,7 @@ protected function _buildContext(Request $request, $options)
$this->_buildHeaders($request, $options);
$this->_buildOptions($request, $options);
$url = $request->url();
$url = $request->getUri();
$scheme = parse_url($url, PHP_URL_SCHEME);
if ($scheme === 'https') {
$this->_buildSslContext($request, $options);
@@ -222,7 +222,7 @@ protected function _buildSslContext(Request $request, $options)
$options['ssl_cafile'] = CORE_PATH . 'config' . DIRECTORY_SEPARATOR . 'cacert.pem';
}
if (!empty($options['ssl_verify_host'])) {
$url = $request->url();
$url = $request->getUri();
$host = parse_url($url, PHP_URL_HOST);
$this->_sslContextOptions['peer_name'] = $host;
}
@@ -248,7 +248,7 @@ protected function _send(Request $request)
$deadline = time() + $this->_contextOptions['timeout'];
}
$url = $request->url();
$url = $request->getUri();
$this->_open($url);
$content = '';
$timedOut = false;
@@ -81,7 +81,7 @@ public function authentication(Request $request, array $credentials)
protected function _getServerInfo(Request $request, $credentials)
{
$response = $this->_client->get(
$request->url(),
$request->getUri(),
[],
['auth' => []]
);
@@ -278,7 +278,7 @@ protected function _normalizedUrl($uri)
*/
protected function _normalizedParams($request, $oauthValues)
{
$query = parse_url($request->url(), PHP_URL_QUERY);
$query = parse_url($request->getUri(), PHP_URL_QUERY);
parse_str($query, $queryArgs);
$post = [];

0 comments on commit d2141c3

Please sign in to comment.
You can’t perform that action at this time.