Merge branch 'MAGETWO-98825' of https://github.com/magento-tango/magento2ce into pr_2019_07_12

Author: vkolesny

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

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Category;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Store\Api\GroupRepositoryInterface;
+
+/**
+ * Fetcher for associated with store group categories.
+ */
+class StoreCategories
+{
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @var GroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * @param CategoryRepositoryInterface $categoryRepository
+     * @param GroupRepositoryInterface $groupRepository
+     */
+    public function __construct(
+        CategoryRepositoryInterface $categoryRepository,
+        GroupRepositoryInterface $groupRepository
+    ) {
+        $this->categoryRepository = $categoryRepository;
+        $this->groupRepository = $groupRepository;
+    }
+
+    /**
+     * Get all category ids for store.
+     *
+     * @param int|null $storeGroupId
+     * @return int[]
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getCategoryIds(?int $storeGroupId = null): array
+    {
+        $rootCategoryId = $storeGroupId
+            ? $this->groupRepository->get($storeGroupId)->getRootCategoryId()
+            : Category::TREE_ROOT_ID;
+        /** @var Category $rootCategory */
+        $rootCategory = $this->categoryRepository->get($rootCategoryId);
+        $categoriesIds = array_map(
+            function ($value) {
+                return (int) $value;
+            },
+            (array) $rootCategory->getAllChildren(true)
+        );
+
+        return $categoriesIds;
+    }
+}

app/code/Magento/Config/Model/Config.php

@@ -287,8 +287,8 @@ private function getField(string $sectionId, string $groupId, string $fieldId):
      *
      * @param Field $field
      * @param string $fieldId Need for support of clone_field feature
-     * @param array &$oldConfig Need for compatibility with _processGroup()
-     * @param array &$extraOldGroups Need for compatibility with _processGroup()
+     * @param array $oldConfig Need for compatibility with _processGroup()
+     * @param array $extraOldGroups Need for compatibility with _processGroup()
      * @return string
      */
     private function getFieldPath(Field $field, string $fieldId, array &$oldConfig, array &$extraOldGroups): string
@@ -337,8 +337,8 @@ private function isValueChanged(array $oldConfig, string $path, array $fieldData
      * @param string $sectionId
      * @param string $groupId
      * @param array $groupData
-     * @param array &$oldConfig
-     * @param array &$extraOldGroups
+     * @param array $oldConfig
+     * @param array $extraOldGroups
      * @return array
      */
     private function getChangedPaths(
@@ -384,8 +384,8 @@ private function getChangedPaths(
      * @param array $groupData
      * @param array $groups
      * @param string $sectionPath
-     * @param array &$extraOldGroups
-     * @param array &$oldConfig
+     * @param array $extraOldGroups
+     * @param array $oldConfig
      * @param \Magento\Framework\DB\Transaction $saveTransaction
      * @param \Magento\Framework\DB\Transaction $deleteTransaction
      * @return void
@@ -546,6 +546,8 @@ public function setDataByPath($path, $value)
         }
 
         $section = array_shift($pathParts);
+        $this->setData('section', $section);
+
         $data = [
             'fields' => [
                 array_pop($pathParts) => ['value' => $value],
@@ -558,8 +560,8 @@ public function setDataByPath($path, $value)
                 ],
             ];
         }
-        $data['section'] = $section;
-        $this->addData($data);
+        $groups = array_replace_recursive((array) $this->getData('groups'), $data['groups']);
+        $this->setData('groups', $groups);
     }
 
     /**
@@ -679,7 +681,7 @@ protected function _checkSingleStoreMode(
      * Get config data value
      *
      * @param string $path
-     * @param null|bool &$inherit
+     * @param null|bool $inherit
      * @param null|array $configData
      * @return \Magento\Framework\Simplexml\Element
      */