Fix deprecations from getContentType

MarkPedron · MarkPedron · commit f949c8cd0657 · 2022-01-15T20:52:34.000+01:00
diff --git a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php
@@ -75,7 +75,7 @@ public function supports(Request $request): bool
     {
         return ($this->options['post_only'] ? $request->isMethod('POST') : true)
             && $this->httpUtils->checkRequestPath($request, $this->options['check_path'])
-            && ($this->options['form_only'] ? 'form' === $request->getContentType() : true);
+            && ($this->options['form_only'] ? 'form' === (method_exists(Request::class, 'getContentTypeFormat') ? $request->getContentTypeFormat) : $request->getContentType()) : true);
     }
 
     public function authenticate(Request $request): Passport
diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -65,7 +65,10 @@ public function __construct(HttpUtils $httpUtils, UserProviderInterface $userPro
 
     public function supports(Request $request): ?bool
     {
-        if (!str_contains($request->getRequestFormat() ?? '', 'json') && !str_contains($request->getContentType() ?? '', 'json')) {
+        if (
+            !str_contains($request->getRequestFormat() ?? '', 'json')
+            && !str_contains((method_exists(Request::class, 'getContentTypeFormat') ? $request->getContentTypeFormat() : $request->getContentType()) ?? '', 'json')
+        ) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function supports(Request $request): bool`
`75`	`75`	`{`
`76`	`76`	`return ($this->options['post_only'] ? $request->isMethod('POST') : true)`
`77`	`77`	`&& $this->httpUtils->checkRequestPath($request, $this->options['check_path'])`
`78`		`- && ($this->options['form_only'] ? 'form' === $request->getContentType() : true);`
	`78`	`+ && ($this->options['form_only'] ? 'form' === (method_exists(Request::class, 'getContentTypeFormat') ? $request->getContentTypeFormat) : $request->getContentType()) : true);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public function authenticate(Request $request): Passport`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ public function __construct(HttpUtils $httpUtils, UserProviderInterface $userPro`
`65`	`65`
`66`	`66`	`public function supports(Request $request): ?bool`
`67`	`67`	`{`
`68`		`- if (!str_contains($request->getRequestFormat() ?? '', 'json') && !str_contains($request->getContentType() ?? '', 'json')) {`
	`68`	`+ if (`
	`69`	`+ !str_contains($request->getRequestFormat() ?? '', 'json')`
	`70`	`+ && !str_contains((method_exists(Request::class, 'getContentTypeFormat') ? $request->getContentTypeFormat() : $request->getContentType()) ?? '', 'json')`
	`71`	`+ ) {`
`69`	`72`	`return false;`
`70`	`73`	`}`
`71`	`74`