Merge branch 'main' of github.com:Spoje-NET/php-csas-webapi

Author: Vitexus

debian/php-spojenet-csas-accountsapi.install

@@ -1,4 +1,4 @@
-lib/*.php		/usr/share/php/CSas/
-lib/Accounts/*.php	/usr/share/php/CSas/Accounts/
-lib/Model/*.php		/usr/share/php/CSas/Model/
-debian/composer.json    /usr/share/php/CSas/
+lib/*.php		/usr/share/php/CSasAccounts/
+lib/Accounts/*.php	/usr/share/php/CSasAccounts/Accounts/
+lib/Model/*.php		/usr/share/php/CSasAccounts/Model/
+debian/composer.json    /usr/share/php/CSasAccounts/

debian/rules

@@ -16,4 +16,4 @@
 
 override_dh_install:
 	dh_install
-	jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//'`'"'  debian/composer.json |sponge debian/php-spojenet-csas-accountsapi/usr/share/php/CSas/composer.json
+	jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//'`'"'  debian/composer.json |sponge debian/php-spojenet-csas-accountsapi/usr/share/php/CSasAccounts/composer.json

lib/Accounts/DefaultApi.php

@@ -73,6 +73,9 @@ class DefaultApi
             'application/json',
         ],
     ];
+    protected ClientInterface $client;
+    protected Configuration $config;
+    protected HeaderSelector $headerSelector;
 
     protected ClientInterface $client;
 

lib/ApiClient.php

@@ -37,7 +37,10 @@ class ApiClient extends \GuzzleHttp\Client
      * ClientID obtained from Developer Portal - when you registered your app with us.
      */
     protected string $apiKey;
+<<<<<<< HEAD
 
+=======
+>>>>>>> a993491f1bca20d2887d0d97ad7a7b4de7de8162
     protected string $token;
 
     /**
@@ -52,31 +55,54 @@ class ApiClient extends \GuzzleHttp\Client
      * $config['token'] - your access token
      * $config['sandbox'] = true to use //api/csas/public/sandbox/v3/* endpoints
      *
+<<<<<<< HEAD
      * @throws \Exception CSAS_ACCESS_TOKEN is not set
      * @throws \Exception CSAS_API_KEY is not set
+=======
+     * @throws \Exception ACCESS_TOKEN is not set
+     * @throws \Exception API_KEY is not set
+>>>>>>> a993491f1bca20d2887d0d97ad7a7b4de7de8162
      */
     public function __construct(array $config = [])
     {
         if (\array_key_exists('apikey', $config) === false) {
+<<<<<<< HEAD
             $this->apiKey = \Ease\Shared::cfg('CSAS_API_KEY');
+=======
+            $this->apiKey = \Ease\Shared::cfg('API_KEY');
+>>>>>>> a993491f1bca20d2887d0d97ad7a7b4de7de8162
         } else {
             $this->apiKey = $config['apikey'];
         }
 
         if (\array_key_exists('token', $config) === false) {
+<<<<<<< HEAD
             $this->token = \Ease\Shared::cfg('CSAS_API_TOKEN');
+=======
+            $this->token = \Ease\Shared::cfg('API_TOKEN');
+>>>>>>> a993491f1bca20d2887d0d97ad7a7b4de7de8162
         } else {
             $this->token = $config['token'];
         }
 
         if (\array_key_exists('debug', $config) === false) {
+<<<<<<< HEAD
             $config['debug'] = \Ease\Shared::cfg('CSAS_API_DEBUG', false);
         }
 
         if (\array_key_exists('sandbox', $config)) {
             $this->sandBoxMode = strtolower((string) $config['sandbox']) === 'true';
         } else {
             $this->token = strtolower((string) \Ease\Shared::cfg('CSAS_SANDBOX_MODE', 'false')) === 'true';
+=======
+            $config['debug'] = \Ease\Shared::cfg('API_DEBUG', false);
+        }
+
+        if (\array_key_exists('sandbox', $config)) {
+            $this->sandBoxMode = (bool) $config['sandbox'];
+        } else {
+            $this->token = (bool) \Ease\Shared::cfg('SANDBOX_MODE');
+>>>>>>> a993491f1bca20d2887d0d97ad7a7b4de7de8162
         }
 
         parent::__construct($config);

lib/Configuration.php

@@ -105,7 +105,10 @@ class Configuration
      * Debug file location (log to STDOUT by default).
      */
     protected string $tempFolderPath;
+<<<<<<< HEAD
 
+=======
+>>>>>>> a993491f1bca20d2887d0d97ad7a7b4de7de8162
     private static Configuration $defaultConfiguration;
 
     /**