Merge pull request #22 from CyberSource/future

Release April 2019

Author: gnongsie

README.md

@@ -31,7 +31,7 @@ override the new secure-http default setting)*.
 {
   "require": {
   "php": ">=5.6",
-  "cybersource/rest-client-php": "0.0.4"
+  "cybersource/rest-client-php": "0.0.5"
   }
 }
 ```

docs/Model/ReportingV3ReportsGet200Response.md

@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**reports** | [**\CyberSource\Model\ReportingV3ReportsGet200ResponseReports[]**](ReportingV3ReportsGet200ResponseReports.md) |  | [optional] 
+**reportSearchResults** | [**\CyberSource\Model\ReportingV3ReportsGet200ResponseReportSearchResults[]**](ReportingV3ReportsGet200ResponseReportSearchResults.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

docs/Model/ReportingV3ReportsGet200ResponseReports.md renamed to docs/Model/ReportingV3ReportsGet200ResponseReportSearchResults.md

@@ -1,4 +1,4 @@
-# ReportingV3ReportsGet200ResponseReports
+# ReportingV3ReportsGet200ResponseReportSearchResults
 
 ## Properties
 Name | Type | Description | Notes

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){

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}})
     {

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

generator/cybersource-rest-spec.json

@@ -12264,7 +12264,7 @@
 							"title": "reportingV3ReportsGet200Response",
 							"type": "object",
 							"properties": {
-								"reports": {
+								"reportSearchResults": {
 									"type": "array",
 									"items": {
 										"type": "object",

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)
     {

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'T'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)
     {

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)
     {