Merge pull request #463 from AuthorizeNet/future

Future
AuthorizeNet · Sep 18, 2024 · 8555cc2 · 8555cc2
2 parents e1acf55 + 2b27d10
commit 8555cc2
Show file tree

Hide file tree

Showing 14 changed files with 198 additions and 7 deletions.
diff --git a/.github/workflows/php-workflow.yml b/.github/workflows/php-workflow.yml
@@ -0,0 +1,78 @@
+name: Authorize.net PHP CI
+on:
+    push:
+    pull_request:
+    workflow_dispatch:
+env:
+    sdk_php: 'sdk-php'
+    sample_code_php: 'sample-code-php'
+jobs:
+    workflow-job:
+        defaults:
+            run:
+                shell: bash
+        strategy:
+            fail-fast: false
+            matrix:
+                operating-system: [ubuntu-latest, macos-latest, windows-latest]
+                php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        runs-on: ${{matrix.operating-system}}
+        env:
+            PHP_VERSION: ${{matrix.php-version}}
+        steps:
+            - name: Creating separate folders for SDK and Sample Codes
+              run: |
+                rm -rf $sdk_php
+                rm -rf $sample_code_php
+                mkdir $sdk_php $sample_code_php
+
+            - name: Checkout authorizenet/sdk-php
+              uses: actions/checkout@v4
+              with:
+                  path: ${{env.sdk_php}}
+
+            - name: Checkout authorizenet/sample-code-php
+              uses: actions/checkout@v4
+              with:
+                repository: 'authorizenet/sample-code-php'
+                ref: 'future' # Remove this line before pushing to master branch
+                path: ${{env.sample_code_php}}
+
+            - name: Setup PHP
+              id: php-setup
+              uses: shivammathur/setup-php@v2
+              with:
+                php-version: ${{matrix.php-version}}
+                extensions: mbstring, curl, openssl, zip
+
+            - name: Composer Validation
+              run: |
+                cd $sdk_php
+                composer validate
+
+                if [[ ${{env.PHP_VERSION}} == "5.6" || ${{env.PHP_VERSION}} == "7.0" ]]; then
+                    echo "PHPUNIT_VERSION=$(echo 5.6.* | cut -c 1-6)" >> "$GITHUB_ENV"
+                elif [[ ${{env.PHP_VERSION}} == "7.1" ]]; then
+                    echo "PHPUNIT_VERSION=$(echo 5.7.* | cut -c 1-6)" >> "$GITHUB_ENV"
+                elif [[ ${{env.PHP_VERSION}} == "7.2" ]]; then
+                    echo "PHPUNIT_VERSION=$(echo 8.5.* | cut -c 1-6)" >> "$GITHUB_ENV"
+                else
+                    echo "PHPUNIT_VERSION=$(echo 9.5.* | cut -c 1-6)" >> "$GITHUB_ENV"
+                fi
+
+            # Cannot use ${{env.PHPUNIT_VERSION}} in the same step where it is defined
+            # Refer: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#example-of-writing-an-environment-variable-to-github_env
+
+            - name: Composer Update
+              run: |
+                cd $sdk_php
+                composer require "phpunit/phpunit:${{env.PHPUNIT_VERSION}}" --no-update --dev
+                composer update --prefer-dist
+
+            - name: Unit Testing
+              run: |
+                cd $sdk_php
+                cp -R lib ../$sample_code_php/
+                cp -R vendor ../$sample_code_php/
+                cd ../$sample_code_php
+                vendor/phpunit/phpunit/phpunit TestRunner.php .
diff --git a/AnetApiSchema.xsd b/AnetApiSchema.xsd
@@ -1716,6 +1716,7 @@
           </xs:element>
           <xs:element name="defaultPaymentProfile" type="xs:boolean" minOccurs="0"/>
           <xs:element name="subsequentAuthInformation" type="anet:subsequentAuthInformation" minOccurs="0" maxOccurs="1"/>
+		  <xs:element name="excludeFromAccountUpdater" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -1757,6 +1758,7 @@
               </xs:restriction>
             </xs:simpleType>
           </xs:element>
+		  <xs:element name="excludeFromAccountUpdater" type="xs:boolean" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -4335,6 +4337,7 @@ Payment Profile Type.
           </xs:restriction>
         </xs:simpleType>
       </xs:element>
+	  <xs:element name="excludeFromAccountUpdater" type="xs:boolean" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="arrayOfCustomerPaymentProfileListItemType">

diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # Authorize.Net PHP SDK
 
-[![Travis CI Status](https://travis-ci.org/AuthorizeNet/sdk-php.svg?branch=master)](https://travis-ci.org/AuthorizeNet/sdk-php)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-php/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-php/?branch=master)
+[![Authorize.net PHP CI](https://github.com/AuthorizeNet/sdk-php/actions/workflows/php-workflow.yml/badge.svg?branch=master)](https://github.com/AuthorizeNet/sdk-php/actions/workflows/php-workflow.yml)
 [![Packagist Stable Version](https://poser.pugx.org/authorizenet/authorizenet/v/stable.svg)](https://packagist.org/packages/authorizenet/authorizenet)
 
 ## Requirements

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "authorizenet/authorizenet",
     "type": "library",
-	"version": "2.0.3",
+	"version": "2.0.4",
     "description": "Official PHP SDK for Authorize.Net",
     "keywords": ["authorizenet", "authorize.net", "payment", "ecommerce"],
     "license": "proprietary",

diff --git a/lib/net/authorize/api/contract/v1/CustomerPaymentProfileListItemType.php b/lib/net/authorize/api/contract/v1/CustomerPaymentProfileListItemType.php
@@ -46,6 +46,11 @@ class CustomerPaymentProfileListItemType implements \JsonSerializable
      */
     private $originalAuthAmount = null;
 
+    /**
+     * @property boolean $excludeFromAccountUpdater
+     */
+    private $excludeFromAccountUpdater = null;
+
     /**
      * Gets as defaultPaymentProfile
      *
@@ -200,6 +205,28 @@ public function setOriginalAuthAmount($originalAuthAmount)
         return $this;
     }
 
+    /**
+     * Gets as excludeFromAccountUpdater
+     *
+     * @return boolean
+     */
+    public function getExcludeFromAccountUpdater()
+    {
+        return $this->excludeFromAccountUpdater;
+    }
+
+    /**
+     * Sets a new excludeFromAccountUpdater
+     *
+     * @param boolean $excludeFromAccountUpdater
+     * @return self
+     */
+    public function setExcludeFromAccountUpdater($excludeFromAccountUpdater)
+    {
+        $this->excludeFromAccountUpdater = $excludeFromAccountUpdater;
+        return $this;
+    }
+
 
     // Json Serialize Code
     #[\ReturnTypeWillChange]

diff --git a/lib/net/authorize/api/contract/v1/CustomerPaymentProfileMaskedType.php b/lib/net/authorize/api/contract/v1/CustomerPaymentProfileMaskedType.php
@@ -57,6 +57,11 @@ class CustomerPaymentProfileMaskedType extends CustomerPaymentProfileBaseType im
      */
     private $originalAuthAmount = null;
 
+    /**
+     * @property boolean $excludeFromAccountUpdater
+     */
+    private $excludeFromAccountUpdater = null;
+
     /**
      * Gets as customerProfileId
      *
@@ -289,6 +294,28 @@ public function setOriginalAuthAmount($originalAuthAmount)
         return $this;
     }
 
+    /**
+     * Gets as excludeFromAccountUpdater
+     *
+     * @return boolean
+     */
+    public function getExcludeFromAccountUpdater()
+    {
+        return $this->excludeFromAccountUpdater;
+    }
+
+    /**
+     * Sets a new excludeFromAccountUpdater
+     *
+     * @param boolean $excludeFromAccountUpdater
+     * @return self
+     */
+    public function setExcludeFromAccountUpdater($excludeFromAccountUpdater)
+    {
+        $this->excludeFromAccountUpdater = $excludeFromAccountUpdater;
+        return $this;
+    }
+
 
     // Json Serialize Code
     #[\ReturnTypeWillChange]

diff --git a/lib/net/authorize/api/contract/v1/CustomerPaymentProfileType.php b/lib/net/authorize/api/contract/v1/CustomerPaymentProfileType.php
@@ -37,6 +37,11 @@ class CustomerPaymentProfileType extends CustomerPaymentProfileBaseType implemen
      */
     private $subsequentAuthInformation = null;
 
+    /**
+     * @property boolean $excludeFromAccountUpdater
+     */
+    private $excludeFromAccountUpdater = null;
+
     /**
      * Gets as payment
      *
@@ -148,6 +153,28 @@ public function setSubsequentAuthInformation(\net\authorize\api\contract\v1\Subs
         return $this;
     }
 
+    /**
+     * Gets as excludeFromAccountUpdater
+     *
+     * @return boolean
+     */
+    public function getExcludeFromAccountUpdater()
+    {
+        return $this->excludeFromAccountUpdater;
+    }
+
+    /**
+     * Sets a new excludeFromAccountUpdater
+     *
+     * @param boolean $excludeFromAccountUpdater
+     * @return self
+     */
+    public function setExcludeFromAccountUpdater($excludeFromAccountUpdater)
+    {
+        $this->excludeFromAccountUpdater = $excludeFromAccountUpdater;
+        return $this;
+    }
+
 
     // Json Serialize Code
     #[\ReturnTypeWillChange]

diff --git a/lib/net/authorize/api/controller/CreateCustomerProfileFromTransactionController.php b/lib/net/authorize/api/controller/CreateCustomerProfileFromTransactionController.php
@@ -8,7 +8,7 @@ class CreateCustomerProfileFromTransactionController extends ApiOperationBase
 {
     public function __construct(AnetApiRequestType $request)
     {
-        $responseType = 'net\authorize\api\contract\v1\CreateCustomerProfileFromTransactionResponse';
+        $responseType = 'net\authorize\api\contract\v1\CreateCustomerProfileResponse';
         parent::__construct($request, $responseType);
     }
 

diff --git a/lib/net/authorize/api/controller/GetTransactionListForCustomerController.php b/lib/net/authorize/api/controller/GetTransactionListForCustomerController.php
@@ -8,7 +8,7 @@ class GetTransactionListForCustomerController extends ApiOperationBase
 {
     public function __construct(AnetApiRequestType $request)
     {
-        $responseType = 'net\authorize\api\contract\v1\GetTransactionListForCustomerResponse';
+        $responseType = 'net\authorize\api\contract\v1\GetTransactionListResponse';
         parent::__construct($request, $responseType);
     }
 

diff --git a/lib/net/authorize/api/yml/v1/CustomerPaymentProfileListItemType.yml b/lib/net/authorize/api/yml/v1/CustomerPaymentProfileListItemType.yml
@@ -70,3 +70,13 @@ net\authorize\api\contract\v1\CustomerPaymentProfileListItemType:
                 getter: getOriginalAuthAmount
                 setter: setOriginalAuthAmount
             type: float
+        excludeFromAccountUpdater:
+            expose: true
+            access_type: public_method
+            serialized_name: excludeFromAccountUpdater
+            xml_element:
+                namespace: AnetApi/xml/v1/schema/AnetApiSchema.xsd
+            accessor:
+                getter: getExcludeFromAccountUpdater
+                setter: setExcludeFromAccountUpdater
+            type: boolean
diff --git a/lib/net/authorize/api/yml/v1/CustomerPaymentProfileMaskedType.yml b/lib/net/authorize/api/yml/v1/CustomerPaymentProfileMaskedType.yml
@@ -95,3 +95,13 @@ net\authorize\api\contract\v1\CustomerPaymentProfileMaskedType:
                 getter: getOriginalAuthAmount
                 setter: setOriginalAuthAmount
             type: float
+        excludeFromAccountUpdater:
+            expose: true
+            access_type: public_method
+            serialized_name: excludeFromAccountUpdater
+            xml_element:
+                namespace: AnetApi/xml/v1/schema/AnetApiSchema.xsd
+            accessor:
+                getter: getExcludeFromAccountUpdater
+                setter: setExcludeFromAccountUpdater
+            type: boolean
diff --git a/lib/net/authorize/api/yml/v1/CustomerPaymentProfileType.yml b/lib/net/authorize/api/yml/v1/CustomerPaymentProfileType.yml
@@ -50,3 +50,13 @@ net\authorize\api\contract\v1\CustomerPaymentProfileType:
                 getter: getSubsequentAuthInformation
                 setter: setSubsequentAuthInformation
             type: net\authorize\api\contract\v1\SubsequentAuthInformationType
+        excludeFromAccountUpdater:
+            expose: true
+            access_type: public_method
+            serialized_name: excludeFromAccountUpdater
+            xml_element:
+                namespace: AnetApi/xml/v1/schema/AnetApiSchema.xsd
+            accessor:
+                getter: getExcludeFromAccountUpdater
+                setter: setExcludeFromAccountUpdater
+            type: boolean
diff --git a/lib/net/authorize/util/Log.php b/lib/net/authorize/util/Log.php
@@ -160,7 +160,7 @@ private function checkPropertyAndMask($prop, $obj){
 
 			if(strcmp($prop->getName(),$sensitiveField->tagName)==0)
 			{
-				$prop->setValue($obj,preg_replace($inputPattern,$inputReplacement,$prop->getValue($obj)));
+				$prop->setValue($obj,preg_replace($inputPattern,$inputReplacement,$prop->getValue($obj) ? $prop->getValue($obj) : ""));
 				return $prop->getValue($obj);
 			}
 		}

diff --git a/lib/net/authorize/util/classes.json b/lib/net/authorize/util/classes.json