diff --git a/app/Repositories/Daemon/DaemonFileRepository.php b/app/Repositories/Daemon/DaemonFileRepository.php index ad1903a68..86f004d6c 100644 --- a/app/Repositories/Daemon/DaemonFileRepository.php +++ b/app/Repositories/Daemon/DaemonFileRepository.php @@ -26,12 +26,11 @@ class DaemonFileRepository extends DaemonRepository Assert::isInstanceOf($this->server, Server::class); try { - $response = $this->getHttpClient()->get( - sprintf('/api/servers/%s/files/contents', $this->server->uuid), - [ - 'query' => ['file' => $path], - ] - ); + $response = $this->getHttpClient() + ->withQueryParameters(['file' => $path]) + ->get( + sprintf('/api/servers/%s/files/contents', $this->server->uuid) + ); } catch (ClientException|TransferException $exception) { throw new DaemonConnectionException($exception); } @@ -55,13 +54,12 @@ class DaemonFileRepository extends DaemonRepository Assert::isInstanceOf($this->server, Server::class); try { - return $this->getHttpClient()->post( - sprintf('/api/servers/%s/files/write', $this->server->uuid), - [ - 'query' => ['file' => $path], - 'body' => $content, - ] - ); + return $this->getHttpClient() + ->withQueryParameters(['file' => $path]) + ->withBody($content) + ->post( + sprintf('/api/servers/%s/files/write', $this->server->uuid) + ); } catch (TransferException $exception) { throw new DaemonConnectionException($exception); } @@ -79,9 +77,7 @@ class DaemonFileRepository extends DaemonRepository try { $response = $this->getHttpClient()->get( sprintf('/api/servers/%s/files/list-directory', $this->server->uuid), - [ - 'query' => ['directory' => $path], - ] + ['directory' => $path] ); } catch (TransferException $exception) { throw new DaemonConnectionException($exception); @@ -125,10 +121,8 @@ class DaemonFileRepository extends DaemonRepository return $this->getHttpClient()->put( sprintf('/api/servers/%s/files/rename', $this->server->uuid), [ - 'json' => [ - 'root' => $root ?? '/', - 'files' => $files, - ], + 'root' => $root ?? '/', + 'files' => $files, ] ); } catch (TransferException $exception) { @@ -275,9 +269,7 @@ class DaemonFileRepository extends DaemonRepository try { return $this->getHttpClient()->post( sprintf('/api/servers/%s/files/pull', $this->server->uuid), - [ - array_filter($attributes, fn ($value) => !is_null($value)), - ] + array_filter($attributes, fn ($value) => !is_null($value)) ); } catch (TransferException $exception) { throw new DaemonConnectionException($exception); diff --git a/app/Repositories/Daemon/DaemonServerRepository.php b/app/Repositories/Daemon/DaemonServerRepository.php index 19a0d2ec2..86c3b0c5d 100644 --- a/app/Repositories/Daemon/DaemonServerRepository.php +++ b/app/Repositories/Daemon/DaemonServerRepository.php @@ -147,7 +147,7 @@ class DaemonServerRepository extends DaemonRepository try { $this->getHttpClient() ->post(sprintf('/api/servers/%s/ws/deny', $this->server->uuid), [ - 'json' => ['jtis' => $jtis], + 'jtis' => $jtis, ]); } catch (TransferException $exception) { throw new DaemonConnectionException($exception);