Merge pull request #39 from thephpleague/issue38

Issue38
thephpleague · Jun 16, 2016 · 439bb6e · 439bb6e
2 parents bd9523c + 45c85fc
commit 439bb6e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Message/AIMAuthorizeRequest.php b/src/Message/AIMAuthorizeRequest.php
@@ -17,8 +17,8 @@ public function getData()
         $data = $this->getBaseData();
         $data->transactionRequest->amount = $this->getAmount();
         $this->addPayment($data);
-        $this->addCustomerIP($data);
         $this->addBillingData($data);
+        $this->addCustomerIP($data);
         $this->addTransactionSettings($data);
 
         return $data;

diff --git a/src/Message/AIMResponse.php b/src/Message/AIMResponse.php
@@ -24,7 +24,7 @@ public function __construct(AbstractRequest $request, $data)
         $xml = preg_replace('/<createTransactionResponse[^>]+>/', '<createTransactionResponse>', (string)$data);
 
         try {
-            $xml = simplexml_load_string($xml);
+            $xml = simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOWARNING);
         } catch (\Exception $e) {
             throw new InvalidResponseException();
         }

diff --git a/tests/Message/AIMAuthorizeRequestTest.php b/tests/Message/AIMAuthorizeRequestTest.php
@@ -31,6 +31,23 @@ public function testGetData()
         $this->assertEquals('10.0.0.1', $data->transactionRequest->customerIP);
         $this->assertEquals('cust-id', $data->transactionRequest->customer->id);
 
+        // Issue #38 Make sure the transactionRequest properties are correctly ordered.
+        // This feels messy, but works.
+        $transactionRequestProperties = array_keys(get_object_vars($data->transactionRequest));
+        // The names of the properies of the $data->transactionRequest object, in the order in
+        // which they must be defined for Authorize.Net to accept the transaction.
+        $keys = array(
+            "transactionType",
+            "amount",
+            "payment",
+            "customer",
+            "billTo",
+            "shipTo",
+            "customerIP",
+            "transactionSettings"
+        );
+        $this->assertEquals($keys, $transactionRequestProperties);
+
         $setting = $data->transactionRequest->transactionSettings->setting[0];
         $this->assertEquals('testRequest', $setting->settingName);
         $this->assertEquals('false', $setting->settingValue);