Fix name value pair encoding

Author: amacneil

src/Omnipay/Payflow/Message/AuthorizeRequest.php

@@ -91,11 +91,28 @@ public function getData()
 
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, $data)->send();
+        $httpResponse = $this->httpClient->post(
+            $this->getEndpoint(),
+            null,
+            $this->encodeData($data)
+        )->send();
 
         return $this->response = new Response($this, $httpResponse->getBody());
     }
 
+    /**
+     * Encode absurd name value pair format
+     */
+    public function encodeData(array $data)
+    {
+        $output = array();
+        foreach ($data as $key => $value) {
+            $output[] = $key.'['.strlen($value).']='.$value;
+        }
+
+        return implode('&', $output);
+    }
+
     protected function getEndpoint()
     {
         return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;

src/Omnipay/Payflow/Message/Response.php

@@ -19,7 +19,32 @@ public function __construct(RequestInterface $request, $data)
             throw new InvalidResponseException;
         }
 
-        parse_str($data, $this->data);
+        $this->data = $this->decodeData($data);
+    }
+
+    /**
+     * Decode absurd name value pair format
+     */
+    public function decodeData($data)
+    {
+        $output = array();
+        while (strlen($data) > 0) {
+            preg_match('/(\w+)(\[(\d+)\])?=/', $data, $matches);
+            $key = $matches[1];
+            $data = substr($data, strlen($matches[0]));
+
+            if (isset($matches[3])) {
+                $value = substr($data, 0, $matches[3]);
+            } else {
+                $next = strpos($data, '&');
+                $value = $next === false ? $data : substr($data, 0, $next);
+            }
+
+            $data = substr($data, strlen($value) + 1);
+            $output[$key] = $value;
+        }
+
+        return $output;
     }
 
     public function isSuccessful()

tests/Omnipay/Payflow/Message/AuthorizeRequestTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Omnipay\Payflow\Message;
+
+use Omnipay\Tests\TestCase;
+
+class AuthorizeRequestTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->request = new AuthorizeRequest($this->getHttpClient(), $this->getHttpRequest());
+        $this->request->initialize(
+            array(
+                'amount' => '12.00',
+                'currency' => 'USD',
+                'card' => $this->getValidCard(),
+            )
+        );
+    }
+
+    public function testEncodeData()
+    {
+        $data = array(
+            'foo' => 'bar',
+            'key' => 'value &= reference',
+        );
+
+        $expected = 'foo[3]=bar&key[18]=value &= reference';
+        $this->assertSame($expected, $this->request->encodeData($data));
+    }
+}

tests/Omnipay/Payflow/Message/ResponseTest.php

@@ -14,14 +14,44 @@ public function testConstructEmpty()
         $response = new Response($this->getMockRequest(), '');
     }
 
+    public function testDecodeData()
+    {
+        $response = new Response($this->getMockRequest(), 'x=y');
+        $data = 'BILLTOFIRSTNAME=Adrian&BILLTOLASTNAME[6]=&= Foo&TEST=Hi';
+
+        $expected = array(
+            'BILLTOFIRSTNAME' => 'Adrian',
+            'BILLTOLASTNAME' => '&= Foo',
+            'TEST' => 'Hi',
+        );
+
+        $this->assertSame($expected, $response->decodeData($data));
+    }
+
+    public function testDecodeDataSimple()
+    {
+        $response = new Response($this->getMockRequest(), 'x=y');
+        $data = 'foo=bar';
+        $expected = array('foo' => 'bar');
+        $this->assertSame($expected, $response->decodeData($data));
+    }
+
+    public function testDecodeDataEmpty()
+    {
+        $response = new Response($this->getMockRequest(), 'x=y');
+        $data = '';
+        $expected = array();
+        $this->assertSame($expected, $response->decodeData($data));
+    }
+
     public function testPurchaseSuccess()
     {
         $httpResponse = $this->getMockHttpResponse('PurchaseSuccess.txt');
         $response = new Response($this->getMockRequest(), $httpResponse->getBody());
 
         $this->assertTrue($response->isSuccessful());
         $this->assertFalse($response->isRedirect());
-        $this->assertEquals('V19R3EF62FBE', $response->getTransactionReference());
+        $this->assertEquals('A10A6AE7042E', $response->getTransactionReference());
         $this->assertEquals('Approved', $response->getMessage());
     }
 

tests/Omnipay/Payflow/Mock/PurchaseSuccess.txt

@@ -1,3 +1,8 @@
 HTTP/1.1 200 OK
+Connection: close
+Server: VPS-3.033.00
+Date: Tue, 11 Feb 2014 02:34:58 GMT
+Content-type: text/namevalue
+Content-length: 269
 
-RESULT=0&PNREF=V19R3EF62FBE&RESPMSG=Approved&AUTHCODE=048747&CVV2MATCH=Y
+RESULT=0&PNREF=A10A6AE7042E&RESPMSG=Approved&AUTHCODE=331PNI&AVSADDR=X&AVSZIP=X&CVV2MATCH=Y&HOSTCODE=A&PROCAVS=U&PROCCVV2=M&VISACARDLEVEL=12&TRANSTIME=2014-02-10 18:34:58&BILLTOFIRSTNAME=Adrian&BILLTOLASTNAME[5]=& Foo&AMT=362.45&ACCT=1111&EXPDATE=0316&CARDTYPE=0&IAVS=X

tests/Omnipay/Payflow/ProGatewayTest.php

@@ -33,7 +33,7 @@ public function testAuthorizeSuccess()
         $response = $this->gateway->authorize($this->options)->send();
 
         $this->assertTrue($response->isSuccessful());
-        $this->assertEquals('V19R3EF62FBE', $response->getTransactionReference());
+        $this->assertEquals('A10A6AE7042E', $response->getTransactionReference());
     }
 
     public function testAuthorizeError()
@@ -58,7 +58,7 @@ public function testCapture()
         $response = $this->gateway->capture($options)->send();
 
         $this->assertTrue($response->isSuccessful());
-        $this->assertEquals('V19R3EF62FBE', $response->getTransactionReference());
+        $this->assertEquals('A10A6AE7042E', $response->getTransactionReference());
     }
 
     public function testPurchaseSuccess()
@@ -68,7 +68,7 @@ public function testPurchaseSuccess()
         $response = $this->gateway->purchase($this->options)->send();
 
         $this->assertTrue($response->isSuccessful());
-        $this->assertEquals('V19R3EF62FBE', $response->getTransactionReference());
+        $this->assertEquals('A10A6AE7042E', $response->getTransactionReference());
     }
 
     public function testPurchaseError()
@@ -93,6 +93,6 @@ public function testRefund()
         $response = $this->gateway->refund($options)->send();
 
         $this->assertTrue($response->isSuccessful());
-        $this->assertEquals('V19R3EF62FBE', $response->getTransactionReference());
+        $this->assertEquals('A10A6AE7042E', $response->getTransactionReference());
     }
 }