Add PHP 8.0 support

.github/workflows/run-tests.yml

@@ -0,0 +1,43 @@
+name: Unit Tests
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - "*"
+  schedule:
+  - cron: '0 0 * * *'
+
+jobs:
+  php-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      COMPOSER_NO_INTERACTION: 1
+
+    strategy:
+      matrix:
+        php: [8.0, 7.4, 7.3, 7.2]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        coverage: none
+        tools: composer:v2
+
+    - name: Install dependencies
+      run: |
+        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
+
+    - name: Execute Unit Tests
+      run: composer test

composer.json

@@ -34,12 +34,13 @@
         }
     },
     "require": {
-        "php": "^5.6|^7",
+        "php": "^7.2|^8",
         "omnipay/common": "~3.0"
     },
     "require-dev": {
-        "omnipay/tests": "~3.0",
-        "squizlabs/php_codesniffer": "^3"
+        "omnipay/tests": "^4.1",
+        "squizlabs/php_codesniffer": "^3",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "extra": {
         "branch-alias": {

tests/DirectGatewayTest.php

@@ -6,7 +6,7 @@
 
 class DirectGatewayTest extends GatewayTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/FormGatewayTest.php

@@ -6,7 +6,7 @@
 
 class FormGatewayTest extends GatewayTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -107,10 +107,10 @@ public function testPurchaseSuccess()
      * supplied, which largely amount to missing parameters.
      *
      * @dataProvider missingParameterProvider
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
      */
     public function testAuthorizeFailure($missingParameter)
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
         $parameters = $this->purchaseOptions;
 
         unset($parameters[$missingParameter]);
@@ -180,37 +180,33 @@ public function testCompleteAuthorizeSuccess()
 
     /**
      * Invalid without any query parameter supplied.
-     * @expectedException Omnipay\Common\Exception\InvalidResponseException
      */
     public function testCompleteAuthorizeInvalid()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
         $response = $this->gateway->completeAuthorize($this->completePurchaseOptions)->send();
     }
 
     /**
      * Invalid without any query parameter supplied.
-     * @expectedException Omnipay\Common\Exception\InvalidResponseException
      */
     public function testCompletePurchaseInvalid1()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
         $response = $this->gateway->completePurchase($this->completePurchaseOptions)->send();
     }
 
-    /**
-     * @expectedException Omnipay\Common\Exception\InvalidResponseException
-     */
     public function testCompletePurchaseInvalid2()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
         // No leading '@'.
         $this->getHttpRequest()->initialize(['crypt' => 'ababab']);
         $response = $this->gateway->completePurchase($this->completePurchaseOptions)->send();
     }
 
-    /**
-     * @expectedException Omnipay\Common\Exception\InvalidResponseException
-     */
     public function testCompletePurchaseInvalid3()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
         // Not hexadecimal.
         $this->getHttpRequest()->initialize(['crypt' => '@ababxx']);
         $response = $this->gateway->completePurchase($this->completePurchaseOptions)->send();
@@ -275,11 +271,10 @@ public function testCompletePurchaseSuccess()
 
     /**
      * The wrong transaction ID is supplied with the server request.
-     *
-     * @expectedException Omnipay\Common\Exception\InvalidResponseException
      */
     public function testCompletePurchaseReplayAttack()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
         //$this->expectException(Complicated::class);
 
         // Set the "crypt" query parameter.
@@ -295,11 +290,10 @@ public function testCompletePurchaseReplayAttack()
 
     /**
      * The missing expected transaction ID supplied by the app.
-     *
-     * @expectedException Omnipay\Common\Exception\InvalidRequestException
      */
     public function testCompletePurchaseMissingExpectedParam()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
         //$this->expectException(Complicated::class);
 
         // Set the "crypt" query parameter.

tests/Message/DirectAuthorizeRequestTest.php

@@ -16,7 +16,7 @@ class DirectAuthorizeRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -123,7 +123,7 @@ public function testBasket()
         // The element does exist, and must contain the basket XML, with optional XML header and
         // trailing newlines.
         $this->assertArrayHasKey('BasketXML', $data);
-        $this->assertContains($basketXml, $data['BasketXML']);
+        $this->assertStringContainsString($basketXml, $data['BasketXML']);
     }
 
     public function testBasketExtendItem()
@@ -151,7 +151,7 @@ public function testBasketExtendItem()
         // The element does exist, and must contain the basket XML, with optional XML header and
         // trailing newlines.
         $this->assertArrayHasKey('BasketXML', $data);
-        $this->assertContains($basketXml, $data['BasketXML']);
+        $this->assertStringContainsString($basketXml, $data['BasketXML']);
     }
 
     public function testGetDataNoReferrerId()
@@ -280,7 +280,7 @@ public function testBasketWithNoDiscount()
         // The element does exist, and must contain the basket XML, with optional XML header and
         // trailing newlines.
         $this->assertArrayHasKey('BasketXML', $data);
-        $this->assertNotContains('<discount>', $data['BasketXML']);
+        $this->assertStringNotContainsString('<discount>', $data['BasketXML']);
     }
 
     public function testMixedBasketWithSpecialChars()
@@ -321,7 +321,7 @@ public function testMixedBasketWithSpecialChars()
         $data = $this->request->getData();
 
         $this->assertArrayHasKey('BasketXML', $data);
-        $this->assertContains($expected, $data['BasketXML'], 'Basket XML does not match the expected output');
+        $this->assertStringContainsString($expected, $data['BasketXML'], 'Basket XML does not match the expected output');
     }
 
     public function testNonXmlBasket()

tests/Message/DirectPurchaseRequestTest.php

@@ -16,7 +16,7 @@ class DirectPurchaseRequestTest extends DirectAuthorizeRequestTest
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/DirectTokenRequestTest.php

@@ -15,7 +15,7 @@ class DirectTokenRequestTest extends TestCase
      */
     protected $card;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new DirectTokenRegistrationRequest(
             $this->getHttpClient(),

tests/Message/ResponseTest.php

@@ -4,10 +4,13 @@
 
 use Omnipay\Common\Message\RequestInterface;
 use Omnipay\Tests\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class ResponseTest extends TestCase
 {
-    public function setUp()
+    use ProphecyTrait;
+
+    public function setUp(): void
     {
         $this->getMockRequest()->shouldReceive('getTransactionId')->andReturn('123456');
     }

tests/Message/ServerAuthorizeRequestTest.php

@@ -8,7 +8,7 @@ class ServerAuthorizeRequestTest extends TestCase
 {
     const SURCHARGE_XML = '<surcharges><surcharge><paymentType>VISA</paymentType><percentage>2.50</percentage></surcharge></surcharges>';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/ServerAuthorizeResponseTest.php

@@ -6,7 +6,7 @@
 
 class ServerAuthorizeResponseTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->getMockRequest()->shouldReceive('getTransactionId')->andReturn('123456');
     }

tests/Message/ServerNotifyRequestTest.php

@@ -184,11 +184,10 @@ public function testError()
         $this->request->error('https://www.example.com/', 'detail');
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidResponseException
-     */
     public function testConfirmInvalidSignature()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
+
         $this->request = new ServerNotifyRequest(
             $this->getHttpClient(),
             $this->getHttpRequest()
@@ -200,11 +199,10 @@ public function testConfirmInvalidSignature()
         $this->request->confirm('https://www.example.com/', 'detail');
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidResponseException
-     */
     public function testErrorInvalidSignature()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidResponseException::class);
+
         $this->request = new ServerNotifyRequest(
             $this->getHttpClient(),
             $this->getHttpRequest()

tests/Message/ServerTokenRegistrationRequestTest.php

@@ -12,7 +12,7 @@ class ServerTokenRegistrationRequestTest extends TestCase
      */
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/ServerTokenRegistrationResponseTest.php

@@ -6,7 +6,7 @@
 
 class ServerTokenRegistrationResponseTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->getMockRequest()->shouldReceive('getTransactionId')->andReturn('123456');
     }

tests/Message/SharedAbortRequestTest.php

@@ -6,7 +6,7 @@
 
 class SharedAbortRequestTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/SharedCaptureRequestTest.php

@@ -6,7 +6,7 @@
 
 class SharedCaptureRequestTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -38,11 +38,10 @@ public function testTxType()
         $this->assertSame('RELEASE', $this->request->getTxType());
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     */
     public function testMissingAmount()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+
         $this->request->getData();
     }
 
@@ -60,22 +59,20 @@ public function testValid()
         $this->assertSame('4255', $data['TxAuthNo']);
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     */
     public function testAuthMissingDescription()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+
         $this->request->setAmount(123.45);
         $this->request->setUseAuthenticate(true);
 
         $this->request->getData();
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     */
     public function testAuthMissingTransactionId()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+
         $this->request->setAmount(123.45);
         $this->request->setDescription('desc');
         $this->request->setUseAuthenticate(true);

tests/Message/SharedRefundRequestTest.php

@@ -6,7 +6,7 @@
 
 class SharedRefundRequestTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/SharedRepeatAuthorizeRequestTest.php

@@ -11,7 +11,7 @@ class SharedRepeatAuthorizeRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();