OctopusDeploy release: 11.0.3

globalpayments · Nov 9, 2023 · 517eeb5 · 517eeb5
1 parent 456db2f
commit 517eeb5
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 23 deletions.
diff --git a/metadata.xml b/metadata.xml
@@ -1,3 +1,3 @@
 <xml>
-  <releaseNumber>11.0.2</releaseNumber>
+  <releaseNumber>11.0.3</releaseNumber>
 </xml>
diff --git a/...tion/Gateways/Terminals/LogManagement.php → src/Utils/Logging/TerminalLogManagement.php b/...tion/Gateways/Terminals/LogManagement.php → src/Utils/Logging/TerminalLogManagement.php
@@ -1,17 +1,21 @@
 <?php
-namespace GlobalPayments\Api\Tests\Integration\Gateways\Terminals;
+namespace GlobalPayments\Api\Utils\Logging;
 
 use GlobalPayments\Api\Terminals\Abstractions\ILogManagement;
 use GlobalPayments\Api\Entities\Exceptions\ConfigurationException;
 
-class LogManagement implements ILogManagement
+class TerminalLogManagement implements ILogManagement
 {
 
     public string $logLocation;
 
-    public function __construct()
+    public function __construct(string $targetFile = null)
     {
-        $this->logLocation = 'logmanagement_'. date('Y-m-d') . '.log';
+        if (!empty($targetFile)) {
+            $this->logLocation = $targetFile;
+        } else {
+            $this->logLocation = 'logmanagement_'. date('Y-m-d') . '.log';
+        }
     }
 
     public function setLog($message, $backTrace = '')

diff --git a/test/Integration/Gateways/Terminals/DiamondCloud/DiamondCloudTests.php b/test/Integration/Gateways/Terminals/DiamondCloud/DiamondCloudTests.php
@@ -16,7 +16,7 @@
 use GlobalPayments\Api\Terminals\Enums\ConnectionModes;
 use GlobalPayments\Api\Terminals\Enums\DeviceType;
 use GlobalPayments\Api\Terminals\TerminalResponse;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
 use PHPUnit\Framework\TestCase;
 
@@ -43,7 +43,7 @@ protected function getConfig(): ConnectionConfig
         $config->deviceType = DeviceType::PAX_A920;
         $config->connectionMode = ConnectionModes::DIAMOND_CLOUD;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
         $config->timeout = 15;
         $config->isvID = '154F070E3E474AB98B00D73ED81AAA93';
         $config->secretKey = '8003672638';

diff --git a/test/Integration/Gateways/Terminals/PAX/PaxCreditTests.php b/test/Integration/Gateways/Terminals/PAX/PaxCreditTests.php
@@ -9,6 +9,9 @@
 use GlobalPayments\Api\Terminals\Enums\{ConnectionModes, DeviceType};
 use GlobalPayments\Api\Tests\Data\TestCards;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
+use GlobalPayments\Api\Utils\Logging\Logger;
+use GlobalPayments\Api\Utils\Logging\SampleRequestLogger;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
@@ -49,6 +52,7 @@ protected function getConfig()
         $config->connectionMode = ConnectionModes::TCP_IP;
         $config->timeout = 10;
         $config->requestIdProvider = new RequestIdProvider();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/PAX/PaxExceptionTests.php b/test/Integration/Gateways/Terminals/PAX/PaxExceptionTests.php
@@ -7,8 +7,8 @@
 use GlobalPayments\Api\Entities\Enums\PaymentMethodType;
 use GlobalPayments\Api\Terminals\Enums\{ConnectionModes, DeviceType};
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
 use GlobalPayments\Api\Terminals\Enums\CurrencyType;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
@@ -35,7 +35,7 @@ protected function getConfig()
         $config->connectionMode = ConnectionModes::TCP_IP;
         $config->timeout = 10;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/PAX/vrf/PaxVerificationTests.php b/test/Integration/Gateways/Terminals/PAX/vrf/PaxVerificationTests.php
@@ -11,12 +11,12 @@
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
 use GlobalPayments\Api\PaymentMethods\CreditCardData;
 use GlobalPayments\Api\Entities\Address;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
 use GlobalPayments\Api\Terminals\Enums\CurrencyType;
 use GlobalPayments\Api\Terminals\Enums\SafMode;
 use GlobalPayments\Api\Terminals\Enums\SafUpload;
 use GlobalPayments\Api\Entities\Enums\TaxType;
 use GlobalPayments\Api\Terminals\Enums\SafDelete;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 
 class PaxVerificationTests extends TestCase
 {
@@ -56,7 +56,7 @@ protected function getConfig()
         $this->config->connectionMode = ConnectionModes::TCP_IP;
         $this->config->timeout = 30;
         $this->config->requestIdProvider = new RequestIdProvider();
-        $this->config->logManagementProvider = new LogManagement();
+        $this->config->logManagementProvider = new TerminalLogManagement();
 
         return $this->config;
     }

diff --git a/test/Integration/Gateways/Terminals/UPA/UpaAdminTests.php b/test/Integration/Gateways/Terminals/UPA/UpaAdminTests.php
@@ -10,7 +10,7 @@
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
 use GlobalPayments\Api\Terminals\UPA\Entities\LineItem;
 use GlobalPayments\Api\Terminals\UPA\Entities\CancelParameters;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 
 class UpaAdminTests extends TestCase
 {
@@ -37,7 +37,7 @@ protected function getConfig() : ConnectionConfig
         $config->connectionMode = ConnectionModes::TCP_IP;
         $config->timeout = 10;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/UPA/UpaBatchTests.php b/test/Integration/Gateways/Terminals/UPA/UpaBatchTests.php
@@ -8,7 +8,7 @@
 use GlobalPayments\Api\Services\DeviceService;
 use PHPUnit\Framework\TestCase;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 
 class UpaBatchTests extends TestCase
 {
@@ -34,7 +34,7 @@ protected function getConfig()
         $config->connectionMode = ConnectionModes::TCP_IP;
         $config->timeout = 30;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/UPA/UpaCreditTests.php b/test/Integration/Gateways/Terminals/UPA/UpaCreditTests.php
@@ -9,9 +9,9 @@
 use GlobalPayments\Api\Terminals\TerminalResponse;
 use PHPUnit\Framework\TestCase;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
 use GlobalPayments\Api\Entities\AutoSubstantiation;
 use GlobalPayments\Api\Entities\Enums\StoredCredentialInitiator;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 
 class UpaCreditTests extends TestCase
 {
@@ -37,7 +37,7 @@ protected function getConfig()
         $config->connectionMode = ConnectionModes::TCP_IP;
         $config->timeout = 30;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/UPA/UpaEBTTests.php b/test/Integration/Gateways/Terminals/UPA/UpaEBTTests.php
@@ -8,7 +8,7 @@
 use GlobalPayments\Api\Services\DeviceService;
 use PHPUnit\Framework\TestCase;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 
 class UpaEBTTests extends TestCase
 {
@@ -34,7 +34,7 @@ protected function getConfig()
         $config->connectionMode = ConnectionModes::TCP_IP;
         $config->timeout = 30;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/UPA/UpaMicTests.php b/test/Integration/Gateways/Terminals/UPA/UpaMicTests.php
@@ -12,9 +12,9 @@
 use GlobalPayments\Api\Terminals\Enums\ConnectionModes;
 use GlobalPayments\Api\Terminals\Enums\DeviceType;
 use GlobalPayments\Api\Tests\Data\BaseGpApiTestConfig;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
 use GlobalPayments\Api\Utils\GenerationUtils;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 use PHPUnit\Framework\TestCase;
 
 class UpaMicTests extends TestCase
@@ -50,7 +50,7 @@ public function getConfig(): ConnectionConfig
         $gpApiConfig->accessTokenInfo = $accessTokenInfo;
         $config->gatewayConfig = $gpApiConfig;
         $config->requestIdProvider = new RequestIdProvider();
-        $config->logManagementProvider = new LogManagement();
+        $config->logManagementProvider = new TerminalLogManagement();
 
         return $config;
     }

diff --git a/test/Integration/Gateways/Terminals/UPA/vrf/UpaVerificationTests.php b/test/Integration/Gateways/Terminals/UPA/vrf/UpaVerificationTests.php
@@ -10,8 +10,8 @@
 use PHPUnit\Framework\TestCase;
 use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\RequestIdProvider;
 use GlobalPayments\Api\Entities\Enums\StoredCredentialInitiator;
-use GlobalPayments\Api\Tests\Integration\Gateways\Terminals\LogManagement;
 use GlobalPayments\Api\Entities\AutoSubstantiation;
+use GlobalPayments\Api\Utils\Logging\TerminalLogManagement;
 
 class UpaVerificationTests extends TestCase
 {
@@ -38,7 +38,7 @@ protected function getConfig()
         $this->config->connectionMode = ConnectionModes::TCP_IP;
         $this->config->timeout = 60;
         $this->config->requestIdProvider = new RequestIdProvider();
-        $this->config->logManagementProvider = new LogManagement();
+        $this->config->logManagementProvider = new TerminalLogManagement();
         $this->config->logManagementProvider->logLocation = 'upavrf.log';
 
         return $this->config;