phlaym/APnutI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed return types

Browse Source
This commit is contained in:
aymm 2021-03-10 19:53:40 +00:00
parent 588fc2846e
commit 3ca95f82a8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/APnutI.php
View File

@ -168,7 +168,7 @@ class APnutI
string $end_point, string $end_point,
array $parameters, array $parameters,
string $content_type = 'application/x-www-form-urlencoded' string $content_type = 'application/x-www-form-urlencoded'
): string { ): array {
$this->redirect_target = null; $this->redirect_target = null;
$this->meta = null; $this->meta = null;
@ -269,9 +269,9 @@ class APnutI
} elseif (isset($response['meta'], $response['data'])) { } elseif (isset($response['meta'], $response['data'])) {
return $response['data']; return $response['data'];
} elseif (isset($response['access_token'])) { } elseif (isset($response['access_token'])) {
return $response['access_token']; return $response;
} elseif (!empty($this->redirect_target)) { } elseif (!empty($this->redirect_target)) {
return $this->redirect_target; return [$this->redirect_target];
} else { } else {
throw new PnutException("No response ".json_encode($response).", http status: ${http_status}"); throw new PnutException("No response ".json_encode($response).", http status: ${http_status}");
} }
@ -281,7 +281,7 @@ class APnutI
string $end_point, string $end_point,
array $parameters, array $parameters,
string $content_type = 'application/x-www-form-urlencoded' string $content_type = 'application/x-www-form-urlencoded'
): string { ): array {
$method = $content_type === 'multipart/form-data' ? 'POST-RAW' : 'POST'; $method = $content_type === 'multipart/form-data' ? 'POST-RAW' : 'POST';
return $this->makeRequest($method, $end_point, $parameters, $content_type); return $this->makeRequest($method, $end_point, $parameters, $content_type);
} }
@ -290,7 +290,7 @@ class APnutI
string $end_point, string $end_point,
array $parameters = [], array $parameters = [],
string $content_type = 'application/json' string $content_type = 'application/json'
): string { ): array {
if (!empty($parameters)) { if (!empty($parameters)) {
$end_point .= '?'.http_build_query($parameters); $end_point .= '?'.http_build_query($parameters);
$parameters = []; $parameters = [];
@ -345,14 +345,14 @@ class APnutI
'application/x-www-form-urlencoded' 'application/x-www-form-urlencoded'
); );
if (empty($resp)) { if (empty($resp['access_token'])) {
$this->logger->error("No access token ".json_encode($resp)); $this->logger->error("No access token ".json_encode($resp));
return false; return false;
} else { } else {
$this->logger->debug('Received access token ' . $resp); $this->logger->debug('Received access token ' . $resp['access_token']);
$_SESSION[$this->token_session_key] = $resp; $_SESSION[$this->token_session_key] = $resp['access_token'];
$this->logger->debug('Saved access token'); $this->logger->debug('Saved access token');
$this->access_token = $resp; $this->access_token = $resp['access_token'];
return true; return true;
} }
} }
@ -500,7 +500,7 @@ class APnutI
} }
} }
public function getAvatar(int $user_id, array $args = []): string public function getAvatar(int $user_id, array $args = []): array
{ {
return $this->get('/users/'.$user_id.'/avatar', $args); return $this->get('/users/'.$user_id.'/avatar', $args);
} }