Merge branch '4.4' into 5.2

* 4.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

CurlHttpClient.php

@@ -272,7 +272,7 @@ public function request(string $method, string $url, array $options = []): Respo
         if ($options['bindto']) {
             if (file_exists($options['bindto'])) {
                 $curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];
-            } elseif (0 !== strpos($options['bindto'], 'if!') && preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
+            } elseif (!str_starts_with($options['bindto'], 'if!') && preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
                 $curlopts[\CURLOPT_INTERFACE] = $matches[1];
                 $curlopts[\CURLOPT_LOCALPORT] = $matches[2];
             } else {
@@ -404,7 +404,7 @@ private function handlePush($parent, $pushed, array $requestHeaders, int $maxPen
         // curl before 7.65 doesn't validate the pushed ":authority" header,
         // but this is a MUST in the HTTP/2 RFC; let's restrict pushes to the original host,
         // ignoring domains mentioned as alt-name in the certificate for now (same as curl).
-        if (0 !== strpos($origin, $url.'/')) {
+        if (!str_starts_with($origin, $url.'/')) {
             $this->logger && $this->logger->debug(sprintf('Rejecting pushed response from "%s": server is not authoritative for "%s"', $origin, $url));
 
             return \CURL_PUSH_DENY;
@@ -515,7 +515,7 @@ private static function createRedirectResolver(array $options, string $host): \C
     private function findConstantName(int $opt): ?string
     {
         $constants = array_filter(get_defined_constants(), static function ($v, $k) use ($opt) {
-            return $v === $opt && 'C' === $k[0] && (0 === strpos($k, 'CURLOPT_') || 0 === strpos($k, 'CURLINFO_'));
+            return $v === $opt && 'C' === $k[0] && (str_starts_with($k, 'CURLOPT_') || str_starts_with($k, 'CURLINFO_'));
         }, \ARRAY_FILTER_USE_BOTH);
 
         return key($constants);

Exception/HttpExceptionTrait.php

@@ -32,7 +32,7 @@ public function __construct(ResponseInterface $response)
         $httpCodeFound = false;
         $isJson = false;
         foreach (array_reverse($response->getInfo('response_headers')) as $h) {
-            if (0 === strpos($h, 'HTTP/')) {
+            if (str_starts_with($h, 'HTTP/')) {
                 if ($httpCodeFound) {
                     break;
                 }

HttpClientTrait.php

@@ -216,7 +216,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
             $alternatives = [];
 
             foreach ($defaultOptions as $key => $v) {
-                if (levenshtein($name, $key) <= \strlen($name) / 3 || false !== strpos($key, $name)) {
+                if (levenshtein($name, $key) <= \strlen($name) / 3 || str_contains($key, $name)) {
                     $alternatives[] = $key;
                 }
             }
@@ -479,7 +479,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
                 continue;
             }
 
-            if (false !== strpos($parts[$part], '%')) {
+            if (str_contains($parts[$part], '%')) {
                 // https://tools.ietf.org/html/rfc3986#section-2.3
                 $parts[$part] = preg_replace_callback('/%(?:2[DE]|3[0-9]|[46][1-9A-F]|5F|[57][0-9A]|7E)++/i', function ($m) { return rawurldecode($m[0]); }, $parts[$part]);
             }
@@ -507,11 +507,11 @@ private static function removeDotSegments(string $path)
         $result = '';
 
         while (!\in_array($path, ['', '.', '..'], true)) {
-            if ('.' === $path[0] && (0 === strpos($path, $p = '../') || 0 === strpos($path, $p = './'))) {
+            if ('.' === $path[0] && (str_starts_with($path, $p = '../') || str_starts_with($path, $p = './'))) {
                 $path = substr($path, \strlen($p));
-            } elseif ('/.' === $path || 0 === strpos($path, '/./')) {
+            } elseif ('/.' === $path || str_starts_with($path, '/./')) {
                 $path = substr_replace($path, '/', 0, 3);
-            } elseif ('/..' === $path || 0 === strpos($path, '/../')) {
+            } elseif ('/..' === $path || str_starts_with($path, '/../')) {
                 $i = strrpos($result, '/');
                 $result = $i ? substr($result, 0, $i) : '';
                 $path = substr_replace($path, '/', 0, 4);

NativeHttpClient.php

@@ -71,10 +71,10 @@ public function request(string $method, string $url, array $options = []): Respo
             if (file_exists($options['bindto'])) {
                 throw new TransportException(__CLASS__.' cannot bind to local Unix sockets, use e.g. CurlHttpClient instead.');
             }
-            if (0 === strpos($options['bindto'], 'if!')) {
+            if (str_starts_with($options['bindto'], 'if!')) {
                 throw new TransportException(__CLASS__.' cannot bind to network interfaces, use e.g. CurlHttpClient instead.');
             }
-            if (0 === strpos($options['bindto'], 'host!')) {
+            if (str_starts_with($options['bindto'], 'host!')) {
                 $options['bindto'] = substr($options['bindto'], 5);
             }
         }
@@ -423,7 +423,7 @@ private static function configureHeadersAndProxy($context, string $host, array $
         foreach ($proxy['no_proxy'] as $rule) {
             $dotRule = '.'.ltrim($rule, '.');
 
-            if ('*' === $rule || $host === $rule || substr($host, -\strlen($dotRule)) === $dotRule) {
+            if ('*' === $rule || $host === $rule || str_ends_with($host, $dotRule)) {
                 stream_context_set_option($context, 'http', 'proxy', null);
                 stream_context_set_option($context, 'http', 'request_fulluri', false);
                 stream_context_set_option($context, 'http', 'header', $requestHeaders);

Response/CurlResponse.php

@@ -381,7 +381,7 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
                 return \strlen($data);
             }
 
-            if (0 !== strpos($data, 'HTTP/')) {
+            if (!str_starts_with($data, 'HTTP/')) {
                 if (0 === stripos($data, 'Location:')) {
                     $location = trim(substr($data, 9));
                 }

composer.json

@@ -18,14 +18,15 @@
         "php-http/async-client-implementation": "*",
         "php-http/client-implementation": "*",
         "psr/http-client-implementation": "1.0",
-        "symfony/http-client-implementation": "2.2"
+        "symfony/http-client-implementation": "2.2",
+        "symfony/polyfill-php80": "^1.16"
     },
     "require": {
         "php": ">=7.2.5",
         "psr/log": "^1|^2|^3",
         "symfony/http-client-contracts": "^2.2",
         "symfony/polyfill-php73": "^1.11",
-        "symfony/polyfill-php80": "^1.15",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.0|^2"
     },
     "require-dev": {