Merge pull request #685 from akeneo/release/104.3.6

Release/104.3.6
akeneo · Apr 8, 2024 · 6dd5ab3 · 6dd5ab3
2 parents 98902f7 + 702a12b
commit 6dd5ab3
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 4 deletions.
diff --git a/App/ResourceConnection.php b/App/ResourceConnection.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Akeneo\Connector\App;
+
+use Magento\Framework\App\ResourceConnection as BaseResourceConnection;
+
+/**
+ * @author    Agence Dn'D <[email protected]>
+ * @copyright 2004-present Agence Dn'D
+ * @license   https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      https://www.dnd.fr/
+ */
+class ResourceConnection extends BaseResourceConnection
+{
+
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -481,3 +481,7 @@
 
 ### Version 104.3.5 :
 * Fix undefined method
+
+### Version 104.3.6 :
+* PGTO-427: Custom Resource Connection
+* 
diff --git a/Helper/Import/Entities.php b/Helper/Import/Entities.php
@@ -4,6 +4,7 @@
 
 namespace Akeneo\Connector\Helper\Import;
 
+use Akeneo\Connector\App\ResourceConnection;
 use Akeneo\Connector\Helper\Authenticator;
 use Akeneo\Connector\Helper\Config as ConfigHelper;
 use Akeneo\Connector\Model\Source\Edition;
@@ -17,7 +18,6 @@
 use Magento\Catalog\Model\Product as BaseProductModel;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;

diff --git a/Helper/Import/Product.php b/Helper/Import/Product.php
@@ -2,6 +2,7 @@
 
 namespace Akeneo\Connector\Helper\Import;
 
+use Akeneo\Connector\App\ResourceConnection;
 use Akeneo\Connector\Helper\Authenticator;
 use Akeneo\Connector\Helper\Config as ConfigHelper;
 use Akeneo\Pim\ApiClient\AkeneoPimClientInterface;
@@ -10,7 +11,6 @@
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Serialize\Serializer\Json;

diff --git a/Model/Config/ConfigManagement.php b/Model/Config/ConfigManagement.php
@@ -4,6 +4,7 @@
 
 namespace Akeneo\Connector\Model\Config;
 
+use Akeneo\Connector\App\ResourceConnection;
 use Akeneo\Connector\Block\Adminhtml\System\Config\Form\Field\Website;
 use Akeneo\Connector\Helper\Config as ConfigHelper;
 use Akeneo\Connector\Model\Backend\Json;
@@ -12,7 +13,6 @@
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Module\Dir;

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "nyholm/psr7": "^1.5"
   },
   "type": "magento2-module",
-  "version": "104.3.5",
+  "version": "104.3.6",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/etc/di.xml b/etc/di.xml
@@ -446,4 +446,11 @@
             <argument name="jobExecutor" xsi:type="object">Akeneo\Connector\Executor\JobExecutor\Proxy</argument>
         </arguments>
     </type>
+
+    <type name="Akeneo\Connector\App\ResourceConnection">
+        <arguments>
+            <argument name="connectionFactory" xsi:type="object">Magento\Framework\App\ResourceConnection\ConnectionFactory</argument>
+            <argument name="deploymentConfig" xsi:type="object">Magento\Framework\App\DeploymentConfig</argument>
+        </arguments>
+    </type>
 </config>