Skip to content

Commit 903aa88

Browse files
author
roadiz-ci
committed
Merge branch hotfix/v2.7.29 into main
1 parent 2d0db6a commit 903aa88

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

.github/workflows/run-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Unit tests, static analysis and code style
1+
name: Static analysis and code style
22

33
on:
44
push:
@@ -15,11 +15,11 @@ on:
1515
- ready_for_review
1616

1717
jobs:
18-
run-tests:
18+
static-analysis-tests:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
php-version: ['8.2', '8.3']
22+
php-version: ['8.3', '8.4', '8.5']
2323
steps:
2424
- uses: shivammathur/setup-php@v2
2525
with:

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright © 2024 Ambroise Maupate
3+
Copyright © 2025 Ambroise Maupate
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
}
1313
],
1414
"require": {
15-
"php": ">=8.2",
15+
"php": ">=8.3",
1616
"lcobucci/jwt": "^5.3",
17-
"symfony/http-client": "6.4.*"
17+
"symfony/http-client": "7.4.*"
1818
},
1919
"require-dev": {
20-
"phpstan/phpstan": "^1.5.3",
20+
"phpstan/phpstan": "^2.1.36",
2121
"phpstan/phpdoc-parser": "<2"
2222
},
2323
"autoload": {
@@ -27,8 +27,8 @@
2727
},
2828
"extra": {
2929
"branch-alias": {
30-
"dev-main": "2.5.x-dev",
31-
"dev-develop": "2.6.x-dev"
30+
"dev-main": "2.7.x-dev",
31+
"dev-develop": "2.8.x-dev"
3232
}
3333
}
3434
}

src/Validation/Constraint/HostedDomain.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public function __construct(private string $hostedDomain)
1515
{
1616
}
1717

18+
#[\Override]
1819
public function assert(Token $token): void
1920
{
2021
if (!$token instanceof Plain || empty($this->hostedDomain)) {

src/Validation/Constraint/UserInfoEndpoint.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public function __construct(
1818
) {
1919
}
2020

21+
#[\Override]
2122
public function assert(Token $token): void
2223
{
2324
try {
@@ -28,7 +29,7 @@ public function assert(Token $token): void
2829
]);
2930
// Trigger lazy request
3031
$response->getContent();
31-
} catch (ExceptionInterface $e) {
32+
} catch (ExceptionInterface) {
3233
throw new ConstraintViolation('Userinfo cannot be fetch from Identity provider');
3334
}
3435
}

0 commit comments

Comments
 (0)