fix code style

retailcrm · Oct 14, 2024 · 7db5256 · 7db5256
1 parent 8d0fc91
commit 7db5256
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## v3.6.12
-* Добавлена передача версий модуля, php и cms в get-запросах к CRM
+* Добавлена передача дополнительных параметров в GET запросах
 
 ## v3.6.11
 * Добавлены подсказки в настройках модуля

diff --git a/retailcrm/lib/api/RetailcrmHttpClient.php b/retailcrm/lib/api/RetailcrmHttpClient.php
@@ -43,7 +43,6 @@ class RetailcrmHttpClient
 
     protected $url;
     protected $defaultParameters;
-    protected $versionData;
 
     /**
      * Client constructor.
@@ -62,13 +61,7 @@ public function __construct($url, array $defaultParameters = [])
         }
 
         $this->url = $url;
-        $this->defaultParameters = $defaultParameters;   
-        $this->versionData = [
-            'php_version' => function_exists('phpversion') ? phpversion() : '',
-            'cms_source' => 'PrestaShop',
-            'module_version' => RetailCRM::VERSION,
-            'cms_version' => _PS_VERSION_
-        ];
+        $this->defaultParameters = $defaultParameters;
     }
 
     /**
@@ -113,11 +106,14 @@ public function makeRequest(
             );
         }
 
-        if (self::METHOD_GET === $method) {
-            $parameters = array_merge($this->defaultParameters, $parameters, $this->versionData);
-        } else {
-            $parameters = array_merge($this->defaultParameters, $parameters);
-        }
+        $parameters = self::METHOD_GET === $method
+            ? array_merge($this->defaultParameters, $parameters, [
+                'php_version' => function_exists('phpversion') ? phpversion() : '',
+                'cms_source' => 'PrestaShop',
+                'module_version' => RetailCRM::VERSION,
+                'cms_version' => _PS_VERSION_,
+            ])
+            : $parameters = array_merge($this->defaultParameters, $parameters);
 
         $url = $this->url . $path;