vitalif
/
oauth2-client
mirror of https://github.com/vitalif/oauth2-client
1
0
Fork 0
Code Issues Releases Wiki Activity

Adding in multi-version syntax support for http_build_query

1.0
Paul Dragoonis 2014-04-20 23:02:10 +01:00
parent a1092a8500
commit 69209e8dd6
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/League/OAuth2/Client/Provider/IdentityProvider.php
View File

@ -30,6 +30,9 @@ abstract class IdentityProvider
protected $cachedUserDetailsResponse; protected $cachedUserDetailsResponse;
public $headers = null; public $headers = null;
/** @var int This represents: PHP_QUERY_RFC1738. The default encryption type for the http_build_query setup */
protected $httpBuildEncType = 1;
public function __construct($options = array()) public function __construct($options = array())
{ {
@ -72,7 +75,7 @@ abstract class IdentityProvider
'approval_prompt' => 'auto' 'approval_prompt' => 'auto'
); );
return $this->urlAuthorize().'?'.http_build_query($params,'','&',PHP_QUERY_RFC1738); return $this->urlAuthorize() . '?' . $this->httpBuildQuery($params, '', '&', PHP_QUERY_RFC1738);
} }
public function authorize($options = array()) public function authorize($options = array())
@ -105,7 +108,7 @@ abstract class IdentityProvider
try { try {
switch ($this->method) { switch ($this->method) {
case 'get': case 'get':
$client = new GuzzleClient($this->urlAccessToken() . '?' . http_build_query($requestParams,'','&',PHP_QUERY_RFC1738)); $client = new GuzzleClient($this->urlAccessToken() . '?' . $this->httpBuildQuery($requestParams, '', '&', PHP_QUERY_RFC1738));
$request = $client->send(); $request = $client->send();
$response = $request->getBody(); $response = $request->getBody();
break; break;
@ -163,7 +166,28 @@ abstract class IdentityProvider
return $this->userScreenName(json_decode($response), $token); return $this->userScreenName(json_decode($response), $token);
} }
/**
* Build HTTP the HTTP query, handling PHP version control options
*
* @param array $params
* @param integer $numeric_prefix
* @param string $arg_separator
* @param null|integer $enc_type
* @return string
*/
protected function httpBuildQuery($params, $numeric_prefix = 0, $arg_separator = '&', $enc_type = null)
{
if(version_compare(PHP_VERSION, '5.4.0', '>=')) {
if($enc_type === null) {
$enc_type = $this->httpBuildEncType;
}
$url = http_build_query($params, $numeric_prefix, $arg_separator, $enc_type);
} else {
$url = http_build_query($params, $numeric_prefix, $arg_separator);
}
return $url;
}
protected function fetchUserDetails(AccessToken $token, $force = false) protected function fetchUserDetails(AccessToken $token, $force = false)
{ {
if ( ! $this->cachedUserDetailsResponse || $force == true) { if ( ! $this->cachedUserDetailsResponse || $force == true) {