Skip to content

[fix] Compatibility among Magento 2 versions #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2024
Merged

[fix] Compatibility among Magento 2 versions #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a7399
[fix] Compatibility among Magento 2 versions
tuyennn Aug 16, 2024
560f2e0
[fix] preg_split give exception while no $excludePatternList or $incl…
tuyennn Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Setup/UpgradeData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Magento\Framework\Setup\ModuleDataSetupInterface;
use Magento\Framework\Setup\ModuleContextInterface;
use Magento\Store\Model\StoreManagerInterface;
use Zend_Uri_Http;

use Tawk\Helpers\PathHelper;
use Tawk\Widget\Model\WidgetFactory;
Expand Down Expand Up @@ -94,14 +93,15 @@ private function getStoreHost($storeId)
$storeHost = '';

$storeUrl = $this->_modelStoreManager->getStore($storeId)->getBaseUrl();
$parsedUrl = Zend_Uri_Http::fromString($storeUrl);
//phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
$parsedUrl = parse_url($storeUrl);

if ($parsedUrl->getHost() !== false) {
$storeHost = $parsedUrl->getHost();
if (!empty($parsedUrl['host'])) {
$storeHost = $parsedUrl['host'];
}

if ($parsedUrl->getPort() !== false) {
$storeHost .= ':' . $parsedUrl->getPort();
if (!empty($parsedUrl['port'])) {
$storeHost .= ':' . $parsedUrl['port'];
}

return $storeHost;
Expand All @@ -116,7 +116,10 @@ private function getStoreHost($storeId)
*/
private function addWildcardToPatternList($patternList, $storeHost)
{
$splittedPatternList = preg_split("/,/", $patternList);
if (empty($patternList)) {
return '';
}
$splittedPatternList = preg_split("/,/", (string)$patternList);
$wildcard = PathHelper::get_wildcard();

$newPatternList = [];
Expand Down