Merge branch 'master' of github.com:thephpleague/omnipay-sagepay into protocol3

Conflicts:
	src/DirectGateway.php

Author: judgej

src/DirectGateway.php

@@ -21,6 +21,7 @@ public function getDefaultParameters()
         return array(
             'vendor' => '',
             'testMode' => false,
+            'referrerId' => '',
         );
     }
 
@@ -46,6 +47,15 @@ public function getHttpClient()
     }
 
     // Available services.
+    public function getReferrerId()
+    {
+        return $this->getParameter('referrerId');
+    }
+
+    public function setReferrerId($value)
+    {
+        return $this->setParameter('referrerId', $value);
+    }
 
     public function authorize(array $parameters = array())
     {

src/Message/AbstractRequest.php

@@ -46,6 +46,19 @@ public function setAccountType($value)
         return $this->setParameter('accountType', $value);
     }
 
+    public function getReferrerId()
+    {
+        return $this->getParameter('referrerId');
+    }
+
+    /**
+     * Set the referrer ID for PAYMENT, DEFERRED and AUTHENTICATE transactions.
+     */
+    public function setReferrerId($value)
+    {
+        return $this->setParameter('referrerId', $value);
+    }
+
     public function getApplyAVSCV2()
     {
         return $this->getParameter('applyAVSCV2');

src/Message/DirectAuthorizeRequest.php

@@ -27,6 +27,10 @@ protected function getBaseAuthorizeData()
         $data['ApplyAVSCV2'] = $this->getApplyAVSCV2() ?: 0;
         $data['Apply3DSecure'] = $this->getApply3DSecure() ?: 0;
 
+        if ($this->getReferrerId()) {
+            $data['ReferrerID'] = $this->getReferrerId();
+        }
+
         // billing details
         $data['BillingFirstnames'] = $card->getBillingFirstName();
         $data['BillingSurname'] = $card->getBillingLastName();

tests/Message/DirectAuthorizeRequestTest.php

@@ -37,6 +37,7 @@ public function testGetData()
         $this->request->setApply3DSecure(3);
         $this->request->setDescription('food');
         $this->request->setClientIp('127.0.0.1');
+        $this->request->setReferrerId('3F7A4119-8671-464F-A091-9E59EB47B80C');
 
         $data = $this->request->getData();
 
@@ -48,6 +49,17 @@ public function testGetData()
         $this->assertSame('127.0.0.1', $data['ClientIPAddress']);
         $this->assertSame(2, $data['ApplyAVSCV2']);
         $this->assertSame(3, $data['Apply3DSecure']);
+        $this->assertSame('3F7A4119-8671-464F-A091-9E59EB47B80C', $data['ReferrerID']);
+    }
+
+    public function testGetDataNoReferrerId()
+    {
+        // Default value is equivalent to this:
+        $this->request->setReferrerId('');
+
+        $data = $this->request->getData();
+
+        $this->assertArrayNotHasKey('ReferrerID', $data);
     }
 
     public function testGetDataCustomerDetails()