Merge pull request #33 from koongo-com/bugfix/SC-2416-abstract-resource

SC-2416 - move driver before the optional dependencies
koongo-com · Jan 30, 2025 · 4ff4d25 · 4ff4d25
2 parents b797d75 + 7392b65
commit 4ff4d25
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "koongo-com/magento2-data-feed-manager",
 	"type": "magento2-module",
-	"version": "2.4.9.1",
+	"version": "2.4.9.2",
 	"license": "CC-BY-4.0",
 	"description": "Koongo is an ultimate product data feed management tool that streamlines the process of product data export from Magento 2 store to any of 500+ price comparison websites, online marketplaces, and affiliate networks worldwide. Koongo helps you upload your product data to selling channels like Google  Shopping, Shop.com, Facebook, Rakuten, Twenga, Bol.com, Beslist.nl, Bing Ads, and more.",
 	"require": {

diff --git a/src/Nostress/Koongo/Model/AbstractModel.php b/src/Nostress/Koongo/Model/AbstractModel.php
@@ -165,6 +165,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractModel
      * @param \Nostress\Koongo\Helper\Data $helper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Nostress\Koongo\Model\Translation $translation
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver ,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -175,9 +176,9 @@ public function __construct(
         \Nostress\Koongo\Helper\Data $helper,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Nostress\Koongo\Model\Translation $translation,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->helper = $helper;

diff --git a/src/Nostress/Koongo/Model/Channel/Feed.php b/src/Nostress/Koongo/Model/Channel/Feed.php
@@ -86,6 +86,7 @@ public function _construct()
      * @param \Nostress\Koongo\Model\Translation $translation
      * @param \Nostress\Koongo\Model\ChannelFactory $channelFactory
      * @param \Nostress\Koongo\Model\Taxonomy\Setup $taxonomySetup
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -98,15 +99,15 @@ public function __construct(
         \Nostress\Koongo\Model\Translation $translation,
         \Nostress\Koongo\Model\ChannelFactory $channelFactory,
         \Nostress\Koongo\Model\Taxonomy\Setup $taxonomySetup,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->channelFactory = $channelFactory;
         $this->taxonomySetup = $taxonomySetup;
 
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     public function getFeedByCode($code = null)

diff --git a/src/Nostress/Koongo/Model/Channel/Profile.php b/src/Nostress/Koongo/Model/Channel/Profile.php
@@ -204,6 +204,7 @@ class Profile extends \Nostress\Koongo\Model\AbstractModel implements ProfileInt
      * @param \Nostress\Koongo\Model\Config\Source\Datetimeformat $datetimeformat
      * @param \Nostress\Koongo\Model\Cache\Product $cacheProduct
      * @param \Nostress\Koongo\Helper\Profile $profileHelper
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -220,9 +221,9 @@ public function __construct(
         \Nostress\Koongo\Model\Config\Source\Datetimeformat $datetimeformat,
         \Nostress\Koongo\Model\Cache\Product $cacheProduct,
         \Nostress\Koongo\Helper\Profile $profileHelper,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->feedFactory = $feedFactory;
@@ -231,7 +232,7 @@ public function __construct(
         $this->_datetimeformat = $datetimeformat;
         $this->cacheProduct = $cacheProduct;
         $this->profileHelper = $profileHelper;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     /**

diff --git a/src/Nostress/Koongo/Model/Channel/Profile/Ftp.php b/src/Nostress/Koongo/Model/Channel/Profile/Ftp.php
@@ -46,6 +46,7 @@ class Ftp extends \Nostress\Koongo\Model\AbstractModel
      * @param \Nostress\Koongo\Helper\Data $helper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Nostress\Koongo\Model\Translation $translation
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param \Magento\Framework\Filesystem\DirectoryList $dir,
@@ -58,13 +59,13 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Nostress\Koongo\Model\Translation $translation,
         \Magento\Framework\Filesystem\DirectoryList $dir,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->_dir = $dir;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     public function uploadFeed(Profile $profile, $checkAutosubmit = false)

diff --git a/src/Nostress/Koongo/Model/ConfigManagement.php b/src/Nostress/Koongo/Model/ConfigManagement.php
@@ -101,6 +101,7 @@ class ConfigManagement extends AbstractModel
      * @param \Magento\Payment\Helper\Data $paymentHelper
      * @param \Nostress\Koongo\Helper\Version $licenseHelper
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -115,16 +116,16 @@ public function __construct(
         \Magento\Payment\Helper\Data $paymentHelper,
         \Nostress\Koongo\Helper\Version $licenseHelper,
         \Magento\Framework\App\ResourceConnection $resourceConnection,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->_shippingConfig = $shippingConfig;
         $this->_paymentHelper = $paymentHelper;
         $this->_licenseHelper  = $licenseHelper;
         $this->_resourceConnection = $resourceConnection;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     /**

diff --git a/src/Nostress/Koongo/Model/Cron.php b/src/Nostress/Koongo/Model/Cron.php
@@ -63,6 +63,7 @@ public function _construct()
      * @param \Nostress\Koongo\Helper\Data $helper
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Nostress\Koongo\Model\Translation $translation
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -74,13 +75,13 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Nostress\Koongo\Model\Translation $translation,
         \Nostress\Koongo\Model\Config\Source\Datetimeformat $datetimeFormat,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->_datetimeFormat = $datetimeFormat;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     /**

diff --git a/src/Nostress/Koongo/Model/Taxonomy/Category.php b/src/Nostress/Koongo/Model/Taxonomy/Category.php
@@ -80,6 +80,7 @@ class Category extends \Nostress\Koongo\Model\AbstractModel
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Nostress\Koongo\Model\Translation $translation
      * @param \Nostress\Koongo\Model\Taxonomy\SetupFactory $taxonomySetupFactory
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -91,13 +92,13 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Nostress\Koongo\Model\Translation $translation,
         \Nostress\Koongo\Model\Taxonomy\SetupFactory $taxonomySetupFactory,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->taxonomySetupFactory = $taxonomySetupFactory;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     public function _construct()

diff --git a/src/Nostress/Koongo/Model/Webhook.php b/src/Nostress/Koongo/Model/Webhook.php
@@ -72,6 +72,7 @@ public function _construct()
      * @param \Nostress\Koongo\Model\Translation $translation
      * @param \Magento\Sales\Model\Order\Shipment $shipmentModel
      * @param \Magento\Shipping\Model\Config $shippingConfig
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver ,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -84,14 +85,14 @@ public function __construct(
         \Nostress\Koongo\Model\Translation $translation,
         \Magento\Sales\Model\Order\Shipment $shipmentModel,
         \Magento\Shipping\Model\Config $shippingConfig,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->_shipmentModel = $shipmentModel;
         $this->_shippingConfig = $shippingConfig;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     /**

diff --git a/src/Nostress/Koongo/Model/Webhook/Event/AbstractProcessor.php b/src/Nostress/Koongo/Model/Webhook/Event/AbstractProcessor.php
@@ -98,6 +98,7 @@ abstract class AbstractProcessor extends AbstractModel
      * @param Kaas $apiClient
      * @param Manager $eventManager
      * @param OrderFactory $orderFactory
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver ,
      * @param AbstractResource $resource
      * @param AbstractDb $resourceCollection
      * @param array $data
@@ -113,17 +114,17 @@ public function __construct(
         Kaas                                                    $apiClient,
         Manager                                                 $webhookEventManager,
         OrderFactory                       $orderFactory,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         AbstractResource $resource = null,
         AbstractDb           $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array                                                   $data = []
     ) {
         $this->_eventFactory = $eventFactory;
         $this->_webhookFactory = $webhookFactory;
         $this->_apiClient = $apiClient;
         $this->_webhookEventManager = $webhookEventManager;
         $this->_orderFactory = $orderFactory;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     /**

diff --git a/src/Nostress/Koongo/Model/Webhook/Event/Manager.php b/src/Nostress/Koongo/Model/Webhook/Event/Manager.php
@@ -52,6 +52,7 @@ class Manager extends \Nostress\Koongo\Model\AbstractModel
      * @param \Nostress\Koongo\Model\Translation $translation
      * @param \Nostress\Koongo\Model\Webhook\EventFactory $eventFactory
      * @param \Nostress\Koongo\Model\WebhookFactory $webhookFactory
+     * @param \Magento\Framework\Filesystem\DriverInterface $driver ,
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -64,14 +65,14 @@ public function __construct(
         \Nostress\Koongo\Model\Translation $translation,
         \Nostress\Koongo\Model\Webhook\EventFactory $eventFactory,
         \Nostress\Koongo\Model\WebhookFactory $webhookFactory,
+        \Magento\Framework\Filesystem\DriverInterface $driver,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
         array $data = []
     ) {
         $this->_eventFactory = $eventFactory;
         $this->_webhookFactory = $webhookFactory;
-        parent::__construct($context, $registry, $helper, $storeManager, $translation, $resource, $resourceCollection, $driver, $data);
+        parent::__construct($context, $registry, $helper, $storeManager, $translation, $driver, $resource, $resourceCollection, $data);
     }
 
     /**

diff --git a/src/Nostress/Koongo/etc/module.xml b/src/Nostress/Koongo/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Nostress_Koongo" setup_version="2.4.9.1" />
+    <module name="Nostress_Koongo" setup_version="2.4.9.2" />
     <sequence>
         <module name="Magento_Store"/>  
         <module name="Magento_Sales"/>