Merge pull request #83 from thephpleague/feat-php8

Initial upgrade to PHP8.0 and Github Actions
thephpleague · Jun 2, 2021 · 57813f5 · 57813f5
2 parents 99d5ad4 + 645bc51
commit 57813f5
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 79 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [barryvdh]
diff --git a/composer.json b/composer.json
@@ -33,15 +33,12 @@
         "psr-4": { "Omnipay\\Mollie\\Test\\": "tests/" }
     },
     "require": {
-        "omnipay/common": "^3.0.1"
+        "php": "^7.3|^8.0",
+        "omnipay/common": "^3.1"
     },
     "require-dev": {
-        "omnipay/tests": "^3.1",
-        "squizlabs/php_codesniffer": "^3",
-        "phpro/grumphp": "^0.14",
-        "phpmd/phpmd": "^2",
-        "overtrue/phplint": "^1",
-        "jakub-onderka/php-parallel-lint": "^1"
+        "omnipay/tests": "^4.0.2",
+        "squizlabs/php_codesniffer": "^3"
     },
     "extra": {
         "branch-alias": {

diff --git a/grumphp.yml b/grumphp.yml
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
@@ -8,15 +9,15 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Omnipay Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/tests/GatewayTest.php b/tests/GatewayTest.php
@@ -29,7 +29,7 @@ class GatewayTest extends GatewayTestCase
      */
     protected $gateway;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -96,11 +96,10 @@ public function testRefund()
         );
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     */
     public function testThatRefundDoesntWorkWithoutAmount()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+
         $request = $this->gateway->refund(
             array(
                 'apiKey'               => 'key',

diff --git a/tests/Message/AbstractMollieRequestTest.php b/tests/Message/AbstractMollieRequestTest.php
@@ -17,7 +17,7 @@ class AbstractMollieRequestTest extends TestCase
      */
     protected $gateway;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->gateway = new Gateway($this->getHttpClient());
     }

diff --git a/tests/Message/AssertRequestTrait.php b/tests/Message/AssertRequestTrait.php
@@ -4,10 +4,6 @@
 
 trait AssertRequestTrait
 {
-    abstract function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false);
-
-    abstract function assertJsonStringEqualsJsonString($expected, $actual, $message = null);
-
     public function assertEqualRequest(\Psr\Http\Message\RequestInterface $expectedRequest, \Psr\Http\Message\RequestInterface $actualRequest)
     {
         $this->assertEquals($expectedRequest->getMethod(), $actualRequest->getMethod(), "Expected request Method should be equal to actual request method.");

diff --git a/tests/Message/CancelOrderRequestTest.php b/tests/Message/CancelOrderRequestTest.php
@@ -20,7 +20,7 @@ final class CancelOrderRequestTest extends TestCase
      */
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->httpClient = $this->createMock(ClientInterface::class);
         $this->request = new CancelOrderRequest($this->httpClient, $this->getHttpRequest());
@@ -46,12 +46,11 @@ public function responseDataProvider()
     /**
      * @dataProvider insufficientDataProvider
      *
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     *
      * @param array $input
      */
     public function testGetDataWillValidateRequiredData(array $input)
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
         $this->request->initialize($input);
         $this->request->getData();
     }
@@ -77,7 +76,9 @@ public function testSendData(array $responseData, $success)
             ->with(
                 'DELETE',
                 'https://api.mollie.com/v2/orders/ord_kEn1PlbGa',
-                ['Authorization' => 'Bearer mykey']
+                $this->callback(function ($headers) {
+                    return $headers['Authorization'] == 'Bearer mykey';
+                })
             )->willReturn($response);
 
         $this->request->initialize(['apiKey' => 'mykey', 'transactionReference' => 'ord_kEn1PlbGa']);

diff --git a/tests/Message/CompleteOrderRequestTest.php b/tests/Message/CompleteOrderRequestTest.php
@@ -18,7 +18,7 @@ class CompleteOrderRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new CompleteOrderRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(
@@ -30,12 +30,10 @@ public function setUp()
         ));
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     * @expectedExceptionMessage The transactionReference parameter is required
-     */
     public function testGetDataWithoutIDParameter()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+        $this->expectExceptionMessage('The transactionReference parameter is required');
         $this->getHttpRequest()->request->remove('id');
 
         $data = $this->request->getData();

diff --git a/tests/Message/CompletePurchaseRequestTest.php b/tests/Message/CompletePurchaseRequestTest.php
@@ -16,7 +16,7 @@ class CompletePurchaseRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new CompletePurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(
@@ -28,12 +28,11 @@ public function setUp()
         ));
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     * @expectedExceptionMessage The transactionReference parameter is required
-     */
     public function testGetDataWithoutIDParameter()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+        $this->expectExceptionMessage('The transactionReference parameter is required');
+
         $this->getHttpRequest()->request->remove('id');
 
         $data = $this->request->getData();

diff --git a/tests/Message/CreateCustomerMandateRequestTest.php b/tests/Message/CreateCustomerMandateRequestTest.php
@@ -17,7 +17,7 @@ class CreateCustomerMandateRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new CreateCustomerMandateRequest($this->getHttpClient(), $this->getHttpRequest());
 

diff --git a/tests/Message/CreateCustomerRequestTest.php b/tests/Message/CreateCustomerRequestTest.php
@@ -18,7 +18,7 @@ class CreateCustomerRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new CreateCustomerRequest($this->getHttpClient(), $this->getHttpRequest());
 

diff --git a/tests/Message/CreateOrderRequestTest.php b/tests/Message/CreateOrderRequestTest.php
@@ -20,7 +20,7 @@ class CreateOrderRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new CreateOrderRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(

diff --git a/tests/Message/CreateShipmentRequestTest.php b/tests/Message/CreateShipmentRequestTest.php
@@ -21,7 +21,7 @@ class CreateShipmentRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new CreateShipmentRequest($this->getHttpClient(), $this->getHttpRequest());
 

diff --git a/tests/Message/FetchCustomerMandatesRequestTest.php b/tests/Message/FetchCustomerMandatesRequestTest.php
@@ -17,7 +17,7 @@ class FetchCustomerMandatesRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new FetchCustomerMandatesRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(

diff --git a/tests/Message/FetchCustomerRequestTest.php b/tests/Message/FetchCustomerRequestTest.php
@@ -17,7 +17,7 @@ class FetchCustomerRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new FetchCustomerRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(

diff --git a/tests/Message/FetchIssuersRequestTest.php b/tests/Message/FetchIssuersRequestTest.php
@@ -18,7 +18,7 @@ class FetchIssuersRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new FetchIssuersRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(

diff --git a/tests/Message/FetchOrderRequestTest.php b/tests/Message/FetchOrderRequestTest.php
@@ -21,7 +21,7 @@ class FetchOrderRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new FetchOrderRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(
@@ -122,8 +122,8 @@ public function testSendDataWithIncludingPayments()
 
         $response = $request->sendData(['id' => 'ord_kEn1PlbGa']);
 
-        self::assertInstanceOf(FetchOrderResponse::class, $response);
-        self::assertEquals($request, $response->getRequest());
-        self::assertEquals($expectedData, $response->getData());
+        $this->assertInstanceOf(FetchOrderResponse::class, $response);
+        $this->assertEquals($request, $response->getRequest());
+        $this->assertEquals($expectedData, $response->getData());
     }
 }
diff --git a/tests/Message/FetchPaymentMethodsRequestTest.php b/tests/Message/FetchPaymentMethodsRequestTest.php
@@ -20,7 +20,7 @@ class FetchPaymentMethodsRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new FetchPaymentMethodsRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize([

diff --git a/tests/Message/FetchTransactionRequestTest.php b/tests/Message/FetchTransactionRequestTest.php
@@ -17,7 +17,7 @@ class FetchTransactionRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new FetchTransactionRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(

diff --git a/tests/Message/PurchaseRequestTest.php b/tests/Message/PurchaseRequestTest.php
@@ -16,7 +16,7 @@ class PurchaseRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(

diff --git a/tests/Message/RefundRequestTest.php b/tests/Message/RefundRequestTest.php
@@ -16,7 +16,7 @@ class RefundRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new RefundRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize([
@@ -45,11 +45,10 @@ public function testGetData()
         $this->assertCount(1, $data);
     }
 
-    /**
-     * @expectedException \Omnipay\Common\Exception\InvalidRequestException
-     */
     public function testGetDataWithoutAmount()
     {
+        $this->expectException(\Omnipay\Common\Exception\InvalidRequestException::class);
+
         $this->request->initialize(
             [
                 'apiKey'               => 'mykey',

diff --git a/tests/Message/RevokeCustomerMandateRequestTest.php b/tests/Message/RevokeCustomerMandateRequestTest.php
@@ -17,7 +17,7 @@ class RevokeCustomerMandateRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new RevokeCustomerMandateRequest($this->getHttpClient(), $this->getHttpRequest());
 

diff --git a/tests/Message/UpdateCustomerRequestTest.php b/tests/Message/UpdateCustomerRequestTest.php
@@ -18,7 +18,7 @@ class UpdateCustomerRequestTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new UpdateCustomerRequest($this->getHttpClient(), $this->getHttpRequest());