wip

composer.json

@@ -38,8 +38,8 @@
     "require-dev": {
         "laravel/pint": "^1.13",
         "guzzlehttp/guzzle": "^7.1",
-        "phpstan/phpstan": "^1.0",
-        "phpunit/phpunit": "^10.0"
+        "pestphp/pest": "^2.34",
+        "phpstan/phpstan": "^1.0"
     },
     "minimum-stability": "dev",
     "autoload": {
@@ -55,7 +55,8 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "pestphp/pest-plugin": true
         }
     }
-}
+}

phpstan.neon

@@ -1,12 +1,8 @@
-includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
-
 parameters:
 
     paths:
         - src
 
-    # The level 8 is the highest level
-    level: 5
+    level: 'max'
 
     checkMissingIterableValueType: false

pint.json

@@ -1,3 +1,3 @@
 {
-    "preset": "laravel"
-}
+    "preset": "per"
+}

src/ApiClient.php

@@ -33,90 +33,106 @@ class ApiClient
 
     private HttpClient $client;
 
+    private RequestFactoryInterface $requestFactory;
+
+    private StreamFactoryInterface $streamFactory;
+
     public function __construct(
         private string $baseUrl,
-        private ?SocketClient $socket = null,
-        private ?RequestFactoryInterface $requestFactory = null,
-        private ?StreamFactoryInterface $streamFactory = null,
-        private ?PluginClientFactory $pluginFactory = null,
+        ?SocketClient $socket = null,
+        ?RequestFactoryInterface $requestFactory = null,
+        ?StreamFactoryInterface $streamFactory = null,
+        ?PluginClientFactory $pluginFactory = null,
         private array $headers = []
     ) {
-        $this->requestFactory ??= Psr17FactoryDiscovery::findRequestFactory();
-        $this->streamFactory ??= Psr17FactoryDiscovery::findStreamFactory();
+        $requestFactory ??= Psr17FactoryDiscovery::findRequestFactory();
+        $streamFactory ??= Psr17FactoryDiscovery::findStreamFactory();
+
+        $this->requestFactory = $requestFactory;
+        $this->streamFactory = $streamFactory;
 
         $socket ??= new SocketClient($this->requestFactory, [
             'remote_socket' => 'unix:///var/run/docker.sock',
         ]);
 
-        $this->pluginFactory ??= new PluginClientFactory;
+        $pluginFactory ??= new PluginClientFactory();
 
-        $this->client = $this->pluginFactory->createClient($socket, [
+        $this->client = $pluginFactory->createClient($socket, [
             new ContentLengthPlugin(),
             new DecoderPlugin(),
         ]);
     }
 
-    public function get(string $path, array $params = [])
+    private function queryToString(array|RequestQuery $params = []): string
+    {
+        return build_http_query(
+            $params instanceof RequestQuery
+                ? $params->toArray()
+                : $params
+        );
+    }
+
+    public function get(string $path, array|RequestQuery $params = []): mixed
     {
         $request = $this->requestFactory->createRequest(
             'GET',
-            $this->baseUrl.$path.build_http_query($params)
+            $this->baseUrl . $path . $this->queryToString($params)
         );
 
         return $this->executeRequest($request);
     }
 
-    public function head(string $path)
+    public function head(string $path, array|RequestQuery $params = []): mixed
     {
         $request = $this->requestFactory->createRequest(
             'HEAD',
-            $this->baseUrl.$path
+            $this->baseUrl . $path
         );
 
         return $this->executeRequest($request);
     }
 
-    public function post(string $path, $body = null, array $params = [], string $contentType = null)
+    public function post(string $path, $body = null, array|RequestQuery $params = [], ?string $contentType = null): mixed
     {
         $this->contentType($contentType ?? static::JSON_CONTENT_TYPE);
 
         $request = $this->requestFactory->createRequest(
             'POST',
-            $this->baseUrl.$path.build_http_query($params)
+            $this->baseUrl . $path . $this->queryToString($params)
         )->withBody($this->applySentBodyParsing($body));
 
         return $this->executeRequest($request);
     }
 
-    public function put(string $path, $body = null, array $params = [], string $contentType = null)
+    public function put(string $path, $body = null, array|RequestQuery $params = [], ?string $contentType = null): mixed
     {
         $this->contentType($contentType ?? static::JSON_CONTENT_TYPE);
 
         $request = $this->requestFactory->createRequest(
             'PUT',
-            $this->baseUrl.$path.build_http_query($params)
+            $this->baseUrl . $path . $this->queryToString($params)
         )->withBody($this->applySentBodyParsing($body));
 
         return $this->executeRequest($request);
     }
 
-    public function patch(string $path, $body = null, array $params = [], string $contentType = null)
+    public function patch(string $path, $body = null, array|RequestQuery $params = [], ?string $contentType = null): mixed
     {
         $this->contentType($contentType ?? static::JSON_CONTENT_TYPE);
 
         $request = $this->requestFactory->createRequest(
             'PATCH',
-            $this->baseUrl.$path.build_http_query($params)
+            $this->baseUrl . $path . $this->queryToString($params)
         )->withBody($this->applySentBodyParsing($body));
 
         return $this->executeRequest($request);
     }
 
-    public function delete(string $path, array $params = [])
+    public function delete(string $path, array|RequestQuery $params = []): mixed
     {
         $request = $this->requestFactory->createRequest(
             'DELETE',
-            $this->baseUrl.$path.build_http_query($params)
+            $this->baseUrl . $path . $this->queryToString($params)
         );
 
         return $this->executeRequest($request);
@@ -134,7 +150,7 @@ public function usingHeader(string $header, string $value): static
         return $this;
     }
 
-    private function executeRequest(RequestInterface $request)
+    private function executeRequest(RequestInterface $request): mixed
     {
         foreach ($this->headers as $header => $value) {
             $request = $request->withAddedHeader($header, $value);

src/Client.php

@@ -54,7 +54,7 @@ public function __construct(
         StreamFactoryInterface $streamFactory = null
     ) {
         $this->apiClient = new ApiClient(
-            $url.'/'.static::DOCKER_API_VERSION,
+            $url . '/' . static::DOCKER_API_VERSION,
             $socketClient,
             $requestFactory,
             $streamFactory

src/Compose/Builder.php

@@ -31,14 +31,14 @@ protected function loadFromFile(): void
 
     public function toFile(string $filePath = null): void
     {
-        // 
+        //
     }
 
     public function toArray(): array
     {
         return [
             'version' => $this->version,
-            'services' => array_map(fn (Service $service) => $service->toArray(), $this->services),
+            'services' => array_map(fn(Service $service) => $service->toArray(), $this->services),
         ];
     }
 
@@ -49,7 +49,7 @@ public function toYaml(int $indentation = 2)
 
     public function newServiceBuilder(): ServiceBuilder
     {
-        return new ServiceBuilder;
+        return new ServiceBuilder();
     }
 
     public function addService(string $id, Service $service): self

src/Compose/Service.php

@@ -18,7 +18,7 @@ public function __construct(
         public array|null $ports = [],
         public array|null $labels = [],
     ) {
-        // 
+        //
     }
 
     public function toArray()
@@ -27,7 +27,7 @@ public function toArray()
             'name' => $this->name,
             'image' => $this->image,
             'build' => $this->build,
-            'ports' => array_map(fn (ServicePort $port) => $port->mode ? $port->toArray() : (string) $port, $this->ports),
+            'ports' => array_map(fn(ServicePort $port) => $port->mode ? $port->toArray() : (string) $port, $this->ports),
             'labels' => $this->labels,
         ]);
     }

src/Compose/ServiceBuilder.php

@@ -7,7 +7,7 @@ class ServiceBuilder
     public function __construct(
         protected ?Service $service = null
     ) {
-        $this->service ??= new Service;
+        $this->service ??= new Service();
     }
 
     public function fromArray(array $data): self

src/Compose/ServicePort.php

@@ -13,7 +13,7 @@ public function __construct(
         public string|null $protocol = null,
         public string|null $mode = null
     ) {
-        // 
+        //
     }
 
     public function getPublished(): int|string

src/Endpoints/Configs.php

@@ -8,28 +8,28 @@ class Configs extends Endpoint
 {
     protected const PATH = '/configs';
 
-    public function list()
+    public function list(): mixed
     {
         return $this->client->get(self::PATH);
     }
 
-    public function create()
+    public function create(): mixed
     {
-        return $this->client->post(self::PATH.'/create');
+        return $this->client->post(self::PATH . '/create');
     }
 
-    public function inspect(string $id)
+    public function inspect(string $id): mixed
     {
-        return $this->client->get(self::PATH."/{$id}");
+        return $this->client->get(self::PATH . "/{$id}");
     }
 
-    public function remove(string $id)
+    public function remove(string $id): mixed
     {
-        return $this->client->delete(self::PATH."/{$id}");
+        return $this->client->delete(self::PATH . "/{$id}");
     }
 
-    public function update(string $id)
+    public function update(string $id): mixed
     {
-        return $this->client->post(self::PATH."/{$id}/update");
+        return $this->client->post(self::PATH . "/{$id}/update");
     }
 }