MAGETWO-69130: Non effective query for catalog search & layered navigation

Author: AVoskoboinikov

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php

@@ -185,7 +185,6 @@ private function applyFilterByWhere(FilterInterface $filter, Select $select)
      *
      * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \InvalidArgumentException
      */
     private function getVisibilityAttributeId()
     {
@@ -194,10 +193,6 @@ private function getVisibilityAttributeId()
             self::VISIBILITY_FILTER_FIELD
         );
 
-        if ($attr === null) {
-            throw new \InvalidArgumentException('Wrong code for visibility attribute');
-        }
-
         return (int) $attr->getId();
     }
 

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilterTest.php

@@ -67,22 +67,6 @@ public function testApplyWithWrongType()
         $this->visibilityFilter->apply($select, $filter, 'Luke, I am your father!');
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Wrong code for visibility attribute
-     */
-    public function testApplyWithWrongAttributeCode()
-    {
-        $select = $this->resource->getConnection()->select();
-        $filter = $this->mockFilter();
-
-        $this->eavConfigMock
-            ->method('getAttribute')
-            ->willReturn(null);
-
-        $this->visibilityFilter->apply($select, $filter, VisibilityFilter::FILTER_BY_WHERE);
-    }
-
     public function testApplyFilterAsWhere()
     {
         $select = $this->resource->getConnection()->select();