Merge pull request #6877 from pixelfed/fix/replace-request-get

Laravel 13 prep: replace Symfony deprecated ->get() with ->input()
pull/6883/head
dansup 4 weeks ago committed by GitHub
commit 93553670e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -385,11 +385,11 @@ class ApiV2Controller extends Controller
}
// Get request parameters
$limit = min((int) $request->get('limit', 20), 40); // Max 40 items
$maxId = $request->get('max_id');
$minId = $request->get('min_id');
$sinceId = $request->get('since_id');
$ancestorsLimit = min((int) $request->get('ancestors_limit', 10), 20); // Max 20 ancestors
$limit = min((int) $request->input('limit', 20), 40); // Max 40 items
$maxId = $request->input('max_id');
$minId = $request->input('min_id');
$sinceId = $request->input('since_id');
$ancestorsLimit = min((int) $request->input('ancestors_limit', 10), 20); // Max 20 ancestors
$ancestors = $this->getAncestors($id, $ancestorsLimit, $pe, $pid);
$descendants = $this->getDescendantsPaginated($id, $limit, $maxId, $minId, $sinceId, $pe, $pid);
@ -603,10 +603,10 @@ class ApiV2Controller extends Controller
// Same visibility checks as above...
$limit = min((int) $request->get('limit', 20), 40);
$maxId = $request->get('max_id');
$minId = $request->get('min_id');
$sinceId = $request->get('since_id');
$limit = min((int) $request->input('limit', 20), 40);
$maxId = $request->input('max_id');
$minId = $request->input('min_id');
$sinceId = $request->input('since_id');
$descendants = $this->getDescendantsPaginated($id, $limit, $maxId, $minId, $sinceId, $pe, $pid);
@ -633,7 +633,7 @@ class ApiV2Controller extends Controller
return response('', 404);
}
$limit = min((int) $request->get('limit', 10), 20);
$limit = min((int) $request->input('limit', 10), 20);
$ancestors = $this->getAncestors($id, $limit, $pe, $pid);
return $this->json($ancestors);

@ -46,10 +46,10 @@ class RemoteOidcController extends Controller
abort_unless($request->input('state'), 400);
abort_unless($request->input('code'), 400);
abort_unless(hash_equals((string)$request->session()->pull('oauth2state'), (string)$request->input('state')), 400, 'invalid state');
abort_unless(hash_equals((string) $request->session()->pull('oauth2state'), (string) $request->input('state')), 400, 'invalid state');
$accessToken = $provider->getAccessToken('authorization_code', [
'code' => $request->get('code'),
'code' => $request->input('code'),
]);
$userInfo = $provider->getResourceOwner($accessToken);

Loading…
Cancel
Save