Skip to content

Commit f221872

Browse files
johanibjohanib
committed
Fix deprecations: $request->get
1 parent 17b0018 commit f221872

7 files changed

Lines changed: 26 additions & 29 deletions

File tree

‎config/packages/twig.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Twig Configuration
22
twig:
3-
exception_controller: null
43
debug: '%kernel.debug%'
54
strict_variables: '%kernel.debug%'
65
paths:

‎src/OpenConext/EngineBlockBundle/Controller/FeedbackController.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function unsupportedSignatureMethodAction(Request $request)
129129
->render(
130130
'@theme/Authentication/View/Feedback/unsupported-signature-method.html.twig',
131131
[
132-
'signatureMethod' => $request->get('signature-method')
132+
'signatureMethod' => $request->query->get('signature-method')
133133
]
134134
),
135135
400
@@ -156,7 +156,7 @@ public function unsupportedAcsLocationSchemeAction()
156156
#[Route(path: '/authentication/feedback/unknown-service-provider', name: 'authentication_feedback_unknown_service_provider', methods: ['GET'])]
157157
public function unknownServiceProviderAction(Request $request)
158158
{
159-
$entityId = $request->get('entity-id');
159+
$entityId = $request->query->get('entity-id');
160160

161161
// Add feedback info from url
162162
$customFeedbackInfo = ['EntityID' => $entityId];
@@ -177,8 +177,8 @@ public function unknownIdentityProviderAction(Request $request)
177177
{
178178
// Add feedback info from url
179179
$customFeedbackInfo = [
180-
'EntityID' => $request->get('entity-id'),
181-
'Destination' => $request->get('destination'),
180+
'EntityID' => $request->query->get('entity-id'),
181+
'Destination' => $request->query->get('destination'),
182182
];
183183

184184
$this->setFeedbackInformationOnSession($request->getSession(), $customFeedbackInfo);
@@ -406,7 +406,7 @@ public function unknownPreselectedIdpAction(Request $request)
406406
{
407407
// Add feedback info from url
408408
$customFeedbackInfo = [
409-
'Idp Hash' => $request->get('idp-hash'),
409+
'Idp Hash' => $request->query->get('idp-hash'),
410410
];
411411
$this->setFeedbackInformationOnSession($request->getSession(), $customFeedbackInfo);
412412

@@ -421,7 +421,7 @@ public function unknownKeyIdAction(Request $request): Response
421421
{
422422
// Add feedback info from url
423423
$customFeedbackInfo = [
424-
'Key ID' => $request->get('keyid'),
424+
'Key ID' => $request->query->get('keyid'),
425425
];
426426
$this->setFeedbackInformationOnSession($request->getSession(), $customFeedbackInfo);
427427

‎src/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/FunctionalTestingGlobalSiteNotice.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(
4141
#[AsTwigFunction(name: 'shouldDisplayGlobalSiteNotice')]
4242
public function shouldDisplayGlobalSiteNotice() : bool
4343
{
44-
return (bool) $this->request->get('showGlobalSiteNotice', false);
44+
return (bool) $this->request->query->get('showGlobalSiteNotice', false);
4545
}
4646

4747
#[AsTwigFunction(name: 'getGlobalSiteNotice')]
@@ -62,7 +62,7 @@ public function getGlobalSiteNotice(): string
6262
You are about to experience the awe and mystery which reaches from the inner mind to... The Outer Limits.
6363
</p>
6464
MSG;
65-
return (string) $this->request->get('globalSiteNotice', $message);
65+
return (string) $this->request->query->get('globalSiteNotice', $message);
6666
}
6767

6868
#[AsTwigFunction(name: 'getAllowedHtmlForNotice')]

‎src/OpenConext/EngineBlockFunctionalTestingBundle/Controllers/FeedbackController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function feedbackAction(Request $request)
9292
*/
9393
private function getTemplate(Request $request)
9494
{
95-
$key = $request->get('template');
95+
$key = $request->query->getString('template');
9696
if (!$key) {
9797
$key = 'session-lost';
9898
}
@@ -112,7 +112,7 @@ private function getFeedbackInfo(Request $request)
112112
"artCode":"31914"
113113
}';
114114

115-
$feedbackInfo = $request->get('feedback-info', $default);
115+
$feedbackInfo = $request->query->getString('feedback-info', $default);
116116

117117
$feedbackInfo = json_decode($feedbackInfo, true);
118118
if (!empty($feedbackInfo['IdentityProvider']) || !empty($feedbackInfo['IdP'])) {
@@ -130,7 +130,7 @@ private function getTemplateParameters(Request $request)
130130
{
131131
$default = '{}';
132132

133-
$parameters = $request->get('parameters', $default);
133+
$parameters = $request->query->getString('parameters', $default);
134134

135135
$parameters = json_decode($parameters, true);
136136

‎src/OpenConext/EngineBlockFunctionalTestingBundle/Controllers/ServiceProviderController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function assertionConsumerAction(Request $request)
144144
throw new RuntimeException(sprintf('Unrecognized message type received: "%s"', get_class($message)));
145145
}
146146

147-
$xml = base64_decode($request->get('SAMLResponse'));
147+
$xml = base64_decode($request->request->getString('SAMLResponse') ?: $request->query->getString('SAMLResponse'));
148148

149149
// Format the XML
150150
$doc = new DomDocument('1.0');

‎src/OpenConext/EngineBlockFunctionalTestingBundle/Controllers/WayfController.php‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,19 @@ public function __construct(Environment $twig)
4040

4141
public function wayfAction(Request $request)
4242
{
43-
$currentLocale = $request->get('lang', 'en');
43+
$currentLocale = $request->query->getString('lang', 'en');
4444
$request->cookies->set('lang', $currentLocale);
45-
$backLink = (bool) $request->get('backLink', false);
46-
$displayUnconnectedIdpsWayf = (bool) $request->get('displayUnconnectedIdpsWayf', false);
47-
$addDiscoveries = (bool) $request->get('addDiscoveries', true);
48-
$rememberChoiceFeature = (bool) $request->get('rememberChoiceFeature', false);
49-
$cutoffPointForShowingUnfilteredIdps = $request->get('cutoffPointForShowingUnfilteredIdps', 100);
50-
$showIdPBanner = $request->get('showIdPBanner', true);
51-
$defaultIdpEntityId = $request->get('defaultIdpEntityId', null);
52-
// Casting a string 'true' or 'false' using filter_var (bool) does not work here
53-
$showIdPBanner = filter_var($showIdPBanner, FILTER_VALIDATE_BOOLEAN);
45+
$backLink = $request->query->getBoolean('backLink');
46+
$displayUnconnectedIdpsWayf = $request->query->getBoolean('displayUnconnectedIdpsWayf');
47+
$addDiscoveries = $request->query->getBoolean('addDiscoveries', true);
48+
$rememberChoiceFeature = $request->query->getBoolean('rememberChoiceFeature');
49+
$cutoffPointForShowingUnfilteredIdps = $request->query->getInt('cutoffPointForShowingUnfilteredIdps', 100);
50+
$showIdPBanner = $request->query->getBoolean('showIdPBanner', true);
51+
$defaultIdpEntityId = $request->query->get('defaultIdpEntityId');
5452

55-
$connectedIdps = (int) $request->get('connectedIdps', 5);
56-
$unconnectedIdps = (int) $request->get('unconnectedIdps', 0);
57-
$randomIdps = (int) $request->get('randomIdps', 0);
53+
$connectedIdps = $request->query->getInt('connectedIdps', 5);
54+
$unconnectedIdps = $request->query->getInt('unconnectedIdps');
55+
$randomIdps = $request->query->getInt('randomIdps');
5856

5957
$idpList = $randomIdps === 0
6058
? TestEntitySeeder::buildIdps($connectedIdps, $unconnectedIdps, $currentLocale, $defaultIdpEntityId, $addDiscoveries)

‎src/OpenConext/EngineBlockFunctionalTestingBundle/Mock/MockStepupGateway.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private function createSecondFactorOnlyResponse($nameId, $destination, $authnCon
180180
private function parseRequest(Request $request, $fullRequestUri)
181181
{
182182
// the GET parameter is already urldecoded by Symfony, so we should not do it again.
183-
$requestData = $request->get(self::PARAMETER_REQUEST);
183+
$requestData = $request->query->getString(self::PARAMETER_REQUEST);
184184
$samlRequest = base64_decode($requestData, true);
185185
if ($samlRequest === false) {
186186
throw new BadRequestHttpException('Failed decoding the request, did not receive a valid base64 string');
@@ -241,9 +241,9 @@ private function parseRequest(Request $request, $fullRequestUri)
241241

242242
// The query string to validate needs to be urlencoded again because Symfony has already decoded this for us
243243
$query = self::PARAMETER_REQUEST . '=' . urlencode($requestData);
244-
$query .= '&' . self::PARAMETER_SIGNATURE_ALGORITHM . '=' . urlencode($request->get(self::PARAMETER_SIGNATURE_ALGORITHM));
244+
$query .= '&' . self::PARAMETER_SIGNATURE_ALGORITHM . '=' . urlencode($request->query->getString(self::PARAMETER_SIGNATURE_ALGORITHM));
245245

246-
$signature = base64_decode($request->get(self::PARAMETER_SIGNATURE));
246+
$signature = base64_decode($request->query->getString(self::PARAMETER_SIGNATURE));
247247

248248
if (!$key->verifySignature($query, $signature)) {
249249
throw new BadRequestHttpException(

0 commit comments

Comments
 (0)