Update CurlRequest.php

evas-php · Aug 29, 2021 · 637386d · 637386d
1 parent 3aca224
commit 637386d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/CurlRequest.php b/src/CurlRequest.php
@@ -53,12 +53,9 @@ public function prepareSend(): CurlRequest
         $ch = $this->getCh();
         $method = $this->getMethod();
         $uri = $this->getUri();
-        
+
         // добавляем данные запроса
-        if ('GET' === $method) {
-            $body = $this->getQuery();
-            $uri .= static::prepareDataToUriQuery($body);
-        } else {
+        if ('GET' !== $method) {
             $type = $this->getHeader('Content-Type');
             if (false !== strpos($type, 'application/json')) {
                 $this->withBodyJson($this->getBody());
@@ -80,7 +77,9 @@ public function prepareSend(): CurlRequest
             $this->withHeader('Cookie', implode(';', $cookies));
         }
         $headers = $this->getHeadersLines();
+
         // устанавливаем url и заголовки
+        $uri .= static::prepareDataToUriQuery($this->getQuery());
         curl_setopt($ch, CURLOPT_URL, $uri);
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);