Merge pull request #273 from AuthorizeNet/master

Sync future with master branch.

Author: Sunny Raj Rathod

.gitignore

@@ -4,6 +4,7 @@ vendor
 phpunit.xml
 tests/log
 build
+phplog
 
 # Ignore eclipse project files
 .buildpath

.travis.yml

@@ -1,23 +1,37 @@
 language: php
 
+sudo: false
+
+env:
+    - TEST_SUITE=samples
+    - TEST_SUITE=coverage
+
 php:
-    - 5.5
     - 5.6
     - 7.0
+    - 7.1
 
-sudo: false
+before_install:
+    # execute all of the commands which need to be executed 
+    # before installing dependencies
+    - composer validate # make sure that our composer.json file is valid for packaging
 
-before_script:
+install:
+    # install all of the dependencies we need here
     - pecl install xmldiff
-    - composer install --prefer-dist --ignore-platform-reqs
+    - composer install --prefer-dist
+
+before_script:
+    # execute all of the commands which need to be executed 
+    # before running actual tests
     - git submodule update --remote --recursive
 
 script:
-    - vendor/phpunit/phpunit/phpunit --coverage-clover=coverage.clover
-    - cd sample-code-php
-    - composer install --prefer-dist --ignore-platform-reqs
-    - vendor/phpunit/phpunit/phpunit test-runner.php .
+    # execute all of the tests or other commands to determine
+    # whether the build will pass or fail
+    - if [[ "$TEST_SUITE" == "coverage" ]]; then vendor/phpunit/phpunit/phpunit --coverage-clover=coverage.clover; fi
+    - if [[ "$TEST_SUITE" == "samples" ]]; then phpenv config-rm xdebug.ini; cd sample-code-php; composer install --prefer-dist; vendor/phpunit/phpunit/phpunit test-runner.php .; fi
 
 after_script:
-    - wget https://scrutinizer-ci.com/ocular.phar
-#    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+#    - if [[ "$TEST_SUITE" == "coverage" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+#    - if [[ "$TEST_SUITE" == "coverage" ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

LICENSE.txt

@@ -6,7 +6,7 @@
     "license": "proprietary",
     "homepage": "http://developer.authorize.net",
     "require": {
-        "php": ">=5.5",
+        "php": ">=5.6",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-simplexml": "*",

README.md

@@ -0,0 +1,3 @@
+# This documentation and the objects it documents have been deprecated
+
+For the README for this repository, see README.md in the root level of the repository. For examples of how to interact with the current Authorize.Net API, see our new sample code GitHub repository at https://github.com/AuthorizeNet/sample-code-php.

composer.json

@@ -1,7 +1,11 @@
 Old Usage Examples (Of Deprecated SDK Functionality)
 =======================================
 
-**PLEASE NOTE: These examples are for deprecated functionality. Refer to the [README](/README.md) in root folder of the SDK for the new examples.**
+# This documentation in this directoary and the objects it documents have been deprecated
+
+**For the README for this repository, see `[README.md]`(/README.md) in the root level of the repository. For examples of how to interact with the current Authorize.Net API, see our new sample code GitHub repository at https://github.com/AuthorizeNet/sample-code-php.**
+
+**What follows is the old README pertaining to this deprecated functionality:**
 
 ## Requirements
 

doc/README.md

@@ -7,5 +7,5 @@ class ANetEnvironment
     const SANDBOX = "https://apitest.authorize.net";
     const PRODUCTION = "https://api2.authorize.net";
 
-    const VERSION = "1.9.1";
+    const VERSION = "1.9.3";
 }

doc/readme.md

@@ -13,6 +13,16 @@ class GetCustomerProfileRequest extends ANetApiRequestType
      */
     private $customerProfileId = null;
 
+    /**
+     * @property string $merchantCustomerId
+     */
+    private $merchantCustomerId = null;
+
+    /**
+     * @property string $email
+     */
+    private $email = null;
+
     /**
      * @property boolean $unmaskExpirationDate
      */
@@ -36,7 +46,51 @@ public function getCustomerProfileId()
      */
     public function setCustomerProfileId($customerProfileId)
     {
-        $this->customerProfileId = $customerProfileId;
+        $this->customerProfileId = $customerProfileId;
+        return $this;
+    }
+
+    /**
+     * Gets as merchantCustomerId
+     *
+     * @return string
+     */
+    public function getMerchantCustomerId()
+    {
+        return $this->merchantCustomerId;
+    }
+
+    /**
+     * Sets a new merchantCustomerId
+     *
+     * @param string $merchantCustomerId
+     * @return self
+     */
+    public function setMerchantCustomerId($merchantCustomerId)
+    {
+        $this->merchantCustomerId = $merchantCustomerId;
+        return $this;
+    }
+
+    /**
+     * Gets as email
+     *
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+     * Sets a new email
+     *
+     * @param string $email
+     * @return self
+     */
+    public function setEmail($email)
+    {
+        $this->email = $email;
         return $this;
     }
 
@@ -58,7 +112,7 @@ public function getUnmaskExpirationDate()
      */
     public function setUnmaskExpirationDate($unmaskExpirationDate)
     {
-        $this->unmaskExpirationDate = $unmaskExpirationDate;
+        $this->unmaskExpirationDate = $unmaskExpirationDate;
         return $this;
     }