Merge branch 'MAGETWO-43102' of https://github.corp.magento.com/magento-troll/magento2ce into MAGETWO-43102

Author: rganin

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

@@ -100,7 +100,7 @@ public function execute()
 
         $refreshTree = false;
         $data['general'] = $this->getRequest()->getPostValue();
-        $data = $this->stringToBoolConverting($this->stringToBoolInputs, $data);
+        $data = $this->stringToBoolConverting($data);
         $data = $this->imagePreprocessing($data);
         $storeId = isset($data['general']['store_id']) ? $data['general']['store_id'] : null;
         if ($data) {
@@ -258,17 +258,20 @@ public function imagePreprocessing($data)
     /**
      * Converting inputs from string to boolean
      *
-     * @param array $stringToBoolInputs
      * @param array $data
+     * @param array $stringToBoolInputs
      *
      * @return array
      */
-    public function stringToBoolConverting($stringToBoolInputs, $data)
+    public function stringToBoolConverting($data, $stringToBoolInputs = null)
     {
+        if (null === $stringToBoolInputs) {
+            $stringToBoolInputs = $this->stringToBoolInputs;
+        }
         foreach ($stringToBoolInputs as $key => $value) {
             if (is_array($value)) {
                 if (isset($data[$key])) {
-                    $data[$key] = $this->stringToBoolConverting($value, $data[$key]);
+                    $data[$key] = $this->stringToBoolConverting($data[$key], $value);
                 }
             } else {
                 if (isset($data[$value])) {

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

@@ -15,7 +15,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
-use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Class DataProvider
@@ -107,9 +108,9 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     private $storeManager;
 
     /**
-     * @var CategoryRepositoryInterface
+     * @var CategoryFactory
      */
-    private $categoryRepository;
+    private $categoryFactory;
 
     /**
      * DataProvider constructor
@@ -123,7 +124,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param \Magento\Framework\Registry $registry
      * @param Config $eavConfig
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param CategoryRepositoryInterface $categoryRepository
+     * @param CategoryFactory $categoryFactory
      * @param array $meta
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -138,7 +139,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         Config $eavConfig,
         \Magento\Framework\App\RequestInterface $request,
-        CategoryRepositoryInterface $categoryRepository,
+        CategoryFactory $categoryFactory,
         array $meta = [],
         array $data = []
     ) {
@@ -149,7 +150,7 @@ public function __construct(
         $this->registry = $registry;
         $this->storeManager = $storeManager;
         $this->request = $request;
-        $this->categoryRepository = $categoryRepository;
+        $this->categoryFactory = $categoryFactory;
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->meta = $this->prepareMeta($this->meta);
     }
@@ -310,6 +311,7 @@ protected function addUseDefaultSettings($category, $categoryData)
      * Get current category
      *
      * @return Category
+     * @throws NoSuchEntityException
      */
     public function getCurrentCategory()
     {
@@ -320,7 +322,12 @@ public function getCurrentCategory()
         $requestId = $this->request->getParam($this->requestFieldName);
         $requestScope = $this->request->getParam($this->requestScopeFieldName, Store::DEFAULT_STORE_ID);
         if ($requestId) {
-            $category = $this->categoryRepository->get($requestId, $requestScope);
+            $category = $this->categoryFactory->create();
+            $category->setStoreId($requestScope);
+            $category->load($requestId);
+            if (!$category->getId()) {
+                throw NoSuchEntityException::singleField('id', $requestId);
+            }
         }
         return $category;
     }

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

@@ -173,33 +173,6 @@ protected function _getTree()
         return $this->_tree;
     }
 
-    /**
-     * Process category data before delete
-     * update children count for parent category
-     * delete child categories
-     *
-     * @param \Magento\Framework\DataObject $object
-     * @return $this
-     */
-    protected function _beforeDelete(\Magento\Framework\DataObject $object)
-    {
-        parent::_beforeDelete($object);
-
-        /**
-         * Update children count for all parent categories
-         */
-        $parentIds = $object->getParentIds();
-        if ($parentIds) {
-            $childDecrease = $object->getChildrenCount() + 1;
-            // +1 is itself
-            $data = ['children_count' => new \Zend_Db_Expr('children_count - ' . $childDecrease)];
-            $where = ['entity_id IN(?)' => $parentIds];
-            $this->getConnection()->update($this->getEntityTable(), $data, $where);
-        }
-        $this->deleteChildren($object);
-        return $this;
-    }
-
     /**
      * Delete children categories of specific category
      *

app/code/Magento/Catalog/Observer/CatalogCategoryDeleteChildren.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Catalog\Model\Category;
+
+class CatalogCategoryDeleteChildren implements ObserverInterface
+{
+    /**
+     * Delete children of category
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var \Magento\Catalog\Model\Category $category */
+        $category = $observer->getEvent()->getData('category');
+        /** @var \Magento\Catalog\Model\ResourceModel\Category $resourceModel */
+        $resourceModel = $category->getResource();
+        $resourceModel->deleteChildren($category);
+    }
+}

app/code/Magento/Catalog/Observer/CatalogCategoryRecalculateChildrenCount.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Catalog\Model\Category;
+
+class CatalogCategoryRecalculateChildrenCount implements ObserverInterface
+{
+    /**
+     * Recalculate children count for category
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var \Magento\Catalog\Model\Category $category */
+        $category = $observer->getEvent()->getData('category');
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Category $resourceModel */
+        $resourceModel = $category->getResource();
+        /**
+         * Update children count for all parent categories
+         */
+        $parentIds = $category->getParentIds();
+        if ($parentIds) {
+            $childDecrease = $category->getChildrenCount() + 1;
+            // +1 is itself
+            $data = ['children_count' => new \Zend_Db_Expr('children_count - ' . $childDecrease)];
+            $where = ['entity_id IN(?)' => $parentIds];
+            $resourceModel->getConnection()->update($resourceModel->getEntityTable(), $data, $where);
+        }
+    }
+}

app/code/Magento/Catalog/etc/adminhtml/events.xml

@@ -9,4 +9,8 @@
     <event name="cms_wysiwyg_images_static_urls_allowed">
         <observer name="catalog_wysiwyg" instance="Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowedObserver" />
     </event>
+    <event name="catalog_category_delete_before">
+        <observer name="catalog_category_recalculate_children_count" instance="Magento\Catalog\Observer\CatalogCategoryRecalculateChildrenCount" />
+        <observer name="catalog_category_delete_children" instance="Magento\Catalog\Observer\CatalogCategoryDeleteChildren" />
+    </event>
 </config>