Merge pull request #10637 from nupplaphil/feat/webdav_storage

PSR-7 Part 4: Add additional Authentication options

src/Network/HTTPClient.php

@@ -125,6 +125,10 @@ class HTTPClient implements IHTTPClient
 			$conf[RequestOptions::BODY] = $opts[HTTPClientOptions::BODY];
 		}
 
+		if (!empty($opts[HTTPClientOptions::AUTH])) {
+			$conf[RequestOptions::AUTH] = $opts[HTTPClientOptions::AUTH];
+		}
+
 		$conf[RequestOptions::ON_HEADERS] = function (ResponseInterface $response) use ($opts) {
 			if (!empty($opts[HTTPClientOptions::CONTENT_LENGTH]) &&
 				(int)$response->getHeaderLine('Content-Length') > $opts[HTTPClientOptions::CONTENT_LENGTH]) {
@@ -135,17 +139,7 @@ class HTTPClient implements IHTTPClient
 		try {
 			$this->logger->debug('http request config.', ['url' => $url, 'method' => $method, 'options' => $conf]);
 
-			switch ($method) {
+			$response = $this->client->request($method, $url, $conf);
-				case 'get':
-				case 'head':
-				case 'post':
-				case 'put':
-				case 'delete':
-					$response = $this->client->$method($url, $conf);
-					break;
-				default:
-					throw new TransferException('Invalid method');
-			}
 			return new GuzzleResponse($response, $url);
 		} catch (TransferException $exception) {
 			if ($exception instanceof RequestException &&

src/Network/HTTPClientOptions.php

@@ -37,4 +37,8 @@ class HTTPClientOptions
 	 * body: (mixed) Setting the body for sending data
 	 */
 	const BODY = RequestOptions::BODY;
+	/**
+	 * auth: (array) Authentication settings for specific requests
+	 */
+	const AUTH = RequestOptions::AUTH;
 }

src/Network/IHTTPClient.php

@@ -97,6 +97,7 @@ interface IHTTPClient
 	 *                           'cookiejar' => path to cookie jar file
 	 *                           'header' => header array
 	 *                           'content_length' => int maximum File content length
+	 *                           'auth' => array authentication settings
 	 *
 	 * @return IHTTPResult
 	 */