From 4ea2daf04dd4df47fe1bdfcae3e87d0122d26fce Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 15 May 2018 11:41:27 +0200 Subject: [PATCH] Refix scope Signed-off-by: Roeland Jago Douma --- lib/private/Authentication/Token/DefaultToken.php | 6 ++++-- lib/private/Authentication/Token/IToken.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/private/Authentication/Token/DefaultToken.php b/lib/private/Authentication/Token/DefaultToken.php index ad4ece0c46..e2753ba979 100644 --- a/lib/private/Authentication/Token/DefaultToken.php +++ b/lib/private/Authentication/Token/DefaultToken.php @@ -158,9 +158,11 @@ class DefaultToken extends Entity implements IToken { return $scope; } - public function setScope(array $scope = null) { - if ($scope !== null) { + public function setScope($scope) { + if (\is_array($scope)) { parent::setScope(json_encode($scope)); + } else { + parent::setScope((string)$scope); } } diff --git a/lib/private/Authentication/Token/IToken.php b/lib/private/Authentication/Token/IToken.php index eff525c8d6..b40f55fb6c 100644 --- a/lib/private/Authentication/Token/IToken.php +++ b/lib/private/Authentication/Token/IToken.php @@ -94,7 +94,7 @@ interface IToken extends JsonSerializable { * * @param array $scope */ - public function setScope(array $scope = null); + public function setScope($scope); public function getName(): string;