Add php 7 support, small fixes

Author: Silvan Laroo

Model/Autocomplete/SearchDataProvider.php

@@ -13,6 +13,7 @@
 namespace Sebwite\SmartSearch\Model\Autocomplete;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\Image;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaFactory as FullTextSearchCriteriaFactory;
@@ -25,7 +26,11 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Full text search implementation of autocomplete.
+ *  Full text search implementation of autocomplete.
+ *
+ * @package        Sebwite\SmartSearch
+ * @author         Sebwite
+ * @copyright      Copyright (c) 2015, Sebwite. All rights reserved
  */
 class SearchDataProvider implements DataProviderInterface
 {
@@ -54,18 +59,24 @@ class SearchDataProvider implements DataProviderInterface
 
     /** @var SearchCriteriaBuilder */
     protected $searchCriteriaBuilder;
+
     /**
      * @var StoreManagerInterface
      */
-    private $storeManager;
+    protected $storeManager;
+
     /**
      * @var PriceCurrencyInterface
      */
-    private $priceCurrency;
+    protected $priceCurrency;
+
     /**
      * @var ProductHelper
      */
-    private $productHelper;
+    protected $productHelper;
+
+    /** @var \Magento\Catalog\Helper\Image */
+    protected $imageHelper;
 
     /**
      * Initialize dependencies.
@@ -80,6 +91,7 @@ class SearchDataProvider implements DataProviderInterface
      * @param SearchCriteriaBuilder                             $searchCriteriaBuilder
      * @param StoreManagerInterface                             $storeManager
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Catalog\Helper\Image                     $imageHelper
      */
     public function __construct(
         QueryFactory $queryFactory,
@@ -91,48 +103,54 @@ public function __construct(
         ProductRepositoryInterface $productRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         StoreManagerInterface $storeManager,
-        PriceCurrencyInterface $priceCurrency
-    ) {
-        $this->queryFactory = $queryFactory;
-        $this->itemFactory = $itemFactory;
-        $this->fullTextSearchApi = $search;
+        PriceCurrencyInterface $priceCurrency,
+        Image $imageHelper
+    )
+    {
+        $this->queryFactory                  = $queryFactory;
+        $this->itemFactory                   = $itemFactory;
+        $this->fullTextSearchApi             = $search;
         $this->fullTextSearchCriteriaFactory = $searchCriteriaFactory;
-        $this->filterBuilder = $filterBuilder;
-        $this->searchFilterGroupBuilder = $searchFilterGroupBuilder;
-        $this->productRepository = $productRepository;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->storeManager = $storeManager;
-        $this->priceCurrency = $priceCurrency;
+        $this->filterBuilder                 = $filterBuilder;
+        $this->searchFilterGroupBuilder      = $searchFilterGroupBuilder;
+        $this->productRepository             = $productRepository;
+        $this->searchCriteriaBuilder         = $searchCriteriaBuilder;
+        $this->storeManager                  = $storeManager;
+        $this->priceCurrency                 = $priceCurrency;
+        $this->imageHelper                   = $imageHelper;
     }
 
     /**
-     * {@inheritdoc}
+     * getItems method
+     *
+     * @return array
      */
     public function getItems()
     {
-        $result = [];
-        $query = $this->queryFactory->get()->getQueryText();
+        $result     = [ ];
+        $query      = $this->queryFactory->get()->getQueryText();
         $productIds = $this->searchProductsFullText($query);
 
         // Check if products are found
-        if ($productIds) {
+        if ( $productIds )
+        {
             $searchCriteria = $this->searchCriteriaBuilder->addFilter('entity_id', $productIds, 'in')->create();
-            $products = $this->productRepository->getList($searchCriteria);
-
-            $baseUrl = $this->storeManager->getStore()->getBaseUrl();
+            $products       = $this->productRepository->getList($searchCriteria);
 
-            // Loop through products
+            foreach ( $products->getItems() as $product )
+            {
 
-            foreach ($products->getItems() as $product) {
+                $image = $this->imageHelper->init($product, 'product_page_image_small')->getUrl();
 
                 $resultItem = $this->itemFactory->create([
-                    'title'             => $product->getName(), 'price' => $this->priceCurrency->format($product->getFinalPrice(), false),
+                    'title'             => $product->getName(),
+                    'price'             => $this->priceCurrency->format($product->getFinalPrice(), false),
                     'special_price'     => $this->priceCurrency->format($product->getSpecialPrice(), false),
                     'has_special_price' => $product->getSpecialPrice() > 0 ? true : false,
-                    'image'             => str_replace('index.php/', '', $baseUrl) . '/pub/media/catalog/product' . $product->getImage(),
+                    'image'             => $image,
                     'url'               => $product->getProductUrl()
                 ]);
-                $result[] = $resultItem;
+                $result[]   = $resultItem;
             }
         }
 
@@ -142,30 +160,34 @@ public function getItems()
     /**
      * Perform full text search and find IDs of matching products.
      *
-     * @param string
-     * @return int[]
+     * @param $query
+     *
+     * @return array
      */
-    private function searchProductsFullText($query)
+    protected function searchProductsFullText($query)
     {
         $searchCriteria = $this->fullTextSearchCriteriaFactory->create();
 
         /** To get list of available request names see Magento/CatalogSearch/etc/search_request.xml */
         $searchCriteria->setRequestName('quick_search_container');
-        $filter = $this->filterBuilder->setField('search_term')->setValue($query)->setConditionType('like')->create();
+        $filter      = $this->filterBuilder->setField('search_term')->setValue($query)->setConditionType('like')->create();
         $filterGroup = $this->searchFilterGroupBuilder->addFilter($filter)->create();
         $currentPage = 1;
-        $searchCriteria->setFilterGroups([$filterGroup])
+        $searchCriteria->setFilterGroups([ $filterGroup ])
             ->setCurrentPage($currentPage)
             ->setPageSize(self::PRODUCTS_NUMBER_IN_SUGGEST);
         $searchResults = $this->fullTextSearchApi->search($searchCriteria);
-        $productIds = [];
+        $productIds    = [ ];
+
         /**
          * Full text search returns document IDs (in this case product IDs),
          * so to get products information we need to load them using filtration by these IDs
          */
-        foreach ($searchResults->getItems() as $searchDocument) {
+        foreach ( $searchResults->getItems() as $searchDocument )
+        {
             $productIds[] = $searchDocument->getId();
         }
+
         return $productIds;
     }
 }

composer.json

@@ -2,13 +2,13 @@
   "name": "sebwite/magento2-smartsearch",
   "description": "Magento 2.0 SmartSearch",
   "type": "magento2-module",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
   ],
   "require": {
-    "php": "~5.5.0|~5.6.0",
+    "php": "~5.5.0|~7.0",
     "magento/magento-composer-installer": "*"
   },
   "autoload": {

etc/di.xml

@@ -10,5 +10,3 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\CatalogSearch\Model\Autocomplete\DataProvider" type="Sebwite\SmartSearch\Model\Autocomplete\SearchDataProvider" />
 </config>
-
-

view/frontend/layout/default.xml

@@ -12,4 +12,4 @@
             </referenceBlock>
         </referenceContainer>
     </body>
-</page>
+</page>

view/frontend/web/form-mini.js

@@ -252,9 +252,13 @@ define([
 
             if (value.length >= parseInt(this.options.minSearchLength, 10)) {
 
-                $('#search').addClass('loading');
+                $('#search_mini_form').addClass('is-loading');
 
-                $.get(this.options.url, {q: value}, $.proxy(function (data) {
+                if(this.request) {
+                    this.request.abort();
+                }
+
+                this.request = $.get(this.options.url, {q: value}, $.proxy(function (data) {
 
                     // Check if SmartSearch returned results
                     if( ! data.length)
@@ -274,7 +278,7 @@ define([
                         .show()
                         .find(this.options.responseFieldElements + ':visible');
 
-                     $('#search').removeClass('loading');
+                    $('#search_mini_form').removeClass('is-loading');
 
                     this._resetResponseList(false);
                     this.element.removeAttr('aria-activedescendant');