Remove constants

Author: Pavlusha311245

src/Abstract/ApplicationAbstract.php

@@ -5,9 +5,6 @@
 use Pavlusha311245\UnitPhpSdk\Config\Application\ProcessManagement\ApplicationProcess;
 use Pavlusha311245\UnitPhpSdk\Config\Application\ProcessManagement\ProcessIsolation;
 use Pavlusha311245\UnitPhpSdk\Config\Application\ProcessManagement\RequestLimit;
-use Pavlusha311245\UnitPhpSdk\Config\Listener;
-use Pavlusha311245\UnitPhpSdk\Enums\ApplicationTypeEnum;
-use Pavlusha311245\UnitPhpSdk\Enums\HttpMethodsEnum;
 use Pavlusha311245\UnitPhpSdk\Exceptions\UnitException;
 use Pavlusha311245\UnitPhpSdk\Interfaces\ApplicationControlInterface;
 use Pavlusha311245\UnitPhpSdk\Interfaces\ApplicationInterface;
@@ -18,11 +15,10 @@ abstract class ApplicationAbstract implements ApplicationInterface, ApplicationC
 {
     use HasListeners;
 
-    public const SOCKET = '/usr/local/var/run/unit/control.sock';
-    public const ADDRESS = 'http://localhost';
-
     private string $_type;
 
+    private UnitRequest $_unitRequest;
+
     /**
      * Environment variables to be passed to the app
      *
@@ -88,19 +84,30 @@ abstract class ApplicationAbstract implements ApplicationInterface, ApplicationC
      */
     private ?ProcessIsolation $_isolation = null;
 
+    /**
+     * @throws UnitException
+     */
     public function __construct(array $data = null)
     {
         if (!empty($data)) {
             $this->parseFromArray($data);
         }
     }
 
+    /**
+     * @param UnitRequest $unitRequest
+     */
+    public function setUnitRequest(UnitRequest $unitRequest): void
+    {
+        $this->_unitRequest = $unitRequest;
+    }
+
     public function getType(): string
     {
         return $this->_type;
     }
 
-    public function setType(string $type)
+    public function setType(string $type): void
     {
         $this->_type = $type;
     }
@@ -130,9 +137,12 @@ public function getEnvironment(): array
         return $this->_environment;
     }
 
+    /**
+     * @throws UnitException
+     */
     public function setEnvironment(array $environment): void
     {
-        foreach ($environment as $key => $value) {
+        foreach ($environment as $value) {
             if (!is_string($value)) {
                 throw new UnitException('Parse Exception');
             }
@@ -278,8 +288,7 @@ public function parseFromArray(array $data): void
     public function restartApplication(): bool
     {
         try {
-            $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-            $result = $request->send("/control/applications/{$this->getName()}/restart");
+            $this->_unitRequest->send("/control/applications/{$this->getName()}/restart");
         } catch (UnitException $exception) {
             return false;
         }

src/Config.php

@@ -16,9 +16,6 @@
  */
 class Config implements ConfigInterface
 {
-    public const SOCKET = '/usr/local/var/run/unit/control.sock';
-    public const ADDRESS = 'http://localhost';
-
     /**
      * Listeners accept requests
      *
@@ -53,7 +50,7 @@ class Config implements ConfigInterface
      *
      * @throws UnitException
      */
-    public function __construct(array $data)
+    public function __construct(array $data, private UnitRequest $_unitRequest)
     {
         if (array_key_exists('routes', $data)) {
             foreach ($data['routes'] as $routeName => $routeData) {
@@ -68,8 +65,8 @@ public function __construct(array $data)
                     'php' => new Application\PhpApplication($appData),
                     'external' => new Application\NodeJsApplication($appData),
                 };
-
                 $this->_applications[$appName]->setName($appName);
+                $this->_applications[$appName]->setUnitRequest($_unitRequest);
             }
         }
 
@@ -126,11 +123,10 @@ public function getListenerByPort(int $port): Listener|null
      */
     public function removeListener(Listener $listener): bool
     {
-        $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-        $request->setMethod(HttpMethodsEnum::DELETE->value);
+        $this->_unitRequest->setMethod(HttpMethodsEnum::DELETE->value);
 
         $listenerId = $listener->getListener();
-        $request->send("/config/listeners/{$listenerId}");
+        $this->_unitRequest->send("/config/listeners/{$listenerId}");
 
         return true;
     }
@@ -169,11 +165,10 @@ public function getApplication($applicationName): ApplicationAbstract
      */
     public function removeApplication(ApplicationAbstract $application): bool
     {
-        $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-        $request->setMethod(HttpMethodsEnum::DELETE->value);
+        $this->_unitRequest->setMethod(HttpMethodsEnum::DELETE->value);
 
         $applicationName = $application->getName();
-        print_r($request->send("/config/applications/{$applicationName}"));
+        $this->_unitRequest->send("/config/applications/{$applicationName}");
 
         return true;
     }
@@ -213,9 +208,8 @@ public function removeRoutes(): bool
         }
 
         try {
-            $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-            $request->setMethod(HttpMethodsEnum::DELETE->value);
-            $request->send('/config/routes');
+            $this->_unitRequest->setMethod(HttpMethodsEnum::DELETE->value);
+            $this->_unitRequest->send('/config/routes');
         } catch (UnitException $exception) {
             return false;
         }
@@ -250,10 +244,9 @@ public function setAccessLog($path, $format = null): bool
         }
 
         try {
-            $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-            $request->setMethod(HttpMethodsEnum::PUT->value);
-            $request->setData(json_encode($data));
-            $request->send('/config/access_log');
+            $this->_unitRequest->setMethod(HttpMethodsEnum::PUT->value);
+            $this->_unitRequest->setData(json_encode($data));
+            $this->_unitRequest->send('/config/access_log');
         } catch (UnitException $exception) {
             return false;
         }
@@ -263,8 +256,7 @@ public function setAccessLog($path, $format = null): bool
 
     public function getAccessLog(): ?AccessLog
     {
-        $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-        $result = $request->send('/config/access_log');
+        $result = $this->_unitRequest->send('/config/access_log');
 
         // TODO: need null
         return new AccessLog($result);
@@ -273,9 +265,8 @@ public function getAccessLog(): ?AccessLog
     public function removeAccessLog(): bool
     {
         try {
-            $request = new UnitRequest(self::SOCKET, self::ADDRESS);
-            $request->setMethod(HttpMethodsEnum::DELETE->value);
-            $request->send('/config/access_log');
+            $this->_unitRequest->setMethod(HttpMethodsEnum::DELETE->value);
+            $this->_unitRequest->send('/config/access_log');
         } catch (UnitException $exception) {
             return false;
         }

src/Unit.php

@@ -50,7 +50,7 @@ private function loadConfig(): void
     {
         $request = new UnitRequest($this->socket, $this->address);
         $result = $request->send('/config');
-        $this->_config = new Config($result);
+        $this->_config = new Config($result, new UnitRequest($this->socket, $this->address));
     }
 
     /**

src/UnitRequest.php

@@ -73,7 +73,19 @@ public function send($uri)
             throw new UnitException('Error:' . curl_error($curlHandler));
         }
         curl_close($curlHandler);
+        $this->clean();
 
         return json_decode($result, true);
     }
+
+    /**
+     * Clear data after request
+     *
+     * @return void
+     */
+    private function clean(): void
+    {
+        $this->_method = 'GET';
+        $this->_data = null;
+    }
 }