Merge branch 'rahulrnitc-master' into Future

brianmc · brianmc · commit 58152270808c · 2015-10-28T22:30:58.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 php:
-    - 5.5
+    - 5.6
 
 before_script:
     - pecl install xmldiff
@@ -13,5 +13,4 @@ script:
 after_script:
     - wget https://scrutinizer-ci.com/ocular.phar
     - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    - cat tests/log
 
diff --git a/README.md b/README.md
@@ -1,14 +1,9 @@
 Authorize.Net PHP SDK
 ======================
 
-[![Build Status] (https://travis-ci.org/ramittal/sdk-php.png?branch=master)]
-(https://travis-ci.org/ramittal/sdk-php)
-[![Code Coverage](https://scrutinizer-ci.com/g/ramittal/sdk-php/badges/coverage.png?b=master)]
-(https://scrutinizer-ci.com/g/ramittal/sdk-php/?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ramittal/sdk-php/badges/quality-score.png?b=master)]
-(https://scrutinizer-ci.com/g/ramittal/sdk-php/?branch=master)
+[![Build Status] (https://travis-ci.org/AuthorizeNet/sdk-php.png?branch=master)]
+(https://travis-ci.org/AuthorizeNet/sdk-php)
 
-Convert XSD into PHP classes.
 
 ## License
 Proprietary, see the provided `license.md`.
@@ -322,3 +317,6 @@ Here's the PHP code :
   
 ?>
 ````
+### Visa Checkout Examples
+"Check out" the Visa Checkout samples at https://github.com/AuthorizeNet/sample-code-php/tree/master/VisaCheckout
+
diff --git a/autoload.php b/autoload.php
@@ -14,7 +14,5 @@
 
     if (isset($classMap[$className])) {
         include $classMap[$className];
-    } else {
-        echo 'Class not loaded: ' . $className;
     }
 });
diff --git a/doc/readme.md b/doc/readme.md
@@ -0,0 +1,3 @@
+# This documentation and the objects it documents have been deprecated
+
+See new sample code GitHub repository at https://github.com/AuthorizeNet/sample-code-php
diff --git a/lib/AuthorizeNetAIM.php b/lib/AuthorizeNetAIM.php
@@ -42,7 +42,7 @@
 class AuthorizeNetAIM extends AuthorizeNetRequest
 {
 
-    const LIVE_URL = 'https://secure.authorize.net/gateway/transact.dll';
+    const LIVE_URL = 'https://secure2.authorize.net/gateway/transact.dll';
     const SANDBOX_URL = 'https://test.authorize.net/gateway/transact.dll';
     
     /**
diff --git a/lib/AuthorizeNetARB.php b/lib/AuthorizeNetARB.php
@@ -16,7 +16,7 @@
  */
 class AuthorizeNetARB extends AuthorizeNetRequest
 {
-    const LIVE_URL = "https://api.authorize.net/xml/v1/request.api";
+    const LIVE_URL = "https://api2.authorize.net/xml/v1/request.api";
     const SANDBOX_URL = "https://apitest.authorize.net/xml/v1/request.api";
 
     private $_request_type;
diff --git a/lib/AuthorizeNetCIM.php b/lib/AuthorizeNetCIM.php
@@ -18,7 +18,7 @@
 class AuthorizeNetCIM extends AuthorizeNetRequest
 {
 
-    const LIVE_URL = "https://api.authorize.net/xml/v1/request.api";
+    const LIVE_URL = "https://api2.authorize.net/xml/v1/request.api";
     const SANDBOX_URL = "https://apitest.authorize.net/xml/v1/request.api";
 
     
diff --git a/lib/AuthorizeNetDPM.php b/lib/AuthorizeNetDPM.php
@@ -27,7 +27,7 @@
 class AuthorizeNetDPM extends AuthorizeNetSIM_Form
 {
 
-    const LIVE_URL = 'https://secure.authorize.net/gateway/transact.dll';
+    const LIVE_URL = 'https://secure2.authorize.net/gateway/transact.dll';
     const SANDBOX_URL = 'https://test.authorize.net/gateway/transact.dll';
 
     /**
diff --git a/lib/AuthorizeNetSOAP.php b/lib/AuthorizeNetSOAP.php
@@ -17,8 +17,8 @@
  */
 class AuthorizeNetSOAP extends SoapClient
 {
-    const WSDL_URL = "https://api.authorize.net/soap/v1/Service.asmx?WSDL";
-    const LIVE_URL = "https://api.authorize.net/soap/v1/Service.asmx";
+    const WSDL_URL = "https://api2.authorize.net/soap/v1/Service.asmx?WSDL";
+    const LIVE_URL = "https://api2.authorize.net/soap/v1/Service.asmx";
     const SANDBOX_URL = "https://apitest.authorize.net/soap/v1/Service.asmx";
     
     public $sandbox;
diff --git a/lib/AuthorizeNetTD.php b/lib/AuthorizeNetTD.php
@@ -17,7 +17,7 @@
 class AuthorizeNetTD extends AuthorizeNetRequest
 {
 
-    const LIVE_URL = "https://api.authorize.net/xml/v1/request.api";
+    const LIVE_URL = "https://api2.authorize.net/xml/v1/request.api";
     const SANDBOX_URL = "https://apitest.authorize.net/xml/v1/request.api";
     
     private $_xml;
diff --git a/lib/net/authorize/api/constants/ANetEnvironment.php b/lib/net/authorize/api/constants/ANetEnvironment.php
@@ -3,7 +3,7 @@
 
 class ANetEnvironment
 {
-    const CUSTOM = "http://ww730vsmbu114.visa.com";
+    const CUSTOM = "http://wwww.myendpoint.com";
     const SANDBOX = "https://apitest.authorize.net";
-    const PRODUCTION = "https://api.authorize.net";
+    const PRODUCTION = "https://api2.authorize.net";
 }
diff --git a/lib/ssl/cert.pem b/lib/ssl/cert.pem
diff --git a/scripts/generateObjectsFromXsd.sh b/scripts/generateObjectsFromXsd.sh
@@ -31,7 +31,7 @@ fi
 mkdir -p "$apidir"
 echo Make sure the ns-dest uses destination as: $apidir
 echo Generating PHP Classes >> $logfile
-vendor/goetas/xsd2php/bin/xsd2php.php  convert:php \
+vendor/goetas/xsd2php/bin/xsd2php  convert:php \
 	--ns-dest='net.authorize.api.contract.v1.;lib/net/authorize/api/contract/v1' \
 	--ns-map='http://www.w3.org/2001/XMLSchema;W3/XMLSchema/2001/' \
 	--ns-map='AnetApi/xml/v1/schema/AnetApiSchema.xsd;net.authorize.api.contract.v1' \
@@ -44,7 +44,7 @@ if [ -d "$jmsdir" ]; then
 fi
 mkdir -p "$jmsdir"
 echo Generating Serializers for Classes >> $logfile
-vendor/goetas/xsd2php/bin/xsd2php.php  convert:jms-yaml \
+vendor/goetas/xsd2php/bin/xsd2php  convert:jms-yaml \
 	--ns-dest='net.authorize.api.contract.v1.;lib/net/authorize/api/yml/v1' \
 	--ns-map='http://www.w3.org/2001/XMLSchema;W3/XMLSchema/2001/' \
 	--ns-map='AnetApi/xml/v1/schema/AnetApiSchema.xsd;net.authorize.api.contract.v1' \
diff --git a/scripts/masterUpdate.sh b/scripts/masterUpdate.sh
@@ -12,7 +12,8 @@ for cmd in $cmdlist ; do
         echo "Script $currdir/scripts/$cmd not found"
         exit 1
     fi
-    echo ***FIXME*** $currdir/scripts/$cmd
+    $currdir/scripts/$cmd
+    # echo ***FIXME*** $currdir/scripts/$cmd
     ERRORCODE=$?
     if [ $ERRORCODE -ne 0 ];then
         echo "########################################################################"
diff --git a/tests/AuthorizeNetARB_Test.php b/tests/AuthorizeNetARB_Test.php
@@ -81,8 +81,8 @@ public function testCreateSubscriptionLong()
         $subscription->bankAccountBankName = "";
         $subscription->orderInvoiceNumber = "";
         $subscription->orderDescription = "";
-        $subscription->customerId = "12";
-        $subscription->customerEmail = "foo@domain.com";
+        $subscription->customerId = rand(1, 1000000);
+        $subscription->customerEmail = rand(1, 1000000) . "foo@domain.com";
         $subscription->customerPhoneNumber = "";
         $subscription->customerFaxNumber = "";
         $subscription->billToFirstName = "john";
@@ -150,8 +150,8 @@ public function testCreateSubscriptionECheck()
         $subscription->bankAccountBankName = "Bank of Earth";
         $subscription->orderInvoiceNumber = "";
         $subscription->orderDescription = "";
-        $subscription->customerId = "12";
-        $subscription->customerEmail = "foo@domain.com";
+        $subscription->customerId = rand(1, 1000000);
+        $subscription->customerEmail = rand(1, 1000000) . "foo@domain.com";
         $subscription->customerPhoneNumber = "";
         $subscription->customerFaxNumber = "";
         $subscription->billToFirstName = "john";
diff --git a/tests/AuthorizeNetCIM_Test.php b/tests/AuthorizeNetCIM_Test.php
@@ -9,9 +9,11 @@ public function testDeleteAllCustomerProfiles()
     $response = $request->getCustomerProfileIds();
     $customers = $response->getCustomerProfileIds();
 
+    
     foreach ($customers as $customer) {
       $response = $request->deleteCustomerProfile($customer);
-      $this->assertTrue($response->isOk());
+      // Not all profiles can be deleted, they could be linked to subscriptions
+      //$this->assertTrue($response->isOk());
     }
 
 
@@ -372,6 +374,13 @@ public function testAll()
 
   public function testGetCustomerProfileIds()
   {
+    // A valid response should be received when a merchant has zero customer profiles...
+    // Hence, first testing using specific credentials for a merchant which has zero customer profiles...  
+    $request = new AuthorizeNetCIM('3qkNY3db6jB','7s8B76QvsPet82HH');
+    $response = $request->getCustomerProfileIds();
+    $this->assertTrue($response->isOk());
+    $this->assertTrue(empty($response->getCustomerProfileIds()));
+	  
     // Create new customer profile
     $request = new AuthorizeNetCIM;
     $customerProfile = new AuthorizeNetCustomer;
diff --git a/tests/AuthorizeNetSSL_Test.php b/tests/AuthorizeNetSSL_Test.php
@@ -15,10 +15,10 @@ public function testSandboxSSLCertIsValid()
     public function testLiveSSLCertIsValid()
     {
         $this->markTestSkipped('Ignoring for Travis. Will fix after release.'); //TODO
-        exec("echo | openssl s_client -connect secure.authorize.net:443 -showcerts -verify 10 -CAfile ../lib/ssl/cert.pem 2>&1", $output, $return_value);
+        exec("echo | openssl s_client -connect secure2.authorize.net:443 -showcerts -verify 10 -CAfile ../lib/ssl/cert.pem 2>&1", $output, $return_value);
         $this->assertEquals(0, $return_value);
         $this->assertTrue(in_array('Verify return code: 0 (ok)', array_map('trim', $output)));
-        exec("echo | openssl s_client -connect api.authorize.net:443 -showcerts -verify 10 -CAfile ../lib/ssl/cert.pem 2>&1", $output, $return_value);
+        exec("echo | openssl s_client -connect api2.authorize.net:443 -showcerts -verify 10 -CAfile ../lib/ssl/cert.pem 2>&1", $output, $return_value);
         $this->assertEquals(0, $return_value);
         $this->assertTrue(in_array('Verify return code: 0 (ok)', array_map('trim', $output)));
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,5 @@`
`14`	`14`
`15`	`15`	`if (isset($classMap[$className])) {`
`16`	`16`	`include $classMap[$className];`
`17`		`- } else {`
`18`		`- echo 'Class not loaded: ' . $className;`
`19`	`17`	`}`
`20`	`18`	`});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# This documentation and the objects it documents have been deprecated`
	`2`	`+`
	`3`	`+See new sample code GitHub repository at https://github.com/AuthorizeNet/sample-code-php`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`class AuthorizeNetAIM extends AuthorizeNetRequest`
`43`	`43`	`{`
`44`	`44`
`45`		`- const LIVE_URL = 'https://secure.authorize.net/gateway/transact.dll';`
	`45`	`+ const LIVE_URL = 'https://secure2.authorize.net/gateway/transact.dll';`
`46`	`46`	`const SANDBOX_URL = 'https://test.authorize.net/gateway/transact.dll';`
`47`	`47`
`48`	`48`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class AuthorizeNetARB extends AuthorizeNetRequest`
`18`	`18`	`{`
`19`		`- const LIVE_URL = "https://api.authorize.net/xml/v1/request.api";`
	`19`	`+ const LIVE_URL = "https://api2.authorize.net/xml/v1/request.api";`
`20`	`20`	`const SANDBOX_URL = "https://apitest.authorize.net/xml/v1/request.api";`
`21`	`21`
`22`	`22`	`private $_request_type;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class AuthorizeNetCIM extends AuthorizeNetRequest`
`19`	`19`	`{`
`20`	`20`
`21`		`- const LIVE_URL = "https://api.authorize.net/xml/v1/request.api";`
	`21`	`+ const LIVE_URL = "https://api2.authorize.net/xml/v1/request.api";`
`22`	`22`	`const SANDBOX_URL = "https://apitest.authorize.net/xml/v1/request.api";`
`23`	`23`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`class AuthorizeNetDPM extends AuthorizeNetSIM_Form`
`28`	`28`	`{`
`29`	`29`
`30`		`- const LIVE_URL = 'https://secure.authorize.net/gateway/transact.dll';`
	`30`	`+ const LIVE_URL = 'https://secure2.authorize.net/gateway/transact.dll';`
`31`	`31`	`const SANDBOX_URL = 'https://test.authorize.net/gateway/transact.dll';`
`32`	`32`
`33`	`33`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`class AuthorizeNetTD extends AuthorizeNetRequest`
`18`	`18`	`{`
`19`	`19`
`20`		`- const LIVE_URL = "https://api.authorize.net/xml/v1/request.api";`
	`20`	`+ const LIVE_URL = "https://api2.authorize.net/xml/v1/request.api";`
`21`	`21`	`const SANDBOX_URL = "https://apitest.authorize.net/xml/v1/request.api";`
`22`	`22`
`23`	`23`	`private $_xml;`