Merge branch '3.4' into 4.4

* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public

Author: nicolas-grekas

CurlHttpClient.php

@@ -34,7 +34,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
                 return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
             }
 
-            @trigger_error('Configure the "curl.cainfo", "openssl.cafile" or "openssl.capath" php.ini setting to enable the CurlHttpClient', E_USER_WARNING);
+            @trigger_error('Configure the "curl.cainfo", "openssl.cafile" or "openssl.capath" php.ini setting to enable the CurlHttpClient', \E_USER_WARNING);
         }
 
         return new NativeHttpClient($defaultOptions, $maxHostConnections);

HttpClient.php

@@ -268,7 +268,7 @@ private static function normalizeHeaders(array $headers): array
     private static function normalizeBody($body)
     {
         if (\is_array($body)) {
-            return http_build_query($body, '', '&', PHP_QUERY_RFC1738);
+            return http_build_query($body, '', '&', \PHP_QUERY_RFC1738);
         }
 
         if ($body instanceof \Traversable) {
@@ -338,15 +338,15 @@ private static function normalizePeerFingerprint($fingerprint): array
      */
     private static function jsonEncode($value, int $flags = null, int $maxDepth = 512): string
     {
-        $flags = $flags ?? (JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_PRESERVE_ZERO_FRACTION);
+        $flags = $flags ?? (\JSON_HEX_TAG | \JSON_HEX_APOS | \JSON_HEX_AMP | \JSON_HEX_QUOT | \JSON_PRESERVE_ZERO_FRACTION);
 
         try {
-            $value = json_encode($value, $flags | (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0), $maxDepth);
+            $value = json_encode($value, $flags | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0), $maxDepth);
         } catch (\JsonException $e) {
             throw new InvalidArgumentException('Invalid value for "json" option: '.$e->getMessage());
         }
 
-        if (\PHP_VERSION_ID < 70300 && JSON_ERROR_NONE !== json_last_error() && (false === $value || !($flags & JSON_PARTIAL_OUTPUT_ON_ERROR))) {
+        if (\PHP_VERSION_ID < 70300 && \JSON_ERROR_NONE !== json_last_error() && (false === $value || !($flags & \JSON_PARTIAL_OUTPUT_ON_ERROR))) {
             throw new InvalidArgumentException('Invalid value for "json" option: '.json_last_error_msg());
         }
 
@@ -441,7 +441,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
                 throw new InvalidArgumentException(sprintf('Unsupported IDN "%s", try enabling the "intl" PHP extension or running "composer require symfony/polyfill-intl-idn".', $host));
             }
 
-            $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host);
+            $host = \defined('INTL_IDNA_VARIANT_UTS46') ? idn_to_ascii($host, \IDNA_DEFAULT, \INTL_IDNA_VARIANT_UTS46) ?: strtolower($host) : strtolower($host);
             $host .= $port ? ':'.$port : '';
         }
 
@@ -526,7 +526,7 @@ private static function mergeQueryString(?string $queryString, array $queryArray
             }
         }
 
-        $queryString = http_build_query($queryArray, '', '&', PHP_QUERY_RFC3986);
+        $queryString = http_build_query($queryArray, '', '&', \PHP_QUERY_RFC3986);
         $queryArray = [];
 
         if ($queryString) {

HttpClientTrait.php

@@ -23,7 +23,7 @@ final class NativeClientState extends ClientState
     /** @var int */
     public $id;
     /** @var int */
-    public $maxHostConnections = PHP_INT_MAX;
+    public $maxHostConnections = \PHP_INT_MAX;
     /** @var int */
     public $responseCount = 0;
     /** @var string[] */
@@ -33,6 +33,6 @@ final class NativeClientState extends ClientState
 
     public function __construct()
     {
-        $this->id = random_int(PHP_INT_MIN, PHP_INT_MAX);
+        $this->id = random_int(\PHP_INT_MIN, \PHP_INT_MAX);
     }
 }

Internal/NativeClientState.php

@@ -55,7 +55,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
         }
 
         $this->multi = new NativeClientState();
-        $this->multi->maxHostConnections = 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX;
+        $this->multi->maxHostConnections = 0 < $maxHostConnections ? $maxHostConnections : \PHP_INT_MAX;
     }
 
     /**
@@ -116,7 +116,7 @@ public function request(string $method, string $url, array $options = []): Respo
         if ($onProgress = $options['on_progress']) {
             // Memoize the last progress to ease calling the callback periodically when no network transfer happens
             $lastProgress = [0, 0];
-            $maxDuration = 0 < $options['max_duration'] ? $options['max_duration'] : INF;
+            $maxDuration = 0 < $options['max_duration'] ? $options['max_duration'] : \INF;
             $onProgress = static function (...$progress) use ($onProgress, &$lastProgress, &$info, $maxDuration) {
                 if ($info['total_time'] >= $maxDuration) {
                     throw new TransportException(sprintf('Max duration was reached for "%s".', implode('', $info['url'])));
@@ -148,11 +148,11 @@ public function request(string $method, string $url, array $options = []): Respo
         $notification = static function (int $code, int $severity, ?string $msg, int $msgCode, int $dlNow, int $dlSize) use ($onProgress, &$info) {
             $info['total_time'] = microtime(true) - $info['start_time'];
 
-            if (STREAM_NOTIFY_PROGRESS === $code) {
+            if (\STREAM_NOTIFY_PROGRESS === $code) {
                 $info['starttransfer_time'] = $info['starttransfer_time'] ?: $info['total_time'];
                 $info['size_upload'] += $dlNow ? 0 : $info['size_body'];
                 $info['size_download'] = $dlNow;
-            } elseif (STREAM_NOTIFY_CONNECT === $code) {
+            } elseif (\STREAM_NOTIFY_CONNECT === $code) {
                 $info['connect_time'] = $info['total_time'];
                 $info['debug'] .= $info['request_header'];
                 unset($info['request_header']);
@@ -310,14 +310,14 @@ private static function getProxy(?string $proxy, array $url): ?array
      */
     private static function dnsResolve(array $url, NativeClientState $multi, array &$info, ?\Closure $onProgress): array
     {
-        if ($port = parse_url($url['authority'], PHP_URL_PORT) ?: '') {
+        if ($port = parse_url($url['authority'], \PHP_URL_PORT) ?: '') {
             $info['primary_port'] = $port;
             $port = ':'.$port;
         } else {
             $info['primary_port'] = 'http:' === $url['scheme'] ? 80 : 443;
         }
 
-        $host = parse_url($url['authority'], PHP_URL_HOST);
+        $host = parse_url($url['authority'], \PHP_URL_HOST);
 
         if (null === $ip = $multi->dnsCache[$host] ?? null) {
             $info['debug'] .= "* Hostname was NOT found in DNS cache\n";
@@ -407,7 +407,7 @@ private static function createRedirectResolver(array $options, string $host, ?ar
             [$host, $port, $url['authority']] = self::dnsResolve($url, $multi, $info, $onProgress);
             stream_context_set_option($context, 'ssl', 'peer_name', $host);
 
-            if (false !== (parse_url($location, PHP_URL_HOST) ?? false)) {
+            if (false !== (parse_url($location, \PHP_URL_HOST) ?? false)) {
                 // Authorization and Cookie headers MUST NOT follow except for the initial host name
                 $requestHeaders = $redirectHeaders['host'] === $host ? $redirectHeaders['with_auth'] : $redirectHeaders['no_auth'];
                 $requestHeaders[] = 'Host: '.$host.$port;