Merge branch '5.2' into 5.3

* 5.2:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Firewall/ChannelListener.php

@@ -49,7 +49,7 @@ public function supports(Request $request): ?bool
             if (null !== $this->logger) {
                 if ('https' === $request->headers->get('X-Forwarded-Proto')) {
                     $this->logger->info('Redirecting to HTTPS. ("X-Forwarded-Proto" header is set to "https" - did you set "trusted_proxies" correctly?)');
-                } elseif (false !== strpos($request->headers->get('Forwarded'), 'proto=https')) {
+                } elseif (str_contains($request->headers->get('Forwarded'), 'proto=https')) {
                     $this->logger->info('Redirecting to HTTPS. ("Forwarded" header is set to "proto=https" - did you set "trusted_proxies" correctly?)');
                 } else {
                     $this->logger->info('Redirecting to HTTPS.');

Firewall/UsernamePasswordJsonAuthenticationListener.php

@@ -81,8 +81,8 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
 
     public function supports(Request $request): ?bool
     {
-        if (false === strpos($request->getRequestFormat() ?? '', 'json')
-            && false === strpos($request->getContentType() ?? '', 'json')
+        if (!str_contains($request->getRequestFormat() ?? '', 'json')
+            && !str_contains($request->getContentType() ?? '', 'json')
         ) {
             return false;
         }

HttpUtils.php

@@ -148,7 +148,7 @@ public function checkRequestPath(Request $request, string $path)
      */
     public function generateUri(Request $request, string $path)
     {
-        if (0 === strpos($path, 'http') || !$path) {
+        if (str_starts_with($path, 'http') || !$path) {
             return $path;
         }
 

RememberMe/AbstractRememberMeServices.php

@@ -263,7 +263,7 @@ protected function decodeCookie(string $rawCookie)
     protected function encodeCookie(array $cookieParts)
     {
         foreach ($cookieParts as $cookiePart) {
-            if (false !== strpos($cookiePart, self::COOKIE_DELIMITER)) {
+            if (str_contains($cookiePart, self::COOKIE_DELIMITER)) {
                 throw new \InvalidArgumentException(sprintf('$cookieParts should not contain the cookie delimiter "%s".', self::COOKIE_DELIMITER));
             }
         }

composer.json

@@ -22,7 +22,7 @@
         "symfony/http-foundation": "^5.3",
         "symfony/http-kernel": "^5.3",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/polyfill-php80": "^1.15",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/property-access": "^4.4|^5.0"
     },
     "require-dev": {