Merge remote-tracking branch 'origin/2.1.8-develop' into MAGETWO-58533

# Conflicts:
#	dev/tests/integration/testsuite/Magento/Security/Model/AdminSessionsManagerTest.php
#	dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AuthSessionTest.php

Author: zakdma

CONTRIBUTING.md

@@ -29,3 +29,8 @@ If you are a new GitHub user, we recommend that you create your own [free github
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
+The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -31,16 +31,16 @@ abstract class Category extends \Magento\Backend\App\Action
      */
     protected function _initCategory($getRootInstead = false)
     {
-        $categoryId = (int)$this->getRequest()->getParam('id', false);
+        $categoryId = $this->resolveCategoryId();
         $storeId = (int)$this->getRequest()->getParam('store');
-        $category = $this->_objectManager->create('Magento\Catalog\Model\Category');
+        $category = $this->_objectManager->create(\Magento\Catalog\Model\Category::class);
         $category->setStoreId($storeId);
 
         if ($categoryId) {
             $category->load($categoryId);
             if ($storeId) {
                 $rootId = $this->_objectManager->get(
-                    'Magento\Store\Model\StoreManagerInterface'
+                    \Magento\Store\Model\StoreManagerInterface::class
                 )->getStore(
                     $storeId
                 )->getRootCategoryId();
@@ -55,13 +55,25 @@ protected function _initCategory($getRootInstead = false)
             }
         }
 
-        $this->_objectManager->get('Magento\Framework\Registry')->register('category', $category);
-        $this->_objectManager->get('Magento\Framework\Registry')->register('current_category', $category);
-        $this->_objectManager->get('Magento\Cms\Model\Wysiwyg\Config')
+        $this->_objectManager->get(\Magento\Framework\Registry::class)->register('category', $category);
+        $this->_objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
+        $this->_objectManager->get(\Magento\Cms\Model\Wysiwyg\Config::class)
             ->setStoreId($this->getRequest()->getParam('store'));
         return $category;
     }
 
+    /**
+     * Resolve Category Id (from get or from post).
+     *
+     * @return int
+     */
+    private function resolveCategoryId()
+    {
+        $categoryId = (int)$this->getRequest()->getParam('id', false);
+
+        return $categoryId ?: (int)$this->getRequest()->getParam('entity_id', false);
+    }
+
     /**
      * Build response for ajax request
      *
@@ -79,7 +91,7 @@ protected function ajaxRequestResponse($category, $resultPage)
         if (empty($breadcrumbsPath)) {
             // but if no category, and it is deleted - prepare breadcrumbs from path, saved in session
             $breadcrumbsPath = $this->_objectManager->get(
-                'Magento\Backend\Model\Auth\Session'
+                \Magento\Backend\Model\Auth\Session::class
             )->getDeletedPath(
                 true
             );
@@ -107,7 +119,7 @@ protected function ajaxRequestResponse($category, $resultPage)
             ['response' => $eventResponse, 'controller' => $this]
         );
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->_objectManager->get('Magento\Framework\Controller\Result\Json');
+        $resultJson = $this->_objectManager->get(\Magento\Framework\Controller\Result\Json::class);
         $resultJson->setHeader('Content-type', 'application/json', true);
         $resultJson->setData($eventResponse->getData());
         return $resultJson;

app/code/Magento/Catalog/Model/ResourceModel/Category.php

@@ -33,6 +33,13 @@ class Category extends AbstractResource
      */
     protected $_categoryProductTable;
 
+    /**
+     * Entities where attribute is filled.
+     *
+     * @var array[]
+     */
+    private $entitiesWhereAttributesIs;
+
     /**
      * Id of 'is_active' category attribute
      *
@@ -575,22 +582,29 @@ public function getIsActiveAttributeId()
      */
     public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValue)
     {
-        $linkField = $this->getLinkField();
-        $bind = ['attribute_id' => $attribute->getId(), 'value' => $expectedValue];
-        $selectEntities = $this->getConnection()->select()->from(
-            ['ce' => $this->getTable('catalog_category_entity')],
-            ['entity_id']
-        )->joinLeft(
-            ['ci' => $attribute->getBackend()->getTable()],
-            "ci.{$linkField} = ce.{$linkField} AND attribute_id = :attribute_id",
-            ['value']
-        )->where(
-            'ci.value = :value'
-        )->where(
-            'ce.entity_id IN (?)',
-            $entityIdsFilter
-        );
-        return $this->getConnection()->fetchCol($selectEntities, $bind);
+        $entityIdsFilterHash = md5(serialize($entityIdsFilter));
+
+        if (!isset($this->entitiesWhereAttributesIs[$entityIdsFilterHash][$attribute->getId()][$expectedValue])) {
+            $linkField = $this->getLinkField();
+            $bind = ['attribute_id' => $attribute->getId(), 'value' => $expectedValue];
+            $selectEntities = $this->getConnection()->select()->from(
+                ['ce' => $this->getTable('catalog_category_entity')],
+                ['entity_id']
+            )->joinLeft(
+                ['ci' => $attribute->getBackend()->getTable()],
+                "ci.{$linkField} = ce.{$linkField} AND attribute_id = :attribute_id",
+                ['value']
+            )->where(
+                'ci.value = :value'
+            )->where(
+                'ce.entity_id IN (?)',
+                $entityIdsFilter
+            );
+            $this->entitiesWhereAttributesIs[$entityIdsFilterHash][$attribute->getId()][$expectedValue] =
+                $this->getConnection()->fetchCol($selectEntities, $bind);
+        }
+
+        return $this->entitiesWhereAttributesIs[$entityIdsFilterHash][$attribute->getId()][$expectedValue];
     }
 
     /**
@@ -1035,7 +1049,7 @@ private function getEntityManager()
     {
         if (null === $this->entityManager) {
             $this->entityManager = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get('Magento\Framework\EntityManager\EntityManager');
+                ->get(\Magento\Framework\EntityManager\EntityManager::class);
         }
         return $this->entityManager;
     }
@@ -1047,7 +1061,7 @@ private function getAggregateCount()
     {
         if (null === $this->aggregateCount) {
             $this->aggregateCount = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get('Magento\Catalog\Model\ResourceModel\Category\AggregateCount');
+                ->get(\Magento\Catalog\Model\ResourceModel\Category\AggregateCount::class);
         }
         return $this->aggregateCount;
     }