Skip to content

chore: fix phpstan #584

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 10 commits into from
Nov 24, 2024
Merged

chore: fix phpstan #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
95c93f2
chore: fix phpstan
bshaffer Nov 24, 2024
7ff4c21
Update tests.yml
bshaffer Nov 24, 2024
90b2f60
Update JWT.php
bshaffer Nov 24, 2024
e1f64ee
Update JWT.php
bshaffer Nov 24, 2024
a7adec2
Update tests.yml
bshaffer Nov 24, 2024
553a56b
Update tests.yml
bshaffer Nov 24, 2024
48ba33a
Update tests.yml
bshaffer Nov 24, 2024
d6c7f99
Update tests.yml
bshaffer Nov 24, 2024
648339a
Update tests.yml
bshaffer Nov 24, 2024
79a6a6e
Merge branch 'main' into bshaffer-patch-1
bshaffer Nov 24, 2024
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: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.2"
php-version: "8.3"
- name: Run Script
run: |
composer global require friendsofphp/php-cs-fixer
Expand All @@ -49,9 +49,9 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
- name: Run Script
run: |
composer install
composer global require phpstan/phpstan
composer global require phpstan/phpstan:~1.10.0
~/.composer/vendor/bin/phpstan analyse
9 changes: 2 additions & 7 deletions src/JWT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public static function encode(
?array $head = null
): string {
$header = ['typ' => 'JWT'];
if (isset($head) && \is_array($head)) {
if (isset($head)) {
$header = \array_merge($header, $head);
}
$header['alg'] = $alg;
Expand Down Expand Up @@ -387,12 +387,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);
} else {
// PHP 5.3 only
$json = \json_encode($input);
}
$json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
if ($errno = \json_last_error()) {
self::handleJsonError($errno);
} elseif ($json === 'null') {
Expand Down
Loading