PSR规范调整

This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions

View File

@@ -10,9 +10,11 @@
// +----------------------------------------------------------------------
namespace think\oauth\driver;
use think\oauth\Driver;
class Renren extends Driver{
class Renren extends Driver
{
/**
* 获取requestCode的api接口
* @var string
@@ -38,7 +40,8 @@ class Renren extends Driver{
* @param string $method HTTP请求方法 默认为GET
* @return json
*/
public function call($api, $param = '', $method = 'POST'){
public function call($api, $param = '', $method = 'POST')
{
/* 人人网调用公共参数 */
$params = array(
'method' => $api,
@@ -46,7 +49,7 @@ class Renren extends Driver{
'v' => '1.0',
'format' => 'json',
);
$data = $this->http($this->url(''), $this->param($params, $param), $method);
return json_decode($data, true);
}
@@ -57,16 +60,17 @@ class Renren extends Driver{
* @param array/string $param 额外参数
* @return array:
*/
protected function param($params, $param){
protected function param($params, $param)
{
$params = parent::param($params, $param);
/* 签名 */
ksort($params);
$param = [];
foreach ($params as $key => $value){
foreach ($params as $key => $value) {
$param[] = "{$key}={$value}";
}
$sign = implode('', $param).$this->AppSecret;
$sign = implode('', $param) . $this->AppSecret;
$params['sig'] = md5($sign);
return $params;
@@ -76,23 +80,29 @@ class Renren extends Driver{
* 解析access_token方法请求后的返回值
* @param string $result 获取access_token的方法的返回值
*/
protected function parseToken($result){
protected function parseToken($result)
{
$data = json_decode($result, true);
if($data['access_token'] && $data['expires_in'] && $data['refresh_token'] && $data['user']['id']){
if ($data['access_token'] && $data['expires_in'] && $data['refresh_token'] && $data['user']['id']) {
$data['openid'] = $data['user']['id'];
unset($data['user']);
return $data;
} else
} else {
throw new \Exception("获取人人网ACCESS_TOKEN出错{$data['error_description']}");
}
}
/**
* 获取当前授权应用的openid
* @return string
*/
public function getOpenId(){
if(!empty($this->token['openid']))
public function getOpenId()
{
if (!empty($this->token['openid'])) {
return $this->token['openid'];
}
return null;
}
@@ -100,14 +110,15 @@ class Renren extends Driver{
* 获取当前登录的用户信息
* @return array
*/
public function getOauthInfo(){
$data = $this->call('users.getInfo');
public function getOauthInfo()
{
$data = $this->call('users.getInfo');
if(!isset($data['error_code'])){
$userInfo['type'] = 'RENREN';
$userInfo['name'] = $data[0]['name'];
$userInfo['nick'] = $data[0]['name'];
$userInfo['avatar'] = $data[0]['headurl'];
if (!isset($data['error_code'])) {
$userInfo['type'] = 'RENREN';
$userInfo['name'] = $data[0]['name'];
$userInfo['nick'] = $data[0]['name'];
$userInfo['avatar'] = $data[0]['headurl'];
return $userInfo;
} else {
E("获取人人网用户信息失败:{$data['error_msg']}");