Merge remote-tracking branch 'refs/remotes/origin/master' into DEV-36…

…2-add-github-actions # Conflicts: # Helper/StoreUrl.php
customgento · Jun 4, 2024 · acae034 · acae034
2 parents 497df8a + 546c83e
commit acae034
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Helper/StoreUrl.php b/Helper/StoreUrl.php
@@ -9,10 +9,7 @@
 /** @phpstan-ignore-next-line */
 use MageWorx\SeoBase\Helper\StoreUrl as MageworxStoreUrl;
 
-/** @phpstan-ignore-next-line */
-if (class_exists(MageWorxStoreUrl::class)) {
-
-    /** @phpstan-ignore-next-line */
+if (class_exists(MageworxStoreUrl::class)) {
     class StoreUrl extends MageworxStoreUrl
     {
         protected function isUseStoreCodeInUrl(StoreInterface $store): bool
@@ -24,7 +21,13 @@ protected function isUseStoreCodeInUrl(StoreInterface $store): bool
             $storeId = (int)$store->getId();
 
             return !($store->hasDisableStoreInUrl() && $store->getDisableStoreInUrl())
+                // @phpstan-ignore-next-line
                 && $this->configDataLoader->getConfigValue(Store::XML_PATH_STORE_IN_URL, $storeId);
         }
     }
+} else {
+    class StoreUrl
+    {
+
+    }
 }
diff --git a/etc/di.xml b/etc/di.xml
@@ -3,6 +3,5 @@
     <type name="Magento\Store\Model\Store">
         <plugin name="hide_default_store_code" type="CustomGento\DefaultStoreCodeRemover\Plugin\Store\HideDefaultStoreCodePlugin"/>
     </type>
-
     <preference for="MageWorx\SeoBase\Helper\StoreUrl" type="CustomGento\DefaultStoreCodeRemover\Helper\StoreUrl"/>
-</config>
+</config>