From d66a1bacddc51e7379b7706d5e98e82ce1e1e748 Mon Sep 17 00:00:00 2001 From: magentix Date: Mon, 8 Apr 2024 09:36:44 +0200 Subject: [PATCH 1/2] PGTO-427: Custom Resource Connection --- App/ResourceConnection.php | 18 ++++++++++++++++++ Helper/Import/Entities.php | 2 +- Helper/Import/Product.php | 2 +- Model/Config/ConfigManagement.php | 2 +- etc/di.xml | 7 +++++++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 App/ResourceConnection.php diff --git a/App/ResourceConnection.php b/App/ResourceConnection.php new file mode 100644 index 00000000..1f6e5bc5 --- /dev/null +++ b/App/ResourceConnection.php @@ -0,0 +1,18 @@ + + * @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/Helper/Import/Entities.php b/Helper/Import/Entities.php index 4e53e950..61a3818b 100644 --- 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 index 337913f2..f331bc65 100755 --- 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 index e3e4dcc0..070be439 100644 --- 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/etc/di.xml b/etc/di.xml index 2cc34edc..98e02b47 100755 --- a/etc/di.xml +++ b/etc/di.xml @@ -446,4 +446,11 @@ Akeneo\Connector\Executor\JobExecutor\Proxy + + + + Magento\Framework\App\ResourceConnection\ConnectionFactory + Magento\Framework\App\DeploymentConfig + + From fdd421672e5b7f9c19439ed46b5e0e11a30a8fe9 Mon Sep 17 00:00:00 2001 From: magentix Date: Mon, 8 Apr 2024 10:40:02 +0200 Subject: [PATCH 2/2] Bump to 104.3.6 --- CHANGELOG.md | 4 ++++ composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5743c263..422a660f 100644 --- 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/composer.json b/composer.json index 520bdcfc..1645f292 100644 --- 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"