friendica/friendica-addons
9
4
Fork 16
Code Issues 3 Pull requests 4 Releases 16 Wiki Activity

[various] Introduce explicit HttpClient "Accept" parameter #1245

Merged
nupplaphil merged 4 commits from feat/http_client_arg into develop 2022-04-08 20:36:55 +02:00
Conversation 0 Commits 4 Files changed 3 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 46221882c3 - Show all commits

10
webdav_storage/src/WebDav.php
View file

@ -111,7 +111,7 @@ class WebDav implements ICanWriteToStorage
HttpClientOptions::BODY => $dom->saveXML(),
];
$response = $this->client->request('propfind', $uri, HttpClientAccept::DEFAULT, $opts);
$response = $this->client->request('propfind', $uri, $opts);
$responseDoc = new \DOMDocument();
$responseDoc->loadXML($response->getBody());
@ -134,7 +134,7 @@ class WebDav implements ICanWriteToStorage
*/
protected function mkcol(string $uri): bool
{
return $this->client->request('mkcol', $uri, HttpClientAccept::DEFAULT, [HttpClientOptions::AUTH => $this->authOptions])
return $this->client->request('mkcol', $uri, [HttpClientOptions::AUTH => $this->authOptions])
->getReturnCode() == 200;
}
@ -200,7 +200,7 @@ class WebDav implements ICanWriteToStorage
{
$file = $this->pathForRef($reference);
$response = $this->client->request('get', $this->url . '/' . $file[0], HttpClientAccept::DEFAULT, [HttpClientOptions::AUTH => $this->authOptions]);
$response = $this->client->request('get', $this->url . '/' . $file[0], [HttpClientOptions::AUTH => $this->authOptions]);
if (!$response->isSuccess()) {
throw new ReferenceStorageException(sprintf('Invalid reference %s', $reference));
@ -230,7 +230,7 @@ class WebDav implements ICanWriteToStorage
HttpClientOptions::AUTH => $this->authOptions,
];
$this->client->request('put', $this->url . '/' . $file[0], HttpClientAccept::DEFAULT, $opts);
$this->client->request('put', $this->url . '/' . $file[0], $opts);
return $reference;
}
@ -242,7 +242,7 @@ class WebDav implements ICanWriteToStorage
{
$file = $this->pathForRef($reference);
$response = $this->client->request('delete', $this->url . '/' . $file[0], HttpClientAccept::DEFAULT, [HttpClientOptions::AUTH => $this->authOptions]);
$response = $this->client->request('delete', $this->url . '/' . $file[0], [HttpClientOptions::AUTH => $this->authOptions]);
if (!$response->isSuccess()) {
throw new ReferenceStorageException(sprintf('Invalid reference %s', $reference));