extract getPluginPath from plugin class to modules

basduchambre · Aug 6, 2021 · a66ada0 · a66ada0
1 parent f390b4e
commit a66ada0
Show file tree

Hide file tree

Showing 29 changed files with 138 additions and 159 deletions.
diff --git a/inc/utils.php b/inc/utils.php
@@ -24,8 +24,10 @@ function mollieWooCommerceIsCheckoutContext()
  */
 function mollieWooCommerceComponentsStylesForAvailableGateways()
 {
+    $pluginPath = untrailingslashit(M4W_PLUGIN_DIR) . '/';
+
     $mollieComponentsStyles = new ComponentsStyles(
-        new SettingsComponents(),
+        new SettingsComponents($pluginPath),
         WC()->payment_gateways()
     );
 

diff --git a/src/Gateway/AbstractGateway.php b/src/Gateway/AbstractGateway.php
@@ -100,6 +100,10 @@ abstract class AbstractGateway extends WC_Payment_Gateway
      * @var string
      */
     protected $pluginUrl;
+    /**
+     * @var string
+     */
+    protected $pluginPath;
 
     /**
      *
@@ -112,7 +116,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->logger = $logger;
@@ -123,6 +128,7 @@ public function __construct(
         $this->mollieOrderService = $mollieOrderService;
         $this->httpResponse = $httpResponse;
         $this->pluginUrl = $pluginUrl;
+        $this->pluginPath = $pluginPath;
 
         // No plugin id, gateway id is unique enough
         $this->plugin_id = '';

diff --git a/src/Gateway/ApplePay/Mollie_WC_Gateway_ApplePay.php b/src/Gateway/ApplePay/Mollie_WC_Gateway_ApplePay.php
@@ -33,7 +33,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -48,7 +49,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
     /**
@@ -127,9 +129,8 @@ protected function getInstructions(
 
     protected function includeApplePayButton()
     {
-        $fields = include Plugin::getPluginPath(
-            '/inc/settings/mollie_apple_pay_button_enabler.php'
-        );
+        $fields = include $this->pluginPath . '/' .
+            '/inc/settings/mollie_apple_pay_button_enabler.php';
 
         $this->form_fields = array_merge($this->form_fields, $fields);
     }

diff --git a/src/Gateway/Bancontact/Mollie_WC_Gateway_Bancontact.php b/src/Gateway/Bancontact/Mollie_WC_Gateway_Bancontact.php
@@ -27,7 +27,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports =  [
@@ -42,7 +43,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/BankTransfer/Mollie_WC_Gateway_BankTransfer.php b/src/Gateway/BankTransfer/Mollie_WC_Gateway_BankTransfer.php
@@ -37,7 +37,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -53,7 +54,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
         add_filter('woocommerce_' . $this->id . '_args', [$this, 'addPaymentArguments'], 10, 2);
     }

diff --git a/src/Gateway/Belfius/Mollie_WC_Gateway_Belfius.php b/src/Gateway/Belfius/Mollie_WC_Gateway_Belfius.php
@@ -27,7 +27,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -42,7 +43,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/Creditcard/Mollie_WC_Gateway_Creditcard.php b/src/Gateway/Creditcard/Mollie_WC_Gateway_Creditcard.php
@@ -28,7 +28,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
         parent::__construct(
                 $iconFactory,
@@ -38,7 +39,8 @@ public function __construct(
                 $logger,
                 $notice,
                 $httpResponse,
-                $pluginUrl
+                $pluginUrl,
+                $pluginPath
         );
         $this->supports = [
             'products',
@@ -177,9 +179,7 @@ protected function getInstructions(
      */
     protected function includeCreditCardIconSelector()
     {
-        $fields = include Plugin::getPluginPath(
-            '/inc/settings/mollie_creditcard_icons_selector.php'
-        );
+        $fields = include $this->pluginPath . '/' . '/inc/settings/mollie_creditcard_icons_selector.php';
 
         $fields and $this->form_fields = array_merge($this->form_fields, $fields);
     }
@@ -224,7 +224,7 @@ public function buildSvgComposed()
         $enabledCreditCards = $this->enabledCreditcards();
 
         $assetsImagesPath
-            = Plugin::getPluginPath('public/images/Creditcard_issuers/');
+            = $this->pluginPath . '/' . 'public/images/Creditcard_issuers/';
         $cardWidth = PaymentMethodsIconUrl::CREDIT_CARD_ICON_WIDTH;
         $cardsNumber = count($enabledCreditCards);
         $cardsWidth = $cardWidth * $cardsNumber;
@@ -286,9 +286,7 @@ protected function hasFieldsIfMollieComponentsIsEnabled()
 
     protected function includeMollieComponentsFields()
     {
-        $fields = include Plugin::getPluginPath(
-            '/inc/settings/mollie_components_enabler.php'
-        );
+        $fields = include $this->pluginPath . '/' . '/inc/settings/mollie_components_enabler.php';
 
         $this->form_fields = array_merge($this->form_fields, $fields);
     }
@@ -328,14 +326,14 @@ protected function isMollieComponentsEnabled(): bool
     protected function lockIcon()
     {
         return file_get_contents(
-            Plugin::getPluginPath('public/images/lock-icon.svg')
+            $this->pluginPath . '/' .  'public/images/lock-icon.svg'
         );
     }
 
     protected function mollieLogo()
     {
         return file_get_contents(
-            Plugin::getPluginPath('public/images/mollie-logo.svg')
+            $this->pluginPath . '/' .  'public/images/mollie-logo.svg'
         );
     }
 

diff --git a/src/Gateway/DirectDebit/Mollie_WC_Gateway_DirectDebit.php b/src/Gateway/DirectDebit/Mollie_WC_Gateway_DirectDebit.php
@@ -29,7 +29,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -45,7 +46,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/EPS/Mollie_WC_Gateway_EPS.php b/src/Gateway/EPS/Mollie_WC_Gateway_EPS.php
@@ -27,7 +27,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports =  [
@@ -43,7 +44,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -381,6 +381,7 @@ public function gatewaysWithNamespace(ContainerInterface $container): array
         $mollieOrderService = $container->get(MollieOrderService::class);
         $HttpResponseService = $container->get('SDK.HttpResponse');
         $pluginUrl = $container->get('core.plugin_url');
+        $pluginPath = $container->get('core.plugin_path');
         $gatewayClassnames = $this->gatewayClassnames;
         $gateways = [];
         $gatewayNamespace = 'Mollie\\WooCommerce\\Gateway\\';
@@ -396,7 +397,8 @@ public function gatewaysWithNamespace(ContainerInterface $container): array
                 $logger,
                 $notice,
                 $HttpResponseService,
-                $pluginUrl
+                $pluginUrl,
+                $pluginPath
             );
         }
         return $gateways;

diff --git a/src/Gateway/Giftcard/Mollie_WC_Gateway_Giftcard.php b/src/Gateway/Giftcard/Mollie_WC_Gateway_Giftcard.php
@@ -28,7 +28,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -46,7 +47,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/Giropay/Mollie_WC_Gateway_Giropay.php b/src/Gateway/Giropay/Mollie_WC_Gateway_Giropay.php
@@ -27,7 +27,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports =  [
@@ -43,7 +44,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/Ideal/Mollie_WC_Gateway_Ideal.php b/src/Gateway/Ideal/Mollie_WC_Gateway_Ideal.php
@@ -30,7 +30,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -50,7 +51,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/Kbc/Mollie_WC_Gateway_Kbc.php b/src/Gateway/Kbc/Mollie_WC_Gateway_Kbc.php
@@ -28,7 +28,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -47,7 +48,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/KlarnaPayLater/Mollie_WC_Gateway_KlarnaPayLater.php b/src/Gateway/KlarnaPayLater/Mollie_WC_Gateway_KlarnaPayLater.php
@@ -27,7 +27,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -43,7 +44,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/KlarnaSliceIt/Mollie_WC_Gateway_KlarnaSliceIt.php b/src/Gateway/KlarnaSliceIt/Mollie_WC_Gateway_KlarnaSliceIt.php
@@ -27,7 +27,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -43,7 +44,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }
 

diff --git a/src/Gateway/MyBank/Mollie_WC_Gateway_MyBank.php b/src/Gateway/MyBank/Mollie_WC_Gateway_MyBank.php
@@ -31,7 +31,8 @@ public function __construct(
         Logger $logger,
         NoticeInterface $notice,
         HttpResponse $httpResponse,
-        string $pluginUrl
+        string $pluginUrl,
+        string $pluginPath
     ) {
 
         $this->supports = [
@@ -47,7 +48,8 @@ public function __construct(
             $logger,
             $notice,
             $httpResponse,
-            $pluginUrl
+            $pluginUrl,
+            $pluginPath
         );
     }