Skip to content

Commit

Permalink
IA-1261
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanyi committed Nov 16, 2023
1 parent 8a3dd5a commit bc8d513
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
6 changes: 4 additions & 2 deletions Block/Snippets.php
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ private function removeDefaultCategories(array $categoryIds): array
*/
public function getMerchantId(): string
{
return (string) $this->configReader->getConfigValue(ConfigInterface::MERCHANT_ID);
$merchantId = $this->configReader->getConfigValue(ConfigInterface::MERCHANT_ID);
return is_array($merchantId) ? '' : (string) $merchantId;
}

/**
Expand All @@ -303,7 +304,8 @@ public function getMerchantId(): string
*/
public function getSnippetUrl(): string
{
return (string) $this->configReader->getConfigValue(ConfigInterface::SNIPPET_URL);
$snippetUrl = $this->configReader->getConfigValue(ConfigInterface::SNIPPET_URL);
return is_array($snippetUrl) ? '' : (string) $snippetUrl;
}

/**
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Release notes:
==============

2.0.11
-------
* Fix
* Fixing type conversion for PHP 8.1.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"php": ">7.0.1"
},
"type": "magento2-module",
"version": "2.0.10",
"version": "2.0.11",
"autoload": {
"files": [
"registration.php"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>

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

0 comments on commit bc8d513

Please sign in to comment.