Skip to content

Replaced usage of ObjectManager with Constructor DI of Factory class #24661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2019
Merged

Replaced usage of ObjectManager with Constructor DI of Factory class #24661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 21 additions & 12 deletions app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,41 @@
*/
namespace Magento\Catalog\Controller\Adminhtml\Category;

use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Backend\App\Action\Context;
use Magento\Backend\Model\View\Result\Page;
use Magento\Framework\Controller\ResultFactory;
use Magento\Backend\Model\View\Result\Redirect;
use Magento\Framework\Controller\ResultInterface;
use Magento\Catalog\Controller\Adminhtml\Category;
use Magento\Backend\Model\View\Result\ForwardFactory;
use Magento\Framework\App\Action\HttpGetActionInterface;

/**
* Class Add Category
*
* @package Magento\Catalog\Controller\Adminhtml\Category
*/
class Add extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
class Add extends Category implements HttpGetActionInterface
{
/**
* Forward factory for result
*
* @var \Magento\Backend\Model\View\Result\ForwardFactory
* @deprecated Unused Class: ForwardFactory
* @see $this->resultFactory->create()
* @var ForwardFactory
*
*/
protected $resultForwardFactory;

/**
* Add category constructor
*
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
* @param Context $context
* @param ForwardFactory $resultForwardFactory
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
Context $context,
ForwardFactory $resultForwardFactory
) {
parent::__construct($context);
$this->resultForwardFactory = $resultForwardFactory;
Expand All @@ -39,15 +49,15 @@ public function __construct(
/**
* Add new category form
*
* @return \Magento\Backend\Model\View\Result\Forward
* @return ResultInterface
*/
public function execute()
{
$parentId = (int)$this->getRequest()->getParam('parent');

$category = $this->_initCategory(true);
if (!$category || !$parentId || $category->getId()) {
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
/** @var Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
return $resultRedirect->setPath('catalog/*/', ['_current' => true, 'id' => null]);
}
Expand All @@ -61,9 +71,8 @@ public function execute()
$category->addData($categoryData);
}

$resultPageFactory = $this->_objectManager->get(\Magento\Framework\View\Result\PageFactory::class);
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
$resultPage = $resultPageFactory->create();
/** @var Page $resultPage */
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);

if ($this->getRequest()->getQuery('isAjax')) {
return $this->ajaxRequestResponse($category, $resultPage);
Expand Down