ENGCOM-2043: [Forwardport] Correct return type of methods and typo correction. #16224

magento-engcom-team · magento-engcom-team · commit c8e7c0c83175 · 2018-06-19T07:25:25.000-05:00
- Merge Pull Request #16224 from saurabh-aureate/magento2:2.3-develop-PR-port-15993 - Merged commits: 1. 57b9cd2 2. bd15eb3 3. 3000eac
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -32,7 +32,7 @@ public function __construct(Context $context, Registry $coreRegistry)
     /**
      * Initialize category object in registry
      *
-     * @return Category
+     * @return Category|bool
      */
     protected function _initCategory()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value)
      *
      * @param array $index
      * @param string $separator
-     * @return string
+     * @return array
      */
     public function prepareEntityIndex($index, $separator = ' ')
     {
diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
@@ -79,7 +79,7 @@ public function getUrlRewriteId()
 
     /**
      * @param int $urlRewriteId
-     * @return int
+     * @return $this
      */
     public function setUrlRewriteId($urlRewriteId)
     {
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
     }
 
     /**
-     * Get admin maxiumum security failures from config
+     * Get admin maximum security failures from config
      *
      * @return int
      */

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(Context $context, Registry $coreRegistry)`
`32`	`32`	`/**`
`33`	`33`	`* Initialize category object in registry`
`34`	`34`	`*`
`35`		`- * @return Category`
	`35`	`+ * @return Category\|bool`
`36`	`36`	`*/`
`37`	`37`	`protected function _initCategory()`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value)`
`120`	`120`	`*`
`121`	`121`	`* @param array $index`
`122`	`122`	`* @param string $separator`
`123`		`- * @return string`
	`123`	`+ * @return array`
`124`	`124`	`*/`
`125`	`125`	`public function prepareEntityIndex($index, $separator = ' ')`
`126`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function getUrlRewriteId()`
`79`	`79`
`80`	`80`	`/**`
`81`	`81`	`* @param int $urlRewriteId`
`82`		`- * @return int`
	`82`	`+ * @return $this`
`83`	`83`	`*/`
`84`	`84`	`public function setUrlRewriteId($urlRewriteId)`
`85`	`85`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * Get admin maxiumum security failures from config`
	`75`	`+ * Get admin maximum security failures from config`
`76`	`76`	`*`
`77`	`77`	`* @return int`
`78`	`78`	`*/`