Added craft 4 support

born05 · May 9, 2022 · b68c366 · b68c366
1 parent d2d1944
commit b68c366
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release notes for Buckaroo Gateway for Craft Commerce
 
+## 2.0.0-beta.1 - 2022-05-09
+### Changed
+- Added craft 4 support
+
 ## 1.3.0 - 2022-03-10
 ### Change
 - Update ideal issuers

diff --git a/src/base/Gateway.php b/src/base/Gateway.php
@@ -9,7 +9,7 @@
 use craft\commerce\omnipay\base\OffsiteGateway;
 
 use Omnipay\Common\AbstractGateway;
-use Omnipay\Buckaroo\Gateway as OmnipayGateway;
+use Omnipay\Buckaroo\BuckarooGateway as OmnipayBuckarooGateway;
 
 abstract class Gateway extends OffsiteGateway
 {
@@ -37,15 +37,15 @@ abstract class Gateway extends OffsiteGateway
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml()
+    public function getSettingsHtml(): ?string
     {
         return Craft::$app->getView()->renderTemplate('commerce-buckaroo/gatewaySettings', ['gateway' => $this]);
     }
 
     /**
      * @inheritdoc
      */
-    public function populateRequest(array &$request, BasePaymentForm $paymentForm = null)
+    public function populateRequest(array &$request, BasePaymentForm $paymentForm = null): void
     {
         $request['culture'] = Craft::$app->language;
     }
@@ -71,9 +71,9 @@ public function getPaymentTypeOptions(): array
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function defineRules(): array
     {
-        $rules = parent::rules();
+        $rules = parent::defineRules();
         $rules[] = ['paymentType', 'compare', 'compareValue' => 'purchase'];
 
         return $rules;
@@ -87,7 +87,7 @@ public function rules()
      */
     protected function createGateway(): AbstractGateway
     {
-        /** @var OmnipayGateway $gateway */
+        /** @var OmnipayBuckarooGateway $gateway */
         $gateway = static::createOmnipayGateway($this->getGatewayClassName());
 
         $settings = BuckarooPlugin::$plugin->getSettings();

diff --git a/src/gateways/CreditCardGateway.php b/src/gateways/CreditCardGateway.php
@@ -52,7 +52,7 @@ public function getPaymentFormModel(): BasePaymentForm
     /**
      * @inheritdoc
      */
-    public function getPaymentFormHtml(array $params)
+    public function getPaymentFormHtml(array $params): null|string
     {
         try {
             $defaults = [
@@ -81,7 +81,7 @@ public function getPaymentFormHtml(array $params)
     /**
      * @inheritdoc
      */
-    public function populateRequest(array &$request, BasePaymentForm $paymentForm = null)
+    public function populateRequest(array &$request, BasePaymentForm $paymentForm = null): void
     {
         parent::populateRequest($request, $paymentForm);
 
@@ -96,7 +96,7 @@ public function populateRequest(array &$request, BasePaymentForm $paymentForm =
     /**
      * @return mixed
      */
-    public function fetchPaymentMethods()
+    public function fetchPaymentMethods(): array
     {
         // Source: https://dev.buckaroo.nl/PaymentMethods/Description/creditcards
         return [
@@ -122,7 +122,7 @@ public function fetchPaymentMethods()
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName()
+    protected function getGatewayClassName(): null|string
     {
         return '\\' . OmniPayCreditCardGateway::class;
     }

diff --git a/src/gateways/IdealGateway.php b/src/gateways/IdealGateway.php
@@ -52,7 +52,7 @@ public function getPaymentFormModel(): BasePaymentForm
     /**
      * @inheritdoc
      */
-    public function getPaymentFormHtml(array $params)
+    public function getPaymentFormHtml(array $params): null|string
     {
         try {
             $defaults = [
@@ -81,7 +81,7 @@ public function getPaymentFormHtml(array $params)
     /**
      * @inheritdoc
      */
-    public function populateRequest(array &$request, BasePaymentForm $paymentForm = null)
+    public function populateRequest(array &$request, BasePaymentForm $paymentForm = null): void
     {
         parent::populateRequest($request, $paymentForm);
 
@@ -96,7 +96,7 @@ public function populateRequest(array &$request, BasePaymentForm $paymentForm =
     /**
      * @return mixed
      */
-    public function fetchIssuers()
+    public function fetchIssuers(): array
     {
         // Source: https://dev.buckaroo.nl/PaymentMethods/Description/ideal
         return [
@@ -121,7 +121,7 @@ public function fetchIssuers()
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName()
+    protected function getGatewayClassName(): null|string
     {
         return '\\' . OmniPayIdealGateway::class;
     }

diff --git a/src/gateways/PayPalGateway.php b/src/gateways/PayPalGateway.php
@@ -44,7 +44,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName()
+    protected function getGatewayClassName(): null|string
     {
         return '\\' . OmniPayPayPalGateway::class;
     }

diff --git a/src/gateways/SepaDirectDebitGateway.php b/src/gateways/SepaDirectDebitGateway.php
@@ -44,7 +44,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName()
+    protected function getGatewayClassName(): null|string
     {
         return '\\' . OmniPaySepaDirectDebitGateway::class;
     }