MAGETWO-88670: Catalog EAV table getting called instead of flat table on top menu when flat is enabled

Author: slopukhov

app/code/Magento/Catalog/Model/ResourceModel/Category/CollectionFactory.php renamed to app/code/Magento/Catalog/Model/ResourceModel/Category/StateDependentCollectionFactory.php

@@ -7,9 +7,9 @@
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
 /**
- * Factory class for category collection
+ * Factory class for state dependent category collection
  */
-class CollectionFactory
+class StateDependentCollectionFactory
 {
     /**
      * Object Manager instance

app/code/Magento/Catalog/Plugin/Block/Topmenu.php

@@ -22,7 +22,7 @@ class Topmenu
     protected $catalogCategory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+     * @var \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory
      */
     private $collectionFactory;
 
@@ -40,13 +40,13 @@ class Topmenu
      * Initialize dependencies.
      *
      * @param \Magento\Catalog\Helper\Category $catalogCategory
-     * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      */
     public function __construct(
         \Magento\Catalog\Helper\Category $catalogCategory,
-        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\StateDependentCollectionFactory $categoryCollectionFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver
     ) {