bug #39286 [HttpClient] throw clearer error when no scheme is provided (BackEndTea)

fabpot · fabpot · commit 1177baa770fd · 2020-12-05T07:03:15.000+01:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [HttpClient] throw clearer error when no scheme is provided | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39285 | License | MIT | Doc PR | N/A This could be considred a BC break, as previously this would've a `TransportExcepiton`, instead of an `InvalidArgumentException`. But i see no reason to catch this specific error, as it would generally be a configuration error. Commits ------- 4d821d6 [HttpClient] throw clearer error when no scheme is provided
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -377,6 +377,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault
             throw new InvalidArgumentException(sprintf('Invalid "base_uri" option: host or scheme is missing in "%s".', implode('', $base)));
         }
 
+        if (null === $url['scheme'] && (null === $base || null === $base['scheme'])) {
+            throw new InvalidArgumentException(sprintf('Invalid URL: scheme is missing in "%s". Did you forget to add "http(s)://"?', implode('', $base ?? $url)));
+        }
+
         if (null === $base && '' === $url['scheme'].$url['authority']) {
             throw new InvalidArgumentException(sprintf('Invalid URL: no "base_uri" option was provided and host or scheme is missing in "%s".', implode('', $url)));
         }
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpClient\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\HttpClientTrait;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -120,6 +121,20 @@ public function provideResolveUrl(): array
         ];
     }
 
+    public function testResolveUrlWithoutScheme()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid URL: scheme is missing in "//localhost:8080". Did you forget to add "http(s)://"?');
+        self::resolveUrl(self::parseUrl('localhost:8080'), null);
+    }
+
+    public function testResolveBaseUrlWitoutScheme()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid URL: scheme is missing in "//localhost:8081". Did you forget to add "http(s)://"?');
+        self::resolveUrl(self::parseUrl('/foo'), self::parseUrl('localhost:8081'));
+    }
+
     /**
      * @dataProvider provideParseUrl
      */

Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault`
`377`	`377`	`throw new InvalidArgumentException(sprintf('Invalid "base_uri" option: host or scheme is missing in "%s".', implode('', $base)));`
`378`	`378`	`}`
`379`	`379`
	`380`	`+ if (null === $url['scheme'] && (null === $base \|\| null === $base['scheme'])) {`
	`381`	`+ throw new InvalidArgumentException(sprintf('Invalid URL: scheme is missing in "%s". Did you forget to add "http(s)://"?', implode('', $base ?? $url)));`
	`382`	`+ }`
	`383`	`+`
`380`	`384`	`if (null === $base && '' === $url['scheme'].$url['authority']) {`
`381`	`385`	`throw new InvalidArgumentException(sprintf('Invalid URL: no "base_uri" option was provided and host or scheme is missing in "%s".', implode('', $url)));`
`382`	`386`	`}`