MAGETWO-99091: Name of categories in the Category tree on Product Edit page is not displayed according to the selected store view scope

dyushkin · dyushkin · commit e2cb7364680f · 2019-04-18T14:14:02.000-05:00
- Fixed returnable method type
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -395,10 +395,10 @@ private function retrieveShownCategoriesIds(int $storeId, string $filter = '') :
      *
      * @param int $storeId
      * @param array $shownCategoriesIds
-     * @return array
+     * @return array|null
      * @throws LocalizedException
      */
-    private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds) : array
+    private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds) : ?array
     {
         /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
         $collection = $this->categoryCollectionFactory->create();

Original file line number	Diff line number	Diff line change
`@@ -395,10 +395,10 @@ private function retrieveShownCategoriesIds(int $storeId, string $filter = '') :`
`395`	`395`	`*`
`396`	`396`	`* @param int $storeId`
`397`	`397`	`* @param array $shownCategoriesIds`
`398`		`- * @return array`
	`398`	`+ * @return array\|null`
`399`	`399`	`* @throws LocalizedException`
`400`	`400`	`*/`
`401`		`- private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds) : array`
	`401`	`+ private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds) : ?array`
`402`	`402`	`{`
`403`	`403`	`/* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */`
`404`	`404`	`$collection = $this->categoryCollectionFactory->create();`