Merge pull request #35 from zaporylie/php-8.0

Support for PHP 8.0
zaporylie · Oct 23, 2021 · 7b43dbf · 7b43dbf
2 parents 741f0fb + 71f6541
commit 7b43dbf
Show file tree

Hide file tree

Showing 49 changed files with 52 additions and 53 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,12 +18,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "5.6"
-          - "7.0"
           - "7.1"
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
         composer-version:
           - "2"
     steps:

diff --git a/composer.json b/composer.json
@@ -4,21 +4,21 @@
     "type": "library",
     "keywords": ["payment"],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1 || ^8.0",
         "psr/http-message": "^1.0",
         "php-http/message": "^1.6",
         "php-http/httplug": "^1.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.0",
         "eloquent/enumeration": "^5.1",
-        "jms/serializer": "^1.8"
+        "jms/serializer": "^1.8 || ^3.0"
     },
     "require-dev": {
         "php-http/guzzle6-adapter": "^1.0",
-        "phpunit/phpunit": ">=5 <8",
+        "phpunit/phpunit": ">=5 <9",
         "symfony/yaml": "^2.0",
         "symfony/filesystem": "^3.1",
-        "squizlabs/php_codesniffer": "^2.0",
+        "squizlabs/php_codesniffer": "^3.0",
         "php-coveralls/php-coveralls": "^2.0"
     },
     "suggest": {

diff --git a/test/Integration/Api/PaymentsTest.php b/test/Integration/Api/PaymentsTest.php
@@ -31,7 +31,7 @@ class PaymentsTest extends IntegrationTestBase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->api = $this->vipps->payment('test_subscription_key', $this->merchantSerialNumber);

diff --git a/test/Integration/IntegrationTestBase.php b/test/Integration/IntegrationTestBase.php
@@ -38,7 +38,7 @@ abstract class IntegrationTestBase extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
         $this->httpClient = $this->getMockBuilder(HttpClient::class)

diff --git a/test/Unit/Api/ApiBaseTest.php b/test/Unit/Api/ApiBaseTest.php
@@ -21,7 +21,7 @@ class ApiBaseTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
         $this->apiBase = $this->getMockForAbstractClass(ApiBase::class, [

diff --git a/test/Unit/Authentication/TokenMemoryCacheStorageTest.php b/test/Unit/Authentication/TokenMemoryCacheStorageTest.php
@@ -26,7 +26,7 @@ class TokenMemoryCacheStorageTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
         AnnotationRegistry::registerLoader('class_exists');

diff --git a/test/Unit/ClientTest.php b/test/Unit/ClientTest.php
@@ -25,7 +25,7 @@ class ClientTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
 

diff --git a/test/Unit/EndpointTest.php b/test/Unit/EndpointTest.php
@@ -17,7 +17,7 @@ class EndpointTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
     }

diff --git a/test/Unit/Exception/VippsExceptionTest.php b/test/Unit/Exception/VippsExceptionTest.php
@@ -24,7 +24,7 @@ class VippsExceptionTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
         $this->vipps = $this->createMock(Vipps::class);

diff --git a/test/Unit/Model/Authorization/ResponseGetTokenTest.php b/test/Unit/Model/Authorization/ResponseGetTokenTest.php
@@ -22,7 +22,7 @@ class ResponseGetTokenTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->resource = new GetToken($this->vipps, 'test', 'test');

diff --git a/test/Unit/Model/Error/AuthorizationErrorTest.php b/test/Unit/Model/Error/AuthorizationErrorTest.php
@@ -19,7 +19,7 @@ class AuthorizationErrorTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         AnnotationRegistry::registerLoader('class_exists');

diff --git a/test/Unit/Model/Error/PaymentErrorTest.php b/test/Unit/Model/Error/PaymentErrorTest.php
@@ -18,7 +18,7 @@ class PaymentErrorTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         AnnotationRegistry::registerLoader('class_exists');

diff --git a/test/Unit/Model/ModelTestBase.php b/test/Unit/Model/ModelTestBase.php
@@ -24,7 +24,7 @@ abstract class ModelTestBase extends TestCase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
 

diff --git a/test/Unit/Model/Payment/AddressTest.php b/test/Unit/Model/Payment/AddressTest.php
@@ -21,7 +21,7 @@ class AddressTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new Address();

diff --git a/test/Unit/Model/Payment/CallbackErrorInfoTest.php b/test/Unit/Model/Payment/CallbackErrorInfoTest.php
@@ -21,7 +21,7 @@ class CallbackErrorInfoTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new CallbackErrorInfo();

diff --git a/test/Unit/Model/Payment/CallbackTransactionInfoStatusTest.php b/test/Unit/Model/Payment/CallbackTransactionInfoStatusTest.php
@@ -21,7 +21,7 @@ class CallbackTransactionInfoStatusTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new CallbackTransactionInfoStatus();

diff --git a/test/Unit/Model/Payment/CustomerInfoTest.php b/test/Unit/Model/Payment/CustomerInfoTest.php
@@ -16,7 +16,7 @@ class CustomerInfoTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = (new CustomerInfo())->setMobileNumber(12345);

diff --git a/test/Unit/Model/Payment/ExpressCheckOutPaymentRequestTest.php b/test/Unit/Model/Payment/ExpressCheckOutPaymentRequestTest.php
@@ -25,7 +25,7 @@ class ExpressCheckOutPaymentRequestTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new ExpressCheckOutPaymentRequest();

diff --git a/test/Unit/Model/Payment/FetchShippingCostAndMethodTest.php b/test/Unit/Model/Payment/FetchShippingCostAndMethodTest.php
@@ -21,7 +21,7 @@ class FetchShippingCostAndMethodTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new FetchShippingCostAndMethod();

diff --git a/test/Unit/Model/Payment/MerchantInfoTest.php b/test/Unit/Model/Payment/MerchantInfoTest.php
@@ -21,7 +21,7 @@ class MerchantInfoTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = (new MerchantInfo())

diff --git a/test/Unit/Model/Payment/PaymentShippingDetailsTest.php b/test/Unit/Model/Payment/PaymentShippingDetailsTest.php
@@ -22,7 +22,7 @@ class PaymentShippingDetailsTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new PaymentShippingDetails();

diff --git a/test/Unit/Model/Payment/RegularCheckOutPaymentRequestTest.php b/test/Unit/Model/Payment/RegularCheckOutPaymentRequestTest.php
@@ -23,7 +23,7 @@ class RegularCheckOutPaymentRequestTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new RegularCheckOutPaymentRequest();

diff --git a/test/Unit/Model/Payment/RequestCancelPaymentTest.php b/test/Unit/Model/Payment/RequestCancelPaymentTest.php
@@ -19,7 +19,7 @@ class RequestCancelPaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new RequestCancelPayment();

diff --git a/test/Unit/Model/Payment/RequestCapturePaymentTest.php b/test/Unit/Model/Payment/RequestCapturePaymentTest.php
@@ -19,7 +19,7 @@ class RequestCapturePaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new RequestCapturePayment();

diff --git a/test/Unit/Model/Payment/RequestInitiatePaymentTest.php b/test/Unit/Model/Payment/RequestInitiatePaymentTest.php
@@ -19,7 +19,7 @@ class RequestInitiatePaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new RequestInitiatePayment();

diff --git a/test/Unit/Model/Payment/RequestRefundPaymentTest.php b/test/Unit/Model/Payment/RequestRefundPaymentTest.php
@@ -19,7 +19,7 @@ class RequestRefundPaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new RequestRefundPayment();

diff --git a/test/Unit/Model/Payment/ResponseCancelPaymentTest.php b/test/Unit/Model/Payment/ResponseCancelPaymentTest.php
@@ -20,7 +20,7 @@ class ResponseCancelPaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $resource = new CancelPayment($this->vipps, 'test', 'test', new RequestCancelPayment());

diff --git a/test/Unit/Model/Payment/ResponseCapturePaymentTest.php b/test/Unit/Model/Payment/ResponseCapturePaymentTest.php
@@ -20,7 +20,7 @@ class ResponseCapturePaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $resource = new CapturePayment($this->vipps, 'test', 'test', new RequestCapturePayment());

diff --git a/test/Unit/Model/Payment/ResponseGetOrderStatusTest.php b/test/Unit/Model/Payment/ResponseGetOrderStatusTest.php
@@ -18,7 +18,7 @@ class ResponseGetOrderStatusTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $resource = new GetOrderStatus($this->vipps, 'test', 'test_merchant_serial_number', 'test_order_id');

diff --git a/test/Unit/Model/Payment/ResponseGetPaymentDetailsTest.php b/test/Unit/Model/Payment/ResponseGetPaymentDetailsTest.php
@@ -20,7 +20,7 @@ class ResponseGetPaymentDetailsTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $resource = new GetPaymentDetails($this->vipps, 'test', 'test_merchant_serial_number', 'test_order_id');

diff --git a/test/Unit/Model/Payment/ResponseInitiatePaymentTest.php b/test/Unit/Model/Payment/ResponseInitiatePaymentTest.php
@@ -20,7 +20,7 @@ class ResponseInitiatePaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $resource = new InitiatePayment($this->vipps, 'test', new RequestInitiatePayment());

diff --git a/test/Unit/Model/Payment/ResponseRefundPaymentTest.php b/test/Unit/Model/Payment/ResponseRefundPaymentTest.php
@@ -20,7 +20,7 @@ class ResponseRefundPaymentTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $resource = new RefundPayment($this->vipps, 'test', 'test', new RequestRefundPayment());

diff --git a/test/Unit/Model/Payment/ShippingDetailsRequestTest.php b/test/Unit/Model/Payment/ShippingDetailsRequestTest.php
@@ -22,7 +22,7 @@ class ShippingDetailsRequestTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new ShippingDetailsRequest();

diff --git a/test/Unit/Model/Payment/ShippingDetailsTest.php b/test/Unit/Model/Payment/ShippingDetailsTest.php
@@ -21,7 +21,7 @@ class ShippingDetailsTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new ShippingDetails();

diff --git a/test/Unit/Model/Payment/TransactionInfoTest.php b/test/Unit/Model/Payment/TransactionInfoTest.php
@@ -16,7 +16,7 @@ class TransactionInfoTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new TransactionInfo();

diff --git a/test/Unit/Model/Payment/TransactionLogTest.php b/test/Unit/Model/Payment/TransactionLogTest.php
@@ -16,7 +16,7 @@ class TransactionLogTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new TransactionLog();

diff --git a/test/Unit/Model/Payment/TransactionSummaryTest.php b/test/Unit/Model/Payment/TransactionSummaryTest.php
@@ -16,7 +16,7 @@ class TransactionSummaryTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new TransactionSummary();

diff --git a/test/Unit/Model/Payment/TransactionTest.php b/test/Unit/Model/Payment/TransactionTest.php
@@ -16,7 +16,7 @@ class TransactionTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new Transaction();

diff --git a/test/Unit/Model/Payment/UserDetailsTest.php b/test/Unit/Model/Payment/UserDetailsTest.php
@@ -21,7 +21,7 @@ class UserDetailsTest extends ModelTestBase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->model = new UserDetails();

diff --git a/test/Unit/Resource/Authorization/GetTokenTest.php b/test/Unit/Resource/Authorization/GetTokenTest.php
@@ -17,7 +17,7 @@ class GetTokenTest extends ResourceTestBase
      */
     protected $resource;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->resource = $this->getMockBuilder(GetToken::class)

diff --git a/test/Unit/Resource/Payment/CancelPaymentTest.php b/test/Unit/Resource/Payment/CancelPaymentTest.php
@@ -20,7 +20,7 @@ class CancelPaymentTest extends PaymentResourceBaseTestBase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->resource = $this->getMockBuilder(CancelPayment::class)

diff --git a/test/Unit/Resource/Payment/CapturePaymentTest.php b/test/Unit/Resource/Payment/CapturePaymentTest.php
@@ -20,7 +20,7 @@ class CapturePaymentTest extends PaymentResourceBaseTestBase
     /**
      * {@inheritdoc}
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->resource = $this->getMockBuilder(CapturePayment::class)