Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	Supports/ResultSerializer.php
  • Loading branch information
frowhy committed Jun 11, 2019
2 parents c78988d + 816d5eb commit 815fe52
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
9 changes: 0 additions & 9 deletions Supports/ResultSerializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,4 @@ public function item($resourceKey, array $data)
{
return $data;
}

/**
* Serialize null resource.
*
* @return array
*/
public function null()
{
}
}
1 change: 0 additions & 1 deletion Traits/Supports/HandleParseTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ protected function parseTokenBlacklistedException(array $response, Exception $ex
protected function parseTokenExpiredException(array $response, Exception $exception)
{
if ($exception instanceof TokenExpiredException) {
dd(123);
if ('Token has expired and can no longer be refreshed' === $exception->getMessage()) {
$response['meta'][Handler::ERROR_CODE] = JWTErrorCode::CAN_NOT_REFRESHED;
} else {
Expand Down

0 comments on commit 815fe52

Please sign in to comment.