From 8a9cedc6433ff95c77de389f8cd1c0f15d1004d9 Mon Sep 17 00:00:00 2001
From: Saurabh Parekh <saurabh.parekh@aureatelabs.com>
Date: Mon, 11 Jun 2018 12:41:30 +0530
Subject: [PATCH 1/3] Correct return type of methods and typo correction.

---
 .../Controller/Adminhtml/Promo/Widget/CategoriesJson.php       | 3 ++-
 app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php  | 2 +-
 app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php     | 2 +-
 app/code/Magento/User/Model/Backend/Config/ObserverConfig.php  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
index 3d9dcd05f8fac..c055bbedbd23e 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -8,6 +8,7 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Model\Category;
+use Magento\Customer\Model\Attribute\Data\Boolean;
 use Magento\Framework\Registry;
 
 class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
@@ -32,7 +33,7 @@ public function __construct(Context $context, Registry $coreRegistry)
     /**
      * Initialize category object in registry
      *
-     * @return Category
+     * @return Category|Boolean
      */
     protected function _initCategory()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
index ffba417eb3ac7..fac8c4d2a47f6 100644
--- 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
index 195c0fc10dc07..38025f21cdab1 100644
--- 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
index c1b7e6a1110f7..6d921dfdcdd65 100644
--- 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
      */

From 633c686c6f3a32784a59c4cb3c2732977b34bab8 Mon Sep 17 00:00:00 2001
From: Saurabh Parekh <saurabh.parekh@aureatelabs.com>
Date: Fri, 15 Jun 2018 15:35:49 +0530
Subject: [PATCH 2/3] bool primitive type in return type

---
 .../Controller/Adminhtml/Promo/Widget/CategoriesJson.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
index c055bbedbd23e..391436e2de941 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -33,7 +33,7 @@ public function __construct(Context $context, Registry $coreRegistry)
     /**
      * Initialize category object in registry
      *
-     * @return Category|Boolean
+     * @return Category|bool
      */
     protected function _initCategory()
     {

From c59721a1005175aa705b0112b6a0dc0d5c41ba2b Mon Sep 17 00:00:00 2001
From: Vlad Veselov <orlangur@users.noreply.github.com>
Date: Fri, 15 Jun 2018 13:08:02 +0300
Subject: [PATCH 3/3] Remove unneeded class import

---
 .../Controller/Adminhtml/Promo/Widget/CategoriesJson.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
index 391436e2de941..d049d74bd2601 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -8,7 +8,6 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Model\Category;
-use Magento\Customer\Model\Attribute\Data\Boolean;
 use Magento\Framework\Registry;
 
 class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget