Skip to content

Commit 3f1ba41

Browse files
Fix deprecated Request::get() methods and Psalm issues (#223)
### Changes - **Fixed deprecated `Request::get()` methods** to use explicit parameter bag methods for Symfony compatibility - **Resolved Psalm type inference error** annotation to clarify mixed type handling from query parameters
1 parent dc5d5e3 commit 3f1ba41

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

psalm.xml.dist

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
findUnusedBaselineEntry="true"
99
findUnusedCode="false"
1010
>
11+
<!-- <php>
12+
<ini name="max_execution_time" value="120"/>
13+
<ini name="memory_limit" value="512M"/>
14+
</php> -->
15+
1116
<projectFiles>
1217
<directory name="src" />
1318
</projectFiles>

src/Controllers/AuthenticationController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public function callback(Request $request): Response
3636
$session = $this->getSdk()->getCredentials();
3737

3838
if (null === $session) {
39-
$code = $request->get('code');
40-
$state = $request->get('state');
39+
$code = $request->query->get('code');
40+
$state = $request->query->get('state');
4141

4242
$code = is_string($code) ? trim($code) : '';
4343
$state = is_string($state) ? trim($state) : '';

src/Controllers/BackchannelLogoutController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function handle(Request $request): Response
3131
return new Response('', Response::HTTP_METHOD_NOT_ALLOWED);
3232
}
3333

34-
$logoutToken = $request->get('logout_token');
34+
$logoutToken = $request->request->get('logout_token');
3535

3636
if (! is_string($logoutToken)) {
3737
return new Response('', Response::HTTP_BAD_REQUEST);

src/Security/Authorizer.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ public function __construct(
3838
public function authenticate(Request $request): Passport
3939
{
4040
// Extract any available value from the authorization header
41-
$param = $request->get('token', null);
41+
$param = $request->query->get('token');
4242
$header = trim($request->headers->get('Authorization', '') ?? '');
43-
$token = $param ?? $header;
4443
$usingHeader = null === $param;
4544

46-
// Ensure the 'authorization' header is present in the request
45+
/** @var mixed $token */
46+
$token = $param ?? $header;
47+
48+
// Ensure the token is a valid string
4749
if (! is_string($token) || '' === $token) {
4850
throw new AuthenticationException('`Authorization` header not present.');
4951
}
@@ -107,7 +109,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
107109
*/
108110
public function supports(Request $request): ?bool
109111
{
110-
if (null !== $request->get('token')) {
112+
if (null !== $request->query->get('token')) {
111113
return true;
112114
}
113115

0 commit comments

Comments
 (0)