Skip to content

Commit

Permalink
Compatible Magento 2.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
magiccart committed Aug 21, 2023
1 parent c14a077 commit c8f94fc
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Controller/Adminhtml/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ abstract class Action extends \Magento\Backend\App\Action
/**
* @var \Magento\Backend\Model\View\Result\RedirectFactory
*/
protected $_resultRedirectFactory;
protected $resultRedirectFactory;

protected $_magicmenuFactory;

Expand Down Expand Up @@ -79,7 +79,7 @@ public function __construct(
$this->_resultPageFactory = $resultPageFactory;
$this->_resultLayoutFactory = $resultLayoutFactory;
$this->_resultForwardFactory = $resultForwardFactory;
$this->_resultRedirectFactory = $context->getResultRedirectFactory();
$this->resultRedirectFactory = $context->getResultRedirectFactory();

$this->_magicmenuFactory = $magicmenuFactory;
$this->_magicmenuCollectionFactory = $magicmenuCollectionFactory;
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Extra/Delete.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function execute()
$this->messageManager->addError($e->getMessage());
}

$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Extra/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function execute()
$model->setStoreViewId($storeViewId)->load($id);
if (!$model->getId()) {
$this->messageManager->addError(__('This Extra Menu no longer exists.'));
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Extra/MassDelete.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function execute()
$this->messageManager->addError($e->getMessage());
}
}
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Extra/MassStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function execute()
$this->messageManager->addError($e->getMessage());
}
}
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/', ['store' => $this->getRequest()->getParam('store')]);
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Extra/Save.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Save extends \Magiccart\Magicmenu\Controller\Adminhtml\Action
*/
public function execute()
{
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

if ($data = $this->getRequest()->getPostValue()) {
$model = $this->_magicmenuFactory->create();
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/Delete.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function execute()
$this->messageManager->addError($e->getMessage());
}

$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function execute()
$model->setStoreViewId($storeViewId)->load($id);
if (!$model->getId()) {
$this->messageManager->addError(__('This Menu no longer exists.'));
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/MassDelete.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function execute()
$this->messageManager->addError($e->getMessage());
}
}
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/MassStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function execute()
$this->messageManager->addError($e->getMessage());
}
}
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath('*/*/', ['store' => $this->getRequest()->getParam('store')]);
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/Save.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Save extends \Magiccart\Magicmenu\Controller\Adminhtml\Action
*/
public function execute()
{
$resultRedirect = $this->_resultRedirectFactory->create();
$resultRedirect = $this->resultRedirectFactory->create();

if ($data = $this->getRequest()->getPostValue()) {
$model = $this->_magicmenuFactory->create();
Expand Down

0 comments on commit c8f94fc

Please sign in to comment.