Merge branch '3.4' into 4.3

* 3.4:
  Improve some URLs
  Fix test compatibility with 4.x components
  [Cache] cs fix

Author: Kyra Farrow

CurlHttpClient.php

@@ -75,7 +75,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
             curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX);
         }
 
-        // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/bug.php?id=77535
+        // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/77535
         if (0 >= $maxPendingPushes || \PHP_VERSION_ID < 70217 || (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304)) {
             return;
         }