Skip to content

Revert "fix: add flag to force object" #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 21, 2022
Merged

Revert "fix: add flag to force object" #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5adf78e
Revert "fix: add flag to force object (#416)"
bshaffer Apr 21, 2022
b6f8294
Update JWTTest.php
bshaffer Apr 21, 2022
b078f41
Update JWTTest.php
bshaffer Apr 21, 2022
2c4257c
Update JWTTest.php
bshaffer Apr 21, 2022
86e1bae
Update JWT.php
bshaffer Apr 21, 2022
cd402e3
Update JWT.php
bshaffer Apr 21, 2022
e9c3736
Update JWT.php
bshaffer Apr 21, 2022
ca29d22
Update JWTTest.php
bshaffer Apr 21, 2022
b70800e
Update JWTTest.php
bshaffer Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/JWT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ public static function decode(
if (null === ($payload = static::jsonDecode($payloadRaw))) {
throw new UnexpectedValueException('Invalid claims encoding');
}
if (is_array($payload)) {
// prevent PHP Fatal Error in edge-cases when payload is empty array
$payload = (object) $payload;
}
if (!$payload instanceof stdClass) {
throw new UnexpectedValueException('Payload must be a JSON object');
}
Expand Down Expand Up @@ -355,7 +359,7 @@ public static function jsonDecode(string $input)
public static function jsonEncode(array $input): string
{
if (PHP_VERSION_ID >= 50400) {
$json = \json_encode($input, \JSON_UNESCAPED_SLASHES|\JSON_FORCE_OBJECT);
$json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
} else {
// PHP 5.3 only
$json = \json_encode($input);
Expand Down
9 changes: 9 additions & 0 deletions tests/JWTTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,15 @@ public function testDecodesEmptyArrayAsObject()
$this->assertEquals((object) $payload, $decoded);
}

public function testDecodesArraysInJWTAsArray()
{
$key = 'yma6Hq4XQegCVND8ef23OYgxSrC3IKqk';
$payload = ['foo' => [1,2,3]];
$jwt = JWT::encode($payload, $key, 'HS256');
$decoded = JWT::decode($jwt, new Key($key, 'HS256'));
$this->assertEquals($payload['foo'], $decoded->foo);
}

/**
* @runInSeparateProcess
* @dataProvider provideEncodeDecode
Expand Down