From 36a73995464bb527fc860a7fb2df87498c11ed8b Mon Sep 17 00:00:00 2001 From: tuyennn Date: Fri, 16 Aug 2024 16:18:22 +0700 Subject: [PATCH 1/2] [fix] Compatibility among Magento 2 versions --- Setup/UpgradeData.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index e802e9b..11840e2 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -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; @@ -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; From 560f2e0546e8b94ade0bd47d8a74ee07b60905e0 Mon Sep 17 00:00:00 2001 From: tuyennn Date: Fri, 16 Aug 2024 16:48:13 +0700 Subject: [PATCH 2/2] [fix] preg_split give exception while no $excludePatternList or $includePatternList exist --- Setup/UpgradeData.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index 11840e2..520923a 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -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 = [];