Refactor and extend SDK functionality in AccessLog and Route classes

Added `if` property to `AccessLog` for dynamic access log conditions with corresponding accessor methods. Enhanced `Route` with `getRouteBlock` and `removeRouteBlock` methods for better configurability. Standardized composer requirements to PHP 8.4. Improved exception handling in `Unit` class, added support for empty configuration uploads in `CanUpload` trait, and resolved array handling in `Config`. Simplified API endpoint references using `ApiPathEnum` and addressed minor formatting issues across the SDK.

Author: Pavlusha311245

composer.json

@@ -28,7 +28,7 @@
     "lint": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --rules=@PSR12 ."
   },
   "require": {
-    "php": "^8.3|^8.4",
+    "php": "^8.4",
     "friendsofphp/php-cs-fixer": "^3.68",
     "guzzlehttp/guzzle": "^7.9",
     "nesbot/carbon": "^3.8",

src/Config.php

@@ -229,7 +229,7 @@ public function parseUpstreams(array $data): void
      */
     public function getListener(string $listener): ?Listener
     {
-        return $this->listeners[$listener] ?? null;
+        return array_find($this->listeners, fn (Listener $item) => $item->getListener() == $listener);
     }
 
     /**
@@ -549,8 +549,8 @@ public function setAccessLog($path, $format = null): bool
 
         try {
             $this->unitRequest->setMethod(HttpMethodsEnum::PUT)
-                ->send(ApiPathEnum::ACCESS_LOG, requestOptions: [
-                    'json' => json_encode($data)
+                ->send(ApiPathEnum::ACCESS_LOG->value, requestOptions: [
+                    'json' => $data
                 ]);
         } catch (UnitException) {
             return false;
@@ -571,7 +571,9 @@ public function getAccessLog(): ?AccessLog
 
             return new AccessLog($result);
         } catch (Throwable $exception) {
-            throw new UnitException($exception->getMessage(), $exception->getCode(), $exception);
+//            TODO: add for all 404 normal exception
+
+            return null;
         }
     }
 

src/Config/AccessLog.php

@@ -2,7 +2,6 @@
 
 namespace UnitPhpSdk\Config;
 
-use UnitPhpSdk\Builders\EndpointBuilder;
 use UnitPhpSdk\Contracts\Arrayable;
 use UnitPhpSdk\Contracts\Uploadable;
 use UnitPhpSdk\Enums\ApiPathEnum;
@@ -26,11 +25,25 @@ class AccessLog implements Uploadable, Arrayable
      */
     private string|array|null $format;
 
+    /**
+     * The access_log can be dynamically turned on and off by using the if option
+     *
+     * This feature lets users set conditions to determine whether access logs are recorded.
+     * The if option supports a string and JavaScript code.
+     * If its value is empty, 0, false, null, or undefined,
+     * the logs will not be recorded. And the ‘!’ as a prefix inverses the condition.
+     *
+     * @var string|mixed|null
+     */
+    private ?string $if;
+
     public function __construct(
         array $data
-    ) {
+    )
+    {
         $this->path = $data['path'] ?? null;
         $this->format = $data['format'] ?? null;
+        $this->if = $data['if'] ?? null;
 
         $this->setApiEndpoint(ApiPathEnum::ACCESS_LOG->value);
     }
@@ -52,9 +65,9 @@ public function setPath(string $path): void
     }
 
     /**
-     * @return string|null
+     * @return string|array|null
      */
-    public function getFormat(): ?string
+    public function getFormat(): string|array|null
     {
         return $this->format;
     }
@@ -73,8 +86,20 @@ public function setFormat(string $format): void
     #[\Override] public function toArray(): array
     {
         return [
+            'if' => $this->if,
             'path' => $this->path,
             'format' => $this->format,
         ];
     }
+
+    public function getIf(): ?string
+    {
+        return $this->if;
+    }
+
+    public function setIf(?string $if): void
+    {
+        $this->if = $if;
+    }
+
 }

src/Config/Route.php

@@ -77,6 +77,16 @@ public function setRouteBlocks(array $routeBlocks): void
         }
     }
 
+    public function getRouteBlock($index): RouteBlock
+    {
+        return $this->routeBlocks->offsetGet($index);
+    }
+
+    public function removeRouteBlock($index): void
+    {
+        $this->routeBlocks->offsetUnset($index);
+    }
+
     /**
      * @param RouteBlock $routeBlock
      * @return void

src/Http/UnitRequest.php

@@ -34,8 +34,9 @@ class UnitRequest
     public function __construct(
         string                   $address,
         private readonly ?string $socket = null,
-        private ?ClientInterface  $client = null
-    ) {
+        private ?ClientInterface $client = null
+    )
+    {
         $this->client = $client ?? new Client([
             'base_uri' => $address,
             'curl' => $this->socket ? [CURLOPT_UNIX_SOCKET_PATH => $this->socket] : []
@@ -89,6 +90,9 @@ public function send($uri, bool $associative = true, array $requestOptions = [])
         try {
             $response = $this->client->request($this->method, $this->address . $uri, $requestOptions);
         } catch (GuzzleException $e) {
+//            $responseBody = $e->hasResponse() ? $e->getResponse()->getBody()->getContents() : null;
+//            throw new UnitException($responseBody ? json_decode($responseBody)['error'] : '');
+
             throw new UnitException($e->getMessage());
         }
 

src/Traits/CanUpload.php

@@ -2,6 +2,11 @@
 
 namespace UnitPhpSdk\Traits;
 
+use UnitPhpSdk\Abstract\AbstractApplication;
+use UnitPhpSdk\Config\Listener;
+use UnitPhpSdk\Config\Route;
+use UnitPhpSdk\Config\Upstream;
+use UnitPhpSdk\Enums\ApiPathEnum;
 use UnitPhpSdk\Enums\HttpMethodsEnum;
 use UnitPhpSdk\Exceptions\UnitException;
 use UnitPhpSdk\Http\UnitRequest;
@@ -48,6 +53,12 @@ protected function removeEmptyArrays($array): array
     public function upload(UnitRequest $request)
     {
         $data = $this->removeEmptyArrays($this->toArray());
+        $configInstancesThatCanBeNotFound = [
+            Route::class => ApiPathEnum::ROUTES,
+            Listener::class => ApiPathEnum::LISTENERS,
+            AbstractApplication::class => ApiPathEnum::APPLICATIONS,
+            Upstream::class => ApiPathEnum::UPSTREAMS
+        ];
 
         try {
             $request->setMethod(HttpMethodsEnum::PUT)->send(
@@ -56,6 +67,22 @@ public function upload(UnitRequest $request)
                 ['json' => $data]
             );
         } catch (UnitException $e) {
+            foreach ($configInstancesThatCanBeNotFound as $configInstance => $path) {
+                if ($this instanceof $configInstance) {
+                    $request->setMethod(HttpMethodsEnum::PUT)->send(
+                        $path->value,
+                        true,
+                        ['json' => (object)[]]
+                    );
+
+                    $request->setMethod(HttpMethodsEnum::PUT)->send(
+                        $this->getApiEndpoint(),
+                        true,
+                        ['json' => $data]
+                    );
+                    return;
+                }
+            }
             throw new UnitException($e->getMessage());
         }
     }

src/Unit.php

@@ -5,6 +5,9 @@
 use UnitPhpSdk\Contracts\{CertificateInterface, UnitInterface, Uploadable};
 use Override;
 use UnitPhpSdk\Abstract\AbstractApplication;
+use UnitPhpSdk\Config\Listener;
+use UnitPhpSdk\Config\Route;
+use UnitPhpSdk\Config\Upstream;
 use UnitPhpSdk\Enums\ApiPathEnum;
 use UnitPhpSdk\Enums\HttpMethodsEnum;
 use UnitPhpSdk\Exceptions\FileNotFoundException;
@@ -60,7 +63,8 @@ class Unit implements UnitInterface
     public function __construct(
         private readonly string  $address,
         private readonly ?string $socket = null,
-    ) {
+    )
+    {
         $this->request = new UnitRequest(
             address: $this->address,
             socket: $this->socket
@@ -145,11 +149,15 @@ public function removeCertificate(string $certificateName): bool
             $this->request
                 ->setMethod(HttpMethodsEnum::DELETE)
                 ->send(ApiPathEnum::CERTIFICATE->getPath($certificateName));
-        } catch (UnitException) {
-            return false;
-        }
 
-        return true;
+            return true;
+        } catch (UnitException $exception) {
+            if ($exception->getCode() == 404) {
+                throw new UnitException('Certificate not found');
+            }
+
+            throw new UnitException($exception->getMessage());
+        }
     }
 
     /**
@@ -325,9 +333,9 @@ public function restartApplication(AbstractApplication $application): bool
     #[Override] public function toArray(): array
     {
         return [
-            'certificates' => array_map(fn ($certificate) => $certificate->toArray(), $this->getCertificates()),
+            'certificates' => array_map(fn($certificate) => $certificate->toArray(), $this->getCertificates()),
             'config' => $this->getConfig()->toArray(),
-            'js_modules' => array_map(fn ($module) => $module->toArray(), $this->getJsModules()),
+            'js_modules' => array_map(fn($module) => $module->toArray(), $this->getJsModules()),
             'status' => $this->getStatistics()->toArray()
         ];
     }