Skip to content

Commit de6175c

Browse files
Nikolay DimitrovSanyi
andauthored
feat: version 2.0.11 IA-1261 (#55)
Co-authored-by: Sanyi <[email protected]>
1 parent 8a3dd5a commit de6175c

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

Block/Snippets.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,8 @@ private function removeDefaultCategories(array $categoryIds): array
293293
*/
294294
public function getMerchantId(): string
295295
{
296-
return (string) $this->configReader->getConfigValue(ConfigInterface::MERCHANT_ID);
296+
$merchantId = $this->configReader->getConfigValue(ConfigInterface::MERCHANT_ID);
297+
return is_array($merchantId) ? '' : (string) $merchantId;
297298
}
298299

299300
/**
@@ -303,7 +304,8 @@ public function getMerchantId(): string
303304
*/
304305
public function getSnippetUrl(): string
305306
{
306-
return (string) $this->configReader->getConfigValue(ConfigInterface::SNIPPET_URL);
307+
$snippetUrl = $this->configReader->getConfigValue(ConfigInterface::SNIPPET_URL);
308+
return is_array($snippetUrl) ? '' : (string) $snippetUrl;
307309
}
308310

309311
/**

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Release notes:
2+
==============
3+
4+
2.0.11
5+
-------
6+
* Fix
7+
* Fixing type conversion for PHP 8.1.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"php": ">7.0.1"
77
},
88
"type": "magento2-module",
9-
"version": "2.0.10",
9+
"version": "2.0.11",
1010
"autoload": {
1111
"files": [
1212
"registration.php"

etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22

33
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
4-
<module name="Emartech_Emarsys" setup_version="2.0.10">
4+
<module name="Emartech_Emarsys" setup_version="2.0.11">
55
<sequence>
66
<module name="Magento_Catalog" />
77
<module name="Magento_Inventory" />

0 commit comments

Comments
 (0)