symfony
diff --git a/‎HttpClientTrait.php
Copy file name to clipboardExpand all lines: HttpClientTrait.php
+6Lines changed: 6 additions & 0 deletions b/‎HttpClientTrait.php
Copy file name to clipboardExpand all lines: HttpClientTrait.php
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎Tests/HttpClientTestCase.php
Copy file name to clipboardExpand all lines: Tests/HttpClientTestCase.php
+11Lines changed: 11 additions & 0 deletions b/‎Tests/HttpClientTestCase.php
Copy file name to clipboardExpand all lines: Tests/HttpClientTestCase.php
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: Tests/HttpClientTraitTest.php
-2Lines changed: 0 additions & 2 deletions b/‎Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: Tests/HttpClientTraitTest.php
-2Lines changed: 0 additions & 2 deletions
@@ -557,6 +557,8 @@ private static function jsonEncode(mixed $value, ?int $flags = null, int $maxDep
      */
     private static function resolveUrl(array $url, ?array $base, array $queryDefaults = []): array
     {
+        $givenUrl = $url;
+
         if (null !== $base && '' === ($base['scheme'] ?? '').($base['authority'] ?? '')) {
             throw new InvalidArgumentException(sprintf('Invalid "base_uri" option: host or scheme is missing in "%s".', implode('', $base)));
         }
@@ -610,6 +612,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault
             $url['query'] = null;
         }
 
+        if (null !== $url['scheme'] && null === $url['authority']) {
+            throw new InvalidArgumentException(\sprintf('Invalid URL: host is missing in "%s".', implode('', $givenUrl)));
+        }
+
         return $url;
     }
 
 
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpClient\Tests;
 
 use Symfony\Component\HttpClient\Exception\ClientException;
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\Internal\ClientState;
 use Symfony\Component\HttpClient\Response\StreamWrapper;
@@ -451,6 +452,16 @@ public function testNullBody()
         $this->expectNotToPerformAssertions();
     }
 
+    public function testMisspelledScheme()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid URL: host is missing in "http:/localhost:8057/".');
+
+        $httpClient->request('GET', 'http:/localhost:8057/');
+    }
+
     /**
      * @dataProvider getRedirectWithAuthTests
      */
 
@@ -175,7 +175,6 @@ public function testResolveUrl(string $base, string $url, string $expected)
     public static function provideResolveUrl(): array
     {
         return [
-            [self::RFC3986_BASE, 'http:h',        'http:h'],
             [self::RFC3986_BASE, 'g',             'http://a/b/c/g'],
             [self::RFC3986_BASE, './g',           'http://a/b/c/g'],
             [self::RFC3986_BASE, 'g/',            'http://a/b/c/g/'],
@@ -229,7 +228,6 @@ public static function provideResolveUrl(): array
             ['http://u:p@a/b/c/d;p?q', '.',       'http://u:p@a/b/c/'],
             // path ending with slash or no slash at all
             ['http://a/b/c/d/',  'e',             'http://a/b/c/d/e'],
-            ['http:no-slash',     'e',            'http:e'],
             // falsey relative parts
             [self::RFC3986_BASE, '//0',           'http://0/'],
             [self::RFC3986_BASE, '0',             'http://a/b/c/0'],
Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,8 @@ private static function jsonEncode(mixed $value, ?int $flags = null, int $maxDep`
`557`	`557`	`*/`
`558`	`558`	`private static function resolveUrl(array $url, ?array $base, array $queryDefaults = []): array`
`559`	`559`	`{`
	`560`	`+ $givenUrl = $url;`
	`561`	`+`
`560`	`562`	`if (null !== $base && '' === ($base['scheme'] ?? '').($base['authority'] ?? '')) {`
`561`	`563`	`throw new InvalidArgumentException(sprintf('Invalid "base_uri" option: host or scheme is missing in "%s".', implode('', $base)));`
`562`	`564`	`}`
`@@ -610,6 +612,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault`
`610`	`612`	`$url['query'] = null;`
`611`	`613`	`}`
`612`	`614`
	`615`	`+ if (null !== $url['scheme'] && null === $url['authority']) {`
	`616`	`+ throw new InvalidArgumentException(\sprintf('Invalid URL: host is missing in "%s".', implode('', $givenUrl)));`
	`617`	`+ }`
	`618`	`+`
`613`	`619`	`return $url;`
`614`	`620`	`}`
`615`	`621`