Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,7 +33,7 @@ public function __construct(Context $context, Registry $coreRegistry)
/**
* Initialize category object in registry
*
* @return Category
* @return Category|Boolean
*/
protected function _initCategory()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value)
*
* @param array $index
* @param string $separator
* @return string
* @return array
*/
public function prepareEntityIndex($index, $separator = ' ')
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function getUrlRewriteId()

/**
* @param int $urlRewriteId
* @return int
* @return $this
*/
public function setUrlRewriteId($urlRewriteId)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
}

/**
* Get admin maxiumum security failures from config
* Get admin maximum security failures from config
*
* @return int
*/
Expand Down