fixes

Author: StereoFlo

src/Func/AbstractFunc.php

@@ -2,6 +2,8 @@
 
 namespace IspApi\Func;
 
+use function array_merge;
+
 /**
  * Class AbstractFunc
  * @package IspApi\Func
@@ -16,17 +18,17 @@ abstract class AbstractFunc implements FuncInterface
     /**
      * @var string
      */
-    protected $func = '';
+    protected $func;
 
     /**
      * @var string
      */
-    protected $elid = '';
+    protected $elid;
 
     /**
      * @var string
      */
-    protected $plid = '';
+    protected $plid;
 
     /**
      * @var array
@@ -38,7 +40,7 @@ abstract class AbstractFunc implements FuncInterface
      * @param string $elid
      * @param string $plid
      */
-    public function __construct(string $elid = '', string $plid = '')
+    public function __construct(string $elid = null, string $plid = null)
     {
         if ($elid) {
             $this->elid = $elid;
@@ -58,38 +60,38 @@ public function setAdditional(array $additional): self
             $this->additional = $additional;
             return $this;
         }
-        $this->additional = \array_merge($this->additional, $additional);
+        $this->additional = array_merge($this->additional, $additional);
         return $this;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    final public function getFunc(): string
+    final public function getFunc(): ?string
     {
         return $this->func;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    final public function getElid(): string
+    final public function getElid(): ?string
     {
         return $this->elid;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    final public function getPlid(): string
+    final public function getPlid(): ?string
     {
         return $this->plid;
     }
 
     /**
      * @return bool
      */
-    final public function isSaveAction(): bool
+    final public function getIsSaveAction(): bool
     {
         return $this->isSaveAction;
     }

src/Func/FuncInterface.php

@@ -11,21 +11,21 @@ interface FuncInterface
     /**
      * @return string
      */
-    public function getFunc(): string ;
+    public function getFunc(): ?string ;
     /**
      * @return string
      */
-    public function getElid(): string ;
+    public function getElid(): ?string ;
 
     /**
      * @return string
      */
-    public function getPlid(): string ;
+    public function getPlid(): ?string ;
 
     /**
      * @return bool
      */
-    public function isSaveAction(): bool ;
+    public function getIsSaveAction(): bool ;
 
     /**
      * @return array

src/HttpClient/HttpClientParams.php

@@ -39,7 +39,7 @@ class HttpClientParams
      * @param array       $header
      * @param null|array  $content
      */
-    public function __construct(string $url, string $method = self::HTTP_METHOD_GET, array $header, ?array $content)
+    public function __construct(string $url, string $method = self::HTTP_METHOD_GET, array $header, ?array $content = null)
     {
         $this->url     = $url;
         $this->method  = $method;

src/IspManager.php

@@ -2,6 +2,8 @@
 
 namespace IspApi;
 
+use Exception;
+use function http_build_query;
 use IspApi\Format\FormatInterface;
 use IspApi\Func\FuncInterface;
 use IspApi\HttpClient\HttpClientInterface;
@@ -15,6 +17,8 @@
  */
 class ispManager
 {
+    const DEFAULT_HEADER = ["Content-type: application/x-www-form-urlencoded\r\n"];
+
     /**
      * @var ServerInterface
      */
@@ -128,14 +132,26 @@ public function setData(array $data): self
 
     /**
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function execute()
     {
         $data = $this->httpClient->setParams($this->getHttpClientParams())->get();
         return $this->format->setData($data)->getOut();
     }
 
+    /**
+     * @return HttpClientParams
+     */
+    public function getHttpClientParams(): HttpClientParams
+    {
+        $this->buildUrl();
+        $method = $this->func->getIsSaveAction() ? HttpClientParams::HTTP_METHOD_POST : HttpClientParams::HTTP_METHOD_GET;
+
+        $header = self::DEFAULT_HEADER;
+        return new HttpClientParams($this->url, $method, $header);
+    }
+
     /**
      * @return self
      */
@@ -147,7 +163,7 @@ private function buildUrl(): self
         $this->prepareUrlFormat();
         $this->prepareUrlFunc();
         $this->prepareUrlAdditional();
-        $this->url .= \http_build_query($this->urlParts->toArray());
+        $this->url .= http_build_query($this->urlParts->toArray());
         return $this;
     }
 
@@ -207,17 +223,4 @@ private function prepareUrlFunc(): self
         }
         return $this;
     }
-
-    /**
-     * @return HttpClientParams
-     */
-    public function getHttpClientParams(): HttpClientParams
-    {
-        $this->buildUrl();
-        $method = $this->func->isSaveAction() ? HttpClientParams::HTTP_METHOD_POST : HttpClientParams::HTTP_METHOD_GET;
-        $content = null; //todo: Доделать...
-
-        $header = ["Content-type: application/x-www-form-urlencoded\r\n"];
-        return new HttpClientParams($this->url, $method, $header, $content);
-    }
 }