Merge branch '6.4' into 7.1

* 6.4:
  [HttpFoundation] Fix test
  [HttpFoundation] Revert risk change
  [Notifier] Fix GoIpTransport
  [HttpClient] Fix catching some invalid Location headers

Author: nicolas-grekas

src/Symfony/Component/HttpClient/CurlHttpClient.php

@@ -421,6 +421,8 @@ private static function createRedirectResolver(array $options, string $host, int
             try {
                 $locationHasHost = false;
                 $location = self::parseUrl($location);
+                $url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
+                $url = self::resolveUrl($location, $url);
             } catch (InvalidArgumentException) {
                 return null;
             }
@@ -441,9 +443,6 @@ private static function createRedirectResolver(array $options, string $host, int
                 curl_setopt($ch, \CURLOPT_HTTPHEADER, $redirectHeaders['with_auth']);
             }
 
-            $url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
-            $url = self::resolveUrl($location, $url);
-
             curl_setopt($ch, \CURLOPT_PROXY, self::getProxyUrl($options['proxy'], $url));
 
             return implode('', $url);

src/Symfony/Component/HttpClient/NativeHttpClient.php

@@ -383,14 +383,14 @@ private static function createRedirectResolver(array $options, string $host, str
 
             try {
                 $url = self::parseUrl($location);
+                $locationHasHost = isset($url['authority']);
+                $url = self::resolveUrl($url, $info['url']);
             } catch (InvalidArgumentException) {
                 $info['redirect_url'] = null;
 
                 return null;
             }
 
-            $locationHasHost = isset($url['authority']);
-            $url = self::resolveUrl($url, $info['url']);
             $info['redirect_url'] = implode('', $url);
 
             if ($info['redirect_count'] >= $maxRedirects) {

src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php

@@ -494,7 +494,11 @@ public function testNoRedirectWithInvalidLocation()
     {
         $client = $this->getHttpClient(__FUNCTION__);
 
-        $response = $client->request('GET', 'http://localhost:8057/302-no-scheme');
+        $response = $client->request('GET', 'http://localhost:8057/302?location=localhost:8067');
+
+        $this->assertSame(302, $response->getStatusCode());
+
+        $response = $client->request('GET', 'http://localhost:8057/302?location=http:localhost');
 
         $this->assertSame(302, $response->getStatusCode());
     }

src/Symfony/Component/HttpFoundation/Request.php

@@ -324,11 +324,9 @@ public static function create(string $uri, string $method = 'GET', array $parame
             if ('https' === $components['scheme']) {
                 $server['HTTPS'] = 'on';
                 $server['SERVER_PORT'] = 443;
-            } elseif ('http' === $components['scheme']) {
+            } else {
                 unset($server['HTTPS']);
                 $server['SERVER_PORT'] = 80;
-            } else {
-                throw new BadRequestException('Invalid URI: http(s) scheme expected.');
             }
         }
 

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

@@ -311,7 +311,6 @@ public function testCreateWithRequestUri()
      *           [" foo"]
      *           ["foo "]
      *           ["//"]
-     *           ["foo:bar"]
      */
     public function testCreateWithBadRequestUri(string $uri)
     {

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php

@@ -106,7 +106,7 @@ public function testFromDsnWithMixDsnQueryOptions()
 
         $this->assertEquals(
             Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['consumer' => 'specific-consumer'], $this->createRedisMock()),
-            Connection::fromDsn('redis://localhost/queue/group1/consumer1', [], $this->createRedisMock()))
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1', [], $this->createRedisMock())
         );
     }
 
@@ -439,8 +439,7 @@ public function testFromDsnOnUnixSocketWithUserAndPassword()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'user' => 'user',
-                'pass' => 'password',
+                'auth' => ['user', 'password'],
             ], $redis),
             Connection::fromDsn('redis://user:password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -460,7 +459,7 @@ public function testFromDsnOnUnixSocketWithPassword()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'pass' => 'password',
+                'auth' => 'password',
             ], $redis),
             Connection::fromDsn('redis://password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -480,7 +479,7 @@ public function testFromDsnOnUnixSocketWithUser()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'user' => 'user',
+                'auth' => 'user',
             ], $redis),
             Connection::fromDsn('redis://user:@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -494,7 +493,7 @@ private function createRedisMock(): \Redis
             ->willReturn(true);
         $redis->expects($this->any())
             ->method('isConnected')
-            ->willReturnOnConsecutiveCalls(false, true);
+            ->willReturnOnConsecutiveCalls(false, true, true);
 
         return $redis;
     }

src/Symfony/Component/Notifier/Bridge/GoIp/GoIpTransport.php

@@ -70,7 +70,7 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new LogicException(sprintf('The "%s" transport does not support the "From" option.', __CLASS__));
         }
 
-        $response = $this->client->request('GET', $this->getEndpoint(), [
+        $response = $this->client->request('GET', 'https://'.$this->getEndpoint(), [
             'query' => [
                 'u' => $this->username,
                 'p' => $this->password,

src/Symfony/Contracts/HttpClient/Test/Fixtures/web/index.php

@@ -31,7 +31,7 @@
 
 $json = json_encode($vars, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE);
 
-switch ($vars['REQUEST_URI']) {
+switch (parse_url($vars['REQUEST_URI'], \PHP_URL_PATH)) {
     default:
         exit;
 
@@ -94,13 +94,8 @@
 
     case '/302':
         if (!isset($vars['HTTP_AUTHORIZATION'])) {
-            header('Location: http://localhost:8057/', true, 302);
-        }
-        break;
-
-    case '/302-no-scheme':
-        if (!isset($vars['HTTP_AUTHORIZATION'])) {
-            header('Location: localhost:8067', true, 302);
+            $location = $_GET['location'] ?? 'http://localhost:8057/';
+            header('Location: '.$location, true, 302);
         }
         break;