ENGCOM-2583: [Forwardport] Correct return type of methods #17215

Stanislav Idolov · web-flow · commit 68c42a5494a0 · 2018-07-29T11:08:28.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -111,7 +111,7 @@ public function __construct(
     /**
      * Initialize requested category object
      *
-     * @return \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Category|bool
      */
     protected function _initCategory()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -538,7 +538,7 @@ private function getProductEmulator($typeId)
      * @param array $indexData
      * @param array $productData
      * @param int $storeId
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @since 100.0.3
      */
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
@@ -61,7 +61,7 @@ public function processAttributeValue($attribute, $value);
      *
      * @param array $index
      * @param string $separator
-     * @return string
+     * @return array
      */
     public function prepareEntityIndex($index, $separator = ' ');
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function __construct(`
`111`	`111`	`/**`
`112`	`112`	`* Initialize requested category object`
`113`	`113`	`*`
`114`		`- * @return \Magento\Catalog\Model\Category`
	`114`	`+ * @return \Magento\Catalog\Model\Category\|bool`
`115`	`115`	`*/`
`116`	`116`	`protected function _initCategory()`
`117`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function processAttributeValue($attribute, $value);`
`61`	`61`	`*`
`62`	`62`	`* @param array $index`
`63`	`63`	`* @param string $separator`
`64`		`- * @return string`
	`64`	`+ * @return array`
`65`	`65`	`*/`
`66`	`66`	`public function prepareEntityIndex($index, $separator = ' ');`
`67`	`67`	`}`