Projects / li3_oauth

diff --git a/extensions/service/Oauth.php b/extensions/service/Oauth.php index 53b5e90..516bbfb 100644 --- a/extensions/service/Oauth.php +++ b/extensions/service/Oauth.php @@ -100,9 +100,7 @@ class Oauth extends \lithium\net\http\Service { } $options['headers'] = array('Authorization' => $header); } - $data += $oauth; - - $response = parent::send($method, $url, $data, $options); + $response = parent::send($method, $url, $data + $oauth, $options); if (strpos($response, 'oauth_token=') !== false) { return $this->_decode($response); @@ -237,15 +235,8 @@ class Oauth extends \lithium\net\http\Service { * @return void */ protected function _decode($query = null) { - $token = array(); - $result = array_filter(explode('&', $query), function ($value) use (&$token) { - $parts = explode("=", $value); - if (count($parts) > 1) { - $token[rawurldecode($parts[0])] = rawurldecode($parts[1]); - } - return false; - }); - return $token; + parse_str($query, $data); + return $data; } } diff --git a/tests/mocks/extensions/service/MockSocket.php b/tests/mocks/extensions/service/MockSocket.php index ca4f535..453800b 100644 --- a/tests/mocks/extensions/service/MockSocket.php +++ b/tests/mocks/extensions/service/MockSocket.php @@ -58,8 +58,8 @@ class MockSocket extends \lithium\net\Socket { if (strpos($message->path, 'search') !== false) { $body = json_encode(array('test' => 'cool')); } - $message = $this->read($body); - return new $options['classes']['response'](compact('message')); + $body = $this->read($body); + return new $options['classes']['response'](compact('body')); } }