Fixing issues reported on Github

gnongsie · gnongsie · commit 81ccced7c723 · 2019-03-28T11:25:10.000+05:30
diff --git a/generator/cybersource-php-template/ApiClient.mustache b/generator/cybersource-php-template/ApiClient.mustache
@@ -58,13 +58,18 @@ class ApiClient
      *
      * @param Configuration $config config for this ApiClient
      */
-    public function __construct(\{{invokerPackage}}\Configuration $config = null)
+    public function __construct(\{{invokerPackage}}\Configuration $config = null, \{{invokerPackage}}\Authentication\Core\MerchantConfiguration $merchantConfig = null)
     {
         if ($config === null) {
             $config = Configuration::getDefaultConfiguration();
         }
+		
+		if ($merchantConfig === null) {
+			echo "Merchant Configuration cannot be null.";
+		}
 
         $this->config = $config;
+		$this->merchantConfig = $merchantConfig;
         $this->serializer = new ObjectSerializer();
     }
 
@@ -382,9 +387,7 @@ class ApiClient
     */
     public function callAuthenticationHeader($method, $postData, $resourcePath)
     {
-        require_once './Resources/ExternalConfiguration.php';
-        $ExternalConfigurationObj = new ExternalConfiguration();
-        $merchantConfig = $ExternalConfigurationObj->merchantConfigObject();
+        $merchantConfig = $this->merchantConfig;
         $authentication = new Authentication();
         $getToken = $authentication->generateToken($resourcePath, $postData, $method, $merchantConfig); 
         if($merchantConfig->getAuthenticationType()==GlobalParameter::HTTP_SIGNATURE){
diff --git a/generator/cybersource-php-template/api.mustache b/generator/cybersource-php-template/api.mustache
@@ -93,7 +93,7 @@ use \{{invokerPackage}}\ObjectSerializer;
      * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
 {{/allParams}}
      * @throws \{{invokerPackage}}\ApiException on non-2xx response
-     * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+     * @return array of {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}, HTTP status code, HTTP response headers (array of strings)
      */
     public function {{operationId}}({{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}'{{{.}}}'{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
     {
diff --git a/generator/cybersource-php-template/configuration.mustache b/generator/cybersource-php-template/configuration.mustache
@@ -85,7 +85,7 @@ class Configuration
      *
      * @var string
      */
-    protected $host = '{{{basePath}}}';
+    protected $host = '{{{host}}}';
 
     /**
      * Timeout (second) of the HTTP request, by default set to 0, no timeout
diff --git a/lib/Api/CaptureApi.php b/lib/Api/CaptureApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param \CyberSource\Model\CapturePaymentRequest $capturePaymentRequest  (required)
      * @param string $id The payment ID returned from a previous payment request. This ID links the capture to the payment. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\PtsV2PaymentsCapturesPost201Response
+     * @return array of \CyberSource\Model\PtsV2PaymentsCapturesPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function capturePayment($capturePaymentRequest, $id)
     {
diff --git a/lib/Api/ConversionDetailsApi.php b/lib/Api/ConversionDetailsApi.php
@@ -96,7 +96,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param \DateTime $endTime Valid report End Time in **ISO 8601 format** Please refer the following link to know more about ISO 8601 format. - https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14   **Example date format:**   - yyyy-MM-dd&#39;T&#39;HH:mm:ssXXX (required)
      * @param string $organizationId Valid Cybersource Organization Id (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3ConversionDetailsGet200Response
+     * @return array of \CyberSource\Model\ReportingV3ConversionDetailsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getConversionDetail($startTime, $endTime, $organizationId = null)
     {
diff --git a/lib/Api/CreditApi.php b/lib/Api/CreditApi.php
@@ -94,7 +94,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      *
      * @param \CyberSource\Model\CreateCreditRequest $createCreditRequest  (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\PtsV2CreditsPost201Response
+     * @return array of \CyberSource\Model\PtsV2CreditsPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function createCredit($createCreditRequest)
     {
diff --git a/lib/Api/FlexTokenApi.php b/lib/Api/FlexTokenApi.php
@@ -94,7 +94,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      *
      * @param \CyberSource\Model\TokenizeRequest $tokenizeRequest  (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\FlexV1TokensPost200Response
+     * @return array of \CyberSource\Model\FlexV1TokensPost200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tokenize($tokenizeRequest = null)
     {
diff --git a/lib/Api/InstrumentIdentifierApi.php b/lib/Api/InstrumentIdentifierApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param string $profileId The id of a profile containing user specific TMS configuration. (required)
      * @param string $tokenId The TokenId of an Instrument Identifier. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return void
+     * @return array of void, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1InstrumentidentifiersTokenIdDelete($profileId, $tokenId)
     {
@@ -221,7 +221,7 @@ public function tmsV1InstrumentidentifiersTokenIdDeleteWithHttpInfo($profileId,
      * @param string $profileId The id of a profile containing user specific TMS configuration. (required)
      * @param string $tokenId The TokenId of an Instrument Identifier. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1InstrumentidentifiersPost200Response
+     * @return array of \CyberSource\Model\TmsV1InstrumentidentifiersPost200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1InstrumentidentifiersTokenIdGet($profileId, $tokenId)
     {
@@ -352,7 +352,7 @@ public function tmsV1InstrumentidentifiersTokenIdGetWithHttpInfo($profileId, $to
      * @param string $tokenId The TokenId of an Instrument Identifier. (required)
      * @param \CyberSource\Model\Body1 $body Please specify the previous transaction Id to update. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1InstrumentidentifiersPost200Response
+     * @return array of \CyberSource\Model\TmsV1InstrumentidentifiersPost200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1InstrumentidentifiersTokenIdPatch($profileId, $tokenId, $body)
     {
diff --git a/lib/Api/InstrumentIdentifiersApi.php b/lib/Api/InstrumentIdentifiersApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param string $profileId The id of a profile containing user specific TMS configuration. (required)
      * @param \CyberSource\Model\Body $body Please specify either a Card or Bank Account. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1InstrumentidentifiersPost200Response
+     * @return array of \CyberSource\Model\TmsV1InstrumentidentifiersPost200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1InstrumentidentifiersPost($profileId, $body)
     {
diff --git a/lib/Api/KeyGenerationApi.php b/lib/Api/KeyGenerationApi.php
@@ -94,7 +94,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      *
      * @param \CyberSource\Model\GeneratePublicKeyRequest $generatePublicKeyRequest  (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\FlexV1KeysPost200Response
+     * @return array of \CyberSource\Model\FlexV1KeysPost200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function generatePublicKey($generatePublicKeyRequest = null)
     {
diff --git a/lib/Api/NetFundingsApi.php b/lib/Api/NetFundingsApi.php
@@ -97,7 +97,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param string $organizationId Valid Cybersource Organization Id (optional)
      * @param string $groupName Valid CyberSource Group Name. (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3NetFundingsGet200Response
+     * @return array of \CyberSource\Model\ReportingV3NetFundingsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getNetFundingInfo($startTime, $endTime, $organizationId = null, $groupName = null)
     {
diff --git a/lib/Api/NotificationOfChangesApi.php b/lib/Api/NotificationOfChangesApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param \DateTime $startTime Valid report Start Time in **ISO 8601 format** Please refer the following link to know more about ISO 8601 format. - https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14   **Example date format:**   - yyyy-MM-dd&#39;T&#39;HH:mm:ssXXX (required)
      * @param \DateTime $endTime Valid report End Time in **ISO 8601 format** Please refer the following link to know more about ISO 8601 format. - https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14   **Example date format:**   - yyyy-MM-dd&#39;T&#39;HH:mm:ssXXX (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3NotificationofChangesGet200Response
+     * @return array of \CyberSource\Model\ReportingV3NotificationofChangesGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getNotificationOfChangeReport($startTime, $endTime)
     {
diff --git a/lib/Api/PaymentInstrumentsApi.php b/lib/Api/PaymentInstrumentsApi.php
@@ -97,7 +97,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param string $offset Starting Payment Instrument record in zero-based dataset that should be returned as the first object in the array. Default is 0. (optional)
      * @param string $limit The maximum number of Payment Instruments that can be returned in the array starting from the offset record in zero-based dataset. Default is 20, maximum is 100. (optional, default to 20)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1InstrumentidentifiersPaymentinstrumentsGet200Response
+     * @return array of \CyberSource\Model\TmsV1InstrumentidentifiersPaymentinstrumentsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1InstrumentidentifiersTokenIdPaymentinstrumentsGet($profileId, $tokenId, $offset = null, $limit = '20')
     {
@@ -248,7 +248,7 @@ public function tmsV1InstrumentidentifiersTokenIdPaymentinstrumentsGetWithHttpIn
      * @param string $profileId The id of a profile containing user specific TMS configuration. (required)
      * @param \CyberSource\Model\Body2 $body Please specify the customers payment details for card or bank account. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1PaymentinstrumentsPost201Response
+     * @return array of \CyberSource\Model\TmsV1PaymentinstrumentsPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1PaymentinstrumentsPost($profileId, $body)
     {
@@ -360,7 +360,7 @@ public function tmsV1PaymentinstrumentsPostWithHttpInfo($profileId, $body)
      * @param string $profileId The id of a profile containing user specific TMS configuration. (required)
      * @param string $tokenId The TokenId of a Payment Instrument. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return void
+     * @return array of void, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1PaymentinstrumentsTokenIdDelete($profileId, $tokenId)
     {
@@ -482,7 +482,7 @@ public function tmsV1PaymentinstrumentsTokenIdDeleteWithHttpInfo($profileId, $to
      * @param string $profileId The id of a profile containing user specific TMS configuration. (required)
      * @param string $tokenId The TokenId of a Payment Instrument. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1PaymentinstrumentsGet200Response
+     * @return array of \CyberSource\Model\TmsV1PaymentinstrumentsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1PaymentinstrumentsTokenIdGet($profileId, $tokenId)
     {
@@ -613,7 +613,7 @@ public function tmsV1PaymentinstrumentsTokenIdGetWithHttpInfo($profileId, $token
      * @param string $tokenId The TokenId of a Payment Instrument. (required)
      * @param \CyberSource\Model\Body3 $body Please specify the customers payment details. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\TmsV1PaymentinstrumentsGet200Response
+     * @return array of \CyberSource\Model\TmsV1PaymentinstrumentsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function tmsV1PaymentinstrumentsTokenIdPatch($profileId, $tokenId, $body)
     {
diff --git a/lib/Api/PaymentsApi.php b/lib/Api/PaymentsApi.php
@@ -94,7 +94,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      *
      * @param \CyberSource\Model\CreatePaymentRequest $createPaymentRequest  (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\PtsV2PaymentsPost201Response
+     * @return array of \CyberSource\Model\PtsV2PaymentsPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function createPayment($createPaymentRequest)
     {
diff --git a/lib/Api/ProcessAPayoutApi.php b/lib/Api/ProcessAPayoutApi.php
@@ -94,7 +94,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      *
      * @param \CyberSource\Model\PtsV2PayoutsPostResponse $octCreatePaymentRequest  (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\PtsV2PayoutsPost201Response
+     * @return array of \CyberSource\Model\PtsV2PayoutsPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function octCreatePayment($octCreatePaymentRequest)
     {
diff --git a/lib/Api/PurchaseAndRefundDetailsApi.php b/lib/Api/PurchaseAndRefundDetailsApi.php
@@ -101,7 +101,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param int $offset Offset of the Purchase and Refund Results. (optional)
      * @param int $limit Results count per page. Range(1-2000) (optional, default to 2000)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3PurchaseRefundDetailsGet200Response
+     * @return array of \CyberSource\Model\ReportingV3PurchaseRefundDetailsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getPurchaseAndRefundDetails($startTime, $endTime, $organizationId = null, $paymentSubtype = 'ALL', $viewBy = 'requestDate', $groupName = null, $offset = null, $limit = '2000')
     {
diff --git a/lib/Api/RefundApi.php b/lib/Api/RefundApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param \CyberSource\Model\RefundCaptureRequest $refundCaptureRequest  (required)
      * @param string $id The capture ID. This ID is returned from a previous capture request. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\PtsV2PaymentsRefundPost201Response
+     * @return array of \CyberSource\Model\PtsV2PaymentsRefundPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function refundCapture($refundCaptureRequest, $id)
     {
@@ -196,7 +196,7 @@ public function refundCaptureWithHttpInfo($refundCaptureRequest, $id)
      * @param \CyberSource\Model\RefundPaymentRequest $refundPaymentRequest  (required)
      * @param string $id The payment ID. This ID is returned from a previous payment request. (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\PtsV2PaymentsRefundPost201Response
+     * @return array of \CyberSource\Model\PtsV2PaymentsRefundPost201Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function refundPayment($refundPaymentRequest, $id)
     {
diff --git a/lib/Api/ReportDefinitionsApi.php b/lib/Api/ReportDefinitionsApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param string $reportDefinitionName Name of the Report definition to retrieve (required)
      * @param string $organizationId Valid Cybersource Organization Id (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3ReportDefinitionsNameGet200Response
+     * @return array of \CyberSource\Model\ReportingV3ReportDefinitionsNameGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getResourceInfoByReportDefinition($reportDefinitionName, $organizationId = null)
     {
@@ -196,7 +196,7 @@ public function getResourceInfoByReportDefinitionWithHttpInfo($reportDefinitionN
      *
      * @param string $organizationId Valid Cybersource Organization Id (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3ReportDefinitionsGet200Response
+     * @return array of \CyberSource\Model\ReportingV3ReportDefinitionsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getResourceV2Info($organizationId = null)
     {
diff --git a/lib/Api/ReportDownloadsApi.php b/lib/Api/ReportDownloadsApi.php
@@ -96,7 +96,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param string $reportName Name of the report to download (required)
      * @param string $organizationId Valid Cybersource Organization Id (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return void
+     * @return array of void, HTTP status code, HTTP response headers (array of strings)
      */
     public function downloadReport($reportDate, $reportName, $organizationId = null)
     {
diff --git a/lib/Api/ReportSubscriptionsApi.php b/lib/Api/ReportSubscriptionsApi.php
@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)
      * @param \CyberSource\Model\RequestBody1 $requestBody Report subscription request payload (required)
      * @param string $organizationId Valid Cybersource Organization Id (optional)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return void
+     * @return array of void, HTTP status code, HTTP response headers (array of strings)
      */
     public function createSubscription($requestBody, $organizationId = null)
     {
@@ -189,7 +189,7 @@ public function createSubscriptionWithHttpInfo($requestBody, $organizationId = n
      *
      * @param string $reportName Name of the Report to Delete (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return void
+     * @return array of void, HTTP status code, HTTP response headers (array of strings)
      */
     public function deleteSubscription($reportName)
     {
@@ -284,7 +284,7 @@ public function deleteSubscriptionWithHttpInfo($reportName)
      * Get all subscriptions
      *
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3ReportSubscriptionsGet200Response
+     * @return array of \CyberSource\Model\ReportingV3ReportSubscriptionsGet200Response, HTTP status code, HTTP response headers (array of strings)
      */
     public function getAllSubscriptions()
     {
@@ -357,7 +357,7 @@ public function getAllSubscriptionsWithHttpInfo()
      *
      * @param string $reportName Name of the Report to Retrieve (required)
      * @throws \CyberSource\ApiException on non-2xx response
-     * @return \CyberSource\Model\ReportingV3ReportSubscriptionsGet200ResponseSubscriptions
+     * @return array of \CyberSource\Model\ReportingV3ReportSubscriptionsGet200ResponseSubscriptions, HTTP status code, HTTP response headers (array of strings)
      */
     public function getSubscription($reportName)
     {
diff --git a/lib/Api/ReportsApi.php b/lib/Api/ReportsApi.php
diff --git a/lib/Api/ReversalApi.php b/lib/Api/ReversalApi.php
diff --git a/lib/Api/SearchTransactionsApi.php b/lib/Api/SearchTransactionsApi.php
diff --git a/lib/Api/SecureFileShareApi.php b/lib/Api/SecureFileShareApi.php
diff --git a/lib/Api/TransactionBatchesApi.php b/lib/Api/TransactionBatchesApi.php
diff --git a/lib/Api/TransactionDetailsApi.php b/lib/Api/TransactionDetailsApi.php
diff --git a/lib/Api/UserManagementApi.php b/lib/Api/UserManagementApi.php
diff --git a/lib/Api/VoidApi.php b/lib/Api/VoidApi.php
diff --git a/lib/ApiClient.php b/lib/ApiClient.php
diff --git a/lib/Configuration.php b/lib/Configuration.php

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,18 @@ class ApiClient`
`58`	`58`	`*`
`59`	`59`	`* @param Configuration $config config for this ApiClient`
`60`	`60`	`*/`
`61`		`- public function __construct(\{{invokerPackage}}\Configuration $config = null)`
	`61`	`+ public function __construct(\{{invokerPackage}}\Configuration $config = null, \{{invokerPackage}}\Authentication\Core\MerchantConfiguration $merchantConfig = null)`
`62`	`62`	`{`
`63`	`63`	`if ($config === null) {`
`64`	`64`	`$config = Configuration::getDefaultConfiguration();`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ if ($merchantConfig === null) {`
	`68`	`+ echo "Merchant Configuration cannot be null.";`
	`69`	`+ }`
`66`	`70`
`67`	`71`	`$this->config = $config;`
	`72`	`+ $this->merchantConfig = $merchantConfig;`
`68`	`73`	`$this->serializer = new ObjectSerializer();`
`69`	`74`	`}`
`70`	`75`
`@@ -382,9 +387,7 @@ class ApiClient`
`382`	`387`	`*/`
`383`	`388`	`public function callAuthenticationHeader($method, $postData, $resourcePath)`
`384`	`389`	`{`
`385`		`- require_once './Resources/ExternalConfiguration.php';`
`386`		`- $ExternalConfigurationObj = new ExternalConfiguration();`
`387`		`- $merchantConfig = $ExternalConfigurationObj->merchantConfigObject();`
	`390`	`+ $merchantConfig = $this->merchantConfig;`
`388`	`391`	`$authentication = new Authentication();`
`389`	`392`	`$getToken = $authentication->generateToken($resourcePath, $postData, $method, $merchantConfig);`
`390`	`393`	`if($merchantConfig->getAuthenticationType()==GlobalParameter::HTTP_SIGNATURE){`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ use \{{invokerPackage}}\ObjectSerializer;`
`93`	`93`	`* @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}`
`94`	`94`	`{{/allParams}}`
`95`	`95`	`* @throws \{{invokerPackage}}\ApiException on non-2xx response`
`96`		`- * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}`
	`96`	`+ * @return array of {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}, HTTP status code, HTTP response headers (array of strings)`
`97`	`97`	`*/`
`98`	`98`	`public function {{operationId}}({{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}'{{{.}}}'{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class Configuration`
`85`	`85`	`*`
`86`	`86`	`* @var string`
`87`	`87`	`*/`
`88`		`- protected $host = '{{{basePath}}}';`
	`88`	`+ protected $host = '{{{host}}}';`
`89`	`89`
`90`	`90`	`/**`
`91`	`91`	`* Timeout (second) of the HTTP request, by default set to 0, no timeout`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)`
`95`	`95`	`* @param \CyberSource\Model\CapturePaymentRequest $capturePaymentRequest (required)`
`96`	`96`	`* @param string $id The payment ID returned from a previous payment request. This ID links the capture to the payment. (required)`
`97`	`97`	`* @throws \CyberSource\ApiException on non-2xx response`
`98`		`- * @return \CyberSource\Model\PtsV2PaymentsCapturesPost201Response`
	`98`	`+ * @return array of \CyberSource\Model\PtsV2PaymentsCapturesPost201Response, HTTP status code, HTTP response headers (array of strings)`
`99`	`99`	`*/`
`100`	`100`	`public function capturePayment($capturePaymentRequest, $id)`
`101`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)`
`96`	`96`	`* @param \DateTime $endTime Valid report End Time in ISO 8601 format Please refer the following link to know more about ISO 8601 format. - https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14 Example date format: - yyyy-MM-dd'T'HH:mm:ssXXX (required)`
`97`	`97`	`* @param string $organizationId Valid Cybersource Organization Id (optional)`
`98`	`98`	`* @throws \CyberSource\ApiException on non-2xx response`
`99`		`- * @return \CyberSource\Model\ReportingV3ConversionDetailsGet200Response`
	`99`	`+ * @return array of \CyberSource\Model\ReportingV3ConversionDetailsGet200Response, HTTP status code, HTTP response headers (array of strings)`
`100`	`100`	`*/`
`101`	`101`	`public function getConversionDetail($startTime, $endTime, $organizationId = null)`
`102`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function setApiClient(\CyberSource\ApiClient $apiClient)`
`94`	`94`	`*`
`95`	`95`	`* @param \CyberSource\Model\CreateCreditRequest $createCreditRequest (required)`
`96`	`96`	`* @throws \CyberSource\ApiException on non-2xx response`
`97`		`- * @return \CyberSource\Model\PtsV2CreditsPost201Response`
	`97`	`+ * @return array of \CyberSource\Model\PtsV2CreditsPost201Response, HTTP status code, HTTP response headers (array of strings)`
`98`	`98`	`*/`
`99`	`99`	`public function createCredit($createCreditRequest)`
`100`	`100`	`{`