Merge pull request #312 from khaaldrogo/master

Fix incorrect regex

Author: anuragg29

lib/AuthorizeNetAIM.php

@@ -269,7 +269,7 @@ public function addLineItem($item_id, $item_name, $item_description, $item_quant
         $line_item = "";
         $delimiter = "";
         foreach (func_get_args() as $key => $value) {
-            $line_item .= $delimiter . preg_replace('/|/', '_', $value);
+            $line_item .= $delimiter . preg_replace('/\|/', '_', $value);
             $delimiter = "<|>";
         }
         $this->_additional_line_items[] = $line_item;

tests/AuthorizeNetAIM_Test.php

@@ -780,6 +780,58 @@ public function testSetBadField()
         }
     }
 
+    /**
+     * Reproduces a bug introduced in
+     * https://github.com/AuthorizeNet/sdk-php/commit/272c21d904dcac0c8147a5bbddd68578b4dee9b1
+     */
+    public function testEscapeLineItem_doesNotMangleItems()
+    {
+        $qty = 1;
+        $unitPrice = 19.99;
+        $taxable = 'N';
+        $sale = new AuthorizeNetAIM;
+        $sale->setSandbox(true);
+        $sale->addLineItem(
+            'the-item-id',
+            'the item name',
+            'the item description',
+            $qty,
+            $unitPrice,
+            $taxable);
+
+        $cardNum = '4111111111111111';
+        $sale->authorizeOnly($qty * $unitPrice, $cardNum);
+        $postString = $sale->getPostString();
+
+        $this->assertContains('the-item-id', $postString);
+        $this->assertContains('the+item+name', $postString);
+    }
+
+    /**
+     * Reproduces a bug introduced in
+     * https://github.com/AuthorizeNet/sdk-php/commit/272c21d904dcac0c8147a5bbddd68578b4dee9b1
+     */
+    public function testEscapeLineItem_escapesPipeCharacterCorrectly()
+    {
+        $qty = 1;
+        $unitPrice = 19.99;
+        $taxable = 'N';
+        $sale = new AuthorizeNetAIM;
+        $sale->setSandbox(true);
+        $sale->addLineItem(
+            'the-item-id',
+            'the item name',
+            'the item description has a | pipe character',
+            $qty,
+            $unitPrice,
+            $taxable);
+
+        $cardNum = '4111111111111111';
+        $sale->authorizeOnly($qty * $unitPrice, $cardNum);
+        $postString = $sale->getPostString();
+
+        $this->assertContains('description+has+a+_+pipe', $postString);
+    }
 }
 
 

tests/AuthorizeNetARB_Test.php

@@ -65,13 +65,13 @@ public function testCreateSubscriptionLong()
         $subscription->name = "test subscription";
         $subscription->intervalLength = "1";
         $subscription->intervalUnit = "months";
-        $subscription->startDate = "2018-03-12";
+        $subscription->startDate = (date("Y") + 1)."-03-12";
         $subscription->totalOccurrences = "14";
         $subscription->trialOccurrences = "";
         $subscription->amount = "6.99";
         $subscription->trialAmount = "";
         $subscription->creditCardCardNumber = "6011000000000012";
-        $subscription->creditCardExpirationDate = "2018-10";
+        $subscription->creditCardExpirationDate = (date("Y") + 2)."-10";
         $subscription->creditCardCardCode = "123";
         $subscription->bankAccountAccountType = "";
         $subscription->bankAccountRoutingNumber = "";

tests/AuthorizeNetCIM_Test.php

@@ -353,14 +353,14 @@ public function testAll()
     $paymentProfile = new AuthorizeNetPaymentProfile;
     $paymentProfile->customerType = "individual";
     $paymentProfile->payment->creditCard->cardNumber = "4111111111111111";
-    $paymentProfile->payment->creditCard->expirationDate = "2019-10";
+    $paymentProfile->payment->creditCard->expirationDate = (date("Y") + 5) ."-10";
     $response = $request->createCustomerPaymentProfile($customerProfileId, $paymentProfile);
     $this->assertTrue($response->isOk());
     $paymentProfileId = $response->getPaymentProfileId();
 
     // Update payment profile.
     $paymentProfile->payment->creditCard->cardNumber = "4111111111111111";
-    $paymentProfile->payment->creditCard->expirationDate = "2019-11";
+    $paymentProfile->payment->creditCard->expirationDate = (date("Y") + 7) ."-11";
     $response = $request->updateCustomerPaymentProfile($customerProfileId,$paymentProfileId, $paymentProfile);
     $this->assertTrue($response->isOk());