MAGETWO-59163: Category product count incorporating products with visibility set to search only

Author: Oleksandr Gorkun

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -254,7 +254,7 @@ public function setFilterBuilder(\Magento\Framework\Api\FilterBuilder $object)
      * Apply attribute filter to facet collection
      *
      * @param string $field
-     * @param null $condition
+     * @param null|string|array $condition
      * @return $this
      */
     public function addFieldToFilter($field, $condition = null)
@@ -265,30 +265,21 @@ public function addFieldToFilter($field, $condition = null)
 
         $this->getSearchCriteriaBuilder();
         $this->getFilterBuilder();
-        if (!is_array($condition) || !in_array(key($condition), ['from', 'to'])) {
-            $this->filterBuilder->setField($field);
-            $this->filterBuilder->setValue($condition);
-            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
-        } else {
-            if (empty($condition['from']) && empty($condition['to'])) {
-                $this->filterBuilder->setField($field);
-                $this->filterBuilder->setValue($condition);
-                $this->filterBuilder->setConditionType('in');
-                $this->searchCriteriaBuilder->addFilter(
-                    $this->filterBuilder->create()
-                );
-            }
+        if (is_array($condition)
+            && in_array(key($condition), ['from', 'to'], true)
+        ) {
             if (!empty($condition['from'])) {
-                $this->filterBuilder->setField("{$field}.from");
-                $this->filterBuilder->setValue($condition['from']);
-                $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+                $this->addFieldToFilter("{$field}.from", $condition['from']);
             }
             if (!empty($condition['to'])) {
-                $this->filterBuilder->setField("{$field}.to");
-                $this->filterBuilder->setValue($condition['to']);
-                $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+                $this->addFieldToFilter("{$field}.to", $condition['to']);
             }
+        } else {
+            $this->filterBuilder->setField($field);
+            $this->filterBuilder->setValue($condition);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
         }
+
         return $this;
     }