magento 2.1, 2.2 compatibility fixes

Model/Adapter/Aggregation/Checker/Query/CatalogView.php → Plugin/CategoryAggregation.php

@@ -1,21 +1,16 @@
 <?php
-namespace Niks\LayeredNavigation\Model\Adapter\Aggregation\Checker\Query;
+namespace Niks\LayeredNavigation\Plugin;
+
 
-use Magento\CatalogSearch\Model\Adapter\Aggregation\Checker\Query\CatalogView as CoreCatalogView;
 use Magento\Framework\Search\RequestInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Search\Request\QueryInterface;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Exception\NoSuchEntityException;
 
-class CatalogView extends CoreCatalogView
+class CategoryAggregation
 {
-    /**
-     * Identifier for query name
-     */
-    private $name;
-
     /**
      * @var CategoryRepositoryInterface
      */
@@ -29,29 +24,26 @@ class CatalogView extends CoreCatalogView
     /**
      * @param CategoryRepositoryInterface $categoryRepository
      * @param StoreManagerInterface $storeManager
-     * @param string $name
      */
     public function __construct(
         CategoryRepositoryInterface $categoryRepository,
-        StoreManagerInterface $storeManager,
-        $name
+        StoreManagerInterface $storeManager
     ) {
         $this->categoryRepository = $categoryRepository;
         $this->storeManager = $storeManager;
-        $this->name = $name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isApplicable(RequestInterface $request)
+    public function aroundIsApplicable(
+        \Magento\CatalogSearch\Model\Adapter\Aggregation\Checker\Query\CatalogView $subject,
+        \Closure $proceed,
+        RequestInterface $request
+    )
     {
-        $result = true;
-        if ($request->getName() === $this->name) {
-            $result = $this->hasAnchorCategory($request);
+        if ($request->getName() === 'catalog_view_container') {
+            return $this->hasAnchorCategory($request);
         }
 
-        return $result;
+        return $proceed($request);
     }
 
     /**

composer.json

@@ -5,7 +5,7 @@
     "php": "~5.5.0|~5.6.0|~7.0.0"
   },
   "type": "magento2-module",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

etc/di.xml

@@ -56,11 +56,7 @@
         <plugin name="multiple_category_ids" type="Niks\LayeredNavigation\Plugin\Preprocessor" sortOrder="1" />
     </type>
 
-    <type name="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerComposite">
-        <arguments>
-            <argument name="queryCheckers" xsi:type="array">
-                <item name="catalog_view_container" xsi:type="object">\Niks\LayeredNavigation\Model\Adapter\Aggregation\Checker\Query\CatalogView</item>
-            </argument>
-        </arguments>
+    <type name="Magento\CatalogSearch\Model\Adapter\Aggregation\Checker\Query\CatalogView">
+        <plugin name="category_aggregation" type="Niks\LayeredNavigation\Plugin\CategoryAggregation" sortOrder="1" />
     </type>
 </config>

etc/module.xml

@@ -1,6 +1,6 @@
 <?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="Niks_LayeredNavigation" setup_version="0.0.1" >
+    <module name="Niks_LayeredNavigation" setup_version="0.0.3" >
         <sequence>
             <module name="Magento_CatalogSearch"/>
             <module name="Magento_Swatches" />