Merge remote-tracking branch 'remotes/origin/PR-sprint-3'

Author: Vadim Zubovich

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -607,11 +607,12 @@ public function isRedirectToCartEnabled()
      */
     public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product)
     {
-        $renderer = $this
-            ->getDetailsRenderer($product->getTypeId())
-            ->setProduct($product);
-
-        return $renderer->toHtml();
+        $renderer = $this->getDetailsRenderer($product->getTypeId());
+        if ($renderer) {
+            $renderer->setProduct($product);
+            return $renderer->toHtml();
+        }
+        return '';
     }
 
     /**
@@ -624,10 +625,10 @@ public function getDetailsRenderer($type = null)
             $type = 'default';
         }
         $rendererList = $this->getDetailsRendererList();
-        if (!$rendererList) {
-            throw new \RuntimeException('Details renderer list for block "' . $this->getNameInLayout() . '" is not defined');
+        if ($rendererList) {
+            return $rendererList->getRenderer($type, 'default');
         }
-        return $rendererList->getRenderer($type, 'default');
+        return null;
     }
 
     /**

app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php

@@ -21,11 +21,6 @@ class Source extends AbstractEav
      */
     protected $_resourceHelper;
 
-    /**
-     * @var \Magento\Eav\Model\Attribute\FrontendType
-     */
-    protected $frontendType;
-
     /**
      * Construct
      *
@@ -41,11 +36,9 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
-        \Magento\Eav\Model\Attribute\FrontendType $frontendType,
         $resourcePrefix = null
     ) {
         $this->_resourceHelper = $resourceHelper;
-        $this->frontendType = $frontendType;
         parent::__construct($context, $eavConfig, $eventManager, $resourcePrefix);
     }
 
@@ -79,11 +72,9 @@ protected function _getIndexableAttributes($multiSelect)
         );
 
         if ($multiSelect == true) {
-            $select->where('ea.backend_type = ?', 'varchar')
-                ->where('ea.frontend_input in (?)', $this->frontendType->getInputs('multiselect'));
+            $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect');
         } else {
-            $select->where('ea.backend_type = ?', 'int')
-                ->where('ea.frontend_input in (?)', $this->frontendType->getInputs('select'));
+            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input = ?', 'select');
         }
 
         return $this->_getReadAdapter()->fetchCol($select);

app/code/Magento/CatalogSearch/Model/Resource/Engine.php

@@ -30,11 +30,6 @@ class Engine extends AbstractDb implements EngineInterface
      */
     protected $productFactoryNames;
 
-    /**
-     * @var \Magento\Eav\Model\Attribute\FrontendType
-     */
-    protected $frontendType;
-
     /**
      * Catalog search data
      *
@@ -49,20 +44,19 @@ class Engine extends AbstractDb implements EngineInterface
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param Advanced $searchResource
      * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
-     * @param string|null $resourcePrefix
+     * @param \Magento\Eav\Model\Attribute\FrontendType $frontendType
+     * @param null $resourcePrefix
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
         \Magento\CatalogSearch\Model\Resource\Advanced $searchResource,
         \Magento\CatalogSearch\Helper\Data $catalogSearchData,
-        \Magento\Eav\Model\Attribute\FrontendType $frontendType,
         $resourcePrefix = null
     ) {
         $this->_catalogProductVisibility = $catalogProductVisibility;
         $this->_searchResource = $searchResource;
         $this->_catalogSearchData = $catalogSearchData;
-        $this->frontendType = $frontendType;
         parent::__construct($context, $resourcePrefix);
     }
 
@@ -155,15 +149,10 @@ public function allowAdvancedIndex()
      */
     private function isTermFilterableAttribute($attribute)
     {
-        $inputTypes = array_merge(
-            $this->frontendType->getInputs('select'),
-            $this->frontendType->getInputs('multiselect')
-        );
-
         return ($attribute->getIsVisibleInAdvancedSearch()
             || $attribute->getIsFilterable()
             || $attribute->getIsFilterableInSearch())
-        && in_array($attribute->getFrontendInput(), $inputTypes);
+        && in_array($attribute->getFrontendInput(), ['select', 'multiselect']);
     }
 
     /**

app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml

@@ -22,6 +22,9 @@
                     <action method="setToolbarBlockName">
                         <argument name="name" xsi:type="string">product_list_toolbar</argument>
                     </action>
+                    <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.details.renderers" as="details.renderers">
+                        <block class="Magento\Framework\View\Element\Template" as="default"/>
+                    </block>
                 </block>
                 <action method="setListOrders"/>
                 <action method="setListModes"/>

app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml

@@ -23,6 +23,9 @@
                     <action method="setToolbarBlockName">
                         <argument name="name" xsi:type="string">product_list_toolbar</argument>
                     </action>
+                    <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.details.renderers" as="details.renderers">
+                        <block class="Magento\Framework\View\Element\Template" as="default"/>
+                    </block>
                 </block>
                 <action method="setListOrders"/>
                 <action method="setListModes"/>

app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php

@@ -268,7 +268,7 @@ public function getStoreOptionValues($storeId)
      *
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      */
-    private function getAttributeObject()
+    protected function getAttributeObject()
     {
         return $this->_registry->registry('entity_attribute');
     }