Updating all dependencies, including omnipay/common to ^3.0

composer.json

@@ -24,12 +24,21 @@
         }
     },
     "require": {
-        "vimeo/payment-gateway-logger": "^1.0",
-        "omnipay/common": "~2.0",
+        "php": "^7.1|^8.0",
         "composer/ca-bundle": "^1.1",
-        "ext-soap": "*"
+        "ext-soap": "*",
+        "omnipay/common": "^3.0",
+        "php-http/guzzle7-adapter": "^1.0.0",
+        "symfony/event-dispatcher": ">=2.1",
+        "vimeo/payment-gateway-logger": "dev-update-dependencies"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "http-interop/http-factory-guzzle": "^1.1",
+        "omnipay/tests": "^4.0"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }

src/Message/AbstractHOARequest.php

@@ -6,7 +6,7 @@
 use ReflectionClass;
 use ReflectionMethod;
 use Omnipay\Vindicia\NameValue;
-use Guzzle\Http\ClientInterface;
+use Omnipay\Common\Http\ClientInterface;
 use Symfony\Component\HttpFoundation\Request as HttpRequest;
 use Omnipay\Vindicia\AttributeBag;
 

src/Message/AbstractRequest.php

@@ -16,9 +16,10 @@
 use PaymentGatewayLogger\Event\ResponseEvent;
 use SoapFault;
 use stdClass;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request as HttpRequest;
-use Guzzle\Http\ClientInterface;
+use Omnipay\Common\Http\ClientInterface;
 use InvalidArgumentException;
 use Omnipay\Common\CreditCard;
 use Omnipay\Vindicia\NonStrippingCreditCard;
@@ -142,7 +143,7 @@ public function __construct(ClientInterface $httpClient, HttpRequest $httpReques
         $this->isUpdate = $isUpdate;
 
         // Used to fire events before and after executing a request.
-        $this->eventDispatcher = $httpClient->getEventDispatcher();
+        $this->eventDispatcher = new EventDispatcher();
     }
 
     /**
@@ -1331,7 +1332,7 @@ abstract public function getData();
      * @return bool
      * @psalm-variadic
      */
-    public function validate()
+    public function validate(...$args)
     {
         return call_user_func_array('parent::validate', func_get_args());
     }

tests/ApplePayGatewayTest.php

@@ -11,7 +11,7 @@ class ApplePayGatewayTest extends GatewayTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->gateway = new ApplePayGateway($this->getHttpClient(), $this->getHttpRequest());
         $this->gateway->setTestMode(true);

tests/AttributeBagTest.php

@@ -10,7 +10,7 @@ class AttributeBagTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->bag = new AttributeBag();
         $this->faker = new DataFaker();

tests/AttributeTest.php

@@ -10,7 +10,7 @@ class AttributeTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->attribute = new Attribute();
         $this->faker = new DataFaker();

tests/ChargebackTest.php

@@ -10,7 +10,7 @@ class ChargebackTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
         $this->chargeback = new Chargeback();

tests/CustomerTest.php

@@ -10,7 +10,7 @@ class CustomerTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
         $this->customer = new Customer();

tests/EventEmitterTest.php

@@ -3,8 +3,8 @@
 namespace Omnipay\Vindicia;
 
 use Exception;
-use Guzzle\Http\Client;
-use Guzzle\Http\ClientInterface;
+use Omnipay\Common\Http\Client;
+use Omnipay\Common\Http\ClientInterface;
 use Omnipay\Vindicia\TestFramework\DataFaker;
 use Omnipay\Vindicia\TestFramework\SoapTestCase;
 use Omnipay\Vindicia\TestFramework\TestSubscriber;
@@ -30,7 +30,7 @@ class EventEmitterTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
 
@@ -45,7 +45,7 @@ public function setUp()
         $this->transactionReference = $this->faker->transactionReference();
         $this->riskScore = $this->faker->riskScore();
 
-        $this->customHttpClient = new Client('', array('redirect.disable' => true));
+        $this->customHttpClient = new Client();
         $this->eventDispatcher = $this->customHttpClient->getEventDispatcher();
 
         $this->testSubscriber = new TestSubscriber($this->faker->name(), new TestLogger());

tests/GatewayTest.php

@@ -12,7 +12,7 @@ class GatewayTest extends GatewayTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->gateway = new Gateway($this->getHttpClient(), $this->getHttpRequest());

tests/HOAGatewayTest.php

@@ -11,7 +11,7 @@ class HOAGatewayTest extends GatewayTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->gateway = new HOAGateway($this->getHttpClient(), $this->getHttpRequest());
         $this->gateway->setTestMode(true);

tests/Message/AbstractHOARequestTest.php

@@ -13,7 +13,7 @@ class AbstractHOARequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = Mocker::mockHOARequest('\Omnipay\Vindicia\Message\AbstractHOARequest')->shouldAllowMockingProtectedMethods();
         $this->request->initialize();

tests/Message/AbstractRequestTest.php

@@ -16,7 +16,7 @@ class AbstractRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->request = Mocker::mock('\Omnipay\Vindicia\Message\AbstractRequest')->makePartial()->shouldAllowMockingProtectedMethods();

tests/Message/ApplePayAuthorizeRequestTest.php

@@ -11,7 +11,7 @@ class ApplePayAuthorizeRequestTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         // Gateway parameters.
         $this->faker = new DataFaker();

tests/Message/ApplePayCompleteAuthorizeRequestTest.php

@@ -10,7 +10,7 @@ class ApplePayCompleteAuthorizeRequestTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         // Gateway parameters.
         $this->faker = new DataFaker();

tests/Message/AuthorizeRequestTest.php

@@ -15,7 +15,7 @@ class AuthorizeRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->faker = new DataFaker();

tests/Message/CalculateSalesTaxRequestTest.php

@@ -13,7 +13,7 @@ class CalculateSalesTaxRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CancelSubscriptionRequestTest.php

@@ -11,7 +11,7 @@ class CancelSubscriptionRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->faker = new DataFaker();

tests/Message/CancelSubscriptionsRequestTest.php

@@ -12,7 +12,7 @@ class CancelSubscriptionsRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CaptureRequestTest.php

@@ -11,7 +11,7 @@ class CaptureRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
         $this->transactionId = $this->faker->transactionId();

tests/Message/CompleteCreatePayPalSubscriptionRequestTest.php

@@ -11,7 +11,7 @@ class CompleteCreatePayPalSubscriptionRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CompleteHOARequestTest.php

@@ -13,7 +13,7 @@ class CompleteHOARequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->faker = new DataFaker();

tests/Message/CompletePayPalPurchaseRequestTest.php

@@ -11,7 +11,7 @@ class CompletePayPalPurchaseRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CreateCustomerRequestTest.php

@@ -14,7 +14,7 @@ class CreateCustomerRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->faker = new DataFaker();

tests/Message/CreatePayPalSubscriptionRequestTest.php

@@ -11,7 +11,7 @@ class CreatePayPalSubscriptionRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CreatePaymentMethodRequestTest.php

@@ -14,7 +14,7 @@ class CreatePaymentMethodRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CreatePlanRequestTest.php

@@ -13,7 +13,7 @@ class CreatePlanRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CreateProductRequestTest.php

@@ -13,7 +13,7 @@ class CreateProductRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/CreateSubscriptionRequestTest.php

@@ -13,7 +13,7 @@ class CreateSubscriptionRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->faker = new DataFaker();

tests/Message/FetchChargebacksRequestTest.php

@@ -11,7 +11,7 @@ class FetchChargebacksRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchCustomerRequestTest.php

@@ -11,7 +11,7 @@ class FetchCustomerRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchPaymentMethodRequestTest.php

@@ -11,7 +11,7 @@ class FetchPaymentMethodRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         date_default_timezone_set('Europe/London');
         $this->faker = new DataFaker();

tests/Message/FetchPaymentMethodsRequestTest.php

@@ -11,7 +11,7 @@ class FetchPaymentMethodsRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchPlanRequestTest.php

@@ -11,7 +11,7 @@ class FetchPlanRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchProductRequestTest.php

@@ -11,7 +11,7 @@ class FetchProductRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchRefundsRequestTest.php

@@ -11,7 +11,7 @@ class FetchRefundsRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchSubscriptionInvoiceReferencesRequestTest.php

@@ -11,7 +11,7 @@ class FetchSubscriptionInvoiceReferencesRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();
 

tests/Message/FetchSubscriptionInvoiceRequestTest.php

@@ -11,7 +11,7 @@ class FetchSubscriptionInvoiceRequestTest extends SoapTestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->faker = new DataFaker();