Match Craft's php standards as much as possible

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release notes for Buckaroo Gateway for Craft Commerce
 
+## 2.1.1 - 2023-07-13
+### Changed
+- Match Craft's php standards as much as possible
+
 ## 2.1.0 - 2023-07-07
 ### Changed
 - Ideal issuer select doesn't have a bank selected by default anymore

src/base/Gateway.php

@@ -7,6 +7,7 @@
 use Craft;
 use craft\commerce\models\payments\BasePaymentForm;
 use craft\commerce\omnipay\base\OffsiteGateway;
+use craft\helpers\App;
 
 use Omnipay\Common\AbstractGateway;
 use Omnipay\Buckaroo\BuckarooGateway as OmnipayBuckarooGateway;
@@ -17,19 +18,19 @@ abstract class Gateway extends OffsiteGateway
     // =========================================================================
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $websiteKey;
+    public ?string $websiteKey;
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $secretKey;
+    public ?string $secretKey;
 
     /**
-     * @var bool
+     * @var bool|null
      */
-    public $testMode = false;
+    public ?bool $testMode = false;
 
     // Public Methods
     // =========================================================================
@@ -93,8 +94,8 @@ protected function createGateway(): AbstractGateway
         $settings = BuckarooPlugin::$plugin->getSettings();
         $testMode = $settings->testMode !== null ? $settings->testMode : $this->testMode;
 
-        $gateway->setWebsiteKey(Craft::parseEnv($this->websiteKey));
-        $gateway->setSecretKey(Craft::parseEnv($this->secretKey));
+        $gateway->setWebsiteKey(App::parseEnv($this->websiteKey));
+        $gateway->setSecretKey(App::parseEnv($this->secretKey));
         $gateway->setTestMode($testMode);
 
         return $gateway;

src/gateways/CreditCardGateway.php

@@ -16,19 +16,19 @@ class CreditCardGateway extends Gateway
     // =========================================================================
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $websiteKey;
+    public ?string $websiteKey;
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $secretKey;
+    public ?string $secretKey;
 
     /**
-     * @var bool
+     * @var bool|null
      */
-    public $testMode = false;
+    public ?bool $testMode = false;
 
     // Public Methods
     // =========================================================================
@@ -122,7 +122,7 @@ public function fetchPaymentMethods(): array
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName(): null|string
+    protected function getGatewayClassName(): ?string
     {
         return '\\' . OmniPayCreditCardGateway::class;
     }

src/gateways/IdealGateway.php

@@ -16,19 +16,19 @@ class IdealGateway extends Gateway
     // =========================================================================
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $websiteKey;
+    public ?string $websiteKey;
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $secretKey;
+    public ?string $secretKey;
 
     /**
-     * @var bool
+     * @var bool|null
      */
-    public $testMode = false;
+    public ?bool $testMode = false;
 
     // Public Methods
     // =========================================================================
@@ -121,7 +121,7 @@ public function fetchIssuers(): array
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName(): null|string
+    protected function getGatewayClassName(): ?string
     {
         return '\\' . OmniPayIdealGateway::class;
     }

src/gateways/PayPalGateway.php

@@ -13,19 +13,19 @@ class PayPalGateway extends Gateway
     // =========================================================================
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $websiteKey;
+    public ?string $websiteKey;
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $secretKey;
+    public ?string $secretKey;
 
     /**
-     * @var bool
+     * @var bool|null
      */
-    public $testMode = false;
+    public ?bool $testMode = false;
 
     // Public Methods
     // =========================================================================
@@ -44,7 +44,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName(): null|string
+    protected function getGatewayClassName(): ?string
     {
         return '\\' . OmniPayPayPalGateway::class;
     }

src/gateways/SepaDirectDebitGateway.php

@@ -13,19 +13,19 @@ class SepaDirectDebitGateway extends Gateway
     // =========================================================================
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $websiteKey;
+    public ?string $websiteKey;
 
     /**
-     * @var string
+     * @var string|null
      */
-    public $secretKey;
+    public ?string $secretKey;
 
     /**
-     * @var bool
+     * @var bool|null
      */
-    public $testMode = false;
+    public ?bool $testMode = false;
 
     // Public Methods
     // =========================================================================
@@ -44,7 +44,7 @@ public static function displayName(): string
     /**
      * @inheritdoc
      */
-    protected function getGatewayClassName(): null|string
+    protected function getGatewayClassName(): ?string
     {
         return '\\' . OmniPaySepaDirectDebitGateway::class;
     }

src/models/forms/CreditCardPaymentForm.php

@@ -6,5 +6,8 @@
 
 class CreditCardPaymentForm extends OffsitePaymentForm
 {
-    public $paymentMethod;
+    /**
+     * @var string|null
+     */
+    public ?string $paymentMethod = null;
 }

src/models/forms/IdealPaymentForm.php

@@ -6,5 +6,8 @@
 
 class IdealPaymentForm extends OffsitePaymentForm
 {
-    public $issuer;
+    /**
+     * @var string|null
+     */
+    public ?string $issuer = null;
 }