Merge pull request #1 from EmicoEcommerce/v4.0

Fix compatibility with emico/m2-attributelanding
EmicoEcommerce · Nov 3, 2022 · 68b32c3 · 68b32c3
2 parents 4103321 + 69b6ae6
commit 68b32c3
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=7.4 <8.2",
         "tweakwise/magento2-tweakwise": "^5.0",
-        "tweakwise/magento2-attributelanding": "^4.0"
+        "emico/m2-attributelanding": "^3.2"
     },
     "type": "magento2-module",
     "replace": {

diff --git a/src/Model/AjaxResultInitializer/LandingPageInitializer.php b/src/Model/AjaxResultInitializer/LandingPageInitializer.php
@@ -7,8 +7,8 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Model\AjaxResultInitializer;
 
-use Tweakwise\AttributeLanding\Model\FilterApplier\FilterApplierInterface;
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\FilterApplier\FilterApplierInterface;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\Magento2Tweakwise\Model\AjaxNavigationResult;
 use Tweakwise\Magento2Tweakwise\Model\AjaxResultInitializer\InitializerInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
@@ -18,7 +18,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Registry;
-use Tweakwise\AttributeLanding\Api\LandingPageRepositoryInterface;
+use Emico\AttributeLanding\Api\LandingPageRepositoryInterface;
 
 class LandingPageInitializer implements InitializerInterface
 {

diff --git a/src/Model/Catalog/Layer/Url/RewriteResolver/LandingPageResolver.php b/src/Model/Catalog/Layer/Url/RewriteResolver/LandingPageResolver.php
@@ -7,7 +7,7 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Model\Catalog\Layer\Url\RewriteResolver;
 
-use Tweakwise\AttributeLanding\Model\Config;
+use Emico\AttributeLanding\Model\Config;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url\RewriteResolver\RewriteResolverInterface;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\Framework\App\Config\ScopeConfigInterface;

diff --git a/src/Model/FilterApplier/TweakwiseFilterApplier.php b/src/Model/FilterApplier/TweakwiseFilterApplier.php
@@ -6,8 +6,8 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Model\FilterApplier;
 
-use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface;
-use Tweakwise\AttributeLanding\Model\FilterApplier\FilterApplierInterface;
+use Emico\AttributeLanding\Api\Data\LandingPageInterface;
+use Emico\AttributeLanding\Model\FilterApplier\FilterApplierInterface;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext;
 
 class TweakwiseFilterApplier implements FilterApplierInterface

diff --git a/src/Model/FilterFormInputProvider/LandingPageInputProvider.php b/src/Model/FilterFormInputProvider/LandingPageInputProvider.php
@@ -6,8 +6,8 @@
  */
 namespace Tweakwise\AttributeLandingTweakwise\Model\FilterFormInputProvider;
 
-use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface;
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Api\Data\LandingPageInterface;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\Magento2Tweakwise\Model\Config;
 use Tweakwise\Magento2Tweakwise\Model\FilterFormInputProvider\FilterFormInputProviderInterface;
 use Magento\Framework\App\RequestInterface;

diff --git a/src/Model/FilterHider/TweakwiseFilterHider.php b/src/Model/FilterHider/TweakwiseFilterHider.php
@@ -6,9 +6,9 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Model\FilterHider;
 
-use Tweakwise\AttributeLanding\Api\Data\FilterInterface as LandingPageFilterInterface;
-use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface;
-use Tweakwise\AttributeLanding\Model\FilterHider\FilterHiderInterface;
+use Emico\AttributeLanding\Api\Data\FilterInterface as LandingPageFilterInterface;
+use Emico\AttributeLanding\Api\Data\LandingPageInterface;
+use Emico\AttributeLanding\Model\FilterHider\FilterHiderInterface;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter as TweakwiseFilter;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item as TweakwiseFilterItem;
 use Magento\Catalog\Model\Layer\Filter\FilterInterface;

diff --git a/src/Model/FilterManager.php b/src/Model/FilterManager.php
@@ -6,12 +6,12 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Model;
 
-use Tweakwise\AttributeLanding\Api\Data\FilterInterface;
-use Tweakwise\AttributeLanding\Api\Data\LandingPageInterface;
-use Tweakwise\AttributeLanding\Model\Filter;
-use Tweakwise\AttributeLanding\Model\FilterHider\FilterHiderInterface;
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
-use Tweakwise\AttributeLanding\Model\UrlFinder;
+use Emico\AttributeLanding\Api\Data\FilterInterface;
+use Emico\AttributeLanding\Api\Data\LandingPageInterface;
+use Emico\AttributeLanding\Model\Filter;
+use Emico\AttributeLanding\Model\FilterHider\FilterHiderInterface;
+use Emico\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\UrlFinder;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item;
 use Tweakwise\Magento2Tweakwise\Model\Client\Type\FacetType\SettingsType;
 use Magento\Catalog\Model\Layer;

diff --git a/src/Plugin/Model/AjaxNavigationResultPlugin.php b/src/Plugin/Model/AjaxNavigationResultPlugin.php
@@ -2,7 +2,7 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Plugin\Model;
 
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\AttributeLandingTweakwise\Model\FilterManager;
 use Tweakwise\Magento2Tweakwise\Model\AjaxNavigationResult;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url;

diff --git a/src/Plugin/PathSlugStrategyPlugin.php b/src/Plugin/PathSlugStrategyPlugin.php
@@ -7,7 +7,7 @@
 namespace Tweakwise\AttributeLandingTweakwise\Plugin;
 
 use Closure;
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\AttributeLandingTweakwise\Model\FilterManager;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url\Strategy\PathSlugStrategy;

diff --git a/src/Plugin/QueryParameterStrategyPlugin.php b/src/Plugin/QueryParameterStrategyPlugin.php
@@ -6,7 +6,7 @@
  */
 namespace Tweakwise\AttributeLandingTweakwise\Plugin;
 
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\AttributeLandingTweakwise\Model\FilterManager;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Url\Strategy\QueryParameterStrategy;

diff --git a/src/Plugin/Seo/FilterHelperPlugin.php b/src/Plugin/Seo/FilterHelperPlugin.php
@@ -6,7 +6,7 @@
 
 namespace Tweakwise\AttributeLandingTweakwise\Plugin\Seo;
 
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\AttributeLandingTweakwise\Model\FilterManager;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item;
 use Tweakwise\Magento2Tweakwise\Model\Seo\FilterHelper;

diff --git a/src/Plugin/UrlPlugin.php b/src/Plugin/UrlPlugin.php
@@ -7,8 +7,8 @@
 namespace Tweakwise\AttributeLandingTweakwise\Plugin;
 
 use Closure;
-use Tweakwise\AttributeLanding\Model\Config;
-use Tweakwise\AttributeLanding\Model\LandingPageContext;
+use Emico\AttributeLanding\Model\Config;
+use Emico\AttributeLanding\Model\LandingPageContext;
 use Tweakwise\AttributeLandingTweakwise\Model\FilterManager;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext\CurrentContext;

diff --git a/src/etc/di.xml b/src/etc/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Tweakwise\AttributeLanding\Model\FilterHider\FilterHiderInterface" type="Tweakwise\AttributeLandingTweakwise\Model\FilterHider\TweakwiseFilterHider"/>
-    <type name="Tweakwise\AttributeLanding\Model\FilterApplier\AggregateFilterApplier">
+    <preference for="Emico\AttributeLanding\Model\FilterHider\FilterHiderInterface" type="Tweakwise\AttributeLandingTweakwise\Model\FilterHider\TweakwiseFilterHider"/>
+    <type name="Emico\AttributeLanding\Model\FilterApplier\AggregateFilterApplier">
         <arguments>
             <argument name="appliers" xsi:type="array">
                 <item name="tweakwise" xsi:type="string">Tweakwise\AttributeLandingTweakwise\Model\FilterApplier\TweakwiseFilterApplier</item>

diff --git a/src/etc/module.xml b/src/etc/module.xml
@@ -2,7 +2,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Tweakwise_AttributeLandingTweakwise" setup_version="1.0.0">
         <sequence>
-            <module name="Tweakwise_AttributeLanding" />
+            <module name="Emico_AttributeLanding" />
             <module name="Tweakwise_Magento2Tweakwise" />
         </sequence>
     </module>

diff --git a/src/view/frontend/layout/tweakwise_ajax_landingpage.xml b/src/view/frontend/layout/tweakwise_ajax_landingpage.xml
@@ -14,7 +14,7 @@
         <container name="content"/>
         <container name="sidebar.main"/>
     </container>
-    <update handle="tweakwise_attributelanding_landingpage_view"/>
+    <update handle="emico_attributelanding_landingpage_view"/>
     <!-- Remove featured products from content as it would be rendered again in ajax call which is not needed -->
     <referenceBlock name="tweakwise.catalog.product.featured.before" remove="true"/>
 </layout>