Merge branch 'jamieburchell-opayo-urls'

judgej · judgej · commit 29b67bd4bef4 · 2023-11-04T12:01:18.000Z
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 composer.lock
 composer.phar
 phpunit.xml
+/.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -35,12 +35,14 @@
     },
     "require": {
         "php": "^7.3|^8",
-        "omnipay/common": "~3.0"
+        "omnipay/common": "~3.0",
+        "symfony/http-client": "^6.0"
     },
     "require-dev": {
         "omnipay/tests": "^4.1",
         "squizlabs/php_codesniffer": "^3",
-        "phpspec/prophecy-phpunit": "^2.0"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "http-interop/http-factory-guzzle": "^1.2"
     },
     "extra": {
         "branch-alias": {
@@ -51,5 +53,10 @@
         "test": "phpunit",
         "check-style": "phpcs -p --standard=PSR2 src/",
         "fix-style": "phpcbf -p --standard=PSR2 src/"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,16 +8,15 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          beStrictAboutTestsThatDoNotTestAnything="false">
     <testsuites>
         <testsuite name="Omnipay Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -58,8 +58,8 @@ abstract class AbstractRequest extends OmnipayAbstractRequest implements Constan
     /**
      * @var string Endpoint base URLs.
      */
-    protected $liveEndpoint = 'https://live.sagepay.com/gateway/service';
-    protected $testEndpoint = 'https://test.sagepay.com/gateway/service';
+    protected $liveEndpoint = 'https://live.opayo.eu.elavon.com/gateway/service';
+    protected $testEndpoint = 'https://sandbox.opayo.eu.elavon.com/gateway/service';
 
     /**
      * Convenience method to switch iframe mode on or off.
diff --git a/src/Message/Form/AuthorizeRequest.php b/src/Message/Form/AuthorizeRequest.php
@@ -201,7 +201,7 @@ public function generateCrypt(array $data)
 
         $query = [];
         foreach ($data as $name => $value) {
-            $query[] = $name . '=' . ($disableUtf8Decode ? $value : utf8_decode($value));
+            $query[] = $name . '=' . ($disableUtf8Decode ? $value : mb_convert_encoding($value, 'ISO-8859-1', 'UTF-8'));
         }
         $query = implode('&', $query);
 
diff --git a/src/Message/Form/Response.php b/src/Message/Form/Response.php
@@ -15,8 +15,8 @@ class Response extends AbstractResponse implements RedirectResponseInterface, Co
     /**
      * @var string Endpoint base URLs.
      */
-    protected $liveEndpoint = 'https://live.sagepay.com/gateway/service/vspform-register.vsp';
-    protected $testEndpoint = 'https://test.sagepay.com/gateway/service/vspform-register.vsp';
+    protected $liveEndpoint = 'https://live.opayo.eu.elavon.com/gateway/service/vspform-register.vsp';
+    protected $testEndpoint = 'https://sandbox.opayo.eu.elavon.com/gateway/service/vspform-register.vsp';
 
     /**
      * Always a redirect, so not yet successful.
diff --git a/src/Message/ServerAuthorizeRequest.php b/src/Message/ServerAuthorizeRequest.php
@@ -38,7 +38,7 @@ public function getData()
 
         // Set the profile only if it is LOW (for iframe use) or NORMAL (for full-page redirects)
 
-        $profile = strtoupper($this->getProfile());
+        $profile = strtoupper($this->getProfile() ?? '');
 
         if ($profile === static::PROFILE_NORMAL || $profile === static::PROFILE_LOW) {
             $data['Profile'] = $this->getProfile();
diff --git a/src/Message/ServerCompleteAuthorizeRequest.php b/src/Message/ServerCompleteAuthorizeRequest.php
@@ -65,7 +65,7 @@ public function getData()
     {
         // The two signatures to compare.
         $signature = $this->getSignature();
-        $VPSSignature = strtolower($this->httpRequest->request->get('VPSSignature'));
+        $VPSSignature = strtolower($this->httpRequest->request->get('VPSSignature') ?? '');
 
         if ($VPSSignature !== $signature) {
             throw new InvalidResponseException;
diff --git a/src/Traits/ServerNotifyTrait.php b/src/Traits/ServerNotifyTrait.php
@@ -18,7 +18,7 @@ trait ServerNotifyTrait
      */
     public function getSignature()
     {
-        return strtolower($this->getDataItem('VPSSignature'));
+        return strtolower($this->getDataItem('VPSSignature') ?? '');
     }
 
     /**
@@ -56,7 +56,7 @@ public function buildSignature()
             $this->getTransactionId(),
             $this->getStatus(),
             $this->getTxAuthNo(),
-            strtolower($this->getVendor()),
+            strtolower($this->getVendor() ?? ''),
             $this->getAVSCV2(),
             ($this->getTxType() === Response::TXTYPE_TOKEN ? $this->getToken() : ''),
             // As saved in the merchant application.
diff --git a/tests/DirectGatewayTest.php b/tests/DirectGatewayTest.php
@@ -6,6 +6,13 @@
 
 class DirectGatewayTest extends GatewayTestCase
 {
+    protected $purchaseOptions;
+    protected $captureOptions;
+    protected $repeatOptions;
+    protected $refundOptions;
+    protected $voidOptions;
+    protected $abortOptions;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -90,7 +97,7 @@ public function testAuthorize3dSecure()
         $this->assertTrue($response->isRedirect());
         $this->assertNull($response->getTransactionReference());
         $this->assertNull($response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/3DAuthPage.asp', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/3DAuthPage.asp', $response->getRedirectUrl());
 
         $redirectData = $response->getRedirectData();
         $this->assertSame('065379457749061954', $redirectData['MD']);
@@ -132,7 +139,7 @@ public function testPurchase3dSecure()
         $this->assertTrue($response->isRedirect());
         $this->assertNull($response->getTransactionReference());
         $this->assertNull($response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/3DAuthPage.asp', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/3DAuthPage.asp', $response->getRedirectUrl());
 
         $redirectData = $response->getRedirectData();
         $this->assertSame('065379457749061954', $redirectData['MD']);
diff --git a/tests/FormGatewayTest.php b/tests/FormGatewayTest.php
@@ -6,6 +6,10 @@
 
 class FormGatewayTest extends GatewayTestCase
 {
+    protected $purchaseOptions;
+    protected $captureOptions;
+    protected $completePurchaseOptions;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -73,7 +77,7 @@ public function testAuthorizeSuccess()
 
         // Live (non-test) endpoint.
         $this->assertSame(
-            'https://live.sagepay.com/gateway/service/vspform-register.vsp',
+            'https://live.opayo.eu.elavon.com/gateway/service/vspform-register.vsp',
             $response->getRedirectUrl()
         );
 
diff --git a/tests/Message/DirectCompleteAuthorizeRequestTest.php b/tests/Message/DirectCompleteAuthorizeRequestTest.php
@@ -7,6 +7,8 @@
 
 class DirectCompleteAuthorizeRequestTest extends TestCase
 {
+    protected $request;
+
     public function testDirectCompleteAuthorizeRequestSuccess()
     {
         parent::setUp();
diff --git a/tests/Message/ResponseTest.php b/tests/Message/ResponseTest.php
@@ -59,7 +59,7 @@ public function testDirectPurchase3dSecure()
         $this->assertTrue($response->isRedirect());
         $this->assertNull($response->getTransactionReference());
         $this->assertNull($response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/3DAuthPage.asp', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/3DAuthPage.asp', $response->getRedirectUrl());
 
         $redirectData = $response->getRedirectData();
         $this->assertSame('065379457749061954', $redirectData['MD']);
diff --git a/tests/Message/ServerAuthorizeRequestTest.php b/tests/Message/ServerAuthorizeRequestTest.php
@@ -6,6 +6,8 @@
 
 class ServerAuthorizeRequestTest extends TestCase
 {
+    protected $request;
+
     const SURCHARGE_XML = '<surcharges><surcharge><paymentType>VISA</paymentType><percentage>2.50</percentage></surcharge></surcharges>';
 
     public function setUp(): void
diff --git a/tests/Message/ServerAuthorizeResponseTest.php b/tests/Message/ServerAuthorizeResponseTest.php
@@ -23,7 +23,7 @@ public function testServerPurchaseSuccess()
         $this->assertTrue($response->isRedirect());
         $this->assertSame('{"SecurityKey":"IK776BWNHN","VPSTxId":"{1E7D9C70-DBE2-4726-88EA-D369810D801D}","VendorTxCode":"123456"}', $response->getTransactionReference());
         $this->assertSame('Server transaction registered successfully.', $response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
         $this->assertSame('GET', $response->getRedirectMethod());
         $this->assertSame([], $response->getRedirectData());
     }
diff --git a/tests/Message/ServerNotifyRequestTest.php b/tests/Message/ServerNotifyRequestTest.php
@@ -11,6 +11,8 @@
 
 class ServerNotifyRequestTest extends TestCase
 {
+    protected $request;
+
     public function testServerNotifyResponseSuccess()
     {
         parent::setUp();
diff --git a/tests/Message/ServerPurchaseRequestTest.php b/tests/Message/ServerPurchaseRequestTest.php
@@ -6,9 +6,10 @@
 
 class ServerPurchaseRequestTest extends TestCase
 {
-
     const SURCHARGE_XML = '<surcharges><surcharge><paymentType>VISA</paymentType><percentage>2.50</percentage></surcharge></surcharges>';
 
+    protected $request;
+
     public function testInitialize()
     {
         $this->request = new ServerPurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
diff --git a/tests/Message/ServerTokenRegistrationResponseTest.php b/tests/Message/ServerTokenRegistrationResponseTest.php
@@ -23,7 +23,7 @@ public function testTokenRegistrationSuccess()
         $this->assertTrue($response->isRedirect());
         $this->assertSame('{"SecurityKey":"IK776BWNHN","VPSTxId":"{1E7D9C70-DBE2-4726-88EA-D369810D801D}","VendorTxCode":"123456"}', $response->getTransactionReference());
         $this->assertSame('Server transaction registered successfully.', $response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
         $this->assertSame('GET', $response->getRedirectMethod());
         $this->assertSame([], $response->getRedirectData());
     }
diff --git a/tests/Message/SharedAbortRequestTest.php b/tests/Message/SharedAbortRequestTest.php
@@ -6,6 +6,8 @@
 
 class SharedAbortRequestTest extends TestCase
 {
+    protected $request;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -36,6 +38,6 @@ public function testGetEndpoint()
     {
         $url = $this->request->getEndpoint();
 
-        $this->assertSame('https://test.sagepay.com/gateway/service/abort.vsp', $url);
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/gateway/service/abort.vsp', $url);
     }
 }
diff --git a/tests/Message/SharedCaptureRequestTest.php b/tests/Message/SharedCaptureRequestTest.php
@@ -6,6 +6,8 @@
 
 class SharedCaptureRequestTest extends TestCase
 {
+    protected $request;
+
     public function setUp(): void
     {
         parent::setUp();
diff --git a/tests/Message/SharedRefundRequestTest.php b/tests/Message/SharedRefundRequestTest.php
@@ -6,6 +6,8 @@
 
 class SharedRefundRequestTest extends TestCase
 {
+    protected $request;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -36,6 +38,6 @@ public function testGetEndpoint()
     {
         $url = $this->request->getEndpoint();
 
-        $this->assertSame('https://test.sagepay.com/gateway/service/refund.vsp', $url);
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/gateway/service/refund.vsp', $url);
     }
 }
diff --git a/tests/Message/SharedVoidRequestTest.php b/tests/Message/SharedVoidRequestTest.php
@@ -6,6 +6,8 @@
 
 class SharedVoidRequestTest extends TestCase
 {
+    protected $request;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -39,6 +41,6 @@ public function testGetEndpoint()
     {
         $url = $this->request->getEndpoint();
 
-        $this->assertSame('https://test.sagepay.com/gateway/service/void.vsp', $url);
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/gateway/service/void.vsp', $url);
     }
 }
diff --git a/tests/Mock/DirectPurchase3dSecure.txt b/tests/Mock/DirectPurchase3dSecure.txt
@@ -12,5 +12,5 @@ VPSProtocol=3.00
 Status=3DAUTH
 3DSecureStatus=OK
 MD=065379457749061954
-ACSURL=https://test.sagepay.com/Simulator/3DAuthPage.asp
+ACSURL=https://sandbox.opayo.eu.elavon.com/Simulator/3DAuthPage.asp
 PAReq=BSkaFwYFFTYAGyFbAB0LFRYWBwsBZw0EGwECEX9YRGFWc08pJCVVKgAANS0KADoZCCAMBnIeOxcWRg0LERdOOTQRDFRdVHNYUgwTMBsBCxABJw4DJHE+ERgPCi8MVC0HIAROCAAfBUk4ER89DD0IWDkvMQ1VdFwoUFgwXVYvbHgvMkdBXXNbQGIjdl1ZUEc1XSwqAAgUUicYBDYcB3I2AjYjIzsn
diff --git a/tests/Mock/ServerPurchaseSuccess.txt b/tests/Mock/ServerPurchaseSuccess.txt
@@ -13,4 +13,4 @@ Status=OK
 StatusDetail=Server transaction registered successfully.
 VPSTxId={1E7D9C70-DBE2-4726-88EA-D369810D801D}
 SecurityKey=IK776BWNHN
-NextURL=https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}
+NextURL=https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}
diff --git a/tests/Mock/ServerPurchaseWithToken.txt b/tests/Mock/ServerPurchaseWithToken.txt
@@ -13,5 +13,5 @@ Status=OK
 StatusDetail=Server transaction registered successfully.
 VPSTxId={1E7D9C70-DBE2-4726-88EA-D369810D801D}
 SecurityKey=IK776BWNHN
-NextURL=https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}
+NextURL=https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}
 Token={ABCDEFGH-ABCD-ABCD-ABCD-ABCDEFGHIJKL}
diff --git a/tests/Mock/ServerTokenRegistrationSuccess.txt b/tests/Mock/ServerTokenRegistrationSuccess.txt
@@ -13,4 +13,4 @@ Status=OK
 StatusDetail=Server transaction registered successfully.
 VPSTxId={1E7D9C70-DBE2-4726-88EA-D369810D801D}
 SecurityKey=IK776BWNHN
-NextURL=https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}
+NextURL=https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}
diff --git a/tests/ServerGatewayTest.php b/tests/ServerGatewayTest.php
@@ -8,6 +8,14 @@ class ServerGatewayTest extends GatewayTestCase
 {
     protected $error_3082_text = '3082 : The Description value is too long.';
 
+    protected $purchaseOptions;
+    protected $captureOptions;
+    protected $completePurchaseOptions;
+    protected $voidOptions;
+    protected $abortOptions;
+    protected $refundOptions;
+    protected $repeatOptions;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -76,7 +84,7 @@ public function testAuthorizeSuccess()
         $this->assertTrue($response->isRedirect());
         $this->assertSame('{"SecurityKey":"IK776BWNHN","VPSTxId":"{1E7D9C70-DBE2-4726-88EA-D369810D801D}","VendorTxCode":"123"}', $response->getTransactionReference());
         $this->assertSame('Server transaction registered successfully.', $response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
     }
 
     public function testAuthorizeFailure()
@@ -145,7 +153,7 @@ public function testPurchaseSuccess()
         $this->assertTrue($response->isRedirect());
         $this->assertSame('{"SecurityKey":"IK776BWNHN","VPSTxId":"{1E7D9C70-DBE2-4726-88EA-D369810D801D}","VendorTxCode":"123"}', $response->getTransactionReference());
         $this->assertSame('Server transaction registered successfully.', $response->getMessage());
-        $this->assertSame('https://test.sagepay.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
+        $this->assertSame('https://sandbox.opayo.eu.elavon.com/Simulator/VSPServerPaymentPage.asp?TransactionID={1E7D9C70-DBE2-4726-88EA-D369810D801D}', $response->getRedirectUrl());
     }
 
     public function testPurchaseFailure()

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public function generateCrypt(array $data)`
`201`	`201`
`202`	`202`	`$query = [];`
`203`	`203`	`foreach ($data as $name => $value) {`
`204`		`- $query[] = $name . '=' . ($disableUtf8Decode ? $value : utf8_decode($value));`
	`204`	`+ $query[] = $name . '=' . ($disableUtf8Decode ? $value : mb_convert_encoding($value, 'ISO-8859-1', 'UTF-8'));`
`205`	`205`	`}`
`206`	`206`	`$query = implode('&', $query);`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getData()`
`65`	`65`	`{`
`66`	`66`	`// The two signatures to compare.`
`67`	`67`	`$signature = $this->getSignature();`
`68`		`- $VPSSignature = strtolower($this->httpRequest->request->get('VPSSignature'));`
	`68`	`+ $VPSSignature = strtolower($this->httpRequest->request->get('VPSSignature') ?? '');`
`69`	`69`
`70`	`70`	`if ($VPSSignature !== $signature) {`
`71`	`71`	`throw new InvalidResponseException;`