[HttpClient] Allow to pass user/pw as an array

Author: dunglas

HttpClientTrait.php

@@ -71,8 +71,17 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             throw new InvalidArgumentException(sprintf('Option "on_progress" must be callable, %s given.', \is_object($onProgress) ? \get_class($onProgress) : \gettype($onProgress)));
         }
 
+        if (\is_array($options['auth_basic'] ?? null)) {
+            $count = \count($options['auth_basic']);
+            if ($count <= 0 || $count > 2) {
+                throw new InvalidArgumentException(sprintf('Option "auth_basic" must contain 1 or 2 elements, %s given.', $count));
+            }
+
+            $options['auth_basic'] = implode(':', $options['auth_basic']);
+        }
+
         if (!\is_string($options['auth_basic'] ?? '')) {
-            throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string, %s given.', \gettype($options['auth_basic'])));
+            throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic'])));
         }
 
         if (!\is_string($options['auth_bearer'] ?? '')) {

HttpOptions.php

@@ -34,9 +34,12 @@ public function toArray(): array
     /**
      * @return $this
      */
-    public function setAuthBasic(string $userinfo)
+    public function setAuthBasic(string $user, string $password = '')
     {
-        $this->options['auth'] = $userinfo;
+        $this->options['auth_basic'] = $user;
+        if ('' !== $password) {
+            $this->options['auth_basic'] .= ':'.$password;
+        }
 
         return $this;
     }

Tests/HttpClientTraitTest.php

@@ -185,8 +185,25 @@ public function testInvalidAuthBearerOption()
      * @expectedException \Symfony\Component\HttpClient\Exception\InvalidArgumentException
      * @expectedExceptionMessage Define either the "auth_basic" or the "auth_bearer" option, setting both is not supported.
      */
-    public function testSetBasicAndBearerOption()
+    public function testSetAuthBasicAndBearerOptions()
     {
         self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => 'foo', 'auth_basic' => 'foo:bar'], HttpClientInterface::OPTIONS_DEFAULTS);
     }
+
+    public function providePrepareAuthBasic()
+    {
+        yield ['foo:bar', 'Zm9vOmJhcg=='];
+        yield [['foo', 'bar'], 'Zm9vOmJhcg=='];
+        yield ['foo', 'Zm9v'];
+        yield [['foo'], 'Zm9v'];
+    }
+
+    /**
+     * @dataProvider providePrepareAuthBasic
+     */
+    public function testPrepareAuthBasic($arg, $result)
+    {
+        [, $options] = $this->prepareRequest('POST', 'http://example.com', ['auth_basic' => $arg], HttpClientInterface::OPTIONS_DEFAULTS);
+        $this->assertSame('Basic '.$result, $options['headers']['authorization'][0]);
+    }
 }

Tests/HttpOptionsTest.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpClient\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\HttpOptions;
+
+/**
+ * @author Kévin Dunglas <[email protected]>
+ */
+class HttpOptionsTest extends TestCase
+{
+    public function provideSetAuth()
+    {
+        yield ['user:password', 'user', 'password'];
+        yield ['user:password', 'user:password'];
+        yield ['user', 'user'];
+        yield ['user:0', 'user', '0'];
+    }
+
+    /**
+     * @dataProvider provideSetAuth
+     */
+    public function testSetAuth(string $expected, string $user, string $password = '')
+    {
+        $this->assertSame($expected, (new HttpOptions())->setAuthBasic($user, $password)->toArray()['auth_basic']);
+    }
+}