Merge branch 'develop'

Author: avstudnitz

composer.json

@@ -6,7 +6,7 @@
     "integer-net/solr-base": "^3.1.0",
     "integer-net/solr-pro": "^1.2.1",
     "integer-net/solr-magento2-autosuggest" : "^1.0.0",
-    "magento/module-catalog": "^101.0.0",
+    "magento/module-catalog": "^101.0.0|^102.0.0",
     "magento/module-search": "^100.1.0"
   },
   "require-dev": {

doc/release-notes.md

@@ -2,6 +2,12 @@ IntegerNet_Solr for Magento 2
 ===============
 Release Notes
 
+Version 1.4.1 (Oct 20, 2017)
+---------------
+
+- Fix behavior of product attributes "Solr Priority" and "Exclude this Product from Solr Index"
+- Compatibility for final Magento 2.2.0 defined in composer.json
+
 Version 1.4.0 (Oct 11, 2017)
 ---------------
 

main/src/Model/Bridge/Product.php

@@ -109,8 +109,10 @@ public function isIndexable()
         if (! \in_array($this->magentoProduct->getStore()->getWebsiteId(), $this->magentoProduct->getWebsiteIds())) {
             return false;
         }
-        if ($this->getMagentoProduct()->getExtensionAttributes()->getSolrExclude()) {
-            return false;
+        if ($solrExcludeCustomAttribute = $this->getMagentoProduct()->getCustomAttribute('solr_exclude')) {
+            if ($solrExcludeCustomAttribute->getValue()) {
+                return false;
+            }
         }
         return true;
     }
@@ -143,7 +145,10 @@ public function isVisibleInSearch()
 
     public function getSolrBoost()
     {
-        $boost = $this->getMagentoProduct()->getExtensionAttributes()->getSolrBoost();
+        $boost = 1;
+        if ($solrBoostCustomAttribute = $this->getMagentoProduct()->getCustomAttribute('solr_boost')) {
+            $boost = $solrBoostCustomAttribute->getValue();
+        }
         if (!$this->isInStock()) {
             if ($boost === null) {
                 $boost = 1;

main/src/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="IntegerNet_Solr" setup_version="1.4.0">
+    <module name="IntegerNet_Solr" setup_version="1.4.1">
         <sequence>
             <module name="Magento_Search"/>
             <module name="Magento_CatalogSearch"/>

main/test/unit/Model/Bridge/ProductTest.php

@@ -66,17 +66,17 @@ protected function tearDown()
      */
     public function testCoreAttributes($storeId, $productData, $expectedHasSpecialPrice)
     {
-        $extensionAttributesStub = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->setMethods(['getSolrBoost'])
+        $customAttributeStub = $this->getMockBuilder(\Magento\Framework\Api\AttributeInterface::class)
+            ->setMethods(['getValue'])
             ->getMockForAbstractClass();
 
         $this->magentoProductStub->method('getId')->willReturn($productData['id']);
         $this->magentoProductStub->method('getPrice')->willReturn($productData['price']);
         $finalPrice = isset($productData['special_price']) ? $productData['special_price'] : $productData['price'];
         $this->magentoProductStub->method('getFinalPrice')->willReturn($finalPrice);
         $this->magentoProductStub->method('getStoreId')->willReturn($storeId);
-        $this->magentoProductStub->method('getExtensionAttributes')->willReturn($extensionAttributesStub);
-        $extensionAttributesStub->method('getSolrBoost')->willReturn($productData['solr_boost']);
+        $this->magentoProductStub->method('getCustomAttribute')->willReturn($customAttributeStub);
+        $customAttributeStub->method('getValue')->willReturn($productData['solr_boost']);
         $this->magentoProductStub->method('getCategoryIds')->willReturn($productData['category_ids']);
         $productBridge = $this->makeProductBridge($storeId);
 
@@ -176,16 +176,16 @@ public function testIndexable($storeAndWebsiteId, $status, $visibility, $website
             ->getMockForAbstractClass();
         $storeStub->method('getWebsiteId')->willReturn($storeAndWebsiteId);
 
-        $extensionAttributesStub = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->setMethods(['getStockItem', 'getSolrExclude'])
+        $customAttributeStub = $this->getMockBuilder(\Magento\Framework\Api\AttributeInterface::class)
+            ->setMethods(['getValue'])
             ->getMockForAbstractClass();
-        $extensionAttributesStub->method('getSolrExclude')->willReturn($solrExclude);
+        $customAttributeStub->method('getValue')->willReturn($solrExclude);
 
         $this->magentoProductStub->method('getStatus')->willReturn($status);
         $this->magentoProductStub->method('getVisibility')->willReturn($visibility);
         $this->magentoProductStub->method('getStore')->willReturn($storeStub);
         $this->magentoProductStub->method('getWebsiteIds')->willReturn($websiteIds);
-        $this->magentoProductStub->method('getExtensionAttributes')->willReturn($extensionAttributesStub);
+        $this->magentoProductStub->method('getCustomAttribute')->willReturn($customAttributeStub);
         $this->magentoProductStub->method('getData')->with('is_salable')->willReturn($inStock);
 
         $productBridge = $this->makeProductBridge($storeAndWebsiteId);