bug #38173 [HttpClient][HttpClientTrait] don't calculate alternatives if option is auth_ntlm (ybenhssaien)

nicolas-grekas · nicolas-grekas · commit 61c1175d05f6 · 2020-09-15T09:11:04.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [HttpClient][HttpClientTrait] don't calculate alternatives if option is auth_ntlm | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | no | License | MIT | Doc PR | symfony/symfony-docs#...  If option is `auth_ntlm` an exception is thrown, `$alternatives` then is not used. Commits ------- ab1a96c [HttpClient][HttpClientTrait] don't calculate alternatives if option is auth_ntlm
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -111,7 +111,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) {
-            throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : '"'.\gettype($options['auth_bearer']).'"'));
+            throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, '.(\is_string($options['auth_bearer']) ? 'invalid string given.' : '"%s" given.'), \gettype($options['auth_bearer'])));
         }
 
         if (isset($options['auth_basic'], $options['auth_bearer'])) {
@@ -197,6 +197,16 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
                 continue;
             }
 
+            if ('auth_ntlm' === $name) {
+                if (!\extension_loaded('curl')) {
+                    $msg = 'try installing the "curl" extension to use "%s" instead.';
+                } else {
+                    $msg = 'try using "%s" instead.';
+                }
+
+                throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", '.$msg, __CLASS__, CurlHttpClient::class));
+            }
+
             $alternatives = [];
 
             foreach ($defaultOptions as $key => $v) {
@@ -205,10 +215,6 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
                 }
             }
 
-            if ('auth_ntlm' === $name) {
-                throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", try using CurlHttpClient instead.', __CLASS__));
-            }
-
             throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to "%s", did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions))));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) \|\| !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) {`
`114`		`- throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : '"'.\gettype($options['auth_bearer']).'"'));`
	`114`	`+ throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, '.(\is_string($options['auth_bearer']) ? 'invalid string given.' : '"%s" given.'), \gettype($options['auth_bearer'])));`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`if (isset($options['auth_basic'], $options['auth_bearer'])) {`
`@@ -197,6 +197,16 @@ private static function mergeDefaultOptions(array $options, array $defaultOption`
`197`	`197`	`continue;`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ if ('auth_ntlm' === $name) {`
	`201`	`+ if (!\extension_loaded('curl')) {`
	`202`	`+ $msg = 'try installing the "curl" extension to use "%s" instead.';`
	`203`	`+ } else {`
	`204`	`+ $msg = 'try using "%s" instead.';`
	`205`	`+ }`
	`206`	`+`
	`207`	`+ throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", '.$msg, __CLASS__, CurlHttpClient::class));`
	`208`	`+ }`
	`209`	`+`
`200`	`210`	`$alternatives = [];`
`201`	`211`
`202`	`212`	`foreach ($defaultOptions as $key => $v) {`
`@@ -205,10 +215,6 @@ private static function mergeDefaultOptions(array $options, array $defaultOption`
`205`	`215`	`}`
`206`	`216`	`}`
`207`	`217`
`208`		`- if ('auth_ntlm' === $name) {`
`209`		`- throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", try using CurlHttpClient instead.', __CLASS__));`
`210`		`- }`
`211`		`-`
`212`	`218`	`throw new InvalidArgumentException(sprintf('Unsupported option "%s" passed to "%s", did you mean "%s"?', $name, __CLASS__, implode('", "', $alternatives ?: array_keys($defaultOptions))));`
`213`	`219`	`}`
`214`	`220`