Skip to content

Commit 1a8939d

Browse files
author
klapaudius
committed
Fix undefined method calls in Symfony 8 #53
1 parent f9cc37f commit 1a8939d

1 file changed

Lines changed: 20 additions & 3 deletions

File tree

Controller/AuthorizeController.php

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function authorizeAction(Request $request, AuthorizeFormHandler $formHand
8585
);
8686

8787
if ($event->isAuthorizedClient()) {
88-
$scope = $request->get('scope');
88+
$scope = $this->requestLegacyGet($request, 'scope');
8989

9090
return $this->oAuth2Server->finishClientAuthorization(true, $user, $request, $scope);
9191
}
@@ -144,8 +144,8 @@ protected function getClient(): ClientInterface
144144

145145
$request = $this->getCurrentRequest();
146146

147-
if (null === $clientId = $request->get('client_id')) {
148-
$formData = $request->get($this->authorizeForm->getName(), []);
147+
if (null === $clientId = $this->requestLegacyGet($request, 'client_id')) {
148+
$formData = $this->requestLegacyGet($request, $this->authorizeForm->getName(), []);
149149
$clientId = $formData['client_id'] ?? null;
150150
}
151151

@@ -184,4 +184,21 @@ private function getCurrentRequest(): Request
184184

185185
return $request;
186186
}
187+
188+
private function requestLegacyGet(Request $request, string $key, mixed $default = null): mixed
189+
{
190+
if ($request !== $result = $request->attributes->get($key, $request)) {
191+
return $result;
192+
}
193+
194+
if ($request->query->has($key)) {
195+
return $request->query->all()[$key];
196+
}
197+
198+
if ($request->request->has($key)) {
199+
return $request->request->all()[$key];
200+
}
201+
202+
return $default;
203+
}
187204
}

0 commit comments

Comments
 (0)