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 Msn extends Driver{
class Msn extends Driver
{
/**
* 获取requestCode的api接口
* @var string
@@ -44,7 +46,8 @@ class Msn extends Driver{
* @param string $method HTTP请求方法 默认为GET
* @return json
*/
public function call($api, $param = '', $method = 'GET'){
public function call($api, $param = '', $method = 'GET')
{
/* MSN 调用公共参数 */
$params = array(
'access_token' => $this->token['access_token'],
@@ -58,39 +61,45 @@ class Msn 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['token_type'] && $data['expires_in']){
if ($data['access_token'] && $data['token_type'] && $data['expires_in']) {
$data['openid'] = $this->getOpenId();
return $data;
} else
} else {
throw new \Exception("获取 MSN ACCESS_TOKEN出错未知错误");
}
}
/**
* 获取当前授权应用的openid
* @return string
*/
public function getOpenId(){
if(!empty($this->token['openid']))
public function getOpenId()
{
if (!empty($this->token['openid'])) {
return $this->token['openid'];
}
$data = $this->call('me');
return !empty($data['id'])?$data['id']:null;
return !empty($data['id']) ? $data['id'] : null;
}
/**
* 获取当前登录的用户信息
* @return array
*/
public function getOauthInfo(){
public function getOauthInfo()
{
$data = $this->call('me');
if(!empty($data['id'])){
$userInfo['type'] = 'MSN';
$userInfo['name'] = $data['name'];
$userInfo['nick'] = $data['name'];
$userInfo['avatar'] = '微软暂未提供头像URL请通过 me/picture 接口下载';
if (!empty($data['id'])) {
$userInfo['type'] = 'MSN';
$userInfo['name'] = $data['name'];
$userInfo['nick'] = $data['name'];
$userInfo['avatar'] = '微软暂未提供头像URL请通过 me/picture 接口下载';
return $userInfo;
} else {
E("获取msn用户信息失败{$data}");