diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php index 793cbe2252531..53f8a7fc3ae44 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php @@ -13,7 +13,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not * * @return void */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->getPostValue()) { return; diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php index 15b88e4c2b6ee..df4b3465ad9e8 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification /** * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu( diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php index bcf66825edf6b..fe11c65da690e 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php @@ -11,7 +11,7 @@ class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notific /** * @return void */ - public function execute() + public function executeInternal() { $notificationId = (int)$this->getRequest()->getParam('id'); if ($notificationId) { diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php index 78090163aa6a2..3f923e05797a3 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php @@ -11,7 +11,7 @@ class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not /** * @return void */ - public function execute() + public function executeInternal() { $ids = $this->getRequest()->getParam('notification'); if (!is_array($ids)) { diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php index 4b0068520ba3e..fd73d3cece48d 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php @@ -11,7 +11,7 @@ class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notific /** * @return void */ - public function execute() + public function executeInternal() { $ids = $this->getRequest()->getParam('notification'); if (!is_array($ids)) { diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php index b4fe7e0e29596..81a62e7613483 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php @@ -11,7 +11,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio /** * @return void */ - public function execute() + public function executeInternal() { if ($id = $this->getRequest()->getParam('id')) { $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id); diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php index 4bf51c2df2902..e173f1df1022d 100644 --- a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php +++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php @@ -38,7 +38,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { $severity = $this->getRequest()->getParam('severity'); if ($severity) { diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php index 945c25b67b961..d41f9c69c2a52 100644 --- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -17,7 +17,7 @@ class GetFilter extends ExportController * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getParams(); if ($this->getRequest()->isXmlHttpRequest() && $data) { diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php index 3da7f100f75b5..2934f7a00ccd8 100644 --- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php @@ -51,7 +51,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ - public function execute() + public function executeInternal() { $paymentParam = $this->getRequest()->getParam('payment'); $controller = $this->getRequest()->getParam('controller'); diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php index d147c3d91e1ff..2387a1bf5b7c1 100644 --- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php +++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php @@ -90,7 +90,7 @@ protected function _returnQuote($cancelOrder, $errorMsg) * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $redirectParams = $this->getRequest()->getParams(); $params = []; diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php index 7ac7153fecf4b..ae85af3ad689b 100644 --- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php +++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php @@ -31,7 +31,7 @@ protected function _returnQuote() * * @return void */ - public function execute() + public function executeInternal() { $this->_returnQuote(); $this->getResponse()->representJson( diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php index 6f0696fbf9d1e..5dc96c39a91e9 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php @@ -14,7 +14,7 @@ class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Paymen * * @return void */ - public function execute() + public function executeInternal() { $this->_responseAction('adminhtml'); } diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php index 2cb3ea5421054..7a13d0ba6c0a8 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php @@ -71,7 +71,7 @@ public function __construct( * * @return string */ - public function execute() + public function executeInternal() { $paymentParam = $this->getRequest()->getParam('payment'); $controller = $this->getRequest()->getParam('controller'); diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php index 0a0fc1a990668..421e4f04fe13e 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php @@ -15,7 +15,7 @@ class Redirect extends \Magento\Authorizenet\Controller\Directpost\Payment * * @return void */ - public function execute() + public function executeInternal() { $helper = $this->dataFactory->create('frontend'); diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php index 7a25db11b46f6..541571db6d9cc 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php @@ -14,7 +14,7 @@ class Response extends \Magento\Authorizenet\Controller\Directpost\Payment * * @return void */ - public function execute() + public function executeInternal() { $this->_responseAction('frontend'); } diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php index 1cef3b032864d..b90112bca7f93 100644 --- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php +++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php @@ -13,7 +13,7 @@ class ReturnQuote extends \Magento\Authorizenet\Controller\Directpost\Payment * * @return void */ - public function execute() + public function executeInternal() { $this->_returnCustomerQuote(); $this->getResponse()->representJson( diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Adminhtml/Authorizenet/Directpost/Payment/RedirectTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Adminhtml/Authorizenet/Directpost/Payment/RedirectTest.php index ad7bb7b5c0245..ff31be443710c 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Controller/Adminhtml/Authorizenet/Directpost/Payment/RedirectTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Controller/Adminhtml/Authorizenet/Directpost/Payment/RedirectTest.php @@ -96,6 +96,11 @@ class RedirectTest extends \PHPUnit_Framework_TestCase */ protected $helperMock; + /** + * @var Redirect|\PHPUnit_Framework_MockObject_MockObject + */ + protected $controller; + protected function setUp() { $this->directpostSessionMock = $this->getMockBuilder('Magento\Authorizenet\Model\Directpost\Session') @@ -196,7 +201,7 @@ protected function setUp() ); } - public function testExecuteErrorMsgWithoutCancelOrder() + public function testExecuteInternalErrorMsgWithoutCancelOrder() { $params = ['success' => 0, 'error_msg' => 'Error message']; $incrementId = 1; @@ -238,10 +243,10 @@ public function testExecuteErrorMsgWithoutCancelOrder() ->method('register') ->with(Iframe::REGISTRY_KEY); - $this->assertInstanceOf('\Magento\Framework\View\Result\Layout', $this->controller->execute()); + $this->assertInstanceOf('\Magento\Framework\View\Result\Layout', $this->controller->executeInternal()); } - public function testExecuteErrorMsgWithCancelOrder() + public function testExecuteInternalErrorMsgWithCancelOrder() { $params = ['success' => 0, 'error_msg' => 'Error message', 'x_invoice_num' => 1]; $incrementId = 1; @@ -273,10 +278,10 @@ public function testExecuteErrorMsgWithCancelOrder() ->method('register') ->with(Iframe::REGISTRY_KEY); - $this->assertInstanceOf('\Magento\Framework\View\Result\Layout', $this->controller->execute()); + $this->assertInstanceOf('\Magento\Framework\View\Result\Layout', $this->controller->executeInternal()); } - public function testExecuteSuccess() + public function testExecuteInternalSuccess() { $params = ['success' => 1, 'controller_action_name' => 'action', 'x_invoice_num' => 1]; $this->requestMock->expects($this->once()) @@ -307,6 +312,6 @@ public function testExecuteSuccess() ->method('register') ->with(Iframe::REGISTRY_KEY); - $this->assertInstanceOf('\Magento\Framework\View\Result\Layout', $this->controller->execute()); + $this->assertInstanceOf('\Magento\Framework\View\Result\Layout', $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php index 517b9e41f7db7..a80b7b41420ef 100644 --- a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php +++ b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php @@ -205,7 +205,7 @@ public function testExecute( ->method('jsonEncode') ->with($result); - $this->placeOrderController->execute(); + $this->placeOrderController->executeInternal(); } /** @@ -243,7 +243,7 @@ public function testExecuteFailedPlaceOrder( ->method('jsonEncode') ->with($result); - $this->placeOrderController->execute(); + $this->placeOrderController->executeInternal(); } /** diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php index c41338591d344..e84bee226d2ab 100644 --- a/app/code/Magento/Backend/App/AbstractAction.php +++ b/app/code/Magento/Backend/App/AbstractAction.php @@ -200,10 +200,10 @@ private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractB * @param \Magento\Framework\App\RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(\Magento\Framework\App\RequestInterface $request) + public function execute(\Magento\Framework\App\RequestInterface $request) { if (!$this->_processUrlKeys()) { - return parent::dispatch($request); + return parent::execute($request); } if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) { @@ -223,7 +223,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request) $this->_processLocaleSettings(); - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php index bf8d90b931ef9..02cc404d4fc81 100644 --- a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php +++ b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php @@ -101,7 +101,7 @@ public function __construct( * @return mixed * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Backend\App\AbstractAction $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php index 767163afc6d30..9e1f5c713ea10 100644 --- a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php +++ b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php @@ -19,7 +19,7 @@ class MassactionKey * @return mixed * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Backend\App\AbstractAction $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php b/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php index 143b12d06c3c9..c8e72073581b4 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $translate = (array)$this->getRequest()->getPost('translate'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php index 08f81426145a3..42836b603d0aa 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php @@ -41,7 +41,7 @@ protected function _getDeniedIframe() * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ $resultRaw = $this->resultRawFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php index 43062aa6908a3..bd2d215007638 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php @@ -43,7 +43,7 @@ protected function _getDeniedJson() * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->resultJsonFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php index 6aed5e22c5282..e29183357ea74 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->_auth->isLoggedIn()) { if ($this->_auth->getAuthStorage()->isFirstPageAfterLogin()) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php index 098022bed0a8d..a8b3973595e4f 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php @@ -13,7 +13,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->_auth->logout(); $this->messageManager->addSuccess(__('You have logged out.')); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php b/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php index f622e39e4917e..6ac1f14d193cb 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php @@ -39,7 +39,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); if ($this->getRequest()->getParam('app')) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php index 2cb699549bd12..75ea9ccaa84a3 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php @@ -16,7 +16,7 @@ class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->_objectManager->create('Magento\Catalog\Model\Product\Image')->clearCache(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php index 41174c3c1f2f9..553e22810c1db 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php @@ -16,7 +16,7 @@ class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->_objectManager->get('Magento\Framework\View\Asset\MergeService')->cleanMergedJsCss(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php index 4ca025b3ec57f..2952908592740 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php @@ -15,7 +15,7 @@ class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->_objectManager->get('Magento\Framework\App\State\CleanupFiles')->clearMaterializedViewFiles(); $this->_eventManager->dispatch('clean_static_files_cache_after'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php index 049f5fa3cb306..2bdddc1048c8d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php @@ -13,7 +13,7 @@ class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->_eventManager->dispatch('adminhtml_cache_flush_all'); /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php index bdd099206ed52..35885a93ee963 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php @@ -13,7 +13,7 @@ class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */ foreach ($this->_cacheFrontendPool as $cacheFrontend) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php index 1078cdf7201be..2d0fd90211278 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php index 98703f0bfa139..5ed4d74b9e68d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php @@ -16,7 +16,7 @@ class MassDisable extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $types = $this->getRequest()->getParam('types'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php index 3fd92bc70775c..361e4c12a7eb1 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php @@ -16,7 +16,7 @@ class MassEnable extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $types = $this->getRequest()->getParam('types'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php index 420d8757e5bb2..d44b99964296a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php @@ -16,7 +16,7 @@ class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $types = $this->getRequest()->getParam('types'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php index e51999e6fc961..b5823437cd868 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/AjaxBlock.php @@ -36,7 +36,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $output = ''; $blockTab = $this->getRequest()->getParam('block'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php index 16f345f31fd93..6a942ca15f0d3 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMost.php @@ -13,7 +13,7 @@ class CustomersMost extends AjaxBlock * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $output = $this->layoutFactory->create() ->createBlock('Magento\Backend\Block\Dashboard\Tab\Customers\Most') diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php index d1d460971fb2e..1e531683a7499 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewest.php @@ -13,7 +13,7 @@ class CustomersNewest extends AjaxBlock * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $output = $this->layoutFactory->create() ->createBlock('Magento\Backend\Block\Dashboard\Tab\Customers\Newest') diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php index 4b6474bfee4b3..1c3098e82bca7 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php @@ -28,7 +28,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php index 8d5862fcc22e3..1931f7284d406 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php @@ -13,7 +13,7 @@ class ProductsViewed extends AjaxBlock * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $output = $this->layoutFactory->create() ->createBlock('Magento\Backend\Block\Dashboard\Tab\Products\Viewed') diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php index e9e51cd3f1daf..943e8e0d2f6c4 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php @@ -27,7 +27,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $collectionsNames = array_values($this->reportTypes); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php index f738be1e83a31..b4e624b09435a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $error = __('invalid request'); $httpCode = 400; diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Denied.php b/app/code/Magento/Backend/Controller/Adminhtml/Denied.php index c77bb09fb0054..478cfa7bca091 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Denied.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Denied.php @@ -28,7 +28,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { if (!$this->_auth->isLoggedIn()) { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php index 9505f4b1d6d2f..cdb9fa361c381 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php @@ -13,7 +13,7 @@ class ChangeLocale extends \Magento\Backend\Controller\Adminhtml\Index * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $redirectResult = $this->resultRedirectFactory->create(); $redirectResult->setRefererUrl(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php index afa3019cfd67c..8e69d2bc6a2ce 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $items = []; diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php index 0298a2b9d36b7..0fc32f759c1fa 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php @@ -14,7 +14,7 @@ class Index extends \Magento\Backend\Controller\Adminhtml\Index * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php index a11957e1b7d37..6f8101396f715 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php index 950b72df2df48..4c63db63ef395 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php @@ -28,7 +28,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->resultPageFactory->create(); $resultPage->getConfig()->getTitle()->prepend(__('My Account')); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php index 4607cd6127401..31f60ebc84d5f 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php @@ -18,7 +18,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account * @return \Magento\Backend\Model\View\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { $userId = $this->_objectManager->get('Magento\Backend\Model\Auth\Session')->getUser()->getId(); $password = (string)$this->getRequest()->getParam('password'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php index cec54abf60878..a1cdb07d9f5e7 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php @@ -11,7 +11,7 @@ class Delete extends \Magento\Backend\Controller\Adminhtml\System\Design /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); if ($id) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php index 7d3445f51d136..afac63a56c6e2 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Edit.php @@ -11,7 +11,7 @@ class Edit extends \Magento\Backend\Controller\Adminhtml\System\Design /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php index 1c8dca8b4254b..b0d9594e04a10 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Grid.php @@ -11,7 +11,7 @@ class Grid extends \Magento\Backend\Controller\Adminhtml\System\Design /** * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { return $this->resultLayoutFactory->create(); } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php index b153800392604..0df909829220f 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\Backend\Controller\Adminhtml\System\Design /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php index 3734ef53d733f..6521aa114f720 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/NewAction.php @@ -11,7 +11,7 @@ class NewAction extends \Magento\Backend\Controller\Adminhtml\System\Design /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php index 1d6cc8c6c23fb..7e52e57ecadcd 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php @@ -28,7 +28,7 @@ protected function _filterPostData($data) /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php index 4af63776d2482..0203351b88829 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php @@ -28,7 +28,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php index a53452ec15893..962a4b882d918 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/SetStore.php @@ -11,7 +11,7 @@ class SetStore extends \Magento\Backend\Controller\Adminhtml\System /** * @return void */ - public function execute() + public function executeInternal() { $storeId = (int)$this->getRequest()->getParam('store'); if ($storeId) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php index 3604948ee6bf0..e6066ce3d2a40 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php @@ -11,7 +11,7 @@ class DeleteGroup extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('item_id', null); if (!($model = $this->_objectManager->create('Magento\Store\Model\Group')->load($itemId))) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php index fe67adeca9055..28557917199f1 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php @@ -13,7 +13,7 @@ class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('item_id'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php index 826f8493fa072..824866867528b 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php @@ -11,7 +11,7 @@ class DeleteStore extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('item_id', null); if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php index c7764a1b20489..589be3238e50c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php @@ -15,7 +15,7 @@ class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('item_id'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php index ea67a10176302..b2c88101d370a 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php @@ -11,7 +11,7 @@ class DeleteWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('item_id', null); if (!($model = $this->_objectManager->create('Magento\Store\Model\Website')->load($itemId))) { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php index 6951bc3b3a9af..dc705339dddf9 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php @@ -13,7 +13,7 @@ class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Sto /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('item_id'); $model = $this->_objectManager->create('Magento\Store\Model\Website'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php index f7403c9eaa20d..4e591b0b106d7 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditGroup.php @@ -11,7 +11,7 @@ class EditGroup extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->_coreRegistry->register('store_type', 'group'); /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php index f6521a418f4bd..0d9465c4b8d3f 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php @@ -13,7 +13,7 @@ class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { if ($this->_getSession()->getPostData()) { $this->_coreRegistry->register('store_post_data', $this->_getSession()->getPostData()); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php index 1fe94f981734d..b26692e6f5448 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditWebsite.php @@ -11,7 +11,7 @@ class EditWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->_coreRegistry->register('store_type', 'website'); /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php index b1f9cf6730948..a91d61bfb20b1 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->resultPageFactory->create(); $resultPage->getConfig()->getTitle()->prepend(__('Stores')); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php index 70f9d8b726b07..f020762e613c2 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewGroup.php @@ -11,7 +11,7 @@ class NewGroup extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->_coreRegistry->register('store_type', 'group'); /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php index 817c67c8be9bd..b59df090433f8 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewStore.php @@ -11,7 +11,7 @@ class NewStore extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { if (!$this->_coreRegistry->registry('store_type')) { $this->_coreRegistry->register('store_type', 'store'); diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php index 65bdd1ee1ede1..cf514c49d02b0 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/NewWebsite.php @@ -11,7 +11,7 @@ class NewWebsite extends \Magento\Backend\Controller\Adminhtml\System\Store /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->_coreRegistry->register('store_type', 'website'); /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php index 7f2152e1e89c8..de1d131eaf8e4 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Store * @return \Magento\Backend\Model\View\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */ $redirectResult = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php index 476f6ca0310e1..052db1d9ae988 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php @@ -45,7 +45,7 @@ protected function tearDown() $this->plugin = null; } - public function testAroundDispatchProlongStorage() + public function testAroundExecuteProlongStorage() { $subject = $this->getMock('Magento\Backend\Controller\Adminhtml\Index', [], [], '', false); $request = $this->getMock('\Magento\Framework\App\Request\Http', ['getActionName'], [], '', false); @@ -82,11 +82,11 @@ public function testAroundDispatchProlongStorage() return $expectedResult; }; - $this->assertEquals($expectedResult, $this->plugin->aroundDispatch($subject, $proceed, $request)); + $this->assertEquals($expectedResult, $this->plugin->aroundExecute($subject, $proceed, $request)); } /** - * Calls aroundDispatch to access protected method _processNotLoggedInUser + * Calls aroundExecute to access protected method _processNotLoggedInUser * * Data provider supplies different possibilities of request parameters and properties * @dataProvider processNotLoggedInUserDataProvider @@ -103,7 +103,7 @@ public function testProcessNotLoggedInUser($isIFrameParam, $isAjaxParam, $isForw ->disableOriginalConstructor() ->getMock(); - // Stubs to control the flow of execution in aroundDispatch + // Stubs to control the flow of execution in aroundExecute $this->auth->expects($this->any())->method('getAuthStorage')->will($this->returnValue($storage)); $request->expects($this->once())->method('getActionName')->will($this->returnValue('non/open/action/name')); $this->auth->expects($this->any())->method('getUser')->willReturn(false); @@ -146,7 +146,7 @@ public function testProcessNotLoggedInUser($isIFrameParam, $isAjaxParam, $isForw $proceed = function ($request) use ($expectedResult) { return $expectedResult; }; - $this->assertEquals($expectedResult, $this->plugin->aroundDispatch($subject, $proceed, $request)); + $this->assertEquals($expectedResult, $this->plugin->aroundExecute($subject, $proceed, $request)); } public function processNotLoggedInUserDataProvider() diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php index 87dad8b6edd41..48ec3a9a592c3 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php @@ -49,13 +49,13 @@ protected function setUp() } /** - * @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch + * @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundExecute * * @param $postData array|string * @param array $convertedData - * @dataProvider aroundDispatchDataProvider + * @dataProvider aroundExecuteDataProvider */ - public function testAroundDispatchWhenMassactionPrepareKeyRequestExists($postData, $convertedData) + public function testAroundExecuteWhenMassactionPrepareKeyRequestExists($postData, $convertedData) { $this->requestMock->expects($this->at(0)) ->method('getPost') @@ -71,11 +71,11 @@ public function testAroundDispatchWhenMassactionPrepareKeyRequestExists($postDat $this->assertEquals( 'Expected', - $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } - public function aroundDispatchDataProvider() + public function aroundExecuteDataProvider() { return [ 'post_data_is_array' => [['key'], ['key']], @@ -84,9 +84,9 @@ public function aroundDispatchDataProvider() } /** - * @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundDispatch + * @covers \Magento\Backend\App\Action\Plugin\MassactionKey::aroundExecute */ - public function testAroundDispatchWhenMassactionPrepareKeyRequestNotExists() + public function testAroundExecuteWhenMassactionPrepareKeyRequestNotExists() { $this->requestMock->expects($this->once()) ->method('getPost') @@ -97,7 +97,7 @@ public function testAroundDispatchWhenMassactionPrepareKeyRequestNotExists() $this->assertEquals( 'Expected', - $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } } diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php b/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php index fa8eb043b33a0..d8a8df5bc1712 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php @@ -8,7 +8,7 @@ class ActionStub extends \Magento\Backend\App\Action { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php index 36db725f9a907..1e6619c6f8df7 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php @@ -10,7 +10,7 @@ class CleanMediaTest extends \PHPUnit_Framework_TestCase { - public function testExecute() + public function testExecuteInternal() { // Wire object with mocks $response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); @@ -62,6 +62,7 @@ public function testExecute() $context->expects($this->once())->method('getMessageManager')->willReturn($messageManager); $context->expects($this->once())->method('getResultFactory')->willReturn($resultFactory); + /** @var \Magento\Backend\Controller\Adminhtml\Cache\CleanMedia $controller */ $controller = $helper->getObject( 'Magento\Backend\Controller\Adminhtml\Cache\CleanMedia', [ @@ -90,6 +91,6 @@ public function testExecute() ->willReturnSelf(); // Run - $controller->execute(); + $controller->executeInternal(); } } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php index 0e78f533c8525..dfc5059ec4763 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php @@ -94,6 +94,6 @@ public function testExecute() ->willReturnSelf(); // Run - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php index 986658d715336..3e67b8311628e 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php @@ -19,7 +19,7 @@ class AbstractTestCase extends \PHPUnit_Framework_TestCase * @param $controllerName * @param $blockName */ - protected function assertExecute($controllerName, $blockName) + protected function assertExecuteInternal($controllerName, $blockName) { $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $outPut = "data"; @@ -47,7 +47,7 @@ protected function assertExecute($controllerName, $blockName) 'layoutFactory' => $layoutFactoryMock ] ); - $result = $controller->execute(); + $result = $controller->executeInternal(); $this->assertInstanceOf('Magento\Framework\Controller\Result\Raw', $result); } } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php index bb7cb6ff15ed4..f60a0fc93072c 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php @@ -15,7 +15,7 @@ class CustomersMostTest extends AbstractTestCase { public function testExecute() { - $this->assertExecute( + $this->assertExecuteInternal( 'Magento\Backend\Controller\Adminhtml\Dashboard\CustomersMost', 'Magento\Backend\Block\Dashboard\Tab\Customers\Most' ); diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php index d9fdd7366ef0d..6d229559e588b 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php @@ -15,7 +15,7 @@ class CustomersNewestTest extends AbstractTestCase { public function testExecute() { - $this->assertExecute( + $this->assertExecuteInternal( 'Magento\Backend\Controller\Adminhtml\Dashboard\CustomersNewest', 'Magento\Backend\Block\Dashboard\Tab\Customers\Newest' ); diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/ProductsViewedTest.php index 145a8a14077d4..4efdf2c4edf43 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/ProductsViewedTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/ProductsViewedTest.php @@ -15,7 +15,7 @@ class ProductsViewedTest extends AbstractTestCase { public function testExecute() { - $this->assertExecute( + $this->assertExecuteInternal( 'Magento\Backend\Controller\Adminhtml\Dashboard\ProductsViewed', 'Magento\Backend\Block\Dashboard\Tab\Products\Viewed' ); diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php index 76d670fef543e..a224583fe5a96 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php @@ -128,7 +128,7 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->refreshStatisticsController->execute() + $this->refreshStatisticsController->executeInternal() ); } } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/TunnelTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/TunnelTest.php index 2e5cd51547eee..cae77b8ad3cc9 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/TunnelTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/TunnelTest.php @@ -92,7 +92,7 @@ public function testTunnelAction() ->with('success_msg') ->willReturnSelf(); - $controller->execute(); + $controller->executeInternal(); $this->assertEquals('success_msg', $controller->getResponse()->getBody()); } @@ -112,7 +112,7 @@ public function testTunnelAction400() ->with('Service unavailable: invalid request') ->willReturnSelf(); - $controller->execute(); + $controller->executeInternal(); } public function testTunnelAction503() @@ -164,7 +164,7 @@ public function testTunnelAction503() ->with('Service unavailable: see error log for details') ->willReturnSelf(); - $controller->execute(); + $controller->executeInternal(); } /** diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php index b36c9a59ab9d4..d86dd0eb5e1bc 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php @@ -197,6 +197,6 @@ public function testSaveAction() $this->userMock->setUserId($userId); $this->requestMock->setParams($requestParams); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php index abfd789889b83..caa8da583a6f3 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php @@ -17,7 +17,7 @@ class Create extends \Magento\Backup\Controller\Adminhtml\Index * @return void|\Magento\Backend\App\Action * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->isAjax()) { return $this->_redirect('*/*/index'); diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php index c9fe2c5758624..a5ea380d2b671 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php @@ -49,7 +49,7 @@ public function __construct( * * @return void|\Magento\Backend\App\Action */ - public function execute() + public function executeInternal() { /* @var $backup \Magento\Backup\Model\Backup */ $backup = $this->_backupModelFactory->create( diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php index 0b93210338255..f1b60948461c7 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Backup\Controller\Adminhtml\Index * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_view->renderLayout(); diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php index 6d3e4f75f4a84..5335d40f9a812 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Backup\Controller\Adminhtml\Index * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('ajax')) { $this->_forward('grid'); diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php index b0c1af3a1f4db..c9958e65d66d7 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/MassDelete.php @@ -13,7 +13,7 @@ class MassDelete extends \Magento\Backup\Controller\Adminhtml\Index * * @return \Magento\Backend\App\Action */ - public function execute() + public function executeInternal() { $backupIds = $this->getRequest()->getParam('ids', []); diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php index fdb4714f0ac8c..bd80aff5febf4 100644 --- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php +++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php @@ -19,7 +19,7 @@ class Rollback extends \Magento\Backup\Controller\Adminhtml\Index * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { if (!$this->_objectManager->get('Magento\Backup\Helper\Data')->isRollbackAllowed()) { $this->_forward('denied'); diff --git a/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php index 21d27ef0c5a34..6d2c6d515f11e 100644 --- a/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php +++ b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php @@ -143,7 +143,7 @@ public function setUp() } /** - * @covers \Magento\Backup\Controller\Adminhtml\Index\Download::execute + * @covers \Magento\Backup\Controller\Adminhtml\Index\Download::executeInternal */ public function testExecuteBackupFound() { @@ -201,11 +201,11 @@ public function testExecuteBackupFound() ->method('create') ->willReturn($this->resultRawMock); - $this->assertSame($this->resultRawMock, $this->downloadController->execute()); + $this->assertSame($this->resultRawMock, $this->downloadController->executeInternal()); } /** - * @covers \Magento\Backup\Controller\Adminhtml\Index\Download::execute + * @covers \Magento\Backup\Controller\Adminhtml\Index\Download::executeInternal * @param int $time * @param bool $exists * @param int $existsCount @@ -240,7 +240,7 @@ public function testExecuteBackupNotFound($time, $exists, $existsCount) ->method('create') ->willReturn($this->resultRedirectMock); - $this->assertSame($this->resultRedirectMock, $this->downloadController->execute()); + $this->assertSame($this->resultRedirectMock, $this->downloadController->executeInternal()); } /** diff --git a/app/code/Magento/Braintree/Controller/Creditcard/AjaxSave.php b/app/code/Magento/Braintree/Controller/Creditcard/AjaxSave.php index 0177988ea45ab..c5d284c62cd77 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/AjaxSave.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/AjaxSave.php @@ -14,7 +14,7 @@ class AjaxSave extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { try { $this->vault->processNonce( diff --git a/app/code/Magento/Braintree/Controller/Creditcard/Delete.php b/app/code/Magento/Braintree/Controller/Creditcard/Delete.php index 2dd4c4f9b136b..a1f8d5e55a95c 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/Delete.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/Delete.php @@ -12,7 +12,7 @@ class Delete extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->hasToken()) { if (!$this->vault->storedCard($this->hasToken())) { diff --git a/app/code/Magento/Braintree/Controller/Creditcard/DeleteConfirm.php b/app/code/Magento/Braintree/Controller/Creditcard/DeleteConfirm.php index bef7c62f78189..20102ff5c36a6 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/DeleteConfirm.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/DeleteConfirm.php @@ -29,7 +29,7 @@ protected function _addError($errors) * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { if ($token = $this->hasToken()) { $result = $this->vault->deleteCard($token); diff --git a/app/code/Magento/Braintree/Controller/Creditcard/Edit.php b/app/code/Magento/Braintree/Controller/Creditcard/Edit.php index 864d53f55639b..7e88faeeeedf1 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/Edit.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/Edit.php @@ -12,7 +12,7 @@ class Edit extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->hasToken()) { if (!$this->vault->storedCard($this->hasToken())) { diff --git a/app/code/Magento/Braintree/Controller/Creditcard/Generate.php b/app/code/Magento/Braintree/Controller/Creditcard/Generate.php index 7bfcdfde5b992..41c13f08cdade 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/Generate.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/Generate.php @@ -19,7 +19,7 @@ class Generate extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { try { if ($this->hasToken()) { diff --git a/app/code/Magento/Braintree/Controller/Creditcard/Index.php b/app/code/Magento/Braintree/Controller/Creditcard/Index.php index db240cda6fcc7..9e94ccdb307ce 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/Index.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/Index.php @@ -12,7 +12,7 @@ class Index extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Braintree/Controller/Creditcard/NewCard.php b/app/code/Magento/Braintree/Controller/Creditcard/NewCard.php index 000ba39e0ab21..1ac92a741d17b 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/NewCard.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/NewCard.php @@ -12,7 +12,7 @@ class NewCard extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Braintree/Controller/Creditcard/Save.php b/app/code/Magento/Braintree/Controller/Creditcard/Save.php index d51c3de282860..9080a2a3b65d6 100644 --- a/app/code/Magento/Braintree/Controller/Creditcard/Save.php +++ b/app/code/Magento/Braintree/Controller/Creditcard/Save.php @@ -12,7 +12,7 @@ class Save extends \Magento\Braintree\Controller\MyCreditCards * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $this->messageManager->addError(__('There was error during saving card data')); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Braintree/Controller/MyCreditCards.php b/app/code/Magento/Braintree/Controller/MyCreditCards.php index 122edc79ca2a0..04ff04202bc09 100644 --- a/app/code/Magento/Braintree/Controller/MyCreditCards.php +++ b/app/code/Magento/Braintree/Controller/MyCreditCards.php @@ -68,7 +68,7 @@ public function __construct( * @param RequestInterface $request * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $loginUrl = $this->customerUrl->getLoginUrl(); if (!$this->customerSession->authenticate($loginUrl)) { @@ -82,7 +82,7 @@ public function dispatch(RequestInterface $request) return $resultRedirect; } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Braintree/Controller/PayPal.php b/app/code/Magento/Braintree/Controller/PayPal.php index e24bd47e8d322..b85b605c9ef8d 100644 --- a/app/code/Magento/Braintree/Controller/PayPal.php +++ b/app/code/Magento/Braintree/Controller/PayPal.php @@ -77,7 +77,7 @@ public function __construct( * @param RequestInterface $request * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$this->braintreePayPalConfig->isActive() || !$this->braintreePayPalConfig->isShortcutCheckoutEnabled()) { $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); @@ -87,7 +87,7 @@ public function dispatch(RequestInterface $request) return $resultRedirect; } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php b/app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php index 4d070aa489d2c..4be1d5aaebd54 100644 --- a/app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php +++ b/app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php @@ -37,7 +37,7 @@ public function __construct(Context $context, Session $checkoutSession) * @return ResultInterface * @throws LocalizedException */ - public function execute() + public function executeInternal() { $isAjax = $this->_request->getParam('isAjax'); diff --git a/app/code/Magento/Braintree/Controller/PayPal/PlaceOrder.php b/app/code/Magento/Braintree/Controller/PayPal/PlaceOrder.php index 45041a25ef04e..febdcf06fed58 100644 --- a/app/code/Magento/Braintree/Controller/PayPal/PlaceOrder.php +++ b/app/code/Magento/Braintree/Controller/PayPal/PlaceOrder.php @@ -48,7 +48,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { try { if (!$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) { diff --git a/app/code/Magento/Braintree/Controller/PayPal/Review.php b/app/code/Magento/Braintree/Controller/PayPal/Review.php index ef01f89b38e11..48634e9fe7ba8 100644 --- a/app/code/Magento/Braintree/Controller/PayPal/Review.php +++ b/app/code/Magento/Braintree/Controller/PayPal/Review.php @@ -49,7 +49,7 @@ public function __construct( /** * @return $this|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $paymentMethodNonce = $this->getRequest()->getParam('payment_method_nonce'); $details = $this->getRequest()->getParam('details'); diff --git a/app/code/Magento/Braintree/Controller/PayPal/SaveShippingMethod.php b/app/code/Magento/Braintree/Controller/PayPal/SaveShippingMethod.php index d8041b7186ea4..6ec5b0c18e21f 100644 --- a/app/code/Magento/Braintree/Controller/PayPal/SaveShippingMethod.php +++ b/app/code/Magento/Braintree/Controller/PayPal/SaveShippingMethod.php @@ -15,7 +15,7 @@ class SaveShippingMethod extends \Magento\Braintree\Controller\PayPal * * @return void */ - public function execute() + public function executeInternal() { try { $isAjax = $this->getRequest()->getParam('isAjax'); diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/AjaxSaveTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/AjaxSaveTest.php index 53e070f5843a8..ff09bdb9e322f 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/AjaxSaveTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/AjaxSaveTest.php @@ -88,8 +88,8 @@ public function testExecute() ->method('addSuccess') ->with($phrase); - - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\AjaxSave $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\AjaxSave', [ 'request' => $this->request, @@ -98,7 +98,7 @@ public function testExecute() ] ); - $this->assertSame($this->resultJson, $notification->execute()); + $this->assertSame($this->resultJson, $controller->executeInternal()); } /** @@ -124,7 +124,8 @@ public function testExecuteLocalizedException() ->method('addError') ->with($phrase); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\AjaxSave $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\AjaxSave', [ 'request' => $this->request, @@ -134,6 +135,6 @@ public function testExecuteLocalizedException() ] ); - $this->assertSame($this->resultJson, $notification->execute()); + $this->assertSame($this->resultJson, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteConfirmTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteConfirmTest.php index a3047c7cac443..13029d4d144b3 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteConfirmTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteConfirmTest.php @@ -66,7 +66,7 @@ public function setUp() /** * Executes the controller action and asserts successfully deleted */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManagerHelper($this); $phrase = new \Magento\Framework\Phrase('Credit card successfully deleted'); @@ -93,7 +93,8 @@ public function testExecute() ->method('addSuccess') ->with($phrase); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\DeleteConfirm $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\DeleteConfirm', [ 'request' => $this->request, @@ -103,13 +104,13 @@ public function testExecute() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } /** * Executes the controller action and asserts with redirect for non valid token param */ - public function testExecuteNoTokenRedirect() + public function testExecuteInternalNoTokenRedirect() { $objectManager = new ObjectManagerHelper($this); @@ -128,7 +129,8 @@ public function testExecuteNoTokenRedirect() ->method('setPath') ->willReturnSelf(); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Edit $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Edit', [ 'request' => $this->request, @@ -137,13 +139,13 @@ public function testExecuteNoTokenRedirect() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } /** * Executes the controller action and asserts with redirects for can't delete card logic */ - public function testExecuteNonExistingTokenRedirect() + public function testExecuteInternalNonExistingTokenRedirect() { $objectManager = new ObjectManagerHelper($this); $phrase = new \Magento\Framework\Phrase('a,b,c'); @@ -172,7 +174,8 @@ public function testExecuteNonExistingTokenRedirect() ->method('addError') ->with($phrase); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\DeleteConfirm $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\DeleteConfirm', [ 'request' => $this->request, @@ -182,13 +185,13 @@ public function testExecuteNonExistingTokenRedirect() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } /** * Executes the controller action and asserts failed deletion */ - public function testExecuteSaveFail() + public function testExecuteInternalSaveFail() { $objectManager = new ObjectManagerHelper($this); $phrase = new \Magento\Framework\Phrase('There was error deleting the credit card'); @@ -214,7 +217,8 @@ public function testExecuteSaveFail() ->method('addError') ->with($phrase); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\DeleteConfirm $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\DeleteConfirm', [ 'request' => $this->request, @@ -224,6 +228,6 @@ public function testExecuteSaveFail() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteTest.php index 504c186ad1177..76c7fa5b7528a 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/DeleteTest.php @@ -106,7 +106,7 @@ public function setUp() /** * Executes the controller action and asserts non exception logic */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManagerHelper($this); @@ -138,8 +138,8 @@ public function testExecute() ->method('getConfig') ->willReturn($this->pageConfig); - - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Delete $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Delete', [ 'request' => $this->request, @@ -148,13 +148,13 @@ public function testExecute() ] ); - $this->assertSame($this->resultPage, $notification->execute()); + $this->assertSame($this->resultPage, $controller->executeInternal()); } /** * Executes the controller action and asserts with redirect for non valid token param */ - public function testExecuteNoTokenRedirect() + public function testExecuteInternalNoTokenRedirect() { $objectManager = new ObjectManagerHelper($this); @@ -176,7 +176,8 @@ public function testExecuteNoTokenRedirect() ->method('setPath') ->willReturnSelf(); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Delete $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Delete', [ 'request' => $this->request, @@ -186,13 +187,13 @@ public function testExecuteNoTokenRedirect() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } /** * Executes the controller action and asserts with redirects for non existing logic */ - public function testExecuteNonExistingTokenRedirect() + public function testExecuteInternalNonExistingTokenRedirect() { $objectManager = new ObjectManagerHelper($this); $phrase = new \Magento\Framework\Phrase('Credit card does not exist'); @@ -224,8 +225,8 @@ public function testExecuteNonExistingTokenRedirect() ->method('addError') ->with($phrase); - - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Delete $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Delete', [ 'request' => $this->request, @@ -236,6 +237,6 @@ public function testExecuteNonExistingTokenRedirect() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/EditTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/EditTest.php index cd14d7181346d..7742f863e16a8 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/EditTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/EditTest.php @@ -106,7 +106,7 @@ public function setUp() /** * Executes the controller action and asserts non exception logic */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManagerHelper($this); @@ -138,8 +138,8 @@ public function testExecute() ->method('getConfig') ->willReturn($this->pageConfig); - - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Edit $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Edit', [ 'request' => $this->request, @@ -148,13 +148,13 @@ public function testExecute() ] ); - $this->assertSame($this->resultPage, $notification->execute()); + $this->assertSame($this->resultPage, $controller->executeInternal()); } /** * Executes the controller action and asserts with redirect for non valid token param */ - public function testExecuteNoTokenRedirect() + public function testExecuteInternalNoTokenRedirect() { $objectManager = new ObjectManagerHelper($this); @@ -176,7 +176,8 @@ public function testExecuteNoTokenRedirect() ->method('setPath') ->willReturnSelf(); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Edit $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Edit', [ 'request' => $this->request, @@ -186,13 +187,13 @@ public function testExecuteNoTokenRedirect() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } /** * Executes the controller action and asserts with redirects for non existing logic */ - public function testExecuteNonExistingTokenRedirect() + public function testExecuteInternalNonExistingTokenRedirect() { $objectManager = new ObjectManagerHelper($this); $phrase = new \Magento\Framework\Phrase('Credit card does not exist'); @@ -224,8 +225,8 @@ public function testExecuteNonExistingTokenRedirect() ->method('addError') ->with($phrase); - - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Edit $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Edit', [ 'request' => $this->request, @@ -236,6 +237,6 @@ public function testExecuteNonExistingTokenRedirect() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/GenerateTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/GenerateTest.php index 40540bb9da8c0..8f000251d18c7 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/GenerateTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/GenerateTest.php @@ -72,7 +72,7 @@ public function setUp() /** * Executes the controller action and asserts non exception logic */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManager($this); $this->resultJson->expects($this->once()) @@ -87,7 +87,8 @@ public function testExecute() ->method('getParam') ->willReturn(true); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Generate $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Generate', [ 'request' => $this->request, @@ -96,13 +97,13 @@ public function testExecute() ] ); - $this->assertSame($this->resultJson, $notification->execute()); + $this->assertSame($this->resultJson, $controller->executeInternal()); } /** * Executes the controller action and asserts non exception logic */ - public function testExecuteLocalizedException() + public function testExecuteInternalLocalizedException() { $phrase = new \Magento\Framework\Phrase('Something went wrong while processing.'); $objectManager = new ObjectManager($this); @@ -126,7 +127,8 @@ public function testExecuteLocalizedException() ->method('getParam') ->willReturn(true); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Generate $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Generate', [ 'request' => $this->request, @@ -136,6 +138,6 @@ public function testExecuteLocalizedException() ] ); - $this->assertSame($this->resultJson, $notification->execute()); + $this->assertSame($this->resultJson, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/IndexTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/IndexTest.php index 7f8e3861a48de..38e88b0586e88 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/IndexTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/IndexTest.php @@ -86,17 +86,18 @@ public function setUp() /** * Executes the controller action and asserts non exception logic */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManagerHelper($this); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Index $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Index', [ 'resultPageFactory' => $this->resultPageFactory, ] ); - $this->assertSame($this->resultPage, $notification->execute()); + $this->assertSame($this->resultPage, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/NewCardTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/NewCardTest.php index ee655fe49b083..23607cc383985 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/NewCardTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/NewCardTest.php @@ -94,7 +94,7 @@ public function setUp() /** * Executes the controller action and asserts non exception logic */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManagerHelper($this); $customerId = 1; @@ -103,7 +103,8 @@ public function testExecute() ->method('getCustomerId') ->willReturn($customerId); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\NewCard $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\NewCard', [ 'resultPageFactory' => $this->resultPageFactory, @@ -111,6 +112,6 @@ public function testExecute() ] ); - $this->assertSame($this->resultPage, $notification->execute()); + $this->assertSame($this->resultPage, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/SaveTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/SaveTest.php index ff42e7e7c6e0e..512dbb4d07c25 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/SaveTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Creditcard/SaveTest.php @@ -58,7 +58,7 @@ public function setUp() /** * Executes the controller action */ - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManagerHelper($this); $phrase = new \Magento\Framework\Phrase('There was error during saving card data'); @@ -84,7 +84,8 @@ public function testExecute() ->method('addError') ->with($phrase); - $notification = $objectManager->getObject( + /** @var \Magento\Braintree\Controller\Creditcard\Save $controller */ + $controller = $objectManager->getObject( 'Magento\Braintree\Controller\Creditcard\Save', [ 'request' => $this->request, @@ -93,6 +94,6 @@ public function testExecute() ] ); - $this->assertSame($this->resultRedirect, $notification->execute()); + $this->assertSame($this->resultRedirect, $controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/MyCreditCardsTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/MyCreditCardsTest.php index 39f70eb0ce2ae..657d83e1f7ae0 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/MyCreditCardsTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/MyCreditCardsTest.php @@ -113,7 +113,7 @@ public function testDispatchNoVault() $requestInterface= $this->getMockBuilder('\Magento\Framework\App\RequestInterface') ->getMock(); - $notification = $objectManager->getObject( + $controller = $objectManager->getObject( 'Magento\Braintree\Test\Unit\Controller\Stub\MyCreditCardsStub', [ 'customerSession' => $this->customerSession, @@ -123,7 +123,7 @@ public function testDispatchNoVault() ] ); - $this->assertSame($this->resultRedirect, $notification->dispatch($requestInterface)); + $this->assertSame($this->resultRedirect, $controller->execute($requestInterface)); } /** @@ -156,7 +156,7 @@ public function testDispatchNotLoggedIn() ->getMock(); - $notification = $objectManager->getObject( + $controller = $objectManager->getObject( 'Magento\Braintree\Test\Unit\Controller\Stub\MyCreditCardsStub', [ 'customerSession' => $this->customerSession, @@ -167,6 +167,6 @@ public function testDispatchNotLoggedIn() ] ); - $this->assertSame($this->_response, $notification->dispatch($requestInterface)); + $this->assertSame($this->_response, $controller->execute($requestInterface)); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/GetButtonDataTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/GetButtonDataTest.php index 75718aa2f9c35..ee314f710e26c 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/GetButtonDataTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/GetButtonDataTest.php @@ -85,7 +85,7 @@ public function testExecute(array $response, array $data) ->willReturn($data['currency']); $getButtonData = new GetButtonData($this->contextMock, $this->checkoutSessionMock); - $getButtonData->execute(); + $getButtonData->executeInternal(); } /** @@ -168,7 +168,7 @@ public function testExecuteException() ->method('getQuote'); $getButtonData = new GetButtonData($this->contextMock, $this->checkoutSessionMock); - $getButtonData->execute(); + $getButtonData->executeInternal(); } /** diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/PlaceOrderTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/PlaceOrderTest.php index e27de2bedd42c..1d4fb2a241b78 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/PlaceOrderTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/PlaceOrderTest.php @@ -204,7 +204,7 @@ public function testExecute() ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT) ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->execute()); + $this->assertEquals($resultRedirect, $this->controller->executeInternal()); } public function testExecuteException() @@ -234,6 +234,6 @@ public function testExecuteException() ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT) ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->execute()); + $this->assertEquals($resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/ReviewTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/ReviewTest.php index bac4378b974a6..c7fc1da866262 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/ReviewTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/ReviewTest.php @@ -253,7 +253,7 @@ public function testExecute() ->with($paymentMethodNonce, ['email' => $email]); $resultPageMock = $this->setupReviewPage($quoteMock); - $this->assertEquals($resultPageMock, $this->controller->execute()); + $this->assertEquals($resultPageMock, $this->controller->executeInternal()); } public function testExecuteWithBillingAddress() @@ -285,7 +285,7 @@ public function testExecuteWithBillingAddress() ->with($paymentMethodNonce, $details); $resultPageMock = $this->setupReviewPage($quoteMock); - $this->assertEquals($resultPageMock, $this->controller->execute()); + $this->assertEquals($resultPageMock, $this->controller->executeInternal()); } public function testExecuteRefresh() @@ -296,7 +296,7 @@ public function testExecuteRefresh() ->willReturn(\Magento\Braintree\Model\PaymentMethod\PayPal::METHOD_CODE); $resultPageMock = $this->setupReviewPage($quoteMock); - $this->assertEquals($resultPageMock, $this->controller->execute()); + $this->assertEquals($resultPageMock, $this->controller->executeInternal()); } public function testExecuteNoPayment() @@ -328,7 +328,7 @@ public function testExecuteNoPayment() ->method('create') ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT) ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->execute()); + $this->assertEquals($resultRedirect, $this->controller->executeInternal()); } public function testExecuteIncorrectPaymentMathod() @@ -352,7 +352,7 @@ public function testExecuteIncorrectPaymentMathod() ->method('create') ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT) ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->execute()); + $this->assertEquals($resultRedirect, $this->controller->executeInternal()); } public function testExecuteValidationFailure() @@ -400,7 +400,7 @@ public function testExecuteValidationFailure() ->method('create') ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT) ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->execute()); + $this->assertEquals($resultRedirect, $this->controller->executeInternal()); } public function testExecuteException() @@ -447,6 +447,6 @@ public function testExecuteException() ->method('create') ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT) ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->execute()); + $this->assertEquals($resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/SaveShippingMethodTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/SaveShippingMethodTest.php index 38d61187310a6..c1c5da115fcfa 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/SaveShippingMethodTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/PayPal/SaveShippingMethodTest.php @@ -198,7 +198,7 @@ public function testExecute() ->with(ResultFactory::TYPE_PAGE) ->willReturn($responsePageMock); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteException() @@ -236,6 +236,6 @@ public function testExecuteException() ->method('setBody') ->with($html); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/PayPalTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/PayPalTest.php index b20831f92fe1d..f9d3db87e6d6f 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/PayPalTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/PayPalTest.php @@ -125,7 +125,7 @@ public function testDispatchNotActive() ->method('create') ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->dispatch($this->requestMock)); + $this->assertEquals($resultRedirect, $this->controller->execute($this->requestMock)); $this->assertEquals('noRoute', $resultRedirect->getPath()) ; } @@ -146,7 +146,7 @@ public function testDispatchButtonNotEnabled() ->method('create') ->willReturn($resultRedirect); - $this->assertEquals($resultRedirect, $this->controller->dispatch($this->requestMock)); + $this->assertEquals($resultRedirect, $this->controller->execute($this->requestMock)); $this->assertEquals('noRoute', $resultRedirect->getPath()) ; } } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Stub/MyCreditCardsStub.php b/app/code/Magento/Braintree/Test/Unit/Controller/Stub/MyCreditCardsStub.php index 971edb13bfa61..b8abdda7eb05f 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Stub/MyCreditCardsStub.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Stub/MyCreditCardsStub.php @@ -8,7 +8,7 @@ class MyCreditCardsStub extends \Magento\Braintree\Controller\MyCreditCards { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Stub/PayPalStub.php b/app/code/Magento/Braintree/Test/Unit/Controller/Stub/PayPalStub.php index b0b5a3dc31884..ca9248d5e6b50 100644 --- a/app/code/Magento/Braintree/Test/Unit/Controller/Stub/PayPalStub.php +++ b/app/code/Magento/Braintree/Test/Unit/Controller/Stub/PayPalStub.php @@ -8,7 +8,7 @@ class PayPalStub extends \Magento\Braintree\Controller\PayPal { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php index 8323781a07c94..2f6f5061a79e7 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Form.php @@ -33,7 +33,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { $product = $this->initializationHelper->initialize($this->productBuilder->build($this->getRequest())); $this->getResponse()->setBody( diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php index 684eb43e4ad60..359f69c72e012 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Grid.php @@ -11,7 +11,7 @@ class Grid extends \Magento\Backend\App\Action /** * @return mixed */ - public function execute() + public function executeInternal() { $index = $this->getRequest()->getParam('index'); if (!preg_match('/^[a-z0-9_.]*$/i', $index)) { diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php index 46c2fae16f490..6101d8b9593a2 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection/Search.php @@ -11,7 +11,7 @@ class Search extends \Magento\Backend\App\Action /** * @return mixed */ - public function execute() + public function executeInternal() { return $this->getResponse()->setBody( $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Product/Edit/FormTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Product/Edit/FormTest.php index 34f249ca2cdd3..75a14fd13a66b 100644 --- a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Product/Edit/FormTest.php +++ b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Product/Edit/FormTest.php @@ -112,6 +112,6 @@ public function testExecute() $layout->expects($this->once())->method('createBlock')->willReturn($block); $block->expects($this->once())->method('toHtml')->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/GridTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/GridTest.php index c0a7342f8249f..49a6c22704ee9 100644 --- a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/GridTest.php +++ b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/GridTest.php @@ -88,7 +88,7 @@ public function testExecute() $block->expects($this->once())->method('setIndex')->willReturnSelf(); $block->expects($this->once())->method('toHtml')->willReturnSelf(); - $this->assertEquals($this->response, $this->controller->execute()); + $this->assertEquals($this->response, $this->controller->executeInternal()); } /** @@ -99,6 +99,6 @@ public function testExecuteWithException() { $this->request->expects($this->once())->method('getParam')->with('index')->willReturn('controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/SearchTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/SearchTest.php index 2ef224ab71715..7f03eeccfd156 100644 --- a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/SearchTest.php +++ b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Bundle/Selection/SearchTest.php @@ -87,6 +87,6 @@ public function testExecute() $block->expects($this->once())->method('setFirstShow')->with(true)->willReturnSelf(); $block->expects($this->once())->method('toHtml')->willReturnSelf(); - $this->assertEquals($this->response, $this->controller->execute()); + $this->assertEquals($this->response, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php index 2c6ad98a280c7..7dd6846a3fda6 100644 --- a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php +++ b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php @@ -13,7 +13,7 @@ class Refresh extends \Magento\Backend\App\Action /** * {@inheritdoc} */ - public function execute() + public function executeInternal() { $formId = $this->getRequest()->getPost('formId'); $captchaModel = $this->_objectManager->get('Magento\Captcha\Helper\Data')->getCaptcha($formId); diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php index f12d17afaa99b..6e4a78090bd6c 100644 --- a/app/code/Magento/Captcha/Controller/Refresh/Index.php +++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php @@ -30,7 +30,7 @@ public function __construct(Context $context, \Magento\Captcha\Helper\Data $capt /** * {@inheritdoc} */ - public function execute() + public function executeInternal() { $formId = $this->_request->getPost('formId'); if (null === $formId) { diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php index 9f1dcff38b658..4cc0d629b0100 100644 --- a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php +++ b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php @@ -57,7 +57,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function aroundExecute( + public function aroundExecuteInternal( \Magento\Customer\Controller\Ajax\Login $subject, \Closure $proceed ) { diff --git a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php index fd47b19ea9038..55f33af2161a8 100644 --- a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php +++ b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php @@ -100,7 +100,7 @@ public function testExecute($formId, $callsNumber) $this->responseMock->expects($this->once())->method('representJson')->with(json_encode(['imgSrc' => 'source'])); $this->flagMock->expects($this->once())->method('set')->with('', 'no-postDispatch', true); - $this->model->execute(); + $this->model->executeInternal(); } /** diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php index 7a79969f8ef4f..3d92086223ca9 100644 --- a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php +++ b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php @@ -82,7 +82,7 @@ protected function setUp() ); } - public function testAroundExecute() + public function testAroundExecuteInternal() { $username = 'name'; $captchaString = 'string'; @@ -102,10 +102,10 @@ public function testAroundExecute() $closure = function () { return 'result'; }; - $this->assertEquals('result', $this->model->aroundExecute($this->loginControllerMock, $closure)); + $this->assertEquals('result', $this->model->aroundExecuteInternal($this->loginControllerMock, $closure)); } - public function testAroundExecuteIncorrectCaptcha() + public function testAroundExecuteInternalIncorrectCaptcha() { $username = 'name'; $captchaString = 'string'; @@ -131,15 +131,15 @@ public function testAroundExecuteIncorrectCaptcha() $closure = function () { }; - $this->assertEquals('response', $this->model->aroundExecute($this->loginControllerMock, $closure)); + $this->assertEquals('response', $this->model->aroundExecuteInternal($this->loginControllerMock, $closure)); } /** - * @dataProvider aroundExecuteCaptchaIsNotRequired + * @dataProvider aroundExecuteInternalCaptchaIsNotRequired * @param string $username * @param array $requestContent */ - public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent) + public function testAroundExecuteInternalCaptchaIsNotRequired($username, $requestContent) { $this->requestMock->expects($this->once())->method('getContent')->will($this->returnValue($requestContent)); @@ -151,13 +151,13 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent $closure = function () { return 'result'; }; - $this->assertEquals('result', $this->model->aroundExecute($this->loginControllerMock, $closure)); + $this->assertEquals('result', $this->model->aroundExecuteInternal($this->loginControllerMock, $closure)); } /** * @return array */ - public function aroundExecuteCaptchaIsNotRequired() + public function aroundExecuteInternalCaptchaIsNotRequired() { return [ [ diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php index 5cd9fffd001c4..9860f99b8267d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->_objectManager->get('Magento\Backend\Model\Auth\Session')->unsActiveTabId(); /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php index 6f9cf5cc6e551..21c4c2fddbdc0 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php @@ -38,7 +38,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('expand_all')) { $this->_objectManager->get('Magento\Backend\Model\Auth\Session')->setIsTreeWasExpanded(true); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php index cc0e60a82a391..7590c92887c70 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php @@ -28,7 +28,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php index 3c308d5deeafa..4c8f0e0be64b6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php @@ -40,7 +40,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $storeId = (int)$this->getRequest()->getParam('store'); $parentId = (int)$this->getRequest()->getParam('parent'); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php index fdecd7c392290..6f389e87de6f8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Grid.php @@ -39,7 +39,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $category = $this->_initCategory(true); if (!$category) { diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php index 1b0bbf347f509..7fb6ab9e9561e 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Index.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php index fb0d48aacc43c..28f7d43bec600 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php @@ -46,7 +46,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { /** * New parent category identifier diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php index 150b019466489..5441e16587445 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $categoryId = (int)$this->getRequest()->getParam('id'); if ($categoryId) { diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php index ac0b303f18d4d..014bea2cfa3ee 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php @@ -70,7 +70,7 @@ protected function _filterCategoryPostData(array $rawData) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php index 94c8010cc3980..6fbed45cc7662 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/SuggestCategories.php @@ -38,7 +38,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->resultJsonFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php index 9acd075bc8276..1eee483d716f6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php @@ -39,7 +39,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $storeId = (int)$this->getRequest()->getParam('store'); $categoryId = (int)$this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php index 329f786314fb2..953daaa46074a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJson.php @@ -42,7 +42,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $categoryId = (int)$this->getRequest()->getPost('id'); if ($categoryId) { diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php index fa9b2ab95b233..f65912621ce89 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget/Chooser.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ $resultRaw = $this->resultRawFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php index 29f30ad573f03..e83384f5f355f 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php @@ -51,7 +51,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); $this->attributeHelper->setProductIds($collection->getAllIds()); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php index 3661567d5fa00..c77b65c71a2ee 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php @@ -85,7 +85,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { if (!$this->_validateProducts()) { return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['_current' => true]); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php index a7f2da5776206..1b3c6e2ad17a9 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $response = $this->_objectManager->create('Magento\Framework\DataObject'); $response->setError(false); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php index 26fea5b4039fd..623c1d0bd3b83 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php @@ -31,7 +31,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $request = $this->getRequest(); $resultJson = $this->resultJsonFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php index b865313f943f8..e8b34dde057e0 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php @@ -14,7 +14,7 @@ class AlertsPriceGrid extends AbstractProductGrid * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { return $this->resultLayoutFactory->create(); } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php index dc4a3f1447011..e6324f2171452 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php @@ -39,7 +39,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { return $this->resultLayoutFactory->create(); } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php index 6d444009f5a77..d2bc262e1a809 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php @@ -62,14 +62,14 @@ public function __construct( * @param \Magento\Framework\App\RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(\Magento\Framework\App\RequestInterface $request) + public function execute(\Magento\Framework\App\RequestInterface $request) { $this->_entityTypeId = $this->_objectManager->create( 'Magento\Eav\Model\Entity' )->setType( \Magento\Catalog\Model\Product::ENTITY )->getTypeId(); - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php index aa99a78945e65..be13157399e31 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php @@ -11,7 +11,7 @@ class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('attribute_id'); $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php index bfe598b3d9b37..14baeaa2461a9 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php @@ -12,7 +12,7 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute * @return \Magento\Framework\Controller\ResultInterface * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('attribute_id'); /** @var $model \Magento\Catalog\Model\ResourceModel\Eav\Attribute */ diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php index bb264940f4af9..b2caa1c521966 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->createActionPage(); $resultPage->addContent( diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php index 08e6e33b32fba..97886d735b71a 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/NewAction.php @@ -34,7 +34,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { return $this->resultForwardFactory->create()->forward('edit'); } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php index 2d57b6148e553..17bed1b247b9c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php @@ -86,7 +86,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php index bb870c3f8ef06..7a529343b1faf 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php @@ -44,7 +44,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(); $response->setError(false); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php index 202f41cda5933..f62dc494341e6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Categories.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); return $this->resultPageFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php index 298dd38b06554..a39e81bcb5dbc 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php index 7dd03b84c0993..06213df4acd58 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php index cc5dde10f1a39..23546bfe57dd2 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CustomOptions.php @@ -45,7 +45,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->registry->register('import_option_products', $this->getRequest()->getPost('products')); return $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php index f51fb90425adb..0abe6282eee29 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\Backend\App\Action /** * @return void */ - public function execute() + public function executeInternal() { } } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php index d335b898f71ce..fa68907d14c78 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php index 30e1299ca1749..123117c22a798 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php @@ -39,7 +39,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $productId = (int) $this->getRequest()->getParam('id'); $product = $this->productBuilder->build($this->getRequest()); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php index fb6511ec6bb0d..6e41eed07bb5d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php @@ -38,7 +38,7 @@ protected function _isAllowed() /** * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { try { $uploader = $this->_objectManager->create( diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php index fdda822206b73..a9536e615d0b5 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Grid.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { return $this->resultPageFactory->create(); } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php index 0732fd041b950..f489d581fe354 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php @@ -39,7 +39,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Products')); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php index 9c4ba567e0453..810fa031ba955 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php @@ -19,7 +19,7 @@ protected function _isAllowed() /** * @return void */ - public function execute() + public function executeInternal() { $model = $this->_objectManager->create('Magento\Eav\Model\Entity\Attribute\Group'); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php index 2edf364aa668a..89051652951c2 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php index 831fb79fc5f46..2140d25e25061 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php @@ -46,7 +46,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); $productDeleted = 0; diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php index 04f37fda61f14..913a1be34b513 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php @@ -75,7 +75,7 @@ public function _validateMassStatus(array $productIds, $status) * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); $productIds = $collection->getAllIds(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php index 47c42d49e3adf..d22b64ee03e5c 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->getParam('set')) { return $this->resultForwardFactory->create()->forward('noroute'); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php index 2fcd0dcf96126..3bd0b5eab8e60 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Options.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); return $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php index a2b2dbda990ec..2958d8fb965b8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/OptionsImportGrid.php @@ -13,7 +13,7 @@ class OptionsImportGrid extends AbstractProductGrid * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { return $this->resultLayoutFactory->create(); } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php index d503a79ff3a67..98bc500a02325 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php @@ -31,7 +31,7 @@ public function __construct( /** * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php index f37bc324c56b2..d09ce170e4c21 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php @@ -53,7 +53,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $storeId = $this->getRequest()->getParam('store'); $redirectBack = $this->getRequest()->getParam('back', false); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php index 7e4bee7a76913..e90f47343d0d9 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Add.php @@ -30,7 +30,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->_setTypeId(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php index 9585bce699f5f..eeaeb920af3c2 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php @@ -30,7 +30,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $setId = $this->getRequest()->getParam('id'); $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php index 8f7dafbf28892..e10b3391c2dd1 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Edit.php @@ -30,7 +30,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->_setTypeId(); $attributeSet = $this->_objectManager->create('Magento\Eav\Model\Entity\Attribute\Set') diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php index 2e1e1a4b642f6..61da929908d30 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Index.php @@ -30,7 +30,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->_setTypeId(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php index 480a079d53d7e..5f36ab3bea0f0 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php @@ -57,7 +57,7 @@ protected function _getEntityTypeId() * @return \Magento\Framework\Controller\ResultInterface * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { $entityTypeId = $this->_getEntityTypeId(); $hasError = false; diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php index d58fa4a600a89..13a7440a7a70d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/SetGrid.php @@ -30,7 +30,7 @@ public function __construct( /** * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->_setTypeId(); return $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php index d7e4db8dbb7e5..c5bda8da562a1 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $layout = false; if ($this->_session->hasCompositeProductResult() diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php index 456a579c6191d..7eb906bfa89c2 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php @@ -38,7 +38,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $resultJson = $this->resultJsonFactory->create(); $resultJson->setData( diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php index 6b60c4f74810f..b5db6ac5e0797 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $resultJson = $this->resultJsonFactory->create(); $resultJson->setData( diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php index 4c11f14d9f998..09ef399f3ce66 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php index 171a1e4694a9e..b4a6a42d94fe6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->productBuilder->build($this->getRequest()); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php index 82e68cd1c943a..be1d2b5b962df 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php @@ -72,7 +72,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(); $response->setError(false); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php index 1c883ea7989d7..eeb41e0bea55b 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget/Chooser.php @@ -38,7 +38,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $uniqId = $this->getRequest()->getParam('uniq_id'); $massAction = $this->getRequest()->getParam('use_massaction', false); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php index f0f0b5274a667..98daec96d7347 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $elementId = $this->getRequest()->getParam('element_id', md5(microtime())); $storeId = $this->getRequest()->getParam('store_id', 0); diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php index b0684d90546f1..bcdea75c74cb3 100644 --- a/app/code/Magento/Catalog/Controller/Category/View.php +++ b/app/code/Magento/Catalog/Controller/Category/View.php @@ -150,7 +150,7 @@ protected function _initCategory() * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { if ($this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED)) { return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl()); diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php index 5ea3a57caf483..d6890855f14f8 100644 --- a/app/code/Magento/Catalog/Controller/Index/Index.php +++ b/app/code/Magento/Catalog/Controller/Index/Index.php @@ -12,7 +12,7 @@ class Index extends \Magento\Framework\App\Action\Action * * @return $this */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); return $resultRedirect->setPath('/'); diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php index 995f51e23ecb8..99dccd664dfbe 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php @@ -15,7 +15,7 @@ class Add extends \Magento\Catalog\Controller\Product\Compare * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->_formKeyValidator->validate($this->getRequest())) { diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php index 40525ddb90fba..085013b86a4b6 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php @@ -15,7 +15,7 @@ class Clear extends \Magento\Catalog\Controller\Product\Compare * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection $items */ $items = $this->_itemCollectionFactory->create(); diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php index a8e79afa1c047..5808e737e5daa 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php @@ -71,7 +71,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $items = $this->getRequest()->getParam('items'); diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php index b710c3a066de0..00db1446bdac8 100644 --- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php +++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php @@ -15,7 +15,7 @@ class Remove extends \Magento\Catalog\Controller\Product\Compare * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $productId = (int)$this->getRequest()->getParam('product'); if ($productId) { diff --git a/app/code/Magento/Catalog/Controller/Product/Gallery.php b/app/code/Magento/Catalog/Controller/Product/Gallery.php index b4e9c7480ba1d..32411c663db8d 100644 --- a/app/code/Magento/Catalog/Controller/Product/Gallery.php +++ b/app/code/Magento/Catalog/Controller/Product/Gallery.php @@ -44,7 +44,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $result = null; if (!$this->_initProduct()) { diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php index aed317633da4b..b50819ecb9861 100644 --- a/app/code/Magento/Catalog/Controller/Product/View.php +++ b/app/code/Magento/Catalog/Controller/Product/View.php @@ -69,7 +69,7 @@ protected function noProductRedirect() * * @return \Magento\Framework\Controller\Result\Forward|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { // Get initial data from request $categoryId = (int) $this->getRequest()->getParam('category', false); diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php index bec5548f8bbc3..203f49495c8cd 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php @@ -122,7 +122,7 @@ public function testDeleteWithoutCategoryId() ->with('catalog/*/', ['_current' => true, 'id' => null]); $this->categoryRepository->expects($this->never())->method('get'); - $this->unit->execute(); + $this->unit->executeInternal(); } public function testDelete() @@ -138,6 +138,6 @@ public function testDelete() $this->resultRedirect->expects($this->once())->method('setPath') ->with('catalog/*/', ['_current' => true, 'id' => $parentId]); - $this->unit->execute(); + $this->unit->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php index 09cad210ad80c..b4e61882ee51d 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php @@ -550,7 +550,7 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId) ) ->will($this->returnValue('result-execute')); - $this->assertEquals('result-execute', $this->save->execute()); + $this->assertEquals('result-execute', $this->save->executeInternal()); } /** diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php index 26b7598e03b0f..e1ae3110fed8d 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php @@ -141,6 +141,6 @@ public function testExecute() $testHtml = '
Some test html
'; $this->chooserBlockMock->expects($this->once())->method('getTreeJson')->will($this->returnValue($testHtml)); $this->resultJson->expects($this->once())->method('setJsonData')->with($testHtml)->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/ChooserTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/ChooserTest.php index f61c31a66208b..ec55fc8616193 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/ChooserTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Widget/ChooserTest.php @@ -123,6 +123,6 @@ public function testExecute() $testHtml = '
Some test html
'; $this->chooserBlockMock->expects($this->once())->method('toHtml')->will($this->returnValue($testHtml)); $this->resultRaw->expects($this->once())->method('setContents')->with($testHtml); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php index b83afa0e6361f..db88d451374f8 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php @@ -274,6 +274,6 @@ public function testExecuteThatProductIdsAreObtainedFromAttributeHelper() $this->messageManager->expects($this->never())->method('addError'); $this->messageManager->expects($this->never())->method('addException'); - $this->object->execute(); + $this->object->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php index f8cf08f547494..480f84e43b8b6 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php @@ -199,7 +199,7 @@ public function testExecutePopup() $this->blockTemplate->expects($this->any())->method('setIsPopup')->willReturnSelf(); - $this->assertSame($this->resultPage, $this->editController->execute()); + $this->assertSame($this->resultPage, $this->editController->executeInternal()); } public function testExecuteNoPopup() @@ -250,6 +250,6 @@ public function testExecuteNoPopup() $this->blockTemplate->expects($this->any())->method('setIsPopup')->willReturnSelf(); - $this->assertSame($this->resultPage, $this->editController->execute()); + $this->assertSame($this->resultPage, $this->editController->executeInternal()); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php index 47dd99f5ce023..9a66cfdd37ec3 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php @@ -80,6 +80,6 @@ protected function setUp() public function testMassStatusAction() { $this->priceProcessor->expects($this->once())->method('reindexList'); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/NewActionTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/NewActionTest.php index 215be1b4d16da..8dd5602000f85 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/NewActionTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/NewActionTest.php @@ -76,7 +76,7 @@ public function testExecute() $this->action->getRequest()->expects($this->any())->method('getParam')->willReturn(true); $this->action->getRequest()->expects($this->any())->method('getFullActionName') ->willReturn('catalog_product_new'); - $this->action->execute(); + $this->action->executeInternal(); } public function testExecuteObtainsProductDataFromSession() @@ -90,6 +90,6 @@ public function testExecuteObtainsProductDataFromSession() $this->product->expects($this->once())->method('addData')->with(['name' => 'test-name', 'stock_data' => null]); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php index 17a99b3ab8f52..4a9d892060a27 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php @@ -120,7 +120,7 @@ public function testExecuteSetsProductDataToSessionAndRedirectsToNewActionOnErro $this->session->expects($this->once())->method('setProductData')->with($productData); $this->resultRedirect->expects($this->once())->method('setPath')->with('catalog/*/new'); - $this->action->execute(); + $this->action->executeInternal(); } /** diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php index c9209c3f0a793..e5c1e4f425f4a 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php @@ -146,6 +146,6 @@ public function testExecute() /** @var \Magento\Catalog\Controller\Adminhtml\Product\ShowUpdateResult $controller */ $controller = new ShowUpdateResult($context, $productBuilder, $productCompositeHelper); - $controller->execute(); + $controller->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php index 9c58d09dfe443..709cd8db94148 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php @@ -132,7 +132,7 @@ public function testAttributeSetIsObtainedFromPostByDefault() $this->request->expects($this->any())->method('getPost')->willReturnMap([['set', null, 9]]); $this->product->expects($this->once())->method('setAttributeSetId')->with(9); - $this->action->execute(); + $this->action->executeInternal(); } public function testAttributeSetIsObtainedFromGetWhenThereIsNoOneInPost() @@ -141,6 +141,6 @@ public function testAttributeSetIsObtainedFromGetWhenThereIsNoOneInPost() $this->request->expects($this->any())->method('getPost')->willReturnMap([['set', null, null]]); $this->product->expects($this->once())->method('setAttributeSetId')->with(4); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php index 735c13b048311..eacdcc1332853 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php @@ -197,6 +197,6 @@ public function testApplyCustomLayoutUpdate() $this->catalogDesign->expects($this->any())->method('getDesignSettings')->will($this->returnValue($settings)); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php index 134776df35391..da0c0c7bea7b1 100644 --- a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php @@ -154,7 +154,7 @@ public function testExecute() ->willReturnSelf(); $this->listCompareMock->expects($this->never())->method('addProducts'); $this->redirectFactoryMock->expects($this->never())->method('create'); - $this->index->execute(); + $this->index->executeInternal(); } public function testExecuteWithItems() @@ -180,6 +180,6 @@ public function testExecuteWithItems() $this->redirectFactoryMock->expects($this->once()) ->method('create') ->willReturn($redirect); - $this->index->execute(); + $this->index->executeInternal(); } } diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php index abe88aa2fccf4..df2b1a38b58fb 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php @@ -16,7 +16,7 @@ class ApplyRules extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $errorMessage = __('We can\'t apply the rules.'); try { diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php index 34d7481851249..ac908bffe6d05 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Chooser.php @@ -11,7 +11,7 @@ class Chooser extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog /** * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('attribute') == 'sku') { $type = 'Magento\CatalogRule\Block\Adminhtml\Promo\Widget\Chooser\Sku'; diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php index 41cca27abd82f..dd14365e464f3 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog /** * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); if ($id) { diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php index 97495f7d0d48f..1f2f29390f752 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php @@ -11,7 +11,7 @@ class Edit extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog /** * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $model = $this->_objectManager->create('Magento\CatalogRule\Model\Rule'); diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php index fd6533a042c35..9eb60fc13cdca 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog /** * @return void */ - public function execute() + public function executeInternal() { $dirtyRules = $this->_objectManager->create('Magento\CatalogRule\Model\Flag')->loadSelf(); if ($dirtyRules->getState()) { diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php index fe944cf16f49c..f3a42f0c95566 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewAction.php @@ -11,7 +11,7 @@ class NewAction extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog /** * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php index 2a1d8aaf878d0..a588a5e00ada0 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewActionHtml.php @@ -13,7 +13,7 @@ class NewActionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Cata /** * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type'))); diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php index 977806d176b76..5a58180e4486d 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php @@ -13,7 +13,7 @@ class NewConditionHtml extends \Magento\CatalogRule\Controller\Adminhtml\Promo\C /** * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type'))); diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php index 16415977b5582..2ac65d736b44c 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php @@ -14,7 +14,7 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getPostValue()) { try { diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php index 646e3cf6c377e..4b8f29d14440d 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Index.php @@ -19,7 +19,7 @@ protected function _isAllowed() /** * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_CatalogRule::promo'); 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 592d6f0bbc280..ae1c964761ff3 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php @@ -68,7 +68,7 @@ protected function _initCategory() * * @return void */ - public function execute() + public function executeInternal() { $categoryId = (int)$this->getRequest()->getPost('id'); if ($categoryId) { diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php index ea081c9c43656..7c764a2452ce1 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/Chooser.php @@ -13,7 +13,7 @@ class Chooser extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget * * @return void */ - public function execute() + public function executeInternal() { $request = $this->getRequest(); diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php index dfc0013e6e23f..961a4cd73d76d 100644 --- a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\Framework\App\Action\Action /** * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_view->renderLayout(); diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php index d98ff86f779b5..e5c71f294f640 100644 --- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php +++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php @@ -47,7 +47,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { try { $this->_catalogSearchAdvanced->addFilters($this->getRequest()->getQueryValue()); diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php index 4a682161c6d6b..92221b02af48d 100644 --- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php +++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php @@ -65,7 +65,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { $this->layerResolver->create(Resolver::CATALOG_LAYER_SEARCH); /* @var $query \Magento\Search\Model\Query */ diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php index 529b92bf4364a..f90be4e218ff8 100644 --- a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php +++ b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php @@ -50,6 +50,6 @@ function ($added) use (&$filters) { 'Magento\CatalogSearch\Controller\Advanced\Result', ['context' => $context, 'catalogSearchAdvanced' => $catalogSearchAdvanced] ); - $instance->execute(); + $instance->executeInternal(); } } diff --git a/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php index dd779b035108c..f2a0dde38a02e 100644 --- a/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php +++ b/app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget/Conditions.php @@ -32,7 +32,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $typeData = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type'))); diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Controller/Adminhtml/Product/Widget/ConditionsTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Controller/Adminhtml/Product/Widget/ConditionsTest.php index 984b420c0bd83..5b76de4974cec 100644 --- a/app/code/Magento/CatalogWidget/Test/Unit/Controller/Adminhtml/Product/Widget/ConditionsTest.php +++ b/app/code/Magento/CatalogWidget/Test/Unit/Controller/Adminhtml/Product/Widget/ConditionsTest.php @@ -94,6 +94,6 @@ public function testExecute() $this->objectManager->expects($this->once())->method('create')->will($this->returnValue($condition)); $this->response->expects($this->once())->method('setBody')->with('')->will($this->returnSelf()); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Checkout/Controller/Account/Create.php b/app/code/Magento/Checkout/Controller/Account/Create.php index 4e8514699c1fd..c6f7ccb7c60af 100644 --- a/app/code/Magento/Checkout/Controller/Account/Create.php +++ b/app/code/Magento/Checkout/Controller/Account/Create.php @@ -52,7 +52,7 @@ public function __construct( * @throws \Exception * @return void */ - public function execute() + public function executeInternal() { if ($this->customerSession->isLoggedIn()) { $this->messageManager->addError(__("Customer is already registered")); diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php index 6e4b71de00fa2..1106eab228282 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Add.php +++ b/app/code/Magento/Checkout/Controller/Cart/Add.php @@ -75,7 +75,7 @@ protected function _initProduct() * @return \Magento\Framework\Controller\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { if (!$this->_formKeyValidator->validate($this->getRequest())) { return $this->resultRedirectFactory->create()->setPath('*/*/'); diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php index 0665e0c291552..abaed132df4cd 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php +++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php @@ -11,7 +11,7 @@ class Addgroup extends \Magento\Checkout\Controller\Cart /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $orderItemIds = $this->getRequest()->getParam('order_items', []); if (is_array($orderItemIds)) { diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php index bd614ec3110aa..f1086d86f2c50 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Configure.php +++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php @@ -48,7 +48,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { // Extract item and product to configure $id = (int)$this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php index 2496709c162c8..421effe555299 100644 --- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php +++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php @@ -61,7 +61,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $couponCode = $this->getRequest()->getParam('remove') == 1 ? '' diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php index 3d73a5f0c205a..873133f3cbb7b 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Delete.php +++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Checkout\Controller\Cart * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('id'); if ($id) { diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php index 2ce3a8805e8db..e780816725228 100644 --- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php +++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php @@ -50,7 +50,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $country = (string)$this->getRequest()->getParam('country_id'); $postcode = (string)$this->getRequest()->getParam('estimate_postcode'); diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php index 0dcd81a8e0185..da121bf5cb499 100644 --- a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php +++ b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php @@ -11,7 +11,7 @@ class EstimateUpdatePost extends \Magento\Checkout\Controller\Cart /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $code = (string)$this->getRequest()->getParam('estimate_method'); if (!empty($code)) { diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php index 1486c2b8487b5..3a6ffc2d9de6f 100644 --- a/app/code/Magento/Checkout/Controller/Cart/Index.php +++ b/app/code/Magento/Checkout/Controller/Cart/Index.php @@ -49,7 +49,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->resultPageFactory->create(); $resultPage->getConfig()->getTitle()->set(__('Shopping Cart')); diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php index c3e38a96dd317..9b5dcc0f3960f 100644 --- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php +++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php @@ -15,7 +15,7 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('id'); $params = $this->getRequest()->getParams(); diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php index 71685ea000563..73261faf0379c 100644 --- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php +++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php @@ -64,7 +64,7 @@ protected function _updateShoppingCart() * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { if (!$this->_formKeyValidator->validate($this->getRequest())) { return $this->resultRedirectFactory->create()->setPath('*/*/'); diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php index 0bb9c2fe85104..73de6be7b12ef 100644 --- a/app/code/Magento/Checkout/Controller/Index/Index.php +++ b/app/code/Magento/Checkout/Controller/Index/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Checkout\Controller\Onepage * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Checkout\Helper\Data $checkoutHelper */ $checkoutHelper = $this->_objectManager->get('Magento\Checkout\Helper\Data'); diff --git a/app/code/Magento/Checkout/Controller/Noroute/Index.php b/app/code/Magento/Checkout/Controller/Noroute/Index.php index e892582009403..6c1821f30ed1d 100644 --- a/app/code/Magento/Checkout/Controller/Noroute/Index.php +++ b/app/code/Magento/Checkout/Controller/Noroute/Index.php @@ -17,7 +17,7 @@ class Index extends \Magento\Framework\App\Action\Action * @return void * @codeCoverageIgnore */ - public function execute() + public function executeInternal() { throw new NotFoundException(__('Page not found.')); } diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php index 38e141855f3f1..2bfbf61db7a7f 100644 --- a/app/code/Magento/Checkout/Controller/Onepage.php +++ b/app/code/Magento/Checkout/Controller/Onepage.php @@ -141,7 +141,7 @@ public function __construct( * @return \Magento\Framework\App\ResponseInterface * @throws \Magento\Framework\Exception\NotFoundException */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $this->_request = $request; $result = $this->_preDispatchValidateCustomer(); @@ -158,7 +158,7 @@ public function dispatch(RequestInterface $request) if (!$this->_canShowForUnregisteredUsers()) { throw new NotFoundException(__('Page not found.')); } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Checkout/Controller/Onepage/Failure.php b/app/code/Magento/Checkout/Controller/Onepage/Failure.php index e6155dbea2981..dcff66c6c294b 100644 --- a/app/code/Magento/Checkout/Controller/Onepage/Failure.php +++ b/app/code/Magento/Checkout/Controller/Onepage/Failure.php @@ -11,7 +11,7 @@ class Failure extends \Magento\Checkout\Controller\Onepage /** * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $lastQuoteId = $this->getOnepage()->getCheckout()->getLastQuoteId(); $lastOrderId = $this->getOnepage()->getCheckout()->getLastOrderId(); diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php index 6c66fd165de55..55fded81c192c 100644 --- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php +++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php @@ -17,7 +17,7 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { if (!$this->_formKeyValidator->validate($this->getRequest())) { return $this->resultRedirectFactory->create()->setPath('*/*/'); diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php index 6287f4785441a..18155e5c61df4 100644 --- a/app/code/Magento/Checkout/Controller/Onepage/Success.php +++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php @@ -13,7 +13,7 @@ class Success extends \Magento\Checkout\Controller\Onepage * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $session = $this->getOnepage()->getCheckout(); if (!$this->_objectManager->get('Magento\Checkout\Model\Session\SuccessValidator')->isValid()) { diff --git a/app/code/Magento/Checkout/Controller/ShippingRates/Index.php b/app/code/Magento/Checkout/Controller/ShippingRates/Index.php index c407b0bab657f..ea8a4da907620 100644 --- a/app/code/Magento/Checkout/Controller/ShippingRates/Index.php +++ b/app/code/Magento/Checkout/Controller/ShippingRates/Index.php @@ -41,7 +41,7 @@ public function __construct( * @return \Magento\Framework\Controller\ResultInterface * @throws Action\NotFoundException */ - public function execute() + public function executeInternal() { $quote = $this->checkoutSession->getQuote(); $address = $quote->getShippingAddress(); diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php index 0eac880fcbdc1..307cc0ae49ab0 100644 --- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php +++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php @@ -61,7 +61,7 @@ public function __construct( /** * @return $this */ - public function execute() + public function executeInternal() { $itemId = (int)$this->getRequest()->getParam('item_id'); try { diff --git a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php index e5504082d6f3a..434276d6951c4 100644 --- a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php +++ b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php @@ -52,7 +52,7 @@ public function __construct( /** * @return $this */ - public function execute() + public function executeInternal() { $itemId = (int)$this->getRequest()->getParam('item_id'); $itemQty = (int)$this->getRequest()->getParam('item_qty'); diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Account/CreateTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Account/CreateTest.php index 2e3ce377ab7b0..43e765cea0a3a 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Account/CreateTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Account/CreateTest.php @@ -65,7 +65,7 @@ public function testExecuteAddsSessionMessageIfCustomerIsLoggedIn() { $this->customerSession->expects($this->once())->method('isLoggedIn')->will($this->returnValue(true)); $this->messageManager->expects($this->once())->method('addError')->with(); - $this->action->execute(); + $this->action->executeInternal(); } public function testExecute() @@ -76,6 +76,6 @@ public function testExecute() $this->orderCustomerService->expects($this->once())->method('create')->with(100)->will( $this->returnValue($customer) ); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php index 35fff77a2b490..9c2664a966ab1 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php @@ -162,7 +162,7 @@ function ($subject) use ($buyRequestMock) { $productMock->expects($this->exactly(2))->method('getId')->willReturn($actualProductId); - $this->assertSame($pageMock, $this->configureController->execute()); + $this->assertSame($pageMock, $this->configureController->executeInternal()); } /** @@ -206,6 +206,6 @@ public function testRedirectWithWrongProductId() ->method('create') ->with(ResultFactory::TYPE_REDIRECT, []) ->willReturn($this->resultRedirectMock); - $this->assertSame($this->resultRedirectMock, $this->configureController->execute()); + $this->assertSame($this->resultRedirectMock, $this->configureController->executeInternal()); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php index 99e3ccd1a7c7c..42453493e5343 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php @@ -174,7 +174,7 @@ public function testExecuteWithEmptyCoupon() ->method('getQuote') ->willReturn($this->quote); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithGoodCouponAndItems() @@ -232,7 +232,7 @@ public function testExecuteWithGoodCouponAndItems() ->method('get') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithGoodCouponAndNoItems() @@ -286,7 +286,7 @@ public function testExecuteWithGoodCouponAndNoItems() ->method('get') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithBadCouponAndItems() @@ -337,7 +337,7 @@ public function testExecuteWithBadCouponAndItems() ->with('You canceled the coupon code.') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithBadCouponAndNoItems() @@ -382,6 +382,6 @@ public function testExecuteWithBadCouponAndNoItems() ->method('get') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php index fc2199407275c..7fe1d10605d17 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/IndexTest.php @@ -156,7 +156,7 @@ public function testExecuteWithMessages() $this->resultPageFactory->expects($this->once()) ->method('create') ->willReturn($page); - $result = $this->controller->execute(); + $result = $this->controller->executeInternal(); $this->assertInstanceOf('Magento\Framework\View\Result\Page', $result); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php index c0f13dc40942f..85d242087e624 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php @@ -192,7 +192,7 @@ public function testRegenerateSessionIdOnExecute() //Expected outcomes $this->sessionMock->expects($this->once())->method('regenerateId'); - $this->assertSame($this->resultPageMock, $this->model->execute()); + $this->assertSame($this->resultPageMock, $this->model->executeInternal()); } public function testOnepageCheckoutNotAvailable() @@ -205,7 +205,7 @@ public function testOnepageCheckoutNotAvailable() ->with($expectedPath) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } public function testInvalidQuote() @@ -218,7 +218,7 @@ public function testInvalidQuote() ->with($expectedPath) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } /** diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php index 659fa90754e67..8afa4c6326db1 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php @@ -100,6 +100,6 @@ public function testDispatch() ->method('getActionName') ->willReturn('index'); - $this->assertEquals($this->response, $this->controller->dispatch($this->request)); + $this->assertEquals($this->response, $this->controller->execute($this->request)); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php index d2cf39386d297..4e8b5690ab168 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php @@ -113,7 +113,7 @@ public function testExecute() ->with('json encoded') ->willReturn('json represented'); - $this->assertEquals('json represented', $this->removeItem->execute()); + $this->assertEquals('json represented', $this->removeItem->executeInternal()); } public function testExecuteWithLocalizedException() @@ -153,7 +153,7 @@ public function testExecuteWithLocalizedException() ->with('json encoded') ->willReturn('json represented'); - $this->assertEquals('json represented', $this->removeItem->execute()); + $this->assertEquals('json represented', $this->removeItem->executeInternal()); } public function testExecuteWithException() @@ -200,6 +200,6 @@ public function testExecuteWithException() ->with('json encoded') ->willReturn('json represented'); - $this->assertEquals('json represented', $this->removeItem->execute()); + $this->assertEquals('json represented', $this->removeItem->executeInternal()); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php index b36cbed010b02..dd666066f9608 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php @@ -110,7 +110,7 @@ public function testExecute() ->with('json encoded') ->willReturn('json represented'); - $this->assertEquals('json represented', $this->updateItemQty->execute()); + $this->assertEquals('json represented', $this->updateItemQty->executeInternal()); } public function testExecuteWithLocalizedException() @@ -154,7 +154,7 @@ public function testExecuteWithLocalizedException() ->with('json encoded') ->willReturn('json represented'); - $this->assertEquals('json represented', $this->updateItemQty->execute()); + $this->assertEquals('json represented', $this->updateItemQty->executeInternal()); } public function testExecuteWithException() @@ -205,6 +205,6 @@ public function testExecuteWithException() ->with('json encoded') ->willReturn('json represented'); - $this->assertEquals('json represented', $this->updateItemQty->execute()); + $this->assertEquals('json represented', $this->updateItemQty->executeInternal()); } } diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php b/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php index 0ee81629337b0..01d5acd4222e4 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php @@ -8,7 +8,7 @@ class OnepageStub extends \Magento\Checkout\Controller\Onepage { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php index 8ca81a642dfbd..72b54d8986cde 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php @@ -11,7 +11,7 @@ class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement /** * @return void */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('id'); $model = $this->_objectManager->get('Magento\CheckoutAgreements\Model\Agreement')->load($id); diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php index 01fcef39eaf97..117905e8c50bb 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php @@ -12,7 +12,7 @@ class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement * @return void * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $agreementModel = $this->_objectManager->create('Magento\CheckoutAgreements\Model\Agreement'); diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php index 5327672f74948..e290737d27228 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement /** * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_addContent( $this->_view->getLayout()->createBlock('Magento\CheckoutAgreements\Block\Adminhtml\Agreement') diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php index 49c4368bc675b..666d8e907635e 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/NewAction.php @@ -12,7 +12,7 @@ class NewAction extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreeme * @return void * @codeCoverageIgnore */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php index ffdfd74395dec..d85847caab2c4 100644 --- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php +++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php @@ -11,7 +11,7 @@ class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement /** * @return void */ - public function execute() + public function executeInternal() { $postData = $this->getRequest()->getPostValue(); if ($postData) { diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php index 107b5f4eb9ecc..3a11c2b4ff0fc 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Cms\Controller\Adminhtml\Block * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php index bc8f586567c58..bd0a0fbb62e84 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php @@ -33,7 +33,7 @@ public function __construct( * @return \Magento\Framework\Controller\ResultInterface * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { // 1. Get ID and create model $id = $this->getRequest()->getParam('block_id'); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php index b81e879b9171f..5e36a87e5a71c 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php index 6ce12cfbf02ec..4d8a7f238bcdd 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php @@ -36,7 +36,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->jsonFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php index a173e9f3dac6b..3b45c6902d2fa 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php @@ -44,7 +44,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory * @return \Magento\Backend\Model\View\Result\Redirect * @throws \Magento\Framework\Exception\LocalizedException|\Exception */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); $collectionSize = $collection->getSize(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php index bc87b5cb8089f..29e37ffeaef27 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php index c6e17f07cbfee..9582e89c995b2 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php index e785e256d97b3..363805df349e7 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php @@ -39,7 +39,7 @@ public function __construct(Context $context, LayoutFactory $layoutFactory, RawF * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Layout $layout */ $layout = $this->layoutFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php index 278515e3f1017..3ae84ce63e764 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php @@ -21,7 +21,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { // check if we know what should be deleted $id = $this->getRequest()->getParam('page_id'); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php index c53641376c471..716e51bc0b4bd 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php @@ -67,7 +67,7 @@ protected function _initAction() * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { // 1. Get ID and create model $id = $this->getRequest()->getParam('page_id'); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php index 61405419a007b..7be6ad88b7b58 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php @@ -42,7 +42,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php index 52882ff71fddf..762d5384afec9 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php @@ -47,7 +47,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->jsonFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php index 45314ebf2d9e1..9ab84769739b8 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php @@ -43,7 +43,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory * @return \Magento\Backend\Model\View\Result\Redirect * @throws \Magento\Framework\Exception\LocalizedException|\Exception */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); $collectionSize = $collection->getSize(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php index 8d8da00375cd2..cda4e802f0698 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php @@ -43,7 +43,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory * @return \Magento\Backend\Model\View\Result\Redirect * @throws \Magento\Framework\Exception\LocalizedException|\Exception */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php index aa44d34ea7861..a904249e653a0 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php @@ -43,7 +43,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory * @return \Magento\Backend\Model\View\Result\Redirect * @throws \Magento\Framework\Exception\LocalizedException|\Exception */ - public function execute() + public function executeInternal() { $collection = $this->filter->getCollection($this->collectionFactory->create()); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php index 100c0b05f2a0f..9f816a5925205 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php @@ -38,7 +38,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php index 6858ef9cadf10..276073e1e9678 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php @@ -38,7 +38,7 @@ protected function _isAllowed() * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php index 49e8206f822fa..493ae73a83ddb 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $uniqId = $this->getRequest()->getParam('uniq_id'); /** @var \Magento\Framework\View\Layout $layout */ diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php index 51d1fc3502be0..05e6350da2bb9 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $directive = $this->getRequest()->getParam('___directive'); $directive = $this->urlDecoder->decode($directive); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php index 0b1155258377a..05c8912acf8d2 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php @@ -53,7 +53,7 @@ protected function _saveSessionCurrentPath() * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { $this->_initAction()->_saveSessionCurrentPath(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php index 73389122633f1..1af7705253569 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php @@ -43,7 +43,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { if (!$this->getRequest()->isPost()) { diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php index 2566d3159e471..45a85b1d009d5 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php index 3c22b5fbcb017..eacf2cb6268a2 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $storeId = (int)$this->getRequest()->getParam('store'); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php index 24240b5ab25e7..8077f38a5a44f 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { $this->_initAction(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php index 738cba1295e40..b0d4818b940ff 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $helper = $this->_objectManager->get('Magento\Cms\Helper\Wysiwyg\Images'); $storeId = $this->getRequest()->getParam('store'); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php index a5a2d6bbc2a1e..9412c2471a0ba 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $file = $this->getRequest()->getParam('file'); $file = $this->_objectManager->get('Magento\Cms\Helper\Wysiwyg\Images')->idDecode($file); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php index 9d70dd5a038de..1690cb3d708c3 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->resultJsonFactory->create(); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php index b05ff1ac92bd1..0811d0572db55 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php @@ -32,7 +32,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { $this->_initAction(); diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php index 91cb093963442..51c6ec15a249e 100644 --- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php +++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php @@ -27,7 +27,7 @@ public function __construct( /** * @return \Magento\Framework\View\Result\LayoutFactory */ - public function execute() + public function executeInternal() { $resultLayout = $this->resultPageFactory->create(); $resultLayout->setStatusHeader(404, '1.1', 'Not Found'); diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php index fe007e0d5173d..969ad75a366e7 100644 --- a/app/code/Magento/Cms/Controller/Index/Index.php +++ b/app/code/Magento/Cms/Controller/Index/Index.php @@ -32,7 +32,7 @@ public function __construct( * @return \Magento\Framework\Controller\Result\Forward * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function execute($coreRoute = null) + public function executeInternal($coreRoute = null) { $pageId = $this->_objectManager->get( 'Magento\Framework\App\Config\ScopeConfigInterface' diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php index 18c4d2181474e..16d67c38a8161 100644 --- a/app/code/Magento/Cms/Controller/Noroute/Index.php +++ b/app/code/Magento/Cms/Controller/Noroute/Index.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $pageId = $this->_objectManager->get( 'Magento\Framework\App\Config\ScopeConfigInterface', diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php index 4775fc3fe9358..0c185380200c1 100644 --- a/app/code/Magento/Cms/Controller/Page/View.php +++ b/app/code/Magento/Cms/Controller/Page/View.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $pageId = $this->getRequest()->getParam('page_id', $this->getRequest()->getParam('id', false)); $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId); diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php index c32d11572cf67..08c2345265962 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php @@ -148,7 +148,7 @@ public function testDeleteAction() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->deleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->deleteController->executeInternal()); } public function testDeleteActionNoId() @@ -168,7 +168,7 @@ public function testDeleteActionNoId() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->deleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->deleteController->executeInternal()); } public function testDeleteActionThrowsException() @@ -195,6 +195,6 @@ public function testDeleteActionThrowsException() ->with('*/*/edit', ['block_id' => $this->blockId]) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->deleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->deleteController->executeInternal()); } } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php index b2432abc0cbde..a48b5b69ea8b4 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php @@ -154,7 +154,7 @@ public function testEditActionBlockNoExists() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->editController->execute()); + $this->assertSame($this->resultRedirectMock, $this->editController->executeInternal()); } /** @@ -220,7 +220,7 @@ public function testEditAction($blockId, $label, $title) ->method('getConfig') ->willReturn($pageConfigMock); - $this->assertSame($resultPageMock, $this->editController->execute()); + $this->assertSame($resultPageMock, $this->editController->executeInternal()); } /** diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php index 81164feafac10..4c52ac86c94b9 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php @@ -80,7 +80,7 @@ public function testMassDeleteAction() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->massDeleteController->executeInternal()); } /** diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php index 0a1c7be6c9541..04f6ac3f08161 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php @@ -216,14 +216,14 @@ public function testSaveAction() $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->saveController->execute()); + $this->assertSame($this->resultRedirect, $this->saveController->executeInternal()); } public function testSaveActionWithoutData() { $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(false); $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->saveController->execute()); + $this->assertSame($this->resultRedirect, $this->saveController->executeInternal()); } public function testSaveActionNoId() @@ -256,7 +256,7 @@ public function testSaveActionNoId() $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->saveController->execute()); + $this->assertSame($this->resultRedirect, $this->saveController->executeInternal()); } public function testSaveAndContinue() @@ -303,7 +303,7 @@ public function testSaveAndContinue() ->with('*/*/edit', ['block_id' => $this->blockId]) ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->saveController->execute()); + $this->assertSame($this->resultRedirect, $this->saveController->executeInternal()); } public function testSaveActionThrowsException() @@ -352,6 +352,6 @@ public function testSaveActionThrowsException() ->with('*/*/edit', ['block_id' => $this->blockId]) ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->saveController->execute()); + $this->assertSame($this->resultRedirect, $this->saveController->executeInternal()); } } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php index 4d2b25a708ddf..e218e22421c61 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php @@ -146,7 +146,7 @@ public function testDeleteAction() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->deleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->deleteController->executeInternal()); } public function testDeleteActionNoId() @@ -166,7 +166,7 @@ public function testDeleteActionNoId() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->deleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->deleteController->executeInternal()); } public function testDeleteActionThrowsException() @@ -210,6 +210,6 @@ public function testDeleteActionThrowsException() ->with('*/*/edit', ['page_id' => $this->pageId]) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->deleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->deleteController->executeInternal()); } } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php index 8402fbc8f3b7f..3024c271a3e90 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php @@ -163,7 +163,7 @@ public function testExecuteWithLocalizedException() ]) ->willReturnSelf(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testExecuteWithRuntimeException() @@ -184,7 +184,7 @@ public function testExecuteWithRuntimeException() ]) ->willReturnSelf(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testExecuteWithException() @@ -205,7 +205,7 @@ public function testExecuteWithException() ]) ->willReturnSelf(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testExecuteWithoutData() @@ -231,7 +231,7 @@ public function testExecuteWithoutData() ]) ->willReturnSelf(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testSetCmsPageData() diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php index 98a5df2b6190b..72cd0cedba318 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php @@ -80,7 +80,7 @@ public function testMassDeleteAction() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute()); + $this->assertSame($this->resultRedirectMock, $this->massDeleteController->executeInternal()); } /** diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php index 688cc87fa09e3..f8d82e0b8631e 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php @@ -85,7 +85,7 @@ public function testMassDisableAction() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->massDisableController->execute()); + $this->assertSame($this->resultRedirectMock, $this->massDisableController->executeInternal()); } /** diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php index 661231aa012bb..f7460ae29cb5c 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php @@ -85,7 +85,7 @@ public function testMassEnableAction() ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->massEnableController->execute()); + $this->assertSame($this->resultRedirectMock, $this->massEnableController->executeInternal()); } /** diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php index 7d0ec584d4675..b0120b54ae06e 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php @@ -157,7 +157,7 @@ protected function setUp() } /** - * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute + * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::executeInternal */ public function testExecute() { @@ -188,12 +188,12 @@ public function testExecute() $this->assertSame( $this->rawMock, - $this->wysiwygDirective->execute() + $this->wysiwygDirective->executeInternal() ); } /** - * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute + * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::executeInternal */ public function testExecuteException() { @@ -236,7 +236,7 @@ public function testExecuteException() $this->assertSame( $this->rawMock, - $this->wysiwygDirective->execute() + $this->wysiwygDirective->executeInternal() ); } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Block/InlineEditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Block/InlineEditTest.php index 85cab72d2aa45..37872f893c335 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Block/InlineEditTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Block/InlineEditTest.php @@ -131,7 +131,7 @@ public function testExecuteWithException() ]) ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithoutData() @@ -157,6 +157,6 @@ public function testExecuteWithoutData() ]) ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php index 3b4ecc8ee1070..10bb82ac001f9 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php @@ -96,7 +96,7 @@ public function testExecuteResultPage() ->method('prepareResultPage') ->with($this->controller, $this->pageId) ->willReturn($this->resultPageMock); - $this->assertSame($this->resultPageMock, $this->controller->execute()); + $this->assertSame($this->resultPageMock, $this->controller->executeInternal()); } public function testExecuteResultForward() @@ -105,6 +105,6 @@ public function testExecuteResultForward() ->method('forward') ->with('defaultIndex') ->willReturnSelf(); - $this->assertSame($this->forwardMock, $this->controller->execute()); + $this->assertSame($this->forwardMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Noroute/IndexTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Noroute/IndexTest.php index 4ff2bcaa75200..444a1d767250e 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Noroute/IndexTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Noroute/IndexTest.php @@ -113,7 +113,7 @@ public function testExecuteResultPage() ); $this->assertSame( $this->resultPageMock, - $this->_controller->execute() + $this->_controller->executeInternal() ); } @@ -146,7 +146,7 @@ public function testExecuteResultForward() ); $this->assertSame( $this->forwardMock, - $this->_controller->execute() + $this->_controller->executeInternal() ); } } diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Page/ViewTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Page/ViewTest.php index df009be3bb0c7..5c15f13b9317a 100644 --- a/app/code/Magento/Cms/Test/Unit/Controller/Page/ViewTest.php +++ b/app/code/Magento/Cms/Test/Unit/Controller/Page/ViewTest.php @@ -89,7 +89,7 @@ public function testExecuteResultPage() ->method('prepareResultPage') ->with($this->controller, $this->pageId) ->willReturn($this->resultPageMock); - $this->assertSame($this->resultPageMock, $this->controller->execute()); + $this->assertSame($this->resultPageMock, $this->controller->executeInternal()); } public function testExecuteResultForward() @@ -106,6 +106,6 @@ public function testExecuteResultForward() ->method('forward') ->with('noroute') ->willReturnSelf(); - $this->assertSame($this->forwardMock, $this->controller->execute()); + $this->assertSame($this->forwardMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php index 92e50151a7519..57b28ebdd42f6 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php @@ -44,12 +44,12 @@ public function __construct( * @param \Magento\Framework\App\RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(\Magento\Framework\App\RequestInterface $request) + public function execute(\Magento\Framework\App\RequestInterface $request) { if (!$request->getParam('section')) { $request->setParam('section', $this->_configStructure->getFirstSection()->getId()); } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php index 9f8bf3a73f177..ad25ce834a507 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Edit.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Framework\App\ResponseInterface|void */ - public function execute() + public function executeInternal() { $current = $this->getRequest()->getParam('section'); $website = $this->getRequest()->getParam('website'); diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php index 2513c9cb00f88..f92619feb0466 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Index.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php index d18c4ffc4bc51..6dea5197bb428 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php @@ -141,7 +141,7 @@ protected function _saveAdvanced() * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { // custom save logic diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php index d1f299e6a32a0..9ac46a6dcb329 100644 --- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php +++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/State.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('isAjax') && $this->getRequest()->getParam('container') != '' diff --git a/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php b/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php index eb5d66c4a6287..3cbd4c901d1c9 100644 --- a/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php +++ b/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php @@ -213,7 +213,7 @@ public function testIndexActionWithAllowedSection() $this->returnValue($backendConfigMock) ); - $this->assertEquals($this->resultRedirect, $this->_controller->execute()); + $this->assertEquals($this->resultRedirect, $this->_controller->executeInternal()); } public function testIndexActionSaveState() @@ -234,7 +234,7 @@ public function testIndexActionSaveState() )->will( $this->returnValue($data) ); - $this->assertEquals($this->resultRedirect, $this->_controller->execute()); + $this->assertEquals($this->resultRedirect, $this->_controller->executeInternal()); } public function testIndexActionGetGroupForSave() @@ -285,7 +285,7 @@ public function testIndexActionGetGroupForSave() ); $backendConfigMock->expects($this->once())->method('save'); - $this->assertEquals($this->resultRedirect, $this->_controller->execute()); + $this->assertEquals($this->resultRedirect, $this->_controller->executeInternal()); } public function testIndexActionSaveAdvanced() @@ -311,6 +311,6 @@ public function testIndexActionSaveAdvanced() $backendConfigMock->expects($this->once())->method('save'); $this->_cacheMock->expects($this->once())->method('clean')->with(\Zend_Cache::CLEANING_MODE_ALL); - $this->assertEquals($this->resultRedirect, $this->_controller->execute()); + $this->assertEquals($this->resultRedirect, $this->_controller->executeInternal()); } } diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php index 2377de0c5b909..ac31893126438 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php @@ -32,7 +32,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout('popup'); $this->productBuilder->build($this->getRequest()); diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php index 6eb4facfee9c3..6fb61d0548a36 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php @@ -33,7 +33,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Layout $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php index 7516807654af8..8e620c749445e 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php @@ -52,7 +52,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->getResponse()->representJson($this->jsonHelper->jsonEncode($this->saveAttributeOptions())); } diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php index 39bee40024eee..b0e66aba601dd 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php @@ -60,7 +60,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE); $collection = $this->collectionFactory->create(); diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php index 4135ea97ab653..1fabe24b05b44 100644 --- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php +++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php @@ -61,7 +61,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE); diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/AddAttributeTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/AddAttributeTest.php index f37d40eccf053..228f44a9a5011 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/AddAttributeTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/AddAttributeTest.php @@ -102,6 +102,6 @@ public function testExecute() $layout->expects($this->once())->method('setChild')->willReturnSelf(); $this->view->expects($this->any())->method('renderLayout')->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributesTest.php index d8b1fc5a051ea..24ace68cf4735 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributesTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributesTest.php @@ -86,6 +86,6 @@ public function testIndexAction() $this->returnValue('body') ); $this->responseMock->expects($this->once())->method('representJson')->with('body'); - $this->suggestAttributes->execute(); + $this->suggestAttributes->executeInternal(); } } diff --git a/app/code/Magento/Contact/Controller/Index.php b/app/code/Magento/Contact/Controller/Index.php index 8a04b5b7b1d0b..28272b87d0c1e 100644 --- a/app/code/Magento/Contact/Controller/Index.php +++ b/app/code/Magento/Contact/Controller/Index.php @@ -82,11 +82,11 @@ public function __construct( * @return \Magento\Framework\App\ResponseInterface * @throws \Magento\Framework\Exception\NotFoundException */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE)) { throw new NotFoundException(__('Page not found.')); } - return parent::dispatch($request); + return parent::execute($request); } } diff --git a/app/code/Magento/Contact/Controller/Index/Index.php b/app/code/Magento/Contact/Controller/Index/Index.php index 247728f63f881..c1ff54c71f75a 100644 --- a/app/code/Magento/Contact/Controller/Index/Index.php +++ b/app/code/Magento/Contact/Controller/Index/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Contact\Controller\Index * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_view->renderLayout(); diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php index f5114cd6f68b9..854a2e1561097 100644 --- a/app/code/Magento/Contact/Controller/Index/Post.php +++ b/app/code/Magento/Contact/Controller/Index/Post.php @@ -14,7 +14,7 @@ class Post extends \Magento\Contact\Controller\Index * @return void * @throws \Exception */ - public function execute() + public function executeInternal() { $post = $this->getRequest()->getPostValue(); if (!$post) { diff --git a/app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php index a914cf698e33b..9a980ca0b7c0d 100644 --- a/app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php @@ -99,6 +99,6 @@ public function testExecute() $this->_view->expects($this->once()) ->method('renderLayout'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } } diff --git a/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php b/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php index a508c25a445c2..d062bb7ad9cd2 100644 --- a/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php +++ b/app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php @@ -135,7 +135,7 @@ public function testExecuteEmptyPost() { $this->_request->expects($this->once())->method('getPostValue')->will($this->returnValue([])); $this->_redirect->expects($this->once())->method('redirect'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } /** @@ -157,7 +157,7 @@ public function testExecutePostValidation($postData, $exceptionExpected) $this->_inlineTranslation->expects($this->once()) ->method('suspend'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } public function testPostDataProvider() @@ -224,6 +224,6 @@ public function testExecuteValidPost() $this->_inlineTranslation->expects($this->once()) ->method('suspend'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } } diff --git a/app/code/Magento/Contact/Test/Unit/Controller/IndexTest.php b/app/code/Magento/Contact/Test/Unit/Controller/IndexTest.php index 93f055f4d0a5f..b27d4db46d4c7 100644 --- a/app/code/Magento/Contact/Test/Unit/Controller/IndexTest.php +++ b/app/code/Magento/Contact/Test/Unit/Controller/IndexTest.php @@ -78,7 +78,7 @@ public function testDispatch() ) ->will($this->returnValue(false)); - $this->_controller->dispatch( + $this->_controller->execute( $this->getMockForAbstractClass('\Magento\Framework\App\RequestInterface', [], '', false) ); } diff --git a/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php b/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php index 4d4320d4acbf2..4966ddd26be7c 100644 --- a/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php +++ b/app/code/Magento/Contact/Test/Unit/Controller/Stub/IndexStub.php @@ -8,7 +8,7 @@ class IndexStub extends \Magento\Contact\Controller\Index { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/app/code/Magento/Cookie/Controller/Index/NoCookies.php b/app/code/Magento/Cookie/Controller/Index/NoCookies.php index c8ce45e0a38ce..edf4949fb0b9f 100644 --- a/app/code/Magento/Cookie/Controller/Index/NoCookies.php +++ b/app/code/Magento/Cookie/Controller/Index/NoCookies.php @@ -13,7 +13,7 @@ class NoCookies extends \Magento\Framework\App\Action\Action * * @return void */ - public function execute() + public function executeInternal() { $redirect = new \Magento\Framework\DataObject(); $this->_eventManager->dispatch( diff --git a/app/code/Magento/Cookie/Test/Unit/Controller/Index/NoCookiesTest.php b/app/code/Magento/Cookie/Test/Unit/Controller/Index/NoCookiesTest.php index 7e2db7aeaf5eb..0d9c3439eda6f 100644 --- a/app/code/Magento/Cookie/Test/Unit/Controller/Index/NoCookiesTest.php +++ b/app/code/Magento/Cookie/Test/Unit/Controller/Index/NoCookiesTest.php @@ -95,7 +95,7 @@ function ($dataArray) { $this->requestMock->expects($this->once())->method('setDispatched')->with($this->isTrue()); // Make the call to test - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteRedirectPath() @@ -126,7 +126,7 @@ function ($dataArray) { $this->requestMock->expects($this->once())->method('setDispatched')->with($this->isTrue()); // Make the call to test - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteDefault() @@ -139,6 +139,6 @@ public function testExecuteDefault() $this->requestMock->expects($this->once())->method('setDispatched')->with($this->isTrue()); // Make the call to test - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php index 08cb0511025c1..9cc52750b3db8 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php @@ -16,7 +16,7 @@ class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Cur * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\Session $backendSession */ $backendSession = $this->_objectManager->get('Magento\Backend\Model\Session'); diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php index 751020010a7b1..1646068a7c46a 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_CurrencySymbol::system_currency_rates'); diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php index 01ba604f11065..06e2a760d250c 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php @@ -16,7 +16,7 @@ class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Curr * * @return void */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getParam('rate'); if (is_array($data)) { diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php index 12ae3374a8876..fdc897735d1e0 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency * * @return void */ - public function execute() + public function executeInternal() { // set active menu and breadcrumbs $this->_view->loadLayout(); diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php index 716ca26e493aa..86cb38a43a29f 100644 --- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php +++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencys * * @return void */ - public function execute() + public function executeInternal() { $symbolsDataArray = $this->getRequest()->getParam('custom_currency_symbol', null); if (is_array($symbolsDataArray)) { diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/IndexTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/IndexTest.php index b75df9bce15b8..5584c064d30bf 100644 --- a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/IndexTest.php +++ b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/IndexTest.php @@ -106,6 +106,6 @@ public function testExecute() $this->viewMock->expects($this->atLeastOnce())->method('getLayout')->willReturn($this->layoutMock); $this->viewMock->expects($this->atLeastOnce())->method('getPage')->willReturn($this->pageMock); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php index 5d6b9d997fc07..7e730e7da55fa 100644 --- a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php +++ b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php @@ -143,6 +143,6 @@ public function testExecute() ->method('addSuccess') ->with(__('You applied the custom currency symbols.')); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php index 2403730753968..26fcce39f2090 100644 --- a/app/code/Magento/Customer/Controller/Account/Confirm.php +++ b/app/code/Magento/Customer/Controller/Account/Confirm.php @@ -86,7 +86,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php index 6f050098debd2..a1da7d92d79f6 100644 --- a/app/code/Magento/Customer/Controller/Account/Confirmation.php +++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php @@ -59,7 +59,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { if ($this->session->isLoggedIn()) { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php index 51e1c151ea8a2..fa910d2fbad53 100644 --- a/app/code/Magento/Customer/Controller/Account/Create.php +++ b/app/code/Magento/Customer/Controller/Account/Create.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { if ($this->session->isLoggedIn() || !$this->registration->isAllowed()) { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Customer/Controller/Account/CreatePassword.php b/app/code/Magento/Customer/Controller/Account/CreatePassword.php index f0288b1f2b424..889b2538eca2c 100644 --- a/app/code/Magento/Customer/Controller/Account/CreatePassword.php +++ b/app/code/Magento/Customer/Controller/Account/CreatePassword.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $resetPasswordToken = (string)$this->getRequest()->getParam('token'); $customerId = (int)$this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php index 8d2c5b81fa416..3bd8c5bacf8ce 100644 --- a/app/code/Magento/Customer/Controller/Account/CreatePost.php +++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php @@ -201,7 +201,7 @@ protected function extractAddress() * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php index 3f035bdcdf1f1..4c862f9509efd 100644 --- a/app/code/Magento/Customer/Controller/Account/Edit.php +++ b/app/code/Magento/Customer/Controller/Account/Edit.php @@ -58,7 +58,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php index a61c551b1719f..8fbc85dac02c8 100644 --- a/app/code/Magento/Customer/Controller/Account/EditPost.php +++ b/app/code/Magento/Customer/Controller/Account/EditPost.php @@ -69,7 +69,7 @@ public function __construct( * @return \Magento\Framework\Controller\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php index daeb13e1eaefb..53139df7a1ee4 100644 --- a/app/code/Magento/Customer/Controller/Account/ForgotPassword.php +++ b/app/code/Magento/Customer/Controller/Account/ForgotPassword.php @@ -44,7 +44,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php index be1d15b56e3af..e40689ea1e58c 100644 --- a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php +++ b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php index c99d8dd199e7d..db90eec8363c0 100644 --- a/app/code/Magento/Customer/Controller/Account/Index.php +++ b/app/code/Magento/Customer/Controller/Account/Index.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php index ca404047dd27c..72511c59423fb 100644 --- a/app/code/Magento/Customer/Controller/Account/Login.php +++ b/app/code/Magento/Customer/Controller/Account/Login.php @@ -44,7 +44,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { if ($this->session->isLoggedIn()) { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php index 7b6191eb2556b..b1b3a8b020c9a 100644 --- a/app/code/Magento/Customer/Controller/Account/LoginPost.php +++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php @@ -67,7 +67,7 @@ public function __construct( * @return \Magento\Framework\Controller\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { if ($this->session->isLoggedIn() || !$this->formKeyValidator->validate($this->getRequest())) { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php index be0dcd6ba5e32..4d070b401cee3 100644 --- a/app/code/Magento/Customer/Controller/Account/Logout.php +++ b/app/code/Magento/Customer/Controller/Account/Logout.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $lastCustomerId = $this->session->getId(); $this->session->logout()->setBeforeAuthUrl($this->_redirect->getRefererUrl()) diff --git a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php index 77eb53149907d..8185c93a60c97 100644 --- a/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php +++ b/app/code/Magento/Customer/Controller/Account/LogoutSuccess.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { return $this->resultPageFactory->create(); } diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php index 0e996ea9a809c..1044c71379f2a 100644 --- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php +++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Address.php b/app/code/Magento/Customer/Controller/Address.php index b527db41ac049..f4ffb6c9dac6d 100644 --- a/app/code/Magento/Customer/Controller/Address.php +++ b/app/code/Magento/Customer/Controller/Address.php @@ -120,12 +120,12 @@ protected function _getSession() * @param RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$this->_getSession()->authenticate()) { $this->_actionFlag->set('', 'no-dispatch', true); } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php index 6dfa17be32b10..6c736e3fcdff8 100644 --- a/app/code/Magento/Customer/Controller/Address/Delete.php +++ b/app/code/Magento/Customer/Controller/Address/Delete.php @@ -11,7 +11,7 @@ class Delete extends \Magento\Customer\Controller\Address /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $addressId = $this->getRequest()->getParam('id', false); diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php index 0691ffd8ad527..5857b0c64b2e5 100644 --- a/app/code/Magento/Customer/Controller/Address/Edit.php +++ b/app/code/Magento/Customer/Controller/Address/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Customer\Controller\Address * * @return \Magento\Framework\Controller\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php index b30d453dce8de..6699bf27d5e2c 100644 --- a/app/code/Magento/Customer/Controller/Address/Form.php +++ b/app/code/Magento/Customer/Controller/Address/Form.php @@ -13,7 +13,7 @@ class Form extends \Magento\Customer\Controller\Address * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php index 9360ca0f7d6d3..eb3e6817dd060 100644 --- a/app/code/Magento/Customer/Controller/Address/FormPost.php +++ b/app/code/Magento/Customer/Controller/Address/FormPost.php @@ -176,7 +176,7 @@ protected function updateRegionData(&$attributeValues) * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $redirectUrl = null; if (!$this->_formKeyValidator->validate($this->getRequest())) { diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php index b445fa6fbfa14..1d5c09e317b61 100644 --- a/app/code/Magento/Customer/Controller/Address/Index.php +++ b/app/code/Magento/Customer/Controller/Address/Index.php @@ -68,7 +68,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $addresses = $this->customerRepository->getById($this->_getSession()->getCustomerId())->getAddresses(); if (count($addresses)) { diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php index 4bfdabbbd5ef1..9bd9402d5e216 100644 --- a/app/code/Magento/Customer/Controller/Address/NewAction.php +++ b/app/code/Magento/Customer/Controller/Address/NewAction.php @@ -11,7 +11,7 @@ class NewAction extends \Magento\Customer\Controller\Address /** * @return \Magento\Framework\Controller\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php index c74520cb96580..ea8a214c16a76 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Configure.php @@ -13,7 +13,7 @@ class Configure extends \Magento\Customer\Controller\Adminhtml\Cart\Product\Comp * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $configureResult = new \Magento\Framework\DataObject(); try { diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php index 42f9ee513a857..7daaa2cc9ec1a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/Update.php @@ -13,7 +13,7 @@ class Update extends \Magento\Customer\Controller\Adminhtml\Cart\Product\Composi * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $updateResult = new \Magento\Framework\DataObject(); try { diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php index 92961f2a0d40f..f4f788c61b715 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php @@ -125,7 +125,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); if ($customerId = $this->getRequest()->getParam('customer_id')) { diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php index 17af771114ffc..5b3b91fcf054a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php @@ -15,7 +15,7 @@ class Delete extends \Magento\Customer\Controller\Adminhtml\Group * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php index 303d2f4f1afff..838cf9b940a1a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Customer\Controller\Adminhtml\Group * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { return $this->resultForwardFactory->create()->forward('new'); } diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php index 290e77238ff11..f80a6fcaa2740 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Customer\Controller\Adminhtml\Group * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php index 0750422cd9435..383af26a0378a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/NewAction.php @@ -28,7 +28,7 @@ protected function _initGroup() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $groupId = $this->_initGroup(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php index a842d8653b339..a775194f12ef9 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php @@ -67,7 +67,7 @@ protected function storeCustomerGroupDataToSession($customerGroupData) * * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $taxClass = (int)$this->getRequest()->getParam('tax_class'); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php index 9a3ca5645f5c7..096efc640be89 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php @@ -51,7 +51,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory * @return \Magento\Backend\Model\View\Result\Redirect * @throws \Magento\Framework\Exception\LocalizedException|\Exception */ - public function execute() + public function executeInternal() { try { $collection = $this->filter->getCollection($this->collectionFactory->create()); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php index e1c4dd68c9cde..ff39bf28ac3ac 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php @@ -14,7 +14,7 @@ class Cart extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $customerId = $this->initCurrentCustomer(); $websiteId = $this->getRequest()->getParam('website_id'); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php index 4c4cb77fa3bd5..fc4c0c0aecaa9 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Carts.php @@ -12,7 +12,7 @@ class Carts extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->initCurrentCustomer(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php index 503969226aa20..c8a0615408f8f 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php @@ -14,7 +14,7 @@ class Delete extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest()); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php index 64af44a9bb84e..0820fbea96217 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Edit.php @@ -18,7 +18,7 @@ class Edit extends \Magento\Customer\Controller\Adminhtml\Index * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { $customerId = $this->initCurrentCustomer(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php index b238a8287e70f..fa9dfbd5529c0 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Index.php @@ -12,7 +12,7 @@ class Index extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getQuery('ajax')) { $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php index f97c48b0ebc1d..4cbc90e88a50c 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php @@ -60,7 +60,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->resultJsonFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php index fa0dcca712a90..4711b9e2b1855 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/LastOrders.php @@ -12,7 +12,7 @@ class LastOrders extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->initCurrentCustomer(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php index d3bdd1eadfd8e..bdb7a8b79a617 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/NewAction.php @@ -12,7 +12,7 @@ class NewAction extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $resultForward = $this->resultForwardFactory->create(); $resultForward->forward('edit'); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php index 6c27c0a46bd8f..6918cf849549d 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Newsletter.php @@ -12,7 +12,7 @@ class Newsletter extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $customerId = $this->initCurrentCustomer(); /** @var \Magento\Newsletter\Model\Subscriber $subscriber */ diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php index c825e5c24a85b..1964c95842840 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Orders.php @@ -12,7 +12,7 @@ class Orders extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->initCurrentCustomer(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php index effaa2618f25a..3a8f93a1c304f 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ProductReviews.php @@ -12,7 +12,7 @@ class ProductReviews extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $customerId = $this->initCurrentCustomer(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php index c330eedde0fff..43c2d474843b1 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php @@ -14,7 +14,7 @@ class ResetPassword extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); $customerId = (int)$this->getRequest()->getParam('customer_id', 0); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php index 2cbe283339dfe..b4aa639c817e7 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php @@ -176,7 +176,7 @@ protected function _extractCustomerAddressData(array & $extractedCustomerData) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $returnToEdit = false; $originalRequestData = $this->getRequest()->getPostValue(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php index bd7230f1aa1d9..001726280a424 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php @@ -107,7 +107,7 @@ protected function _validateCustomerAddress($response) * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(); $response->setError(0); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php index ee95065596c0a..cda5a37bc0e42 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewCart.php @@ -12,7 +12,7 @@ class ViewCart extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->initCurrentCustomer(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php index 34fa6b66a1187..2f201d260289c 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ViewWishlist.php @@ -12,7 +12,7 @@ class ViewWishlist extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->initCurrentCustomer(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php index 52a8ea95f9412..75341af2d6a6c 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php @@ -129,7 +129,7 @@ public function __construct( * * @SuppressWarnings(PHPMD.ExitExpression) */ - public function execute() + public function executeInternal() { $file = null; $plain = false; diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php index 6f7e0e3bfbd81..c550f125dc7a2 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php @@ -12,7 +12,7 @@ class Wishlist extends \Magento\Customer\Controller\Adminhtml\Index * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $customerId = $this->initCurrentCustomer(); $itemId = (int)$this->getRequest()->getParam('delete'); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php index 8bd9ce97c3432..172622ac17624 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Online/Index.php @@ -43,7 +43,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php index f1f638a852e2e..e8a7b96b4bbe3 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/Validate.php @@ -31,7 +31,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $result = $this->_validate(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php index b3df87ed9ffb0..8d8d34086870a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/System/Config/Validatevat/ValidateAdvanced.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $result = $this->_validate(); $valid = $result->getIsValid(); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php index 6101483eb983b..31038f2bd083f 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Configure.php @@ -15,7 +15,7 @@ class Configure extends \Magento\Customer\Controller\Adminhtml\Wishlist\Product\ * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $configureResult = new \Magento\Framework\DataObject(); try { diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php index cb895085d7f6d..8e098708fb976 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Wishlist/Product/Composite/Wishlist/Update.php @@ -15,7 +15,7 @@ class Update extends \Magento\Customer\Controller\Adminhtml\Wishlist\Product\Com * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { // Update wishlist item $updateResult = new \Magento\Framework\DataObject(); diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php index 4258ebf1ef0e1..08b72b1e3ec6c 100644 --- a/app/code/Magento/Customer/Controller/Ajax/Login.php +++ b/app/code/Magento/Customer/Controller/Ajax/Login.php @@ -76,7 +76,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $credentials = null; $httpBadRequestCode = 400; diff --git a/app/code/Magento/Customer/Controller/Ajax/Logout.php b/app/code/Magento/Customer/Controller/Ajax/Logout.php index 69ce4693b035e..4d90a7ae39a2c 100644 --- a/app/code/Magento/Customer/Controller/Ajax/Logout.php +++ b/app/code/Magento/Customer/Controller/Ajax/Logout.php @@ -47,7 +47,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $lastCustomerId = $this->customerSession->getId(); $this->customerSession->logout() diff --git a/app/code/Magento/Customer/Controller/Plugin/Account.php b/app/code/Magento/Customer/Controller/Plugin/Account.php index c035c983d8028..10f2c8fc15fc2 100644 --- a/app/code/Magento/Customer/Controller/Plugin/Account.php +++ b/app/code/Magento/Customer/Controller/Plugin/Account.php @@ -41,7 +41,7 @@ public function __construct( * @param RequestInterface $request * @return mixed */ - public function aroundDispatch( + public function aroundExecute( ActionInterface $subject, \Closure $proceed, RequestInterface $request diff --git a/app/code/Magento/Customer/Controller/Review.php b/app/code/Magento/Customer/Controller/Review.php index 2a667e4c3e77f..396ad3da69297 100644 --- a/app/code/Magento/Customer/Controller/Review.php +++ b/app/code/Magento/Customer/Controller/Review.php @@ -30,7 +30,7 @@ public function __construct( /** * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { return $this->resultPageFactory->create(); } diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php index df4abe308baa5..503c075d9bf0f 100644 --- a/app/code/Magento/Customer/Controller/Section/Load.php +++ b/app/code/Magento/Customer/Controller/Section/Load.php @@ -51,7 +51,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Json|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->resultJsonFactory->create(); diff --git a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php index a5b268eaa1744..8198a70957f87 100644 --- a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php +++ b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php @@ -43,7 +43,7 @@ public function __construct( * @return mixed * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Framework\App\ActionInterface $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php index f3dee06b41141..0a0d2dbbefd07 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php @@ -190,7 +190,7 @@ public function testIsLoggedIn() ->with('*/*/') ->willReturnSelf(); - $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->model->execute()); + $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->model->executeInternal()); } /** @@ -232,7 +232,7 @@ public function testNoCustomerIdInRequest($customerId, $key) ->with($this->equalTo($testUrl)) ->willReturnSelf(); - $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->model->execute()); + $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->model->executeInternal()); } /** @@ -307,7 +307,7 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad ->method('getStore') ->will($this->returnValue($this->storeMock)); - $this->model->execute(); + $this->model->executeInternal(); } /** @@ -404,7 +404,7 @@ public function testSuccessRedirect( ) ->willReturn($isSetFlag); - $this->model->execute(); + $this->model->executeInternal(); } /** diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php index 3a1172d0953f3..6ef1faa6378ae 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePasswordTest.php @@ -108,7 +108,7 @@ public function testExecuteWithLink() ->with('*/*/createpassword', []) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } public function testExecuteWithSession() @@ -176,7 +176,7 @@ public function testExecuteWithSession() ->with($token) ->willReturnSelf(); - $this->assertEquals($pageMock, $this->model->execute()); + $this->assertEquals($pageMock, $this->model->executeInternal()); } public function testExecuteWithException() @@ -225,6 +225,6 @@ public function testExecuteWithException() ->with('*/*/forgotpassword', []) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php index c765dc8393922..d8815ba253b47 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php @@ -270,7 +270,7 @@ public function testCreatePostActionRegistrationDisabled() $this->customerRepository->expects($this->never()) ->method('save'); - $this->model->execute(); + $this->model->executeInternal(); } public function testRegenerateIdOnExecution() @@ -297,7 +297,7 @@ public function testRegenerateIdOnExecution() $this->storeManagerMock->expects($this->once()) ->method('getStore') ->willReturn($this->storeMock); - $this->model->execute(); + $this->model->executeInternal(); } /** @@ -391,7 +391,7 @@ public function testSuccessMessage( ->method('getTaxCalculationAddressType') ->will($this->returnValue($addressType)); - $this->model->execute(); + $this->model->executeInternal(); } /** @@ -539,7 +539,7 @@ public function testSuccessRedirect( ->method('getStore') ->will($this->returnValue($this->storeMock)); - $this->model->execute(); + $this->model->executeInternal(); } public function getSuccessRedirectDataProvider() diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php index 0706355a39fce..894582be4b310 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php @@ -116,7 +116,7 @@ public function testCreateActionRegistrationDisabled() $this->resultPageMock->expects($this->never()) ->method('getLayout'); - $this->object->execute(); + $this->object->executeInternal(); } /** @@ -139,6 +139,6 @@ public function testCreateActionRegistrationEnabled() ->method('create') ->willReturn($this->resultPageMock); - $this->object->execute(); + $this->object->executeInternal(); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php index 991a4b17ecab6..acd413d000684 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php @@ -131,7 +131,7 @@ public function testInvalidFormKey() ->with('*/*/edit') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->model->execute()); + $this->assertSame($this->resultRedirect, $this->model->executeInternal()); } public function testNoPostValues() @@ -150,7 +150,7 @@ public function testNoPostValues() ->with('*/*/edit') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->model->execute()); + $this->assertSame($this->resultRedirect, $this->model->executeInternal()); } public function testGeneralSave() @@ -211,7 +211,7 @@ public function testGeneralSave() ->with('customer/account') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->model->execute()); + $this->assertSame($this->resultRedirect, $this->model->executeInternal()); } /** @@ -311,7 +311,7 @@ public function testChangePassword( ->willReturn($errors['counter']); - $this->assertSame($this->resultRedirect, $this->model->execute()); + $this->assertSame($this->resultRedirect, $this->model->executeInternal()); } /** @@ -443,7 +443,7 @@ public function testGeneralException( ->with('*/*/edit') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->model->execute()); + $this->assertSame($this->resultRedirect, $this->model->executeInternal()); } /** diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php index 8f060f2dd3bff..0cf693299feec 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php @@ -107,7 +107,7 @@ public function testExecuteEmptyEmail() ->with('*/*/forgotpassword') ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->controller->execute()); + $this->assertSame($this->resultRedirect, $this->controller->executeInternal()); } public function testExecute() @@ -143,7 +143,7 @@ public function testExecute() ->with('*/*/') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteNoSuchEntityException() @@ -179,7 +179,7 @@ public function testExecuteNoSuchEntityException() ->with('*/*/') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteException() @@ -207,7 +207,7 @@ public function testExecuteException() ->with('*/*/forgotpassword') ->willReturnSelf(); - $this->controller->execute(); + $this->controller->executeInternal(); } protected function prepareContext() diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php index e71e413d7e117..ca9a975b7cd61 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php @@ -133,7 +133,7 @@ public function testExecuteInvalidFormKey( ->with('*/*/') ->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } /** @@ -176,7 +176,7 @@ public function testExecuteNoPostData() ->method('getRedirect') ->willReturn($this->redirect); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } public function testExecuteEmptyLoginData() @@ -207,7 +207,7 @@ public function testExecuteEmptyLoginData() ->method('getRedirect') ->willReturn($this->redirect); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } public function testExecuteSuccess() @@ -255,7 +255,7 @@ public function testExecuteSuccess() ->method('getRedirect') ->willReturn($this->redirect); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } /** @@ -303,7 +303,7 @@ public function testExecuteWithException( ->method('getRedirect') ->willReturn($this->redirect); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } /** diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php index 6cb488a07c6ba..5581be2e75ae7 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ResetPasswordPostTest.php @@ -142,7 +142,7 @@ public function testExecute() ->with('*/*/login', []) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } public function testExecuteWithException() @@ -208,7 +208,7 @@ public function testExecuteWithException() ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token]) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } public function testExecuteWithWrongConfirmation() @@ -255,7 +255,7 @@ public function testExecuteWithWrongConfirmation() ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token]) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } public function testExecuteWithEmptyPassword() @@ -302,6 +302,6 @@ public function testExecuteWithEmptyPassword() ->with('*/*/createPassword', ['id' => $customerId, 'token' => $token]) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php index 39fa2018cff7a..e082233b6e26f 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php @@ -342,7 +342,7 @@ public function testExecuteNoFormKey() ->with('*/*/') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } public function testExecuteNoPostData() @@ -389,7 +389,7 @@ public function testExecuteNoPostData() ->with($url) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } /** @@ -575,7 +575,7 @@ public function testExecute( ->with($url) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } public function dataProviderTestExecute() @@ -668,7 +668,7 @@ public function testExecuteInputException() ->with($url) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } public function testExecuteException() @@ -731,6 +731,6 @@ public function testExecuteException() ->with($url) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/IndexTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/IndexTest.php index 38d6e7d53efae..17c9033803117 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/IndexTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/IndexTest.php @@ -108,7 +108,7 @@ protected function setUp() } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal */ public function testExecute() { @@ -140,12 +140,12 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Framework\View\Result\Page', - $this->indexController->execute() + $this->indexController->executeInternal() ); } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal */ public function testExecuteAjax() { @@ -161,7 +161,7 @@ public function testExecuteAjax() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Forward', - $this->indexController->execute() + $this->indexController->executeInternal() ); } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php index e806e30201346..181b8dbab6ec0 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php @@ -259,7 +259,7 @@ public function testExecuteWithUpdateBilling() ->method('save') ->with($this->customerData); $this->prepareMocksForErrorMessagesProcessing(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testExecuteWithoutItems() @@ -283,7 +283,7 @@ public function testExecuteWithoutItems() 'error' => true, ]) ->willReturnSelf(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testExecuteLocalizedException() @@ -305,7 +305,7 @@ public function testExecuteLocalizedException() ->with($exception); $this->prepareMocksForErrorMessagesProcessing(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } public function testExecuteException() @@ -327,6 +327,6 @@ public function testExecuteException() ->with($exception); $this->prepareMocksForErrorMessagesProcessing(); - $this->assertSame($this->resultJson, $this->controller->execute()); + $this->assertSame($this->resultJson, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php index 4cbd57be53837..f78e202b884d2 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php @@ -172,7 +172,7 @@ public function testExecute() ->with('customer/*/index') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } public function testExecuteWithException() @@ -191,6 +191,6 @@ public function testExecuteWithException() ->method('addError') ->with('Some message.'); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php index de91d73d10a76..dcfc2084e261c 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php @@ -172,7 +172,7 @@ public function testExecute() ->with('customer/*/index') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } public function testExecuteWithException() @@ -191,6 +191,6 @@ public function testExecuteWithException() ->method('addError') ->with('Some message.'); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php index 8aff6b96313fc..6e288583c1c9a 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php @@ -188,7 +188,7 @@ public function testExecute() ->with('customer/*/index') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } public function testExecuteWithException() @@ -207,6 +207,6 @@ public function testExecuteWithException() ->method('addError') ->with('Some message.'); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php index 00eaa7546e7df..9129be9c89fd0 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php @@ -188,7 +188,7 @@ public function testExecute() ->with('customer/*/index') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } public function testExecuteWithException() @@ -207,6 +207,6 @@ public function testExecuteWithException() ->method('addError') ->with('Some message.'); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/NewsletterTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/NewsletterTest.php index 97599618c34b0..36c3ff142670e 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/NewsletterTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/NewsletterTest.php @@ -256,7 +256,7 @@ public function testNewsletterAction() $this->assertInstanceOf( 'Magento\Framework\View\Result\Layout', - $this->_testedObject->execute() + $this->_testedObject->executeInternal() ); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php index a4a9df750dceb..416f8055bec76 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php @@ -236,7 +236,7 @@ public function testResetPasswordActionNoCustomer() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->_testedObject->execute() + $this->_testedObject->executeInternal() ); } @@ -290,7 +290,7 @@ public function testResetPasswordActionInvalidCustomerId() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->_testedObject->execute() + $this->_testedObject->executeInternal() ); } @@ -329,7 +329,7 @@ public function testResetPasswordActionCoreException() ->method('addMessage') ->with($error); - $this->_testedObject->execute(); + $this->_testedObject->executeInternal(); } public function testResetPasswordActionCoreExceptionWarn() @@ -358,7 +358,7 @@ public function testResetPasswordActionCoreExceptionWarn() ->method('addMessage') ->with(new \Magento\Framework\Message\Error($warningText)); - $this->_testedObject->execute(); + $this->_testedObject->executeInternal(); } public function testResetPasswordActionException() @@ -399,7 +399,7 @@ public function testResetPasswordActionException() $this->equalTo('Something went wrong while resetting customer password.') ); - $this->_testedObject->execute(); + $this->_testedObject->executeInternal(); } public function testResetPasswordActionSendEmail() @@ -479,7 +479,7 @@ public function testResetPasswordActionSendEmail() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->_testedObject->execute() + $this->_testedObject->executeInternal() ); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php index 95c875393ed6a..dee2600fb3397 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php @@ -239,7 +239,7 @@ protected function setUp() } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExecuteWithExistentCustomer() @@ -512,11 +512,11 @@ public function testExecuteWithExistentCustomer() ->with('customer/*/edit', ['id' => $customerId, '_current' => true]) ->willReturn(true); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExecuteWithNewCustomer() @@ -760,11 +760,11 @@ public function testExecuteWithNewCustomer() ->with('customer/index', []) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExecuteWithNewCustomerAndValidationException() @@ -900,11 +900,11 @@ public function testExecuteWithNewCustomerAndValidationException() ->with('customer/*/new', ['_current' => true]) ->willReturn(true); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExecuteWithNewCustomerAndLocalizedException() @@ -1040,11 +1040,11 @@ public function testExecuteWithNewCustomerAndLocalizedException() ->with('customer/*/new', ['_current' => true]) ->willReturn(true); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** - * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::executeInternal * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExecuteWithNewCustomerAndException() @@ -1181,6 +1181,6 @@ public function testExecuteWithNewCustomerAndException() ->with('customer/*/new', ['_current' => true]) ->willReturn(true); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php index f4065cc205e81..c7abdf3bb46ef 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php @@ -186,7 +186,7 @@ public function testExecute() ->method('validate') ->willReturn($validationResult); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithoutAddresses() @@ -225,7 +225,7 @@ public function testExecuteWithoutAddresses() ->method('validate') ->willReturn($validationResult); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithException() @@ -271,6 +271,6 @@ public function testExecuteWithException() ->method('validate') ->willReturn($validationResult); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php index afa437c58ac33..3b838c369b0a5 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php @@ -107,7 +107,7 @@ public function testExecuteNoParamsShouldThrowException() { /** @var \Magento\Customer\Controller\Adminhtml\Index\Viewfile $controller */ $controller = $this->objectManager->getObject('Magento\Customer\Controller\Adminhtml\Index\Viewfile'); - $controller->execute(); + $controller->executeInternal(); } public function testExecuteParamFile() @@ -154,7 +154,7 @@ public function testExecuteParamFile() 'fileFactory' => $fileFactoryMock ] ); - $controller->execute(); + $controller->executeInternal(); } public function testExecuteGetParamImage() @@ -217,6 +217,6 @@ public function testExecuteGetParamImage() 'resultRawFactory' => $this->resultRawFactoryMock ] ); - $this->assertSame($this->resultRawMock, $controller->execute()); + $this->assertSame($this->resultRawMock, $controller->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/System/Config/Validatevat/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/System/Config/Validatevat/ValidateTest.php index ac5625eadef26..377f7d331a6d3 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/System/Config/Validatevat/ValidateTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/System/Config/Validatevat/ValidateTest.php @@ -104,7 +104,7 @@ public function testExecute() ]) ->willReturn($json); - $this->assertEquals($json, $this->controller->execute()); + $this->assertEquals($json, $this->controller->executeInternal()); } /** diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php index 77260f56c584d..e1ec62d35378a 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php @@ -204,7 +204,7 @@ public function testLogin() ->method('setData') ->with($result) ->willReturn($loginSuccessResponse); - $this->assertEquals($loginSuccessResponse, $this->object->execute()); + $this->assertEquals($loginSuccessResponse, $this->object->executeInternal()); } public function testLoginFailure() @@ -260,6 +260,6 @@ public function testLoginFailure() ->with($result) ->willReturn($loginFailureResponse); - $this->assertEquals($loginFailureResponse, $this->object->execute()); + $this->assertEquals($loginFailureResponse, $this->object->executeInternal()); } } diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php index 8146fce1aa3df..2c65115532100 100644 --- a/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php +++ b/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php @@ -87,9 +87,9 @@ protected function setUp() * @param boolean $isActionAllowed * @param boolean $isAuthenticated * - * @dataProvider dataProviderAroundDispatch + * @dataProvider dataProviderAroundExecute */ - public function testAroundDispatch( + public function testAroundExecute( $action, $allowedActions, $isActionAllowed, @@ -128,11 +128,11 @@ public function testAroundDispatch( $plugin = new Account($this->session, $allowedActions); $this->assertEquals( self::EXPECTED_VALUE, - $plugin->aroundDispatch($this->subject, $this->proceed, $this->request) + $plugin->aroundExecute($this->subject, $this->proceed, $this->request) ); } - public function dataProviderAroundDispatch() + public function dataProviderAroundExecute() { return [ [ diff --git a/app/code/Magento/Customer/Test/Unit/Model/App/Action/ContextPluginTest.php b/app/code/Magento/Customer/Test/Unit/Model/App/Action/ContextPluginTest.php index 4d338cef2aaea..f246b0e9559dd 100644 --- a/app/code/Magento/Customer/Test/Unit/Model/App/Action/ContextPluginTest.php +++ b/app/code/Magento/Customer/Test/Unit/Model/App/Action/ContextPluginTest.php @@ -74,9 +74,9 @@ public function setUp() } /** - * Test aroundDispatch + * Test aroundExecute */ - public function testAroundDispatch() + public function testAroundExecute() { $this->customerSessionMock->expects($this->once()) ->method('getCustomerGroupId') @@ -96,7 +96,7 @@ public function testAroundDispatch() ); $this->assertEquals( 'ExpectedValue', - $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } } diff --git a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php index d078bd13b335e..8afd580c5b4a9 100644 --- a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php +++ b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportCsv.php @@ -37,7 +37,7 @@ public function __construct( * * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'customers.csv'; diff --git a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php index 7a5edb1d27829..686e829e3c5d9 100644 --- a/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php +++ b/app/code/Magento/CustomerImportExport/Controller/Adminhtml/Index/ExportXml.php @@ -37,7 +37,7 @@ public function __construct( * * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'customers.xml'; diff --git a/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php b/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php index 412028bdd8f78..b8006ccfd0708 100644 --- a/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php +++ b/app/code/Magento/Directory/Controller/Adminhtml/Json/CountryRegion.php @@ -13,7 +13,7 @@ class CountryRegion extends \Magento\Backend\App\Action * * @return string */ - public function execute() + public function executeInternal() { $arrRes = []; diff --git a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php index b8aada56cf7fd..1a30600ef8aab 100644 --- a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php +++ b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php @@ -11,7 +11,7 @@ class SwitchAction extends \Magento\Framework\App\Action\Action /** * @return void */ - public function execute() + public function executeInternal() { /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */ $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface'); diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php index 6e056ee9e45a4..a762b2d52c217 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php @@ -69,7 +69,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $type = $this->getRequest()->getParam('type'); $tmpPath = ''; diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php index 926491e073595..1d966b22bfb1d 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php @@ -13,7 +13,7 @@ class Form extends \Magento\Catalog\Controller\Adminhtml\Product\Edit * * @return void */ - public function execute() + public function executeInternal() { $this->_initProduct(); $this->getResponse()->setBody( diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php index 0da0cf5fb96f8..9cc1bb7b00fb1 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php @@ -77,7 +77,7 @@ protected function _processDownload($resource, $resourceType) * * @return void */ - public function execute() + public function executeInternal() { $linkId = $this->getRequest()->getParam('id', 0); $type = $this->getRequest()->getParam('type', 0); diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php index 746b5242d5ca4..3176cb802ca2f 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php @@ -31,7 +31,7 @@ protected function _getLink() * * @return void */ - public function execute() + public function executeInternal() { $sampleId = $this->getRequest()->getParam('id', 0); /** @var \Magento\Downloadable\Model\Sample $sample */ diff --git a/app/code/Magento/Downloadable/Controller/Customer/Products.php b/app/code/Magento/Downloadable/Controller/Customer/Products.php index 78e865dd8c323..b05852738e179 100644 --- a/app/code/Magento/Downloadable/Controller/Customer/Products.php +++ b/app/code/Magento/Downloadable/Controller/Customer/Products.php @@ -34,14 +34,14 @@ public function __construct(\Magento\Framework\App\Action\Context $context, \Mag * @param RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $loginUrl = $this->_objectManager->get('Magento\Customer\Model\Url')->getLoginUrl(); if (!$this->_customerSession->authenticate($loginUrl)) { $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); } - return parent::dispatch($request); + return parent::execute($request); } /** @@ -49,7 +49,7 @@ public function dispatch(RequestInterface $request) * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); if ($block = $this->_view->getLayout()->getBlock('downloadable_customer_products_list')) { diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php index c2cd4b91b92d6..59f49533c9eaf 100644 --- a/app/code/Magento/Downloadable/Controller/Download/Link.php +++ b/app/code/Magento/Downloadable/Controller/Download/Link.php @@ -31,7 +31,7 @@ protected function _getCustomerSession() * @SuppressWarnings(PHPMD.ExcessiveMethodLength) * @SuppressWarnings(PHPMD.ExitExpression) */ - public function execute() + public function executeInternal() { $session = $this->_getCustomerSession(); diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php index 351fc26c55c5f..46747905711ef 100644 --- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php +++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php @@ -17,7 +17,7 @@ class LinkSample extends \Magento\Downloadable\Controller\Download * @return ResponseInterface * @SuppressWarnings(PHPMD.ExitExpression) */ - public function execute() + public function executeInternal() { $linkId = $this->getRequest()->getParam('link_id', 0); /** @var \Magento\Downloadable\Model\Link $link */ diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php index a8cecbc48bd07..c6715dbf90c1e 100644 --- a/app/code/Magento/Downloadable/Controller/Download/Sample.php +++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php @@ -17,7 +17,7 @@ class Sample extends \Magento\Downloadable\Controller\Download * @return ResponseInterface * @SuppressWarnings(PHPMD.ExitExpression) */ - public function execute() + public function executeInternal() { $sampleId = $this->getRequest()->getParam('sample_id', 0); /** @var \Magento\Downloadable\Model\Sample $sample */ diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php index 7c1040876e8b0..1a900b56c3f7a 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php @@ -165,6 +165,6 @@ public function testExecute() $this->resultFactory->expects($this->once())->method('create')->willReturn($resultJson); $resultJson->expects($this->once())->method('setData')->willReturnSelf(); - $this->assertEquals($resultJson, $this->upload->execute()); + $this->assertEquals($resultJson, $this->upload->executeInternal()); } } diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php index 5e8c472595f66..887e35d8b1154 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/LinkTest.php @@ -171,7 +171,7 @@ public function testExecuteFile($fileType) $this->objectManager->expects($this->once())->method('create') ->will($this->returnValue($this->linkModel)); - $this->link->execute(); + $this->link->executeInternal(); } /** @@ -217,7 +217,7 @@ public function testExecuteUrl($fileType) $this->objectManager->expects($this->once())->method('create') ->will($this->returnValue($this->linkModel)); - $this->link->execute(); + $this->link->executeInternal(); } /** diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php index 88f7b2a301c09..e2de4bde3478f 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php @@ -164,7 +164,7 @@ public function testExecuteFile() $this->objectManager->expects($this->once())->method('create') ->will($this->returnValue($this->sampleModel)); - $this->sample->execute(); + $this->sample->executeInternal(); } /** @@ -205,6 +205,6 @@ public function testExecuteUrl() $this->objectManager->expects($this->once())->method('create') ->will($this->returnValue($this->sampleModel)); - $this->sample->execute(); + $this->sample->executeInternal(); } } diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php index 110ce5fe27912..9d58bbd27efc3 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php @@ -191,7 +191,7 @@ public function testExecuteLinkTypeUrl() $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url'); $this->response->expects($this->once())->method('setRedirect')->with('redirect_url')->willReturnSelf(); - $this->assertEquals($this->response, $this->linkSample->execute()); + $this->assertEquals($this->response, $this->linkSample->executeInternal()); } public function testExecuteLinkTypeFile() @@ -238,6 +238,6 @@ public function testExecuteLinkTypeFile() $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url'); $this->response->expects($this->once())->method('setRedirect')->with('redirect_url')->willReturnSelf(); - $this->assertEquals($this->response, $this->linkSample->execute()); + $this->assertEquals($this->response, $this->linkSample->executeInternal()); } } diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php index 7801f28594100..939b3786f1295 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php @@ -236,7 +236,7 @@ public function testAbsentLinkId() ->with("We can't find the link you requested."); $this->redirect->expects($this->once())->method('redirect')->with($this->response, '*/customer/products', []); - $this->assertEquals($this->response, $this->link->execute()); + $this->assertEquals($this->response, $this->link->executeInternal()); } public function testGetLinkForGuestCustomer() @@ -287,7 +287,7 @@ public function testGetLinkForGuestCustomer() ->willReturn('before_auth_url'); $this->session->expects($this->once())->method('setBeforeAuthUrl')->with('before_auth_url')->willReturnSelf(); - $this->assertNull($this->link->execute()); + $this->assertNull($this->link->executeInternal()); } public function testGetLinkForWrongCustomer() @@ -327,7 +327,7 @@ public function testGetLinkForWrongCustomer() ->with("We can't find the link you requested."); $this->redirect->expects($this->once())->method('redirect')->with($this->response, '*/customer/products', []); - $this->assertEquals($this->response, $this->link->execute()); + $this->assertEquals($this->response, $this->link->executeInternal()); } public function testExceptionInUpdateLinkStatus() @@ -371,7 +371,7 @@ public function testExceptionInUpdateLinkStatus() ->willReturnSelf(); $this->redirect->expects($this->once())->method('redirect')->with($this->response, '*/customer/products', []); - $this->assertEquals($this->response, $this->link->execute()); + $this->assertEquals($this->response, $this->link->executeInternal()); } private function processDownload($resource, $resourceType) @@ -448,7 +448,7 @@ public function testLinkNotAvailable($messageType, $status, $notice) $this->linkPurchasedItem->expects($this->once())->method('getStatus')->willReturn($status); $this->messageManager->expects($this->once())->method($messageType)->with($notice)->willReturnSelf(); - $this->assertEquals($this->response, $this->link->execute()); + $this->assertEquals($this->response, $this->link->executeInternal()); } /** diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php index 7366846899d6f..42933e534d00e 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php @@ -191,7 +191,7 @@ public function testExecuteLinkTypeUrl() $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url'); $this->response->expects($this->once())->method('setRedirect')->with('redirect_url')->willReturnSelf(); - $this->assertEquals($this->response, $this->sample->execute()); + $this->assertEquals($this->response, $this->sample->executeInternal()); } public function testExecuteLinkTypeFile() @@ -234,6 +234,6 @@ public function testExecuteLinkTypeFile() $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url'); $this->response->expects($this->once())->method('setRedirect')->with('redirect_url')->willReturnSelf(); - $this->assertEquals($this->response, $this->sample->execute()); + $this->assertEquals($this->response, $this->sample->executeInternal()); } } diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php index 116d88710173e..3ffb0528e23f6 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php @@ -32,7 +32,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $template = $this->_initTemplate('id'); diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php index 7022d18ff3cc9..04127a7c311c1 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { $template = $this->_initTemplate('id'); if ($template->getId()) { diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php index 017f05898d99a..653094a7baf51 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $template = $this->_initTemplate('id'); diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php index 8205fa3e7dfb3..0a63dad7192af 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php index 39f1684934517..892affd8da87a 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getQuery('ajax')) { $this->_forward('grid'); diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php index 4e405353acf02..b92f01f12bf01 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php index c85cc7d4a6c48..81558a7805c86 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php @@ -13,7 +13,7 @@ class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { try { $this->_view->loadLayout(); diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php index ecb8f8c55ad57..be2022ffa7e77 100644 --- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php +++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php @@ -15,7 +15,7 @@ class Save extends \Magento\Email\Controller\Adminhtml\Email\Template * * @return void */ - public function execute() + public function executeInternal() { $request = $this->getRequest(); $id = $this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/EditTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/EditTest.php index 905318c274a39..6838b1ba1b1fc 100644 --- a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/EditTest.php +++ b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/EditTest.php @@ -184,7 +184,7 @@ protected function setUp() } /** - * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Edit::execute + * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Edit::executeInternal */ public function testExecuteNewTemplate() { @@ -217,11 +217,11 @@ public function testExecuteNewTemplate() ] ); - $this->assertNull($this->editController->execute()); + $this->assertNull($this->editController->executeInternal()); } /** - * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Edit::execute + * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Edit::executeInternal */ public function testExecuteEdit() { @@ -254,6 +254,6 @@ public function testExecuteEdit() ] ); - $this->assertNull($this->editController->execute()); + $this->assertNull($this->editController->executeInternal()); } } diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/IndexTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/IndexTest.php index c5ada6573f6b8..027e66b1670e1 100644 --- a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/IndexTest.php +++ b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/IndexTest.php @@ -118,9 +118,9 @@ protected function setUp() } /** - * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Index::execute + * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Index::executeInternal */ - public function testExecute() + public function testExecuteInternal() { $this->prepareExecute(); @@ -157,13 +157,13 @@ public function testExecute() ->method('addLink') ->willReturnSelf(); - $this->assertNull($this->indexController->execute()); + $this->assertNull($this->indexController->executeInternal()); } /** - * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Index::execute + * @covers \Magento\Email\Controller\Adminhtml\Email\Template\Index::executeInternal */ - public function testExecuteAjax() + public function testExecuteInternalAjax() { $this->prepareExecute(true); $indexController = $this->getMockBuilder('Magento\Email\Controller\Adminhtml\Email\Template\Index') @@ -176,7 +176,7 @@ public function testExecuteAjax() $indexController->expects($this->once()) ->method('_forward') ->with('grid'); - $this->assertNull($indexController->execute()); + $this->assertNull($indexController->executeInternal()); } /** diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php index 59fccebfe3858..e1f80f7f1336e 100644 --- a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php +++ b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php @@ -95,7 +95,7 @@ protected function setUp() ]); } - public function testExecute() + public function testExecuteInternal() { $this->viewMock->expects($this->once()) ->method('getPage') @@ -110,6 +110,6 @@ public function testExecute() ->method('prepend') ->willReturnSelf(); - $this->assertNull($this->object->execute()); + $this->assertNull($this->object->executeInternal()); } } diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php index 0c2ad5395a93e..31b7833485ffd 100644 --- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php +++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Index.php @@ -16,7 +16,7 @@ class Index extends \Magento\EncryptionKey\Controller\Adminhtml\Crypt\Key * * @return void */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\App\DeploymentConfig\Writer $writer */ $writer = $this->_objectManager->get('Magento\Framework\App\DeploymentConfig\Writer'); diff --git a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php index b06c18cae6b64..6921d482c1d23 100644 --- a/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php +++ b/app/code/Magento/EncryptionKey/Controller/Adminhtml/Crypt/Key/Save.php @@ -50,7 +50,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { try { $key = null; diff --git a/app/code/Magento/EncryptionKey/Test/Unit/Controller/Adminhtml/Crypt/Key/SaveTest.php b/app/code/Magento/EncryptionKey/Test/Unit/Controller/Adminhtml/Crypt/Key/SaveTest.php index f4f697418343d..13f8f772138e3 100644 --- a/app/code/Magento/EncryptionKey/Test/Unit/Controller/Adminhtml/Crypt/Key/SaveTest.php +++ b/app/code/Magento/EncryptionKey/Test/Unit/Controller/Adminhtml/Crypt/Key/SaveTest.php @@ -90,7 +90,7 @@ public function testExecuteNonRandomAndWithCryptKey() $this->cacheMock->expects($this->once())->method('clean'); $this->responseMock->expects($this->once())->method('setRedirect'); - $this->model->execute(); + $this->model->executeInternal(); } public function testExecuteNonRandomAndWithoutCryptKey() @@ -108,7 +108,7 @@ public function testExecuteNonRandomAndWithoutCryptKey() ->willReturn($key); $this->managerMock->expects($this->once())->method('addErrorMessage'); - $this->model->execute(); + $this->model->executeInternal(); } public function testExecuteRandom() @@ -125,6 +125,6 @@ public function testExecuteRandom() $this->cacheMock->expects($this->once())->method('clean'); $this->responseMock->expects($this->once())->method('setRedirect'); - $this->model->execute(); + $this->model->executeInternal(); } } diff --git a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php index 5a46c44b01fd4..258c74c4bafb0 100644 --- a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php +++ b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php @@ -62,7 +62,7 @@ protected function _isAllowed() * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $productId = (int)$this->getRequest()->getParam('id'); diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Controller/Adminhtml/Edit/PopupTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Controller/Adminhtml/Edit/PopupTest.php index 4daa62a813c2c..fab1db7071046 100644 --- a/app/code/Magento/GroupedProduct/Test/Unit/Controller/Adminhtml/Edit/PopupTest.php +++ b/app/code/Magento/GroupedProduct/Test/Unit/Controller/Adminhtml/Edit/PopupTest.php @@ -118,7 +118,7 @@ public function testPopupActionNoProductId() $this->request->expects($this->at(3))->method('getParam')->with('set')->will($this->returnValue($setId)); $this->registry->expects($this->once())->method('register')->with('current_product', $product); - $this->assertSame($this->resultLayoutMock, $this->action->execute()); + $this->assertSame($this->resultLayoutMock, $this->action->executeInternal()); } public function testPopupActionWithProductIdNoSetId() @@ -155,6 +155,6 @@ public function testPopupActionWithProductIdNoSetId() $this->request->expects($this->at(3))->method('getParam')->with('set')->will($this->returnValue($setId)); $this->registry->expects($this->once())->method('register')->with('current_product', $product); - $this->assertSame($this->resultLayoutMock, $this->action->execute()); + $this->assertSame($this->resultLayoutMock, $this->action->executeInternal()); } } diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php index a223c72ccd190..343c24d910461 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php @@ -37,7 +37,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getPost(ExportModel::FILTER_ELEMENT_GROUP)) { try { diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php index 7e50e5fca3062..81d0aa4a8e3cb 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -15,7 +15,7 @@ class GetFilter extends ExportController * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getParams(); if ($this->getRequest()->isXmlHttpRequest() && $data) { diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php index 9b1a0c3ecbdf5..a9f4b02e78455 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php @@ -15,7 +15,7 @@ class Index extends ExportController * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php index 84d3cb4d59b0a..64ab7b253d8c3 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Download.php @@ -37,7 +37,7 @@ public function __construct( * * @return void|\Magento\Backend\App\Action */ - public function execute() + public function executeInternal() { $fileName = $this->getRequest()->getParam('filename'); diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php index 5c88c232807dc..df70dff2a4083 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php @@ -15,7 +15,7 @@ class Index extends HistoryController * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php index 005a2b0cde121..240067a4f1ff2 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php @@ -65,7 +65,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $fileName = $this->getRequest()->getParam('filename') . '.csv'; $moduleDir = $this->reader->getModuleDir('', self::SAMPLE_FILES_MODULE); diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php index ec4f027d4a9ac..6bf064e686948 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php @@ -15,7 +15,7 @@ class Index extends ImportController * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->messageManager->addNotice( $this->_objectManager->get('Magento\ImportExport\Helper\Data')->getMaxUploadSizeMessage() diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php index 54c9049bcc91d..d58b1a1f81f55 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php @@ -38,7 +38,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); if ($data) { diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php index 631966a9a40c2..bc009302895e1 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php @@ -19,7 +19,7 @@ class Validate extends ImportResultController * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); /** @var \Magento\Framework\View\Result\Layout $resultLayout */ diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php index e9661264810d0..532cf1d718ae0 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php +++ b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php @@ -172,7 +172,7 @@ public function testExecute() { $this->reportHelper->expects($this->any())->method('importFileExists')->willReturn(true); $this->resultRaw->expects($this->once())->method('setContents'); - $this->downloadController->execute(); + $this->downloadController->executeInternal(); } /** @@ -182,6 +182,6 @@ public function testExecuteFileNotFound() { $this->reportHelper->expects($this->any())->method('importFileExists')->willReturn(false); $this->resultRaw->expects($this->never())->method('setContents'); - $this->downloadController->execute(); + $this->downloadController->executeInternal(); } } diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/IndexTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/IndexTest.php index 789854701f587..aa9adfde2c22f 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/IndexTest.php +++ b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/IndexTest.php @@ -75,6 +75,6 @@ protected function setUp() */ public function testExecute() { - $this->indexController->execute(); + $this->indexController->executeInternal(); } } diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php index f76a7d9ca1a9f..f84c939bf9323 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/ListAction.php @@ -13,7 +13,7 @@ class ListAction extends \Magento\Indexer\Controller\Adminhtml\Indexer * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_Indexer::system_index'); diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php index 1ea64de8b75d6..af4730a66629f 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php @@ -13,7 +13,7 @@ class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer * * @return void */ - public function execute() + public function executeInternal() { $indexerIds = $this->getRequest()->getParam('indexer_ids'); if (!is_array($indexerIds)) { diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php index fecf0df7a53d7..7fe6dd3a60b2a 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php @@ -13,7 +13,7 @@ class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer * * @return void */ - public function execute() + public function executeInternal() { $indexerIds = $this->getRequest()->getParam('indexer_ids'); if (!is_array($indexerIds)) { diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php index 958125477b992..57364ec606022 100644 --- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php +++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php @@ -60,6 +60,7 @@ class ListActionTest extends \PHPUnit_Framework_TestCase /** * Set up test + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ protected function setUp() { @@ -200,6 +201,6 @@ public function testExecute() ->method('renderLayout') ->will($this->returnValue(1)); - $this->object->execute(); + $this->object->executeInternal(); } } diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php index 133a763f8312d..c08535d273189 100644 --- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php +++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php @@ -243,7 +243,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues) $this->helper->expects($this->any())->method("getUrl")->willReturn("magento.com"); $this->response->expects($this->any())->method("setRedirect")->willReturn(1); - $this->model->execute(); + $this->model->executeInternal(); } /** diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php index c535ed59f686f..8adaf2d07fe92 100644 --- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php +++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php @@ -242,7 +242,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues) $this->helper->expects($this->any())->method("getUrl")->willReturn("magento.com"); $this->response->expects($this->any())->method("setRedirect")->willReturn(1); - $this->model->execute(); + $this->model->executeInternal(); } /** diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php index 8771947fce6f3..42409bd208cc0 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php @@ -17,7 +17,7 @@ class Delete extends \Magento\Integration\Controller\Adminhtml\Integration * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php index db23246d371c3..6c45010bfb2d0 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php @@ -17,7 +17,7 @@ class Edit extends \Magento\Integration\Controller\Adminhtml\Integration * * @return void */ - public function execute() + public function executeInternal() { /** Try to recover integration data from session if it was added during previous request which failed. */ $integrationId = (int)$this->getRequest()->getParam(self::PARAM_INTEGRATION_ID); diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php index 24b4fc3af40e9..e5750479e09fc 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Integration\Controller\Adminhtml\Integration * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php index aa4411b459866..f759279d7f3ba 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Integration\Controller\Adminhtml\Integration * * @return void */ - public function execute() + public function executeInternal() { $unsecureIntegrationsCount = $this->_integrationCollection->addUnsecureUrlsFilter()->getSize(); if ($unsecureIntegrationsCount > 0) { diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php index 7b72344442057..befdfbedc848b 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php @@ -13,7 +13,7 @@ class LoginSuccessCallback extends \Magento\Integration\Controller\Adminhtml\Int * * @return void */ - public function execute() + public function executeInternal() { $this->getResponse()->setBody(''); } diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php index 50a971031872b..2e32315b5e596 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Integration\Controller\Adminhtml\Integration * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_Integration::system_integrations'); diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php index 50f6302b49c2b..d8de19f8d96bb 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php @@ -15,7 +15,7 @@ class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integr * * @return void */ - public function execute() + public function executeInternal() { $integrationId = (int)$this->getRequest()->getParam(self::PARAM_INTEGRATION_ID); if ($integrationId) { diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php index 53cccbb46b058..d6581e6004dcb 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php @@ -32,7 +32,7 @@ protected function _redirectOnSaveError() * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var array $integrationData */ $integrationData = []; diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php index 1dcff4547e3c7..8ad72835c71ae 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php @@ -35,7 +35,7 @@ protected function _setActivationSuccessMsg($isReauthorize, $integrationName) * * @return void */ - public function execute() + public function executeInternal() { try { $integrationId = $this->getRequest()->getParam(self::PARAM_INTEGRATION_ID); diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php index a6ab708350a7b..a186dc016a795 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php @@ -34,7 +34,7 @@ protected function _setActivationInProcessMsg($isReauthorize, $integrationName) * * @return void */ - public function execute() + public function executeInternal() { try { $integrationId = $this->getRequest()->getParam(self::PARAM_INTEGRATION_ID); diff --git a/app/code/Magento/Integration/Controller/Token/Access.php b/app/code/Magento/Integration/Controller/Token/Access.php index c9c5c7c3124b0..979a63cbbd973 100644 --- a/app/code/Magento/Integration/Controller/Token/Access.php +++ b/app/code/Magento/Integration/Controller/Token/Access.php @@ -58,7 +58,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { try { $requestUrl = $this->helper->getRequestUrl($this->getRequest()); diff --git a/app/code/Magento/Integration/Controller/Token/Request.php b/app/code/Magento/Integration/Controller/Token/Request.php index d1ee7d042969b..be75117d2c489 100644 --- a/app/code/Magento/Integration/Controller/Token/Request.php +++ b/app/code/Magento/Integration/Controller/Token/Request.php @@ -38,7 +38,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { try { $requestUrl = $this->helper->getRequestUrl($this->getRequest()); diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php index f31d362287602..4be5b0c73979e 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php @@ -60,7 +60,7 @@ public function testDeleteAction() ->method('addSuccess') ->with(__('The integration \'%1\' has been deleted.', $intData[Info::DATA_NAME])); - $this->integrationController->execute(); + $this->integrationController->executeInternal(); } public function testDeleteActionWithConsumer() @@ -89,7 +89,7 @@ public function testDeleteActionWithConsumer() ->method('addSuccess') ->with(__('The integration \'%1\' has been deleted.', $intData[Info::DATA_NAME])); - $this->integrationController->execute(); + $this->integrationController->executeInternal(); } public function testDeleteActionConfigSetUp() @@ -117,7 +117,7 @@ public function testDeleteActionConfigSetUp() // verify success message $this->_messageManager->expects($this->never())->method('addSuccess'); - $this->integrationController->execute(); + $this->integrationController->executeInternal(); } public function testDeleteActionMissingId() @@ -131,7 +131,7 @@ public function testDeleteActionMissingId() ->method('addError') ->with(__('Integration ID is not specified or is invalid.')); - $this->integrationController->execute(); + $this->integrationController->executeInternal(); } public function testDeleteActionForServiceIntegrationException() @@ -153,7 +153,7 @@ public function testDeleteActionForServiceIntegrationException() ->willThrowException($invalidIdException); $this->_messageManager->expects($this->once())->method('addError'); - $this->integrationController->execute(); + $this->integrationController->executeInternal(); } public function testDeleteActionForServiceGenericException() @@ -175,6 +175,6 @@ public function testDeleteActionForServiceGenericException() ->willThrowException($invalidIdException); $this->_messageManager->expects($this->never())->method('addError'); - $this->integrationController->execute(); + $this->integrationController->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php index 0bd7ab3e46632..e4529c88f5fd1 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php @@ -53,7 +53,7 @@ public function testEditAction() ->method('prepend'); $this->_verifyLoadAndRenderLayout(); $controller = $this->_createIntegrationController('Edit'); - $controller->execute(); + $controller->executeInternal(); } public function testEditActionNonExistentIntegration() @@ -81,7 +81,7 @@ public function testEditActionNonExistentIntegration() ); $this->_verifyLoadAndRenderLayout(); $integrationContr = $this->_createIntegrationController('Edit'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } public function testEditActionNoDataAdd() @@ -91,7 +91,7 @@ public function testEditActionNoDataAdd() $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($exceptionMessage)); $this->_verifyLoadAndRenderLayout(); $integrationContr = $this->_createIntegrationController('Edit'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } public function testEditException() @@ -100,6 +100,6 @@ public function testEditException() // verify the error $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($exceptionMessage)); $this->_controller = $this->_createIntegrationController('Edit'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/IndexTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/IndexTest.php index 8dd1bfd69f535..4adf09665751e 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/IndexTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/IndexTest.php @@ -14,6 +14,6 @@ public function testIndexAction() $this->_verifyLoadAndRenderLayout(); // renderLayout $this->_controller = $this->_createIntegrationController('Index'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/NewActionTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/NewActionTest.php index 013857d809f3b..a24b1787a8edd 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/NewActionTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/NewActionTest.php @@ -25,6 +25,6 @@ public function testNewAction() $this->returnValue($this->_requestMock) ); $integrationContr = $this->_createIntegrationController('NewAction'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/PermissionsDialogTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/PermissionsDialogTest.php index 484267a729613..28e3c19b01285 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/PermissionsDialogTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/PermissionsDialogTest.php @@ -72,6 +72,6 @@ public function testPermissionsDialog() $this->equalTo(['adminhtml_integration_activate_permissions_webapi']) ); - $controller->execute(); + $controller->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php index d29767e6091b2..6852687159399 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php @@ -59,7 +59,7 @@ public function testSaveAction() __('The integration \'%1\' has been saved.', $intData[Info::DATA_NAME]) ); $integrationContr = $this->_createIntegrationController('Save'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } public function testSaveActionException() @@ -80,7 +80,7 @@ public function testSaveActionException() // Verify error $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($exceptionMessage)); $integrationContr = $this->_createIntegrationController('Save'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } public function testSaveActionIntegrationException() @@ -101,7 +101,7 @@ public function testSaveActionIntegrationException() // Verify error $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($exceptionMessage)); $integrationContr = $this->_createIntegrationController('Save'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } public function testSaveActionNew() @@ -146,7 +146,7 @@ public function testSaveActionNew() __('The integration \'%1\' has been saved.', $integration->getName()) ); $integrationContr = $this->_createIntegrationController('Save'); - $integrationContr->execute(); + $integrationContr->executeInternal(); } public function testSaveActionExceptionDuringServiceCreation() @@ -186,6 +186,6 @@ public function testSaveActionExceptionDuringServiceCreation() // Verify success message $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); $integrationController = $this->_createIntegrationController('Save'); - $integrationController->execute(); + $integrationController->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php index cb7b484f40be5..3db548316f5bd 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php @@ -48,7 +48,7 @@ public function testTokensDialog() $this->_viewMock->expects($this->any())->method('loadLayout'); $this->_viewMock->expects($this->any())->method('renderLayout'); - $controller->execute(); + $controller->executeInternal(); } public function testTokensExchangeReauthorize() @@ -95,6 +95,6 @@ public function testTokensExchangeReauthorize() $this->_responseMock->expects($this->once())->method('getBody'); $this->_responseMock->expects($this->once())->method('representJson'); - $controller->execute(); + $controller->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Token/AccessTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Token/AccessTest.php index 121db1fb72357..140000c8bfc5d 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Token/AccessTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Token/AccessTest.php @@ -178,6 +178,6 @@ public function testAccessAction() $this->response->expects($this->once()) ->method('setBody'); - $this->accessAction->execute(); + $this->accessAction->executeInternal(); } } diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Token/RequestTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Token/RequestTest.php index f387829278f90..275e30191f0ef 100644 --- a/app/code/Magento/Integration/Test/Unit/Controller/Token/RequestTest.php +++ b/app/code/Magento/Integration/Test/Unit/Controller/Token/RequestTest.php @@ -142,6 +142,6 @@ public function testRequestAction() ->willReturn(['response']); $this->response->expects($this->once()) ->method('setBody'); - $this->requestAction->execute(); + $this->requestAction->executeInternal(); } } diff --git a/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php index 8ce0b1b3c10cd..f808bbbc3f875 100644 --- a/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/Marketplace/Controller/Adminhtml/Index/Index.php @@ -28,7 +28,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->getResultPageFactory()->create(); diff --git a/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php b/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php index 774f80491b17f..f1657b4c1826d 100644 --- a/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php +++ b/app/code/Magento/Marketplace/Controller/Adminhtml/Partners/Index.php @@ -33,7 +33,7 @@ public function __construct( /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { if ($this->getRequest()->isAjax()) { $output = $this->getLayoutFactory()->create() diff --git a/app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php index 4983cd76e0f44..ebb9386d3ef52 100644 --- a/app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php @@ -19,7 +19,7 @@ public function setUp() } /** - * @covers \Magento\Marketplace\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Marketplace\Controller\Adminhtml\Index\Index::executeInternal */ public function testExecute() { @@ -50,7 +50,7 @@ public function testExecute() ->method('getConfig') ->will($this->returnValue($configMock)); - $this->indexControllerMock->execute(); + $this->indexControllerMock->executeInternal(); } /** diff --git a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php b/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php index 2a9538a1bb7fe..c285f31c9958d 100644 --- a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php +++ b/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php @@ -25,7 +25,7 @@ public function setUp() } /** - * @covers \Magento\Marketplace\Controller\Adminhtml\Partners\Index::execute + * @covers \Magento\Marketplace\Controller\Adminhtml\Partners\Index::executeInternal */ public function testExecute() { @@ -65,7 +65,7 @@ public function testExecute() ->method('getResponse') ->will($this->returnValue($responseMock)); - $this->partnersControllerMock->execute(); + $this->partnersControllerMock->executeInternal(); } /** diff --git a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php index 3d2b755575ad0..469da98b91fa2 100644 --- a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php +++ b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Status.php @@ -31,7 +31,7 @@ public function __construct( * @return \Magento\Framework\Controller\Result\Json * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { $result = []; $flag = $this->_getSyncFlag(); diff --git a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php index 5078929270609..af0239448f9db 100644 --- a/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php +++ b/app/code/Magento/MediaStorage/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php @@ -13,7 +13,7 @@ class Synchronize extends \Magento\MediaStorage\Controller\Adminhtml\System\Conf * * @return void */ - public function execute() + public function executeInternal() { session_write_close(); diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php index f6b391b0d89bb..1940acf759573 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout.php +++ b/app/code/Magento/Multishipping/Controller/Checkout.php @@ -86,11 +86,11 @@ protected function _getCheckoutSession() * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $this->_request = $request; if ($this->_actionFlag->get('', 'redirectLogin')) { - return parent::dispatch($request); + return parent::execute($request); } $action = $request->getActionName(); @@ -109,7 +109,7 @@ public function dispatch(RequestInterface $request) ) { $this->_redirect('*/*/index'); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); - return parent::dispatch($request); + return parent::execute($request); } if (!in_array($action, ['login', 'register'])) { @@ -123,7 +123,7 @@ public function dispatch(RequestInterface $request) $this->messageManager->addError($error); $this->getResponse()->setRedirect($this->_getHelper()->getCartUrl()); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); - return parent::dispatch($request); + return parent::execute($request); } } @@ -142,11 +142,11 @@ public function dispatch(RequestInterface $request) ) { $this->getResponse()->setRedirect($this->_getHelper()->getCartUrl()); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); - return parent::dispatch($request); + return parent::execute($request); } if ($action == 'success' && $this->_getCheckout()->getCheckoutSession()->getDisplaySuccess(true)) { - return parent::dispatch($request); + return parent::execute($request); } $quote = $this->_getCheckout()->getQuote(); @@ -155,7 +155,7 @@ public function dispatch(RequestInterface $request) $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address.php b/app/code/Magento/Multishipping/Controller/Checkout/Address.php index 41f7377c58773..ee525003fa7c5 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address.php @@ -13,12 +13,12 @@ abstract class Address extends \Magento\Framework\App\Action\Action /** * {@inheritdoc} */ - public function dispatch(\Magento\Framework\App\RequestInterface $request) + public function execute(\Magento\Framework\App\RequestInterface $request) { if (!$this->_getCheckout()->getCustomer()->getId()) { return $this->_redirect('customer/account/login'); } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php index 724226b2e27ce..919c55c2cc8a7 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php @@ -11,7 +11,7 @@ class EditAddress extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); if ($addressForm = $this->_view->getLayout()->getBlock('customer_address_edit')) { diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php index eaa98e4e7c403..df532c5384b5a 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php @@ -11,7 +11,7 @@ class EditBilling extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep( \Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_BILLING diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php index 8409ed59f3687..3d9c8ada633cc 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php @@ -11,7 +11,7 @@ class EditShipping extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep( \Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_SHIPPING diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php index ff73e374f39db..bf62a2dbb56eb 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShippingPost.php @@ -11,7 +11,7 @@ class EditShippingPost extends \Magento\Multishipping\Controller\Checkout\Addres /** * @return void */ - public function execute() + public function executeInternal() { if ($addressId = $this->getRequest()->getParam('id')) { $this->_objectManager->create( diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php index 23b209b60b479..7f7293bdf9929 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php @@ -11,7 +11,7 @@ class NewBilling extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); if ($addressForm = $this->_view->getLayout()->getBlock('customer_address_edit')) { diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php index 1a05f9cc46cf4..a0a69c2a21648 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php @@ -13,7 +13,7 @@ class NewShipping extends \Magento\Multishipping\Controller\Checkout\Address * * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep( \Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_SELECT_ADDRESSES diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php index f19e427f14b4c..6e254071ee037 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/SaveBilling.php @@ -11,7 +11,7 @@ class SaveBilling extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { if ($addressId = $this->getRequest()->getParam('id')) { $this->_objectManager->create( diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php index a64e877d58682..cb7a1216760d1 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/SelectBilling.php @@ -11,7 +11,7 @@ class SelectBilling extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep( \Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_BILLING diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php index 4781ff1fd8d8a..60cf5d6988785 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/SetBilling.php @@ -11,7 +11,7 @@ class SetBilling extends \Magento\Multishipping\Controller\Checkout\Address /** * @return void */ - public function execute() + public function executeInternal() { if ($addressId = $this->getRequest()->getParam('id')) { $this->_objectManager->create( diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php index 01187fce18184..dc301de3eb29c 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php @@ -56,7 +56,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { $filter = $this->filterBuilder->setField('parent_id')->setValue($this->_getCheckout()->getCustomer()->getId()) ->setConditionType('eq')->create(); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php index 38ae81fadc81d..477ca6dbf2a0d 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Addresses.php @@ -15,7 +15,7 @@ class Addresses extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { // If customer do not have addresses if (!$this->_getCheckout()->getCustomerDefaultShippingAddress()) { diff --git a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php index e78d126f41390..f6c74959e4108 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php @@ -15,7 +15,7 @@ class AddressesPost extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { if (!$this->_getCheckout()->getCustomerDefaultShippingAddress()) { $this->_redirect('*/checkout_address/newShipping'); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php b/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php index 9f9e2352e3a32..82a1ecce2b0c4 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/BackToAddresses.php @@ -13,7 +13,7 @@ class BackToAddresses extends \Magento\Multishipping\Controller\Checkout /** * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep(State::STEP_SELECT_ADDRESSES); $this->_getState()->unsCompleteStep(State::STEP_SHIPPING); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php index 49c98834c6795..d2db0277429d7 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/BackToBilling.php @@ -15,7 +15,7 @@ class BackToBilling extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep(State::STEP_BILLING); $this->_getState()->unsCompleteStep(State::STEP_OVERVIEW); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php index dddf2dab0b870..2bc68f69ee237 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/BackToShipping.php @@ -13,7 +13,7 @@ class BackToShipping extends \Magento\Multishipping\Controller\Checkout /** * @return void */ - public function execute() + public function executeInternal() { $this->_getState()->setActiveStep(State::STEP_SHIPPING); $this->_getState()->unsCompleteStep(State::STEP_BILLING); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Billing.php b/app/code/Magento/Multishipping/Controller/Checkout/Billing.php index 0f3d9a0103c85..7ca829db580ab 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Billing.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Billing.php @@ -30,7 +30,7 @@ protected function _validateBilling() * * @return void|ResponseInterface */ - public function execute() + public function executeInternal() { if (!$this->_validateBilling()) { return; diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Index.php b/app/code/Magento/Multishipping/Controller/Checkout/Index.php index c71c54ca8e241..03607155b8769 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Index.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { $this->_getCheckoutSession()->setCartWasUpdated(false); $this->_redirect('*/*/addresses'); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Login.php b/app/code/Magento/Multishipping/Controller/Checkout/Login.php index 8b68c678010de..4c68fd50819c5 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Login.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Login.php @@ -13,7 +13,7 @@ class Login extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { if ($this->_objectManager->get('Magento\Customer\Model\Session')->isLoggedIn()) { $this->_redirect('*/*/'); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php index 9ab19c70889d2..cb693c019ffff 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php @@ -15,7 +15,7 @@ class Overview extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { if (!$this->_validateMinimumAmount()) { return; diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php index fe288a54f74b9..7e80e00754b01 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php @@ -65,7 +65,7 @@ public function __construct( * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { if (!$this->formKeyValidator->validate($this->getRequest())) { $this->_forward('backToAddresses'); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php b/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php index 3467cc8b9a85a..4fbd38f11781c 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php @@ -28,7 +28,7 @@ public function __construct(\Magento\Checkout\Model\Cart $cart) * @return void * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function beforeExecute(\Magento\Framework\App\Action\Action $subject) + public function beforeExecuteInternal(\Magento\Framework\App\Action\Action $subject) { $this->cart->getQuote()->setIsMultiShipping(0); } diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Register.php b/app/code/Magento/Multishipping/Controller/Checkout/Register.php index 34aba23698077..4033d98580171 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Register.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Register.php @@ -13,7 +13,7 @@ class Register extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { if ($this->_objectManager->get('Magento\Customer\Model\Session')->isLoggedIn()) { $this->getResponse()->setRedirect($this->_getHelper()->getMSCheckoutUrl()); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php b/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php index 4bba45d304701..1dced5c2360b9 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php @@ -13,7 +13,7 @@ class RemoveItem extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { $itemId = $this->getRequest()->getParam('id'); $addressId = $this->getRequest()->getParam('address'); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php index d8ffd0d2b6af0..8d8e9c4643e01 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php @@ -16,7 +16,7 @@ class Shipping extends \Magento\Multishipping\Controller\Checkout * * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { if (!$this->_validateMinimumAmount()) { return; diff --git a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php index e5c1a001b9eac..d3693051344de 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php @@ -13,7 +13,7 @@ class ShippingPost extends \Magento\Multishipping\Controller\Checkout /** * @return void */ - public function execute() + public function executeInternal() { $shippingMethods = $this->getRequest()->getPost('shipping_method'); try { diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Success.php b/app/code/Magento/Multishipping/Controller/Checkout/Success.php index 52a7de51c1839..ea4838ee85f51 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Success.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Success.php @@ -15,7 +15,7 @@ class Success extends \Magento\Multishipping\Controller\Checkout * * @return void */ - public function execute() + public function executeInternal() { if (!$this->_getState()->getCompleteStep(State::STEP_OVERVIEW)) { $this->_redirect('*/*/addresses'); diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php index 54c431ecd3fb8..4f15a7d7055c4 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php @@ -126,7 +126,7 @@ public function testExecute() $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title'); $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('success/url'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } @@ -140,6 +140,6 @@ public function testExecuteWhenCustomerAddressBlockNotExist() ->with('customer_address_edit'); $this->urlMock->expects($this->never())->method('getUrl'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php index e0b516a09e74a..232add6bf1e41 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php @@ -153,7 +153,7 @@ public function testExecute() $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title'); $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('back/address'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWhenCustomerAddressBlockNotExist() @@ -170,7 +170,7 @@ public function testExecuteWhenCustomerAddressBlockNotExist() ->with('customer_address_edit'); $this->urlMock->expects($this->never())->method('getUrl'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditShippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditShippingTest.php index dbe004b62d005..0b9a5fb2f80e1 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditShippingTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditShippingTest.php @@ -157,7 +157,7 @@ public function testExecute() ->willReturn('shipping_addres'); $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('back/address'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWhenCustomerAddressBlockNotExist() @@ -174,6 +174,6 @@ public function testExecuteWhenCustomerAddressBlockNotExist() ->with('customer_address_edit'); $this->urlMock->expects($this->never())->method('getUrl'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php index 7afb5d6ee2fa0..e5c701b3c2161 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php @@ -118,7 +118,7 @@ public function testExecute() $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title'); $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('success/url'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } @@ -132,6 +132,6 @@ public function testExecuteWhenCustomerAddressBlockNotExist() ->with('customer_address_edit'); $this->urlMock->expects($this->never())->method('getUrl'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php index 1f98daffc1d8d..3b1b76d9c7ca0 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php @@ -157,7 +157,7 @@ public function testExecute($backUrl, $shippingAddress, $url) ->willReturn($shippingAddress); $this->addressFormMock->expects($this->once())->method('setBackUrl')->with($url); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } public function executeDataProvider() @@ -183,6 +183,6 @@ public function testExecuteWhenCustomerAddressBlockNotExist() ->with('customer_address_edit'); $this->urlMock->expects($this->never())->method('getUrl'); $this->viewMock->expects($this->once())->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/ShippingSavedTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/ShippingSavedTest.php index ffb91ebb4e132..23ff549744ccc 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/ShippingSavedTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/ShippingSavedTest.php @@ -100,7 +100,7 @@ public function testExecuteResetsCheckoutIfCustomerHasAddedNewShippingAddressAnd // check that checkout is reset $this->checkoutMock->expects($this->once())->method('reset'); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteDoesNotResetCheckoutIfCustomerHasMoreThanOneAddress() @@ -120,7 +120,7 @@ public function testExecuteDoesNotResetCheckoutIfCustomerHasMoreThanOneAddress() // check that checkout is not reset $this->checkoutMock->expects($this->never())->method('reset'); - $this->controller->execute(); + $this->controller->executeInternal(); } /** diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php index 9cfb6a0c75f55..dc9a3056acdc9 100644 --- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php +++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php @@ -39,10 +39,10 @@ protected function setUp() $this->object = new \Magento\Multishipping\Controller\Checkout\Plugin($this->cartMock); } - public function testExecuteTurnsOffMultishippingModeOnQuote() + public function testExecuteInternalTurnsOffMultishippingModeOnQuote() { $subject = $this->getMock('Magento\Checkout\Controller\Index\Index', [], [], '', false); $this->quoteMock->expects($this->once())->method('setIsMultiShipping')->with(0); - $this->object->beforeExecute($subject); + $this->object->beforeExecuteInternal($subject); } } diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php index cf2ae4964f767..e3904f2efadcd 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Problem * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('_unsubscribe')) { $problems = (array)$this->getRequest()->getParam('problem', []); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php index 2b377e93c2867..89045ddfa6ab9 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Problem * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getQuery('ajax')) { $this->_forward('grid'); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php index eda2ee69860a8..a04519e190e6e 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Cancel.php @@ -13,7 +13,7 @@ class Cancel extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $queue = $this->_objectManager->get( 'Magento\Newsletter\Model\Queue' diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php index ff410c926fcb6..af2cc33cca501 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Drop.php @@ -13,7 +13,7 @@ class Drop extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout('newsletter_queue_preview_popup'); $this->_view->renderLayout(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php index ea3cfed3771ec..d8881fa43aca6 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Edit.php @@ -30,7 +30,7 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen * * @return void */ - public function execute() + public function executeInternal() { $this->_coreRegistry->register('current_queue', $this->_objectManager->get('Magento\Newsletter\Model\Queue')); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php index 509b868d29eea..33df60e59212a 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php index 412d531b7d402..cd9b39395f7a3 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getQuery('ajax')) { $this->_forward('grid'); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php index 1e890edcb36dc..2e2cad6b58808 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Pause.php @@ -13,7 +13,7 @@ class Pause extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $queue = $this->_objectManager->get( 'Magento\Newsletter\Model\Queue' diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php index 3a6f564f90d14..488dc897f8f98 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php @@ -13,7 +13,7 @@ class Preview extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $data = $this->getRequest()->getParams(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php index f92ab4bf691db..da87317dda95e 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Resume.php @@ -13,7 +13,7 @@ class Resume extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $queue = $this->_objectManager->get( 'Magento\Newsletter\Model\Queue' diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php index 33fd2052a4205..28990582b6676 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php @@ -18,7 +18,7 @@ class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { try { /* @var $queue \Magento\Newsletter\Model\Queue */ diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php index bc6053c67aa8f..6e5000bbb27f1 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Sending.php @@ -13,7 +13,7 @@ class Sending extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { // Todo: put it somewhere in config! $countOfQueue = 3; diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php index 1917681ca21ea..bda80ec99015c 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Start.php @@ -13,7 +13,7 @@ class Start extends \Magento\Newsletter\Controller\Adminhtml\Queue * * @return void */ - public function execute() + public function executeInternal() { $queue = $this->_objectManager->create( 'Magento\Newsletter\Model\Queue' diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php index 8a795384b148b..398a7ef8221a2 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php @@ -16,7 +16,7 @@ class ExportCsv extends \Magento\Newsletter\Controller\Adminhtml\Subscriber * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'subscribers.csv'; diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php index 44b68aa1afe6c..ac16f90c852dd 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php @@ -16,7 +16,7 @@ class ExportXml extends \Magento\Newsletter\Controller\Adminhtml\Subscriber * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'subscribers.xml'; diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php index 89aa1b4652096..5a06ac05d3c1d 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Subscriber * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php index 9aed2baed18b7..a8d7f096b6476 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Subscriber * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('ajax')) { $this->_forward('grid'); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php index 4ea5f85728efd..ebc712cefb777 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php @@ -13,7 +13,7 @@ class MassDelete extends \Magento\Newsletter\Controller\Adminhtml\Subscriber * * @return void */ - public function execute() + public function executeInternal() { $subscribersIds = $this->getRequest()->getParam('subscriber'); if (!is_array($subscribersIds)) { diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php index d6b6df7c19a69..8a6feb8b349ae 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php @@ -13,7 +13,7 @@ class MassUnsubscribe extends \Magento\Newsletter\Controller\Adminhtml\Subscribe * * @return void */ - public function execute() + public function executeInternal() { $subscribersIds = $this->getRequest()->getParam('subscriber'); if (!is_array($subscribersIds)) { diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php index 188e800f3bfae..9b1ebaa45ffab 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void */ - public function execute() + public function executeInternal() { $template = $this->_objectManager->create( 'Magento\Newsletter\Model\Template' diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php index f96ac80e7f07a..bf4ac7d5ff74c 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php @@ -13,7 +13,7 @@ class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout('newsletter_template_preview_popup'); $this->_view->renderLayout(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php index b1030723790e2..fb52832aca992 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Edit.php @@ -30,7 +30,7 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen * * @return void */ - public function execute() + public function executeInternal() { $model = $this->_objectManager->create('Magento\Newsletter\Model\Template'); $id = $this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php index dbd0e7195a56a..d3c850e81b487 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $grid = $this->_view->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Grid')->toHtml(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php index f4c51a0f590a5..4647c06de1f8c 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getQuery('ajax')) { $this->_forward('grid'); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php index 9409faf0f6abf..a03fd5c6f3789 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php index 5594435c98d38..fc04569de3173 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php @@ -13,7 +13,7 @@ class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void|$this */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php index 4378ac6ba704c..7f9c4bdb76ea0 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php @@ -16,7 +16,7 @@ class Save extends \Magento\Newsletter\Controller\Adminhtml\Template * * @return void */ - public function execute() + public function executeInternal() { $request = $this->getRequest(); if (!$request->isPost()) { diff --git a/app/code/Magento/Newsletter/Controller/Manage.php b/app/code/Magento/Newsletter/Controller/Manage.php index 6bc940662cebe..16ba747c011e8 100644 --- a/app/code/Magento/Newsletter/Controller/Manage.php +++ b/app/code/Magento/Newsletter/Controller/Manage.php @@ -37,11 +37,11 @@ public function __construct( * @param RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$this->_customerSession->authenticate()) { $this->_actionFlag->set('', 'no-dispatch', true); } - return parent::dispatch($request); + return parent::execute($request); } } diff --git a/app/code/Magento/Newsletter/Controller/Manage/Index.php b/app/code/Magento/Newsletter/Controller/Manage/Index.php index de782a3d3bc09..0ef350892c3fb 100644 --- a/app/code/Magento/Newsletter/Controller/Manage/Index.php +++ b/app/code/Magento/Newsletter/Controller/Manage/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Newsletter\Controller\Manage * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php index 92ba7f93628b3..67fe6e4dd2c76 100644 --- a/app/code/Magento/Newsletter/Controller/Manage/Save.php +++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php @@ -60,7 +60,7 @@ public function __construct( * * @return void|null */ - public function execute() + public function executeInternal() { if (!$this->formKeyValidator->validate($this->getRequest())) { return $this->_redirect('customer/account/'); diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php index 91d4f0d288055..785f3ab018538 100644 --- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php +++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php @@ -12,7 +12,7 @@ class Confirm extends \Magento\Newsletter\Controller\Subscriber * Subscription confirm action * @return void */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('id'); $code = (string)$this->getRequest()->getParam('code'); diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php index 5e8850de308da..11dcfacb44fb5 100644 --- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php +++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php @@ -111,7 +111,7 @@ protected function validateEmailFormat($email) * @throws \Magento\Framework\Exception\LocalizedException * @return void */ - public function execute() + public function executeInternal() { if ($this->getRequest()->isPost() && $this->getRequest()->getPost('email')) { $email = (string)$this->getRequest()->getPost('email'); diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php index 9fb7575699a49..9449f3336f9f6 100644 --- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php +++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php @@ -12,7 +12,7 @@ class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber * Unsubscribe newsletter * @return void */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('id'); $code = (string)$this->getRequest()->getParam('code'); diff --git a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php index f592aafcbc9c2..99bb1abdfc13c 100644 --- a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php +++ b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php @@ -107,7 +107,7 @@ public function testSaveActionInvalidFormKey() ->method('addSuccess'); $this->messageManagerMock->expects($this->never()) ->method('addError'); - $this->action->execute(); + $this->action->executeInternal(); } public function testSaveActionNoCustomerInSession() @@ -126,7 +126,7 @@ public function testSaveActionNoCustomerInSession() $this->messageManagerMock->expects($this->once()) ->method('addError') ->with('Something went wrong while saving your subscription.'); - $this->action->execute(); + $this->action->executeInternal(); } public function testSaveActionWithException() @@ -156,6 +156,6 @@ public function testSaveActionWithException() $this->messageManagerMock->expects($this->once()) ->method('addError') ->with('Something went wrong while saving your subscription.'); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php index 8f273e49c6191..af20ac56ba4e0 100644 --- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php +++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php @@ -46,7 +46,7 @@ public function __construct( * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'tablerates.csv'; /** @var $gridBlock \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid */ diff --git a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php index 6ff33668ae9c6..36925596918c1 100644 --- a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php +++ b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'varnish.vcl'; $varnishVersion = $this->getRequest()->getParam('varnish'); diff --git a/app/code/Magento/PageCache/Controller/Block/Esi.php b/app/code/Magento/PageCache/Controller/Block/Esi.php index e21aabd7cfde4..026c0ec4c150b 100644 --- a/app/code/Magento/PageCache/Controller/Block/Esi.php +++ b/app/code/Magento/PageCache/Controller/Block/Esi.php @@ -13,7 +13,7 @@ class Esi extends \Magento\PageCache\Controller\Block * * @return void */ - public function execute() + public function executeInternal() { $response = $this->getResponse(); $blocks = $this->_getBlocks(); diff --git a/app/code/Magento/PageCache/Controller/Block/Render.php b/app/code/Magento/PageCache/Controller/Block/Render.php index 499973ae1e1bd..b6a9591977526 100644 --- a/app/code/Magento/PageCache/Controller/Block/Render.php +++ b/app/code/Magento/PageCache/Controller/Block/Render.php @@ -13,7 +13,7 @@ class Render extends \Magento\PageCache\Controller\Block * * @return void */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->isAjax()) { $this->_forward('noroute'); diff --git a/app/code/Magento/PageCache/Test/Unit/Controller/Adminhtml/PageCache/ExportVarnishConfigTest.php b/app/code/Magento/PageCache/Test/Unit/Controller/Adminhtml/PageCache/ExportVarnishConfigTest.php index d99f597c3e7cb..4bee20c5f4ce5 100644 --- a/app/code/Magento/PageCache/Test/Unit/Controller/Adminhtml/PageCache/ExportVarnishConfigTest.php +++ b/app/code/Magento/PageCache/Test/Unit/Controller/Adminhtml/PageCache/ExportVarnishConfigTest.php @@ -102,7 +102,7 @@ public function testExportVarnishConfigAction() $this->returnValue($responseMock) ); - $result = $this->action->execute(); + $result = $this->action->executeInternal(); $this->assertInstanceOf('Magento\Framework\App\ResponseInterface', $result); } } diff --git a/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php b/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php index bc23f569d17f6..9bddcbeb778d3 100644 --- a/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php +++ b/app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php @@ -123,7 +123,7 @@ public function testExecute($blockClass, $shouldSetHeaders) ->method('appendBody') ->with($this->equalTo($html)); - $this->action->execute(); + $this->action->executeInternal(); } public function executeDataProvider() @@ -145,6 +145,6 @@ public function testExecuteBlockNotExists() $this->requestMock->expects($this->any())->method('getParam')->will($this->returnValueMap($mapData)); $this->viewMock->expects($this->never())->method('getLayout')->will($this->returnValue($this->layoutMock)); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php b/app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php index a9493a7a4c3ab..c419a150fc640 100644 --- a/app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php +++ b/app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php @@ -79,7 +79,7 @@ public function testExecuteNotAjax() $this->requestMock->expects($this->once())->method('isAjax')->will($this->returnValue(false)); $this->requestMock->expects($this->once())->method('setActionName')->will($this->returnValue('noroute')); $this->requestMock->expects($this->once())->method('setDispatched')->will($this->returnValue(false)); - $this->action->execute(); + $this->action->executeInternal(); } /** @@ -96,7 +96,7 @@ public function testExecuteNoParams() ->method('getParam') ->with($this->equalTo('handles'), $this->equalTo('')) ->will($this->returnValue('')); - $this->action->execute(); + $this->action->executeInternal(); } public function testExecute() @@ -171,6 +171,6 @@ public function testExecute() ->method('appendBody') ->with($this->equalTo(json_encode($expectedData))); - $this->action->execute(); + $this->action->executeInternal(); } } diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php index 70134fdf2826f..f26e1c043919e 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Cancel.php @@ -13,7 +13,7 @@ class Cancel extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $agreementModel = $this->_initBillingAgreement(); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php index 0c157101b7065..8fe43e3611b7d 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/CustomerGrid.php @@ -29,7 +29,7 @@ protected function initCurrentCustomer() * * @return void */ - public function execute() + public function executeInternal() { $this->initCurrentCustomer(); $this->_view->loadLayout(false); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php index 3bc7143a4a1d0..3351f7dcf7e2e 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $agreementModel = $this->_initBillingAgreement(); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php index 2753574d2b4f9..a84f114d41e2e 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php index f20444f9214c2..51edf6b55bfe8 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_Paypal::paypal_billing_agreement'); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php index 62208a96b7103..10b9b003c8454 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/OrdersGrid.php @@ -13,7 +13,7 @@ class OrdersGrid extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $this->_initBillingAgreement(); $this->_view->loadLayout(false); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php index 3755d973cac11..85c81a7778819 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/View.php @@ -13,7 +13,7 @@ class View extends \Magento\Paypal\Controller\Adminhtml\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $agreementModel = $this->_initBillingAgreement(); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php index 20633c5c585e4..f48168d33d397 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Details.php @@ -13,7 +13,7 @@ class Details extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports * * @return void */ - public function execute() + public function executeInternal() { $rowId = $this->getRequest()->getParam('id'); $row = $this->_rowFactory->create()->load($rowId); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php index 89ccd4a5f9d6d..67c4824259e24 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Fetch.php @@ -18,7 +18,7 @@ class Fetch extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $reports = $this->_settlementFactory->create(); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php index 33551753da591..0d3342c266955 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php index 2f2ad28ce1958..4bd6de4cdfb9b 100644 --- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php +++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Paypal\Controller\Adminhtml\Paypal\Reports * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction(); $this->_view->renderLayout(); diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement.php b/app/code/Magento/Paypal/Controller/Billing/Agreement.php index 8d6f0f0b1e63b..01f632dba7fc0 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement.php @@ -37,15 +37,15 @@ public function __construct( * @param RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$request->isDispatched()) { - return parent::dispatch($request); + return parent::execute($request); } if (!$this->_getSession()->authenticate()) { $this->_actionFlag->set('', 'no-dispatch', true); } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php index ee0daf917271d..5b8e8f30b753b 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/Cancel.php @@ -14,7 +14,7 @@ class Cancel extends \Magento\Paypal\Controller\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $agreement = $this->_initAgreement(); if (!$agreement) { diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php index f95b687f57631..22394e572ada4 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/CancelWizard.php @@ -13,7 +13,7 @@ class CancelWizard extends \Magento\Paypal\Controller\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $this->_redirect('*/*/index'); } diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php index 85c210699962a..c5ccc5c8afbff 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Paypal\Controller\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Billing Agreements')); diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php index 59040954d0cee..f7bd4d4b3a311 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/ReturnWizard.php @@ -15,7 +15,7 @@ class ReturnWizard extends \Magento\Paypal\Controller\Billing\Agreement * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Paypal\Model\Billing\Agreement $agreement */ $agreement = $this->_objectManager->create('Magento\Paypal\Model\Billing\Agreement'); diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php index 407240c756b59..24364b02e0d14 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/StartWizard.php @@ -13,7 +13,7 @@ class StartWizard extends \Magento\Paypal\Controller\Billing\Agreement * * @return \Magento\Framework\App\Response\Http */ - public function execute() + public function executeInternal() { $agreement = $this->_objectManager->create('Magento\Paypal\Model\Billing\Agreement'); $paymentCode = $this->getRequest()->getParam('payment_method'); diff --git a/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php b/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php index 31b2dfd759c15..2cbe118f4db85 100644 --- a/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php +++ b/app/code/Magento/Paypal/Controller/Billing/Agreement/View.php @@ -13,7 +13,7 @@ class View extends \Magento\Paypal\Controller\Billing\Agreement * * @return void */ - public function execute() + public function executeInternal() { if (!($agreement = $this->_initAgreement())) { return; diff --git a/app/code/Magento/Paypal/Controller/Bml/Start.php b/app/code/Magento/Paypal/Controller/Bml/Start.php index d189c91965e7b..1fe8cc717009b 100644 --- a/app/code/Magento/Paypal/Controller/Bml/Start.php +++ b/app/code/Magento/Paypal/Controller/Bml/Start.php @@ -13,7 +13,7 @@ class Start extends \Magento\Framework\App\Action\Action * * @return void */ - public function execute() + public function executeInternal() { $this->_forward( 'start', diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php index 05c5dd2b5d171..a6b9079f91302 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php @@ -15,7 +15,7 @@ class Cancel extends \Magento\Paypal\Controller\Express\AbstractExpress * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->_initToken(false); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php index a9e879b51472e..c7bca30884601 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Paypal\Controller\Express\AbstractExpress * * @return void */ - public function execute() + public function executeInternal() { try { $this->getResponse()->setRedirect($this->_config->getExpressCheckoutEditUrl($this->_initToken())); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php index 3a72369228772..456eb87f65e8d 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php @@ -60,7 +60,7 @@ public function __construct( * @return void * @throws \Magento\Framework\Exception\LocalizedException */ - public function execute() + public function executeInternal() { try { if ($this->isValidationRequired() && diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php index 20604c61a1dfa..a1df008106672 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ReturnAction.php @@ -15,7 +15,7 @@ class ReturnAction extends \Magento\Paypal\Controller\Express\AbstractExpress * * @return void|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php index ec848148b647f..f60c2fd7847e4 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Review.php @@ -15,7 +15,7 @@ class Review extends \Magento\Paypal\Controller\Express\AbstractExpress * * @return void|\Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->_initCheckout(); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php index 311900157b192..befc1615314c9 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/SaveShippingMethod.php @@ -13,7 +13,7 @@ class SaveShippingMethod extends \Magento\Paypal\Controller\Express\AbstractExpr * * @return void */ - public function execute() + public function executeInternal() { try { $isAjax = $this->getRequest()->getParam('isAjax'); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php index a66433f346aa8..ca53012f5346d 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php @@ -53,7 +53,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { try { $quoteId = $this->getRequest()->getParam('quote_id'); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php index 1ec1c2d96c868..dae43744757fb 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php @@ -16,7 +16,7 @@ class Start extends \Magento\Paypal\Controller\Express\AbstractExpress * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { try { $this->_initCheckout(); diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php index 1d0cbdf548137..dc4f01b3f3cd7 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/UpdateShippingMethods.php @@ -13,7 +13,7 @@ class UpdateShippingMethods extends \Magento\Paypal\Controller\Express\AbstractE * * @return void */ - public function execute() + public function executeInternal() { try { $this->_initCheckout(); diff --git a/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php b/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php index fab449dc19823..0889ae11aa1e8 100644 --- a/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php +++ b/app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php @@ -48,7 +48,7 @@ protected function _cancelPayment($errorMsg = '') * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $gotoSection = $this->_cancelPayment(); diff --git a/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php b/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php index aa3a234d2d2a6..37c874e14fa6a 100644 --- a/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php +++ b/app/code/Magento/Paypal/Controller/Hostedpro/Redirect.php @@ -13,7 +13,7 @@ class Redirect extends \Magento\Paypal\Controller\Payflow * * @return void */ - public function execute() + public function executeInternal() { $this->getResponse()->setRedirect( $this->getOrder()->getPayment()->getAdditionalInformation('secure_form_url') diff --git a/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php b/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php index 9f0651b3a1457..b3f791e578214 100644 --- a/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php +++ b/app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php @@ -13,7 +13,7 @@ class ReturnAction extends \Magento\Framework\App\Action\Action * * @return void */ - public function execute() + public function executeInternal() { $session = $this->_objectManager->get('Magento\Checkout\Model\Session'); //TODO: some actions with order diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php index b8078937d320c..b3384cba4dee9 100644 --- a/app/code/Magento/Paypal/Controller/Ipn/Index.php +++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php @@ -45,7 +45,7 @@ public function __construct( * @return void * @SuppressWarnings(PHPMD.ExitExpression) */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->isPost()) { return; diff --git a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php index fa59c545b86b7..7bd94850d9d4c 100644 --- a/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php +++ b/app/code/Magento/Paypal/Controller/Payflow/CancelPayment.php @@ -13,7 +13,7 @@ class CancelPayment extends \Magento\Paypal\Controller\Payflow * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $gotoSection = $this->_cancelPayment(); diff --git a/app/code/Magento/Paypal/Controller/Payflow/Form.php b/app/code/Magento/Paypal/Controller/Payflow/Form.php index 47834722d2b21..32ca420965954 100644 --- a/app/code/Magento/Paypal/Controller/Payflow/Form.php +++ b/app/code/Magento/Paypal/Controller/Payflow/Form.php @@ -17,7 +17,7 @@ class Form extends Payflow * * @return void */ - public function execute() + public function executeInternal() { $this->getResponse()->setHeader('P3P', 'CP="CAO PSA OUR"'); $this->_view->loadLayout(false)->renderLayout(); diff --git a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php index 1907a07045f39..1c095d439eee5 100644 --- a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php +++ b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php @@ -24,7 +24,7 @@ class ReturnUrl extends Payflow * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); /** @var \Magento\Checkout\Block\Onepage\Success $redirectBlock */ diff --git a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php index 8b737177ada22..9f1aae5624f69 100644 --- a/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php +++ b/app/code/Magento/Paypal/Controller/Payflow/SilentPost.php @@ -13,7 +13,7 @@ class SilentPost extends \Magento\Paypal\Controller\Payflow * * @return void */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); if (isset($data['INVNUM'])) { diff --git a/app/code/Magento/Paypal/Controller/Payflowbml/Start.php b/app/code/Magento/Paypal/Controller/Payflowbml/Start.php index 4cd82e1146492..8da3b6f2715fb 100644 --- a/app/code/Magento/Paypal/Controller/Payflowbml/Start.php +++ b/app/code/Magento/Paypal/Controller/Payflowbml/Start.php @@ -13,7 +13,7 @@ class Start extends \Magento\Framework\App\Action\Action * * @return void */ - public function execute() + public function executeInternal() { $this->_forward( 'start', diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php index 2fba2402a5f6b..923988d12a1d8 100644 --- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php +++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php @@ -77,7 +77,7 @@ public function __construct( * * @return ResultInterface */ - public function execute() + public function executeInternal() { /** @var Quote $quote */ $quote = $this->sessionManager->getQuote(); diff --git a/app/code/Magento/Paypal/Controller/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Transparent/Response.php index c6c8105cba90e..30792f3857825 100644 --- a/app/code/Magento/Paypal/Controller/Transparent/Response.php +++ b/app/code/Magento/Paypal/Controller/Transparent/Response.php @@ -62,7 +62,7 @@ public function __construct( /** * @return ResultInterface */ - public function execute() + public function executeInternal() { $parameters = []; try { diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Billing/Agreement/CancelTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Billing/Agreement/CancelTest.php index 8d4e0ef4ccfc2..3a7ae2302c313 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Billing/Agreement/CancelTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Billing/Agreement/CancelTest.php @@ -122,7 +122,7 @@ public function testExecuteActionSuccess() $this->identicalTo($this->_agreement) ); - $this->_controller->execute(); + $this->_controller->executeInternal(); } public function testExecuteAgreementDoesNotBelongToCustomer() @@ -136,7 +136,7 @@ public function testExecuteAgreementDoesNotBelongToCustomer() $this->_registry->expects($this->never())->method('register'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } public function testExecuteAgreementStatusDoesNotAllowToCancel() @@ -157,6 +157,6 @@ public function testExecuteAgreementStatusDoesNotAllowToCancel() $this->identicalTo($this->_agreement) ); - $this->_controller->execute(); + $this->_controller->executeInternal(); } } diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php index e3c5c9445e4dd..e34159f711ae8 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Ipn/IndexTest.php @@ -8,7 +8,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase { - /** @var Index */ + /** @var \Magento\Paypal\Controller\Ipn\Index */ protected $model; /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */ @@ -44,6 +44,6 @@ public function testIndexActionException() $this->request->expects($this->once())->method('getPostValue')->will($this->throwException($exception)); $this->logger->expects($this->once())->method('critical')->with($this->identicalTo($exception)); $this->response->expects($this->once())->method('setHttpResponseCode')->with(500); - $this->model->execute(); + $this->model->executeInternal(); } } diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php index 96a45ab4cfb23..b4ae7940e76a6 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php @@ -202,7 +202,7 @@ public function testExecuteAllowedOrderState($state) ->with('goto_success_page', true) ->will($this->returnSelf()); - $this->returnUrl->execute(); + $this->returnUrl->executeInternal(); } /** @@ -272,6 +272,6 @@ public function testExecuteNotAllowedOrderState($state, $restoreQuote, $expected ->with('error_msg', __('Your payment has been declined. Please try again.')) ->will($this->returnSelf()); - $this->returnUrl->execute(); + $this->returnUrl->executeInternal(); } } diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php index 7285064bcb799..4429f6a9e5df4 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php @@ -153,7 +153,7 @@ public function testExecuteSuccess() ->with($resultExpectation) ->willReturnSelf(); - $this->assertEquals($jsonMock, $this->controller->execute()); + $this->assertEquals($jsonMock, $this->controller->executeInternal()); } public function testExecuteTokenRequestException() @@ -193,7 +193,7 @@ public function testExecuteTokenRequestException() ->with($resultExpectation) ->willReturnSelf(); - $this->assertEquals($jsonMock, $this->controller->execute()); + $this->assertEquals($jsonMock, $this->controller->executeInternal()); } public function testExecuteEmptyQuoteError() @@ -220,6 +220,6 @@ public function testExecuteEmptyQuoteError() ->with($resultExpectation) ->willReturnSelf(); - $this->assertEquals($jsonMock, $this->controller->execute()); + $this->assertEquals($jsonMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php index 7cddae94159b4..b772f2d79bfa9 100644 --- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php +++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php @@ -119,7 +119,7 @@ public function testExecute() ->method('getLayout') ->willReturn($this->getLayoutMock()); - $this->assertInstanceOf('\Magento\Framework\Controller\ResultInterface', $this->object->execute()); + $this->assertInstanceOf('\Magento\Framework\Controller\ResultInterface', $this->object->executeInternal()); } public function testExecuteWithException() @@ -144,7 +144,7 @@ public function testExecuteWithException() ->method('getLayout') ->willReturn($this->getLayoutMock()); - $this->assertInstanceOf('\Magento\Framework\Controller\ResultInterface', $this->object->execute()); + $this->assertInstanceOf('\Magento\Framework\Controller\ResultInterface', $this->object->executeInternal()); } /** diff --git a/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php b/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php index fbe7be4e45268..2defce5a7187b 100644 --- a/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php +++ b/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php @@ -18,7 +18,7 @@ class ExpressCheckout extends Index * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $this->messageManager->addNotice(__('Your shopping cart has been updated with new prices.')); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Persistent/Controller/Index/SaveMethod.php b/app/code/Magento/Persistent/Controller/Index/SaveMethod.php index 64e32cb947246..e83d6085b0706 100644 --- a/app/code/Magento/Persistent/Controller/Index/SaveMethod.php +++ b/app/code/Magento/Persistent/Controller/Index/SaveMethod.php @@ -15,7 +15,7 @@ class SaveMethod extends Index * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->sessionHelper->isPersistent()) { $this->sessionHelper->getSession()->removePersistentCookie(); diff --git a/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php b/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php index 369c63f7de880..eb45cfbb1761f 100644 --- a/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php +++ b/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php @@ -15,7 +15,7 @@ class UnsetCookie extends Index * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->sessionHelper->isPersistent()) { $this->cleanup(); diff --git a/app/code/Magento/ProductAlert/Controller/Add.php b/app/code/Magento/ProductAlert/Controller/Add.php index 78ceff1e6299d..299dedbdbf644 100644 --- a/app/code/Magento/ProductAlert/Controller/Add.php +++ b/app/code/Magento/ProductAlert/Controller/Add.php @@ -35,7 +35,7 @@ public function __construct( * @param \Magento\Framework\App\RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$this->customerSession->authenticate()) { $this->_actionFlag->set('', 'no-dispatch', true); @@ -43,6 +43,6 @@ public function dispatch(RequestInterface $request) $this->customerSession->setBeforeUrl($this->_redirect->getRefererUrl()); } } - return parent::dispatch($request); + return parent::execute($request); } } diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php index 7ee60ebf79966..b6a79a78f46e8 100644 --- a/app/code/Magento/ProductAlert/Controller/Add/Price.php +++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php @@ -63,7 +63,7 @@ protected function isInternal($url) /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $backUrl = $this->getRequest()->getParam(Action::PARAM_NAME_URL_ENCODED); $productId = (int)$this->getRequest()->getParam('product_id'); diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php index ea0cb55cc1584..0756c5168bd84 100644 --- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php +++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php @@ -37,7 +37,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $backUrl = $this->getRequest()->getParam(Action::PARAM_NAME_URL_ENCODED); $productId = (int)$this->getRequest()->getParam('product_id'); diff --git a/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php b/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php index 96a357be0e8ab..87a3ba10cf989 100644 --- a/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php +++ b/app/code/Magento/ProductAlert/Controller/Add/TestObserver.php @@ -13,7 +13,7 @@ class TestObserver extends AddController /** * @return void */ - public function execute() + public function executeInternal() { $object = new DataObject(); /** @var \Magento\ProductAlert\Model\Observer $observer */ diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php index 46ba80f4b3a55..c0050834b692f 100644 --- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php +++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php @@ -36,7 +36,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $productId = (int)$this->getRequest()->getParam('product'); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php index 1dafba13dd766..0055633db681a 100644 --- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php +++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php @@ -13,7 +13,7 @@ class PriceAll extends UnsubscribeController /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->_objectManager->create('Magento\ProductAlert\Model\Price') diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php index 3052fcfe0abef..50284d3b04d8a 100644 --- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php +++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php @@ -36,7 +36,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $productId = (int)$this->getRequest()->getParam('product'); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php index 63872d2cdd937..7b4eddfc7c0d7 100644 --- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php +++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php @@ -13,7 +13,7 @@ class StockAll extends UnsubscribeController /** * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->_objectManager->create('Magento\ProductAlert\Model\Stock') diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php index 6d969e88642eb..cf5f42da71cf4 100644 --- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php +++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php @@ -73,7 +73,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $baseTmpMediaPath = $this->mediaConfig->getBaseTmpMediaPath(); try { diff --git a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php index bd11bb20d4e36..70af0519f536a 100644 --- a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php +++ b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php @@ -128,6 +128,6 @@ public function testExecute() $readInterface->expects($this->any())->method('getAbsolutePath')->willReturn('/var/www/application/sample.jpg'); $this->abstractAdapter->expects($this->any())->method('validateUploadFile')->willReturn('true'); - $this->image->execute(); + $this->image->executeInternal(); } } diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php index b53d9b874610c..da8eb394ba586 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Accounts.php @@ -13,7 +13,7 @@ class Accounts extends \Magento\Reports\Controller\Adminhtml\Report\Customer * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_customers_accounts' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php index 1fa8340b524eb..2de1d22265020 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php @@ -17,7 +17,7 @@ class ExportAccountsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Cus * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'new_accounts.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php index 368c8d0691751..b7e565a3f407d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php @@ -17,7 +17,7 @@ class ExportAccountsExcel extends \Magento\Reports\Controller\Adminhtml\Report\C * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'new_accounts.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php index d674ff274c25e..8e12efa03ebaa 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php @@ -17,7 +17,7 @@ class ExportOrdersCsv extends \Magento\Reports\Controller\Adminhtml\Report\Custo * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'customers_orders.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php index 205107520422d..c3f2afa18148d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php @@ -17,7 +17,7 @@ class ExportOrdersExcel extends \Magento\Reports\Controller\Adminhtml\Report\Cus * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'customers_orders.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php index 629e25bdf6d23..c0b2f87e0feb9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php @@ -17,7 +17,7 @@ class ExportTotalsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Custo * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'customer_totals.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php index 8c2800fe6caa4..6c33a4a1eefab 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php @@ -17,7 +17,7 @@ class ExportTotalsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Cus * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'customer_totals.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php index 5e556d9fe8919..bc7363825f2e1 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Orders.php @@ -13,7 +13,7 @@ class Orders extends \Magento\Reports\Controller\Adminhtml\Report\Customer * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_customers_orders' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php index f58bfb2bfc8b4..b7e3d117467d1 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/Totals.php @@ -13,7 +13,7 @@ class Totals extends \Magento\Reports\Controller\Adminhtml\Report\Customer * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_customers_totals' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php index 93213f776ec83..5776f796be91a 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Downloads.php @@ -23,7 +23,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Downloadable::report_products_downloads' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php index 5c6af987aec61..31086ee266b84 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsCsv.php @@ -25,7 +25,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'products_downloads.csv'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php index a42c7f09851fc..20c5715b2602f 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportDownloadsExcel.php @@ -25,7 +25,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'products_downloads.xml'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php index 2b63aa2d4c8ae..bbbce2b95b1e5 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php @@ -26,7 +26,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $fileName = 'products_lowstock.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php index 0d0ed5e0b8595..f8e86a4636866 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php @@ -26,7 +26,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $fileName = 'products_lowstock.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php index f1c02ac7971ab..7eb7c810ffbf2 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php @@ -27,7 +27,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'products_ordered.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php index 818b7a73c63cd..8b4e4ed7fa240 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php @@ -27,7 +27,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $fileName = 'products_ordered.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php index a7b42c9399233..9c7348d76f22d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php @@ -26,7 +26,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'products_mostviewed.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Viewed\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php index b33650eee886c..77a5ffff1aa80 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php @@ -26,7 +26,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'products_mostviewed.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Viewed\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php index f2734c22fac08..14eaafe76b887 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Lowstock.php @@ -23,7 +23,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_products_lowstock' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php index 2b43c124f8389..25445c349e112 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Sold.php @@ -23,7 +23,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_products_sold' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php index 4de88db184a83..3a370259de9e0 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php @@ -25,7 +25,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { try { $this->_showLastExecutionTime(Flag::REPORT_PRODUCT_VIEWED_FLAG_CODE, 'viewed'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php index f956bf14c1d38..18c0961d48344 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Customer.php @@ -13,7 +13,7 @@ class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Review * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Review::report_review_customer' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php index 1a7f776d00fe7..473f42a4ca301 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php @@ -16,7 +16,7 @@ class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Rev * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $fileName = 'review_customer.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php index 9744feb1f5e69..7dfe0c646d0bf 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php @@ -16,7 +16,7 @@ class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\R * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $fileName = 'review_customer.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php index 2c471b803049c..15d4d4d6df0ad 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php @@ -16,7 +16,7 @@ class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Revi * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $fileName = 'review_product.csv'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php index 7358396f2aa0f..d27f3fe37c74d 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php @@ -16,7 +16,7 @@ class ExportProductDetailCsv extends \Magento\Reports\Controller\Adminhtml\Repor * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'review_product_detail.csv'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php index 9e80e2309c13b..32abda47b6dcd 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php @@ -16,7 +16,7 @@ class ExportProductDetailExcel extends \Magento\Reports\Controller\Adminhtml\Rep * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'review_product_detail.xml'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php index c5b6b33457fb4..dc04c672a10db 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php @@ -16,7 +16,7 @@ class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Re * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $fileName = 'review_product.xml'; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php index fe7364181ea67..e5f5aecb69b51 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/Product.php @@ -13,7 +13,7 @@ class Product extends \Magento\Reports\Controller\Adminhtml\Report\Review * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Review::report_review_product' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php index 4ee32cade01de..d4bea33168c2c 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ProductDetail.php @@ -13,7 +13,7 @@ class ProductDetail extends \Magento\Reports\Controller\Adminhtml\Report\Review * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Review::report_review' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php index 5c8247bda6425..97be72a935dde 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php @@ -15,7 +15,7 @@ class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_BESTSELLERS_FLAG_CODE, 'bestsellers'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php index 1ccc99988bb40..e9ece3ae68256 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Coupons.php @@ -15,7 +15,7 @@ class Coupons extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_COUPONS_FLAG_CODE, 'coupons'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php index e831fc8347189..0a531d06068a4 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php @@ -16,7 +16,7 @@ class ExportBestsellersCsv extends \Magento\Reports\Controller\Adminhtml\Report\ * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'bestsellers.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php index bba9bbacf8861..2d1afc0fac191 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php @@ -16,7 +16,7 @@ class ExportBestsellersExcel extends \Magento\Reports\Controller\Adminhtml\Repor * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'bestsellers.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php index 4b5ed51a45f4e..ccd04b83482e5 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php @@ -16,7 +16,7 @@ class ExportCouponsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sale * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'coupons.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php index 54641cd44945b..d70457746f8fc 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php @@ -16,7 +16,7 @@ class ExportCouponsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sa * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'coupons.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php index 46f977f415786..e4ad782163c32 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php @@ -16,7 +16,7 @@ class ExportInvoicedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sal * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'invoiced.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php index 771078bae984d..503bc1562cef1 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php @@ -16,7 +16,7 @@ class ExportInvoicedExcel extends \Magento\Reports\Controller\Adminhtml\Report\S * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'invoiced.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php index 375b63e36000d..987b288f934c7 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php @@ -16,7 +16,7 @@ class ExportRefundedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sal * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'refunded.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php index ca4a842af874d..311380659a623 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php @@ -16,7 +16,7 @@ class ExportRefundedExcel extends \Magento\Reports\Controller\Adminhtml\Report\S * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'refunded.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php index 345f809725e9c..20e4a577b3fa3 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php @@ -16,7 +16,7 @@ class ExportSalesCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'sales.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php index b0bc6001d458a..0e5b9beacccb4 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php @@ -16,7 +16,7 @@ class ExportSalesExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sale * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'sales.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php index 82fe7afbeadfa..c7c699a105f40 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php @@ -16,7 +16,7 @@ class ExportShippingCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sal * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shipping.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php index 39b7a4676c130..13ae0fe237c00 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php @@ -16,7 +16,7 @@ class ExportShippingExcel extends \Magento\Reports\Controller\Adminhtml\Report\S * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shipping.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php index ae7ce954bb3b2..d9496b9f5ee6e 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php @@ -16,7 +16,7 @@ class ExportTaxCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'tax.csv'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php index b7648a55d5ba5..f7737132e9d16 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php @@ -16,7 +16,7 @@ class ExportTaxExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'tax.xml'; $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php index 3a7cd19fef7a6..242d9c41d273f 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Invoiced.php @@ -15,7 +15,7 @@ class Invoiced extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_INVOICE_FLAG_CODE, 'invoiced'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php index d093fd273b7ad..19e3007db7a01 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshLifetime.php @@ -13,7 +13,7 @@ class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('refreshLifetime', 'report_statistics'); } diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php index 2d4665fe4f404..0b7ccef07bdc1 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshRecent.php @@ -13,7 +13,7 @@ class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('refreshRecent', 'report_statistics'); } diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php index 77c6bfab4db59..64ac14d427ff9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/RefreshStatistics.php @@ -13,7 +13,7 @@ class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sal * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('index', 'report_statistics'); } diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php index 5d03937d815d0..3120ff01236a6 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Refunded.php @@ -15,7 +15,7 @@ class Refunded extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_REFUNDED_FLAG_CODE, 'refunded'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php index c54cafb6c0ca2..3dd5c10bf9f19 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php @@ -15,7 +15,7 @@ class Sales extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_ORDER_FLAG_CODE, 'sales'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php index 46aa42db9b19d..1068596451067 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Shipping.php @@ -15,7 +15,7 @@ class Shipping extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_SHIPPING_FLAG_CODE, 'shipping'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php index 6fd6555ef09e9..143140f42b0f9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Tax.php @@ -15,7 +15,7 @@ class Tax extends \Magento\Reports\Controller\Adminhtml\Report\Sales * * @return void */ - public function execute() + public function executeInternal() { $this->_showLastExecutionTime(Flag::REPORT_TAX_FLAG_CODE, 'tax'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php index 5db3858d0043c..6c88e443ca517 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php @@ -13,7 +13,7 @@ class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_shopcart_abandoned' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php index 376d220a795b2..b8045d003aafd 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php @@ -13,7 +13,7 @@ class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_shopcart_customer' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php index 6023236b82c46..aff71b76b3749 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php @@ -16,7 +16,7 @@ class ExportAbandonedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sh * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shopcart_abandoned.csv'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php index 6118c9fb20a47..71aae22568e42 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php @@ -16,7 +16,7 @@ class ExportAbandonedExcel extends \Magento\Reports\Controller\Adminhtml\Report\ * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shopcart_abandoned.xml'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php index 30218563edddb..4405cfc9614f9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php @@ -15,7 +15,7 @@ class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sho * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shopcart_customer.csv'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php index 2c017142a18c1..f20fcb9c20f8b 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php @@ -15,7 +15,7 @@ class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\S * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shopcart_customer.xml'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php index c244aee257429..9ad9dd030d3be 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php @@ -16,7 +16,7 @@ class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shop * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shopcart_product.csv'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php index 1b8442918643f..43ed6690d3bb2 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php @@ -16,7 +16,7 @@ class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sh * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $fileName = 'shopcart_product.xml'; $content = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php index c257a75108402..d8035545af1eb 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php @@ -13,7 +13,7 @@ class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_shopcart_product' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php index e4cf01207adf8..36e87ff3d7bbb 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Reports\Controller\Adminhtml\Report\Statistics * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_setActiveMenu( 'Magento_Reports::report_statistics_refresh' diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php index 35222afc53af6..016c026abafc7 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php @@ -14,7 +14,7 @@ class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Stati * * @return void */ - public function execute() + public function executeInternal() { try { $collectionsNames = $this->_getCollectionNames(); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php index e4e5c4e651095..8864c3401ece5 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php @@ -14,7 +14,7 @@ class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statist * * @return void */ - public function execute() + public function executeInternal() { try { $collectionsNames = $this->_getCollectionNames(); diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php index baad059fb4825..96a1921b295d7 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php @@ -70,6 +70,6 @@ public function testExecute() ->expects($this->at(2)) ->method('addLink') ->with(new Phrase('New Accounts'), new Phrase('New Accounts')); - $this->accounts->execute(); + $this->accounts->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsCsvTest.php index c5e9ccccf6d93..273574130f18a 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsCsvTest.php @@ -45,6 +45,6 @@ public function testExecute() ->expects($this->once()) ->method('create') ->with('new_accounts.csv', ['export'], \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportAccountsCsv->execute(); + $this->exportAccountsCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsExcelTest.php index 98134d20ccd9e..8205201a150ed 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportAccountsExcelTest.php @@ -45,6 +45,6 @@ public function testExecute() ->expects($this->once()) ->method('create') ->with('new_accounts.xml', ['export'], \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportAccountsExcel->execute(); + $this->exportAccountsExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersCsvTest.php index 573720a1859cd..50bde9a3f4203 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersCsvTest.php @@ -45,6 +45,6 @@ public function testExecute() ->expects($this->once()) ->method('create') ->with('customers_orders.csv', ['export'], \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportOrdersCsv->execute(); + $this->exportOrdersCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersExcelTest.php index b8273becb2d66..8cc84ac980e64 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportOrdersExcelTest.php @@ -45,6 +45,6 @@ public function testExecute() ->expects($this->once()) ->method('create') ->with('customers_orders.xml', ['export'], \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportOrdersExcel->execute(); + $this->exportOrdersExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsCsvTest.php index b4a7a0c68e2d2..989d05bc651e6 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsCsvTest.php @@ -45,6 +45,6 @@ public function testExecute() ->expects($this->once()) ->method('create') ->with('customer_totals.csv', ['export'], \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportTotalsCsv->execute(); + $this->exportTotalsCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsExcelTest.php index 33177c27a183f..3c2cb5976476c 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/ExportTotalsExcelTest.php @@ -45,6 +45,6 @@ public function testExecute() ->expects($this->once()) ->method('create') ->with('customer_totals.xml', ['export'], \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportTotalsExcel->execute(); + $this->exportTotalsExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php index 1d960cc8175d3..c15797a18d9c1 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php @@ -70,6 +70,6 @@ public function testExecute() ->expects($this->at(2)) ->method('addLink') ->with(new Phrase('Customers by Number of Orders'), new Phrase('Customers by Number of Orders')); - $this->orders->execute(); + $this->orders->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php index a479fb53c3a55..44d554a10c75d 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php @@ -70,6 +70,6 @@ public function testExecute() ->expects($this->at(2)) ->method('addLink') ->with(new Phrase('Customers by Orders Total'), new Phrase('Customers by Orders Total')); - $this->totals->execute(); + $this->totals->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php index 6bae34a56872c..b3e5f9c472563 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php @@ -86,6 +86,6 @@ public function testExecute() ->with('Magento\Reports\Block\Adminhtml\Product\Downloads') ->willReturn($this->abstractBlockMock); - $this->downloads->execute(); + $this->downloads->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php index 9c80ef0700bc5..3b54b2e96fcf3 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php @@ -70,6 +70,6 @@ public function testExecute() ->method('create') ->with('products_downloads.csv', $content); - $this->exportDownloadsCsv->execute(); + $this->exportDownloadsCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php index 010e14168b4fd..864abadb92d6b 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php @@ -72,6 +72,6 @@ public function testExecute() ->method('create') ->with($fileName, $content); - $this->exportDownloadsExcel->execute(); + $this->exportDownloadsExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php index 074c8e88d572f..d1897fe6ac370 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php @@ -65,6 +65,6 @@ public function testExecute() ->method('create') ->with('products_lowstock.csv', $content, \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportLowstockCsv->execute(); + $this->exportLowstockCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php index 509fc27b170d4..0b5b2240fabc8 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php @@ -65,6 +65,6 @@ public function testExecute() ->method('create') ->with('products_lowstock.xml', $content, \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportLowstockExcel->execute(); + $this->exportLowstockExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php index b0f76d5804962..2c01c8d3eab78 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php @@ -65,6 +65,6 @@ public function testExecute() ->method('create') ->with('products_ordered.csv', $content, \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportSoldCsv->execute(); + $this->exportSoldCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php index 21ce5635d33db..202252d7f2588 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php @@ -67,6 +67,6 @@ public function testExecute() ->method('create') ->with($fileName, $content, \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportSoldExcel->execute(); + $this->exportSoldExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php index e31655f118378..f1f060d09f2da 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php @@ -90,6 +90,6 @@ public function testExecute() ->method('create') ->with($fileName, $content, \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportViewedCsv->execute(); + $this->exportViewedCsv->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php index 43e615c7a9acd..4a92d6c8f2f2b 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php @@ -91,6 +91,6 @@ public function testExecute() ->method('create') ->with($fileName, $content, \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR); - $this->exportViewedExcel->execute(); + $this->exportViewedExcel->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php index 10eaa830d7999..0ec6a082b926e 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php @@ -83,6 +83,6 @@ public function testExecute() [new Phrase('Low Stock'), new Phrase('Low Stock')] ); - $this->lowstock->execute(); + $this->lowstock->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php index 34c9e12df2c48..82981d6f142e2 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php @@ -83,6 +83,6 @@ public function testExecute() [new Phrase('Products Ordered'), new Phrase('Products Ordered')] ); - $this->sold->execute(); + $this->sold->executeInternal(); } } diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php index 686aed163ece4..01cfe44f65256 100644 --- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php +++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php @@ -151,7 +151,7 @@ public function testExecute() ->expects($this->once()) ->method('renderLayout'); - $this->viewed->execute(); + $this->viewed->executeInternal(); } /** @@ -202,7 +202,7 @@ public function testExecuteWithException() ->method('setActive') ->willThrowException(new \Exception()); - $this->viewed->execute(); + $this->viewed->executeInternal(); } /** @@ -222,6 +222,6 @@ public function testExecuteWithLocalizedException() ->method('setActive') ->willThrowException(new \Magento\Framework\Exception\LocalizedException($errorText)); - $this->viewed->execute(); + $this->viewed->executeInternal(); } } diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php index ce84f4e99850a..f6ea8b9f899d2 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php @@ -13,7 +13,7 @@ class Delete extends ProductController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php index 10026df39b87a..658b798acbf2e 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php @@ -13,7 +13,7 @@ class Edit extends ProductController /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php index da31a87aa9f53..e999732f5ef14 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php @@ -13,7 +13,7 @@ class Index extends ProductController /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('ajax')) { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php index 2f449cfd4caf6..acd2b40a78ff9 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php @@ -42,7 +42,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $response = new DataObject(); $id = $this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php index 6a64c6cf54982..73dfe572ba718 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php @@ -14,7 +14,7 @@ class MassDelete extends ProductController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $reviewsIds = $this->getRequest()->getParam('reviews'); if (!is_array($reviewsIds)) { diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php index 285503a236500..9866a2be76a89 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php @@ -14,7 +14,7 @@ class MassUpdateStatus extends ProductController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $reviewsIds = $this->getRequest()->getParam('reviews'); if (!is_array($reviewsIds)) { diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php index 4e65891133ace..f9d646d68e6d5 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php @@ -14,7 +14,7 @@ class MassVisibleIn extends ProductController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $reviewsIds = $this->getRequest()->getParam('reviews'); if (!is_array($reviewsIds)) { diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php index e5d2a0e1b3159..4cbd60d0342aa 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends ProductController /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php index 46b341492ab8b..ddae839c33cdd 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php @@ -13,7 +13,7 @@ class Pending extends ProductController /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getParam('ajax')) { $this->coreRegistry->register('usePendingFilter', true); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php index f6b7f24bffdbf..20cc725e3d1f8 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php @@ -15,7 +15,7 @@ class Post extends ProductController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $productId = $this->getRequest()->getParam('product_id', false); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php index afdd87aac5d5a..43aaf18b47316 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php @@ -41,7 +41,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $layout = $this->layoutFactory->create(); /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php index f79da2549bf26..46a2a19088f90 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php @@ -41,7 +41,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $layout = $this->layoutFactory->create(); /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php index 293b958b6ec98..7715f73dbff7c 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php @@ -41,7 +41,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $layout = $this->layoutFactory->create(); /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php index 84606cfe8b33f..a88025a2755e1 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Reviews/Grid.php @@ -34,7 +34,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $product = $this->productBuilder->build($this->getRequest()); /** @var \Magento\Framework\View\Result\Layout $resultLayout */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php index f1121eec6b2f5..8494e1b55904b 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php @@ -15,7 +15,7 @@ class Save extends ProductController * @return \Magento\Backend\Model\View\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php index 55fc796fc26c3..818f8bf9351a5 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php @@ -13,7 +13,7 @@ class Delete extends RatingController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php index 54bd62f83a124..e4a4e8808bc3c 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php @@ -13,7 +13,7 @@ class Edit extends RatingController /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->initEnityId(); /** @var \Magento\Review\Model\Rating $ratingModel */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php index be9bebf78c7e9..1723d2800921d 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php @@ -13,7 +13,7 @@ class Index extends RatingController /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->initEnityId(); /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php index 162f85eac6591..ec6190f27deef 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends RatingController /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD); diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php index 6cfaeabfa331e..2802b50031d15 100644 --- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php +++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php @@ -15,7 +15,7 @@ class Save extends RatingController * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->initEnityId(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Review/Controller/Customer.php b/app/code/Magento/Review/Controller/Customer.php index 0e96a652b7247..a1a39d544c271 100644 --- a/app/code/Magento/Review/Controller/Customer.php +++ b/app/code/Magento/Review/Controller/Customer.php @@ -40,11 +40,11 @@ public function __construct( * @param \Magento\Framework\App\RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { if (!$this->customerSession->authenticate()) { $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); } - return parent::dispatch($request); + return parent::execute($request); } } diff --git a/app/code/Magento/Review/Controller/Customer/Index.php b/app/code/Magento/Review/Controller/Customer/Index.php index 6123c009cdda1..e51ca5c547661 100644 --- a/app/code/Magento/Review/Controller/Customer/Index.php +++ b/app/code/Magento/Review/Controller/Customer/Index.php @@ -15,7 +15,7 @@ class Index extends CustomerController * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/Review/Controller/Customer/View.php b/app/code/Magento/Review/Controller/Customer/View.php index 92972dce3aebc..222f8a0bcb065 100644 --- a/app/code/Magento/Review/Controller/Customer/View.php +++ b/app/code/Magento/Review/Controller/Customer/View.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $review = $this->reviewFactory->create()->load($this->getRequest()->getParam('id')); if ($review->getCustomerId() != $this->customerSession->getCustomerId()) { diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php index a0137ef07b98c..8db2e062706be 100644 --- a/app/code/Magento/Review/Controller/Product.php +++ b/app/code/Magento/Review/Controller/Product.php @@ -144,11 +144,11 @@ public function __construct( * @param RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $allowGuest = $this->_objectManager->get('Magento\Review\Helper\Data')->getIsGuestAllowToWrite(); if (!$request->isDispatched()) { - return parent::dispatch($request); + return parent::execute($request); } if (!$allowGuest && $request->getActionName() == 'post' && $request->isPost()) { @@ -166,7 +166,7 @@ public function dispatch(RequestInterface $request) } } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/Review/Controller/Product/ListAction.php b/app/code/Magento/Review/Controller/Product/ListAction.php index 3c28379ec4af6..910b9232da9ed 100644 --- a/app/code/Magento/Review/Controller/Product/ListAction.php +++ b/app/code/Magento/Review/Controller/Product/ListAction.php @@ -38,7 +38,7 @@ protected function getProductPage($product) * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $product = $this->initProduct(); if ($product) { diff --git a/app/code/Magento/Review/Controller/Product/ListAjax.php b/app/code/Magento/Review/Controller/Product/ListAjax.php index b261971c509b1..36fa3830a36ce 100644 --- a/app/code/Magento/Review/Controller/Product/ListAjax.php +++ b/app/code/Magento/Review/Controller/Product/ListAjax.php @@ -15,7 +15,7 @@ class ListAjax extends ProductController * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->initProduct(); /** @var \Magento\Framework\View\Result\Layout $resultLayout */ diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php index a68f0d18c3bc5..9cf199d7f72c9 100644 --- a/app/code/Magento/Review/Controller/Product/Post.php +++ b/app/code/Magento/Review/Controller/Product/Post.php @@ -18,7 +18,7 @@ class Post extends ProductController * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Review/Controller/Product/View.php b/app/code/Magento/Review/Controller/Product/View.php index f65d1ceb8198c..fb2a1893ba6e2 100644 --- a/app/code/Magento/Review/Controller/Product/View.php +++ b/app/code/Magento/Review/Controller/Product/View.php @@ -40,7 +40,7 @@ protected function loadReview($reviewId) * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $review = $this->loadReview((int)$this->getRequest()->getParam('id')); /** @var \Magento\Framework\Controller\Result\Forward $resultForward */ diff --git a/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php index d20abf31a19c4..1c6cc30cafb17 100644 --- a/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php +++ b/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php @@ -209,6 +209,6 @@ public function testPostAction() ->method('addOptionVote') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->postController->execute()); + $this->assertSame($this->resultRedirectMock, $this->postController->executeInternal()); } } diff --git a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php index 9cedb87e15afe..f1ccec681b25a 100644 --- a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php +++ b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php @@ -315,6 +315,6 @@ public function testExecute() ->with(true) ->willReturn($redirectUrl); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php index 5bdb72f7036ad..f3e450c8c722d 100644 --- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php +++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php @@ -95,7 +95,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function aroundDispatch(AbstractAction $subject, \Closure $proceed, RequestInterface $request) + public function aroundExecute(AbstractAction $subject, \Closure $proceed, RequestInterface $request) { $resource = isset($this->aclResources[$request->getControllerName()]) ? isset($this->aclResources[$request->getControllerName()][$request->getActionName()]) @@ -107,7 +107,7 @@ public function aroundDispatch(AbstractAction $subject, \Closure $proceed, Reque $resourceType = isset($this->aclResources[$type]) ? $this->aclResources[$type] : null; if (!$resource || !$resourceType) { - return parent::aroundDispatch($subject, $proceed, $request); + return parent::aroundExecute($subject, $proceed, $request); } $session = $this->_auth->getAuthStorage(); @@ -129,6 +129,6 @@ public function aroundDispatch(AbstractAction $subject, \Closure $proceed, Reque return $this->_response; } - return parent::aroundDispatch($subject, $proceed, $request); + return parent::aroundExecute($subject, $proceed, $request); } } diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php index 61da0e27c2e12..96b989cdf7845 100644 --- a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php +++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php @@ -20,7 +20,7 @@ class Index extends \Magento\Rss\Controller\Adminhtml\Feed * @return void * @throws NotFoundException */ - public function execute() + public function executeInternal() { if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) { throw new NotFoundException(__('Page not found.')); diff --git a/app/code/Magento/Rss/Controller/Feed/Index.php b/app/code/Magento/Rss/Controller/Feed/Index.php index e3679a100212d..5f8e58afefd7e 100644 --- a/app/code/Magento/Rss/Controller/Feed/Index.php +++ b/app/code/Magento/Rss/Controller/Feed/Index.php @@ -20,7 +20,7 @@ class Index extends \Magento\Rss\Controller\Feed * @return void * @throws NotFoundException */ - public function execute() + public function executeInternal() { if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) { throw new NotFoundException(__('Page not found.')); diff --git a/app/code/Magento/Rss/Controller/Index/Index.php b/app/code/Magento/Rss/Controller/Index/Index.php index 63575ad8e44ec..0a2096c35d89e 100644 --- a/app/code/Magento/Rss/Controller/Index/Index.php +++ b/app/code/Magento/Rss/Controller/Index/Index.php @@ -16,7 +16,7 @@ class Index extends \Magento\Rss\Controller\Index * @return void * @throws NotFoundException */ - public function execute() + public function executeInternal() { if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) { $this->_view->loadLayout(); diff --git a/app/code/Magento/Rss/Test/Unit/App/Action/Plugin/BackendAuthenticationTest.php b/app/code/Magento/Rss/Test/Unit/App/Action/Plugin/BackendAuthenticationTest.php index 79685fb88a379..240da650216cc 100644 --- a/app/code/Magento/Rss/Test/Unit/App/Action/Plugin/BackendAuthenticationTest.php +++ b/app/code/Magento/Rss/Test/Unit/App/Action/Plugin/BackendAuthenticationTest.php @@ -7,7 +7,7 @@ class BackendAuthenticationTest extends \PHPUnit_Framework_TestCase { - public function testAroundDispatch() + public function testAroundExecute() { /** @var \Magento\Backend\App\AbstractAction|\PHPUnit_Framework_MockObject_MockObject $subject */ $subject = $this->getMock('Magento\Backend\App\AbstractAction', [], [], '', false); @@ -69,7 +69,7 @@ public function testAroundDispatch() ); $this->assertSame( $response, - $plugin->aroundDispatch($subject, $proceed, $request) + $plugin->aroundExecute($subject, $proceed, $request) ); } } diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php index 8312633913081..2d58e440902cd 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php @@ -93,7 +93,7 @@ public function testExecute() $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithException() @@ -110,6 +110,6 @@ public function testExecuteWithException() $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); $this->setExpectedException('\Zend_Feed_Builder_Exception'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php index 5b209caa27449..638f2dc802dcf 100644 --- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php +++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php @@ -81,7 +81,7 @@ public function testExecute() $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel)); $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteWithException() @@ -98,6 +98,6 @@ public function testExecuteWithException() $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider)); $this->setExpectedException('\Zend_Feed_Builder_Exception'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php b/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php index b011b8f60e592..433e8d38c4d61 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php +++ b/app/code/Magento/Sales/Controller/AbstractController/PrintAction.php @@ -41,7 +41,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $result = $this->orderLoader->load($this->_request); if ($result instanceof \Magento\Framework\Controller\ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php b/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php index 24f13d49d08c7..bffa469a2ee07 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php +++ b/app/code/Magento/Sales/Controller/AbstractController/PrintCreditmemo.php @@ -58,7 +58,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $creditmemoId = (int)$this->getRequest()->getParam('creditmemo_id'); if ($creditmemoId) { diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php b/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php index 04088a9c79c2a..fffcb6ca4dfd8 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php +++ b/app/code/Magento/Sales/Controller/AbstractController/PrintInvoice.php @@ -49,7 +49,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $invoiceId = (int)$this->getRequest()->getParam('invoice_id'); if ($invoiceId) { diff --git a/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php b/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php index 74fbb3439445d..ab17469ccf16d 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php +++ b/app/code/Magento/Sales/Controller/AbstractController/PrintShipment.php @@ -49,7 +49,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $shipmentId = (int)$this->getRequest()->getParam('shipment_id'); if ($shipmentId) { diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php index bf86825d8b473..f589dbabab90c 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php +++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php @@ -41,7 +41,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $result = $this->orderLoader->load($this->_request); if ($result instanceof \Magento\Framework\Controller\ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/AbstractController/View.php b/app/code/Magento/Sales/Controller/AbstractController/View.php index 987fa30704e59..0bef4ed08e068 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/View.php +++ b/app/code/Magento/Sales/Controller/AbstractController/View.php @@ -41,7 +41,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $result = $this->orderLoader->load($this->_request); if ($result instanceof \Magento\Framework\Controller\ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php index 68fc9d62e85ac..6a6babfc1b153 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php @@ -25,7 +25,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $creditmemoId = $this->getRequest()->getParam('creditmemo_id'); if (!$creditmemoId) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php index 3022cf995e632..209096f62fee2 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Grid.php @@ -37,7 +37,7 @@ protected function _isAllowed() * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $resultLayout = $this->resultLayoutFactory->create(); return $resultLayout; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php index 4fbd4c7ff5bd5..5569d131abd88 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Index.php @@ -51,7 +51,7 @@ protected function _initAction() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->_initAction(); $resultPage->getConfig()->getTitle()->prepend(__('Credit Memos')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php index 83befcc3b58f9..39137a698fe91 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php @@ -55,7 +55,7 @@ protected function _isAllowed() /** * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @see \Magento\Sales\Controller\Adminhtml\Order\Invoice */ $creditmemoId = $this->getRequest()->getParam('creditmemo_id'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php index 06e4209173175..c70eb6e4cb482 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php @@ -37,7 +37,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $resultForward = $this->resultForwardFactory->create(); if ($this->getRequest()->getParam('creditmemo_id')) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php index baa603c9ef5c1..c7ea617b5354a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/Index.php @@ -12,8 +12,8 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCredi * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { - return parent::execute(); + return parent::executeInternal(); } } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php index c807026addf05..8c32e32f47897 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php @@ -45,7 +45,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $invoiceId = $this->getRequest()->getParam('invoice_id'); if (!$invoiceId) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php index d448d97138f60..a01e0ba26f620 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Grid.php @@ -38,7 +38,7 @@ protected function _isAllowed() * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { return $this->resultLayoutFactory->create(); } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php index e88f6089c48b4..603ec3258ba8c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Index.php @@ -53,7 +53,7 @@ protected function _initAction() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->_initAction(); $resultPage->getConfig()->getTitle()->prepend(__('Invoices')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php index ac5c97372b7f0..b72dc44f2ca3a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php @@ -47,7 +47,7 @@ protected function _isAllowed() /** * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { $invoiceId = $this->getRequest()->getParam('invoice_id'); if ($invoiceId) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php index e6e49dd0ca65b..98fe68a4def0e 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php @@ -49,7 +49,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $resultForward = $this->resultForwardFactory->create(); if ($this->getRequest()->getParam('invoice_id')) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php index badfbc2ad438d..225ab0ddd0111 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php @@ -48,7 +48,7 @@ public function __construct(Context $context, Filter $filter) * @return \Magento\Backend\Model\View\Result\Redirect * @throws \Magento\Framework\Exception\LocalizedException|\Exception */ - public function execute() + public function executeInternal() { try { $collection = $this->filter->getCollection($this->collectionFactory->create()); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php index 29729f850bb64..f83fb55e21809 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php @@ -16,7 +16,7 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $order = $this->_initOrder(); if ($order) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php index 18fdf29cf8024..07a49e22fab85 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Address.php @@ -13,7 +13,7 @@ class Address extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $addressId = $this->getRequest()->getParam('address_id'); $address = $this->_objectManager->create('Magento\Sales\Model\Order\Address')->load($addressId); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php index b10329e70d376..43962356bab67 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php @@ -13,7 +13,7 @@ class AddressSave extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $addressId = $this->getRequest()->getParam('address_id'); /** @var $address \Magento\Sales\Api\Data\OrderAddressInterface|\Magento\Sales\Model\Order\Address */ diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php index 959917738dbc0..c4740f7825af4 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php @@ -13,7 +13,7 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->isValidPostRequest()) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php index 54774ec719e7d..fd6239b48480f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php @@ -74,7 +74,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $this->_initOrder(); $layout = $this->layoutFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php index b991a11b2878c..cbc62796bcd09 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/AddConfigured.php @@ -12,7 +12,7 @@ class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $errorMessage = null; try { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php index f778a07a85a4f..7cfd40bda0c1e 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Cancel.php @@ -12,7 +12,7 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php index d8c70e6d63b33..07bbc3e479fa6 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureProductToAdd.php @@ -12,7 +12,7 @@ class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Cr * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { // Prepare data $productId = (int)$this->getRequest()->getParam('id'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php index 080d5103c0862..10c3432f5c8b2 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ConfigureQuoteItems.php @@ -12,7 +12,7 @@ class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Crea * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { // Prepare data $configureResult = new \Magento\Framework\DataObject(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php index 055b3fe11f811..2d159a99ee425 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php @@ -12,7 +12,7 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create * * @return void */ - public function execute() + public function executeInternal() { $this->_initSession(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php index ba4b0e833e289..e5b063280bbe7 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php @@ -48,7 +48,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $request = $this->getRequest(); try { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php index 7d550a7d35730..cc2d978556caf 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessData.php @@ -12,7 +12,7 @@ class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->_initSession(); $this->_processData(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php index b64cb14c95c39..8c91da215ca16 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php @@ -10,7 +10,7 @@ class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create /** * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->_getSession()->clearStorage(); $orderId = $this->getRequest()->getParam('order_id'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php index 3f48e6cf0679d..087e6311cb69d 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php @@ -16,7 +16,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create * * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php index a3546de1fa6a7..9cd5b4d524547 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php @@ -49,7 +49,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ $resultRaw = $this->resultRawFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php index d9fd5c50f5bad..acc80e9742685 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Start.php @@ -14,7 +14,7 @@ class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->_getSession()->clearStorage(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php index a3cf6e6a308da..d404c6a16aa4e 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php @@ -72,7 +72,7 @@ protected function _isAllowed() * * @return \Magento\Framework\Controller\Result\Raw|\Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { try { $this->getRequest()->setParam('creditmemo_id', $this->getRequest()->getParam('id')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php index ce4652929c7ba..935eca652b365 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php @@ -40,7 +40,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $creditmemoId = $this->getRequest()->getParam('creditmemo_id'); if ($creditmemoId) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php index a9760a20fda4c..e1c7b8d9cc2ca 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php @@ -55,7 +55,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->creditmemoLoader->setCreditmemoId($this->getRequest()->getParam('creditmemo_id')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php index b5bb3333ac32e..a848506b90030 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php @@ -49,13 +49,13 @@ public function __construct( * * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->creditmemoLoader->setCreditmemoId($this->getRequest()->getParam('creditmemo_id')); $this->creditmemoLoader->setCreditmemo($this->getRequest()->getParam('creditmemo')); $this->creditmemoLoader->setInvoiceId($this->getRequest()->getParam('invoice_id')); $this->creditmemoLoader->load(); - return parent::execute(); + return parent::executeInternal(); } } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php index 24d74e2177f1c..c66532f3aa5d4 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php @@ -61,7 +61,7 @@ protected function _isAllowed() * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); $data = $this->getRequest()->getPost('creditmemo'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php index 4305bef4930e7..a60433a2e0348 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php @@ -20,7 +20,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** * Clear old values for creditmemo qty's diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php index 38068b10918bb..d1f400c84fba5 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php @@ -63,7 +63,7 @@ protected function _isAllowed() * * @return \Magento\Framework\Controller\Result\Json|\Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { try { $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php index 486b041554a3b..fe8808c559f8b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/View.php @@ -55,7 +55,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->creditmemoLoader->setCreditmemoId($this->getRequest()->getParam('creditmemo_id')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php index 23bd5f1ccdb82..fcc978d5ddd06 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php @@ -47,7 +47,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->creditmemoLoader->setCreditmemoId($this->getRequest()->getParam('creditmemo_id')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php index 46571b222f35c..9fb23be0820b4 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemos.php @@ -12,7 +12,7 @@ class Creditmemos extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->_initOrder(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php index a40e61cfa89f3..f2384d108842e 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Index.php @@ -22,7 +22,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->_initSession(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php index 22bcb5a621277..c216968a893ea 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php @@ -22,7 +22,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $this->_getSession()->clearStorage(); $orderId = $this->getRequest()->getParam('order_id'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php index ae1763485bdbc..95e845bce78c7 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php @@ -12,7 +12,7 @@ class Email extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $order = $this->_initOrder(); if ($order) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php index d16a0ea8cd1d8..c2017647e88ed 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Grid.php @@ -12,7 +12,7 @@ class Grid extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $resultLayout = $this->resultLayoutFactory->create(); return $resultLayout; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php index 881ba0c98c9d4..fd5f07df5e983 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php @@ -12,7 +12,7 @@ class Hold extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->isValidPostRequest()) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php index 9fc67fd2754f5..3aac062e01b11 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Index.php @@ -12,7 +12,7 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->_initAction(); $resultPage->getConfig()->getTitle()->prepend(__('Orders')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php index 2be526b212971..f4a48a1456895 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php @@ -68,7 +68,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { $this->getRequest()->setParam('invoice_id', $this->getRequest()->getParam('id')); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php index a717843c7e99c..d79599efb94cb 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php @@ -13,7 +13,7 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $invoice = $this->getInvoice(); if (!$invoice) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php index 50ab1d8a9f2bf..3f8b12d19fcf6 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php @@ -13,7 +13,7 @@ class Capture extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoic * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $invoice = $this->getInvoice(); if (!$invoice) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php index 306518b16edcb..4c52db5ff5750 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php @@ -73,7 +73,7 @@ protected function _redirectToOrder($orderId) * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $orderId = $this->getRequest()->getParam('order_id'); $invoiceData = $this->getRequest()->getParam('invoice', []); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php index 1ffa64f0100cc..5a822770fe527 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php @@ -110,7 +110,7 @@ protected function _prepareShipment($invoice) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php index 8db329dad0876..594a437c653bf 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php @@ -13,7 +13,7 @@ class Start extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\ * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** * Clear old values for invoice qty's diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php index 3b30dbde11f07..cfee5ad1ff2d0 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php @@ -71,7 +71,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { try { $orderId = $this->getRequest()->getParam('order_id'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php index b6f4ae27b44e6..9e01376261e5a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php @@ -39,7 +39,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $invoice = $this->getInvoice(); if (!$invoice) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php index 841d517037b43..005c3cdbc47d0 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php @@ -13,7 +13,7 @@ class Void extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\V * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $invoice = $this->getInvoice(); if (!$invoice) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php index 08354deb66839..cfb8841f41cf0 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php @@ -12,7 +12,7 @@ class Invoices extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->_initOrder(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php index 8a0d64c9bcb6e..a2d72953eb41b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php @@ -16,7 +16,7 @@ class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); try { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php index 98683c7601790..84efbffee9d23 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php @@ -12,7 +12,7 @@ class Shipments extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->_initOrder(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php index 04e05fc348e1f..7a2abd381e1a9 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php index a77c6dc3cc642..a103fbf417557 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php @@ -13,7 +13,7 @@ class AssignPost extends \Magento\Sales\Controller\Adminhtml\Order\Status * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php index 26ee0651e3657..0f5f2e720b8ce 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $status = $this->_initStatus(); if ($status) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php index 3bafba1937248..65f3dd3f164dc 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php index f9668e8325859..57e8e0b852ea7 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php @@ -36,7 +36,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $data = $this->_getSession()->getFormData(true); if ($data) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php index efd73d7a2b34e..79efd7eede660 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); $isNew = $this->getRequest()->getParam('is_new'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php index e44b4f5e48eef..e84ac0bc45b24 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php @@ -11,7 +11,7 @@ class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $state = $this->getRequest()->getParam('state'); $status = $this->_initStatus(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php index f41824df84b5f..9801ada2f82f3 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php @@ -14,7 +14,7 @@ class Transactions extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Framework\View\Result\Layout */ - public function execute() + public function executeInternal() { $this->_initOrder(); $resultLayout = $this->resultLayoutFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php index 6cedb1e60b95f..83fc8808df3cc 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php @@ -12,7 +12,7 @@ class Unhold extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->isValidPostRequest()) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php index 831538fa21d11..011056eac1403 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php @@ -14,7 +14,7 @@ class View extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $order = $this->_initOrder(); $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php index 554935ed551ad..13ced62a88849 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php @@ -11,7 +11,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\View\Giftmessage /** * @return void */ - public function execute() + public function executeInternal() { try { $this->_getGiftmessageSaveModel()->setGiftmessages( diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php index 03b870d71cab1..3a10f5684c6aa 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php @@ -12,7 +12,7 @@ class VoidPayment extends \Magento\Sales\Controller\Adminhtml\Order * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $order = $this->_initOrder(); $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php index 1a800be5b93a3..c393c2b1a1c91 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Index.php @@ -41,7 +41,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php index 633cf071b933b..6a72dfe0ebcaa 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php @@ -50,7 +50,7 @@ protected function _isAllowed() /** * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { $shipmentId = $this->getRequest()->getParam('shipment_id'); if ($shipmentId) { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php index 150f98e597b10..926a46c14c4f1 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php @@ -41,7 +41,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php index df3a48ca4a76d..a2ac001589d63 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php @@ -17,7 +17,7 @@ class Fetch extends \Magento\Sales\Controller\Adminhtml\Transactions * * @return Redirect */ - public function execute() + public function executeInternal() { $txn = $this->_initTransaction(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php index 0b4579d1810b9..d65bba3d004bf 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Grid.php @@ -16,7 +16,7 @@ class Grid extends \Magento\Sales\Controller\Adminhtml\Transactions * * @return Layout */ - public function execute() + public function executeInternal() { return $this->resultLayoutFactory->create(); } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php index 6125b244d2991..2d39c91638ec3 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Transactions /** * @return Page */ - public function execute() + public function executeInternal() { /** @var Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php index 867d700cb41ec..df25ccba4a9c4 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/View.php @@ -16,7 +16,7 @@ class View extends \Magento\Sales\Controller\Adminhtml\Transactions * * @return Page */ - public function execute() + public function executeInternal() { $txn = $this->_initTransaction(); if (!$txn) { diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php index 991ac197d784a..d0e7ca016d052 100644 --- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php +++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php @@ -54,7 +54,7 @@ public function __construct( * * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { $quoteItemOptionId = $this->getRequest()->getParam('id'); /** @var $option \Magento\Quote\Model\Quote\Item\Option */ diff --git a/app/code/Magento/Sales/Controller/Guest/Form.php b/app/code/Magento/Sales/Controller/Guest/Form.php index c9f87d44e7995..03f56609495b9 100644 --- a/app/code/Magento/Sales/Controller/Guest/Form.php +++ b/app/code/Magento/Sales/Controller/Guest/Form.php @@ -30,7 +30,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { if ($this->_objectManager->get('Magento\Customer\Model\Session')->isLoggedIn()) { return $this->resultRedirectFactory->create()->setPath('customer/account/'); diff --git a/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php b/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php index 5b6fd6c5a6a10..cc62bfa704781 100644 --- a/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php +++ b/app/code/Magento/Sales/Controller/Guest/PrintCreditmemo.php @@ -52,7 +52,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $result = $this->orderLoader->load($this->_request); if ($result instanceof \Magento\Framework\Controller\ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php b/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php index ddd943b3246b5..d8c30fe056d14 100644 --- a/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php +++ b/app/code/Magento/Sales/Controller/Guest/PrintInvoice.php @@ -42,7 +42,7 @@ public function __construct( /** * {@inheritdoc} */ - public function execute() + public function executeInternal() { $result = $this->orderLoader->load($this->_request); if ($result instanceof \Magento\Framework\Controller\ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/Guest/PrintShipment.php b/app/code/Magento/Sales/Controller/Guest/PrintShipment.php index 8dcbfe4ef735c..8a1ad2b803e16 100644 --- a/app/code/Magento/Sales/Controller/Guest/PrintShipment.php +++ b/app/code/Magento/Sales/Controller/Guest/PrintShipment.php @@ -42,7 +42,7 @@ public function __construct( /** * {@inheritdoc} */ - public function execute() + public function executeInternal() { $result = $this->orderLoader->load($this->_request); if ($result instanceof \Magento\Framework\Controller\ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/Guest/View.php b/app/code/Magento/Sales/Controller/Guest/View.php index 93de3cab2db47..500d1d30d0813 100644 --- a/app/code/Magento/Sales/Controller/Guest/View.php +++ b/app/code/Magento/Sales/Controller/Guest/View.php @@ -40,7 +40,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $result = $this->guestHelper->loadValidOrder($this->getRequest()); if ($result instanceof ResultInterface) { diff --git a/app/code/Magento/Sales/Controller/Order/History.php b/app/code/Magento/Sales/Controller/Order/History.php index 5a87a8b944258..8dd70bfbe330b 100644 --- a/app/code/Magento/Sales/Controller/Order/History.php +++ b/app/code/Magento/Sales/Controller/Order/History.php @@ -34,7 +34,7 @@ public function __construct( * * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php b/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php index e496f13e7a64a..fed11efb2717c 100644 --- a/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php +++ b/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php @@ -40,7 +40,7 @@ public function __construct( * @return void * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request) + public function beforeExecute(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request) { $loginUrl = $this->customerUrl->getLoginUrl(); diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php index 6a78aef9bcf3d..b35968afc83ee 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php @@ -163,7 +163,7 @@ public function testEmail() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->creditmemoEmail->execute() + $this->creditmemoEmail->executeInternal() ); $this->assertEquals($this->response, $this->creditmemoEmail->getResponse()); } @@ -175,7 +175,7 @@ public function testEmailNoCreditmemoId() ->with('creditmemo_id') ->will($this->returnValue(null)); - $this->assertNull($this->creditmemoEmail->execute()); + $this->assertNull($this->creditmemoEmail->executeInternal()); } /** diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php index 4e5bd8e7472da..0566645df83e0 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php @@ -206,7 +206,7 @@ public function testEmail() ->method('setPath') ->with('sales/invoice/view', ['order_id' => $orderId, 'invoice_id' => $invoiceId]) ->willReturnSelf(); - $this->assertInstanceOf('Magento\Backend\Model\View\Result\Redirect', $this->invoiceEmail->execute()); + $this->assertInstanceOf('Magento\Backend\Model\View\Result\Redirect', $this->invoiceEmail->executeInternal()); } public function testEmailNoInvoiceId() @@ -223,7 +223,7 @@ public function testEmailNoInvoiceId() ->with('noroute') ->willReturnSelf(); - $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->invoiceEmail->execute()); + $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->invoiceEmail->executeInternal()); } public function testEmailNoInvoice() @@ -253,6 +253,6 @@ public function testEmailNoInvoice() ->with('noroute') ->willReturnSelf(); - $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->invoiceEmail->execute()); + $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->invoiceEmail->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php index 186a40730f98a..fe34c10eb4f64 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php @@ -137,6 +137,6 @@ public function testExecuteNotPost() ->with('sales/*/') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->controller->execute()); + $this->assertEquals($this->resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php index 805edbea1ea9b..c0763bf80d8ac 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php @@ -233,7 +233,7 @@ public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCoup ->method('forward') ->with('index') ->willReturnSelf(); - $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->processData->execute()); + $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->processData->executeInternal()); } public function isApplyDiscountDataProvider() diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php index b96f2254501ab..f7f6a0db9dc40 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php @@ -173,7 +173,7 @@ public function testExecuteModelException() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Json', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -201,7 +201,7 @@ public function testExecuteException() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Json', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -230,7 +230,7 @@ public function testExecuteNoComment() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Json', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -294,7 +294,7 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Raw', - $this->controller->execute() + $this->controller->executeInternal() ); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php index 223b5a9753b63..5b8749215aaab 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php @@ -200,7 +200,7 @@ public function testExecuteModelException() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -235,7 +235,7 @@ public function testExecuteException() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -258,7 +258,7 @@ public function testExecuteNoCreditmemo() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Forward', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -293,7 +293,7 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->controller->execute() + $this->controller->executeInternal() ); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php index 68726f2894c58..99abeba2695a9 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php @@ -238,7 +238,7 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Page', - $this->controller->execute() + $this->controller->executeInternal() ); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php index 7f2ae31af7e98..753ed02380db4 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php @@ -152,7 +152,7 @@ public function setUp() } /** - * @covers \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\PrintAction::execute + * @covers \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\PrintAction::executeInternal */ public function testExecute() { @@ -201,12 +201,12 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Framework\App\ResponseInterface', - $this->printAction->execute() + $this->printAction->executeInternal() ); } /** - * @covers \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\PrintAction::execute + * @covers \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\PrintAction::executeInternal */ public function testExecuteNoCreditmemoId() { @@ -222,7 +222,7 @@ public function testExecuteNoCreditmemoId() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Forward', - $this->printAction->execute() + $this->printAction->executeInternal() ); } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php index 5549ee7f193ce..6c0a726a516b0 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php @@ -14,7 +14,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase { /** - * @var \Magento\Sales\Controller\Adminhtml\Order\Creditmemo + * @var \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Save */ protected $_controller; @@ -190,7 +190,7 @@ public function testSaveActionOnlineRefundToStoreCredit() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->_controller->execute() + $this->_controller->executeInternal() ); } @@ -237,7 +237,7 @@ public function testSaveActionWithNegativeCreditmemo() $this->_setSaveActionExpectationForMageCoreException($data, 'The credit memo\'s total must be positive.'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } /** diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php index 9e02c98b1c374..30534fcacfdec 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php @@ -221,7 +221,7 @@ public function testExecuteModelException() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Json', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -252,7 +252,7 @@ public function testExecuteException() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Json', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -300,7 +300,7 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Framework\Controller\Result\Raw', - $this->controller->execute() + $this->controller->executeInternal() ); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/ViewTest.php index fb87393407dce..1b45562472581 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/ViewTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/ViewTest.php @@ -223,7 +223,7 @@ public function testExecuteNoCreditMemo() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Forward', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -269,7 +269,7 @@ public function testExecute($invoice) $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Page', - $this->controller->execute() + $this->controller->executeInternal() ); } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php index 6d2d02861be07..efd4d5b43551f 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php @@ -207,7 +207,7 @@ public function testExecuteNoCreditmemo() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Forward', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -243,7 +243,7 @@ public function testExecuteModelException() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -279,7 +279,7 @@ public function testExecuteException() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->controller->execute() + $this->controller->executeInternal() ); } @@ -333,7 +333,7 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->controller->execute() + $this->controller->executeInternal() ); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php index 73396196f9723..578f64454d5fb 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php @@ -196,7 +196,7 @@ public function testEmail() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->orderEmail->execute() + $this->orderEmail->executeInternal() ); $this->assertEquals($this->response, $this->orderEmail->getResponse()); } @@ -228,7 +228,7 @@ public function testEmailNoOrderId() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->orderEmail->execute() + $this->orderEmail->executeInternal() ); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php index 18dd6a8c8b337..2ddc7d1d212b1 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php @@ -137,6 +137,6 @@ public function testExecuteNotPost() ->with('sales/*/') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->controller->execute()); + $this->assertEquals($this->resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php index f8b5c3f44b178..a72cf068a00b1 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php @@ -265,7 +265,7 @@ public function testExecute() $resultRaw->expects($this->once())->method('setContents')->with($response); $this->resultRawFactoryMock->expects($this->once())->method('create')->will($this->returnValue($resultRaw)); - $this->assertSame($resultRaw, $this->controller->execute()); + $this->assertSame($resultRaw, $this->controller->executeInternal()); } /** @@ -288,7 +288,7 @@ public function testExecuteModelException() ->will($this->returnValue($this->resultJsonMock)); $this->resultJsonMock->expects($this->once())->method('setData')->with($response); - $this->assertSame($this->resultJsonMock, $this->controller->execute()); + $this->assertSame($this->resultJsonMock, $this->controller->executeInternal()); } /** @@ -310,6 +310,6 @@ public function testExecuteException() ->will($this->returnValue($this->resultJsonMock)); $this->resultJsonMock->expects($this->once())->method('setData')->with($response); - $this->assertSame($this->resultJsonMock, $this->controller->execute()); + $this->assertSame($this->resultJsonMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php index 689d7efa270a7..9190aefc12826 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php @@ -226,7 +226,7 @@ public function testExecute() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } /** @@ -263,7 +263,7 @@ public function testExecuteNoInvoice() ->method('create') ->will($this->returnValue($resultForward)); - $this->assertSame($resultForward, $this->controller->execute()); + $this->assertSame($resultForward, $this->controller->executeInternal()); } /** @@ -319,7 +319,7 @@ public function testExecuteModelException() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } /** @@ -375,6 +375,6 @@ public function testExecuteException() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php index c0e86d79f3481..e1e759a8cdd38 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php @@ -244,7 +244,7 @@ public function testExecute() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } /** @@ -280,7 +280,7 @@ public function testExecuteNoInvoice() ->method('create') ->will($this->returnValue($resultForward)); - $this->assertSame($resultForward, $this->controller->execute()); + $this->assertSame($resultForward, $this->controller->executeInternal()); } /** @@ -339,7 +339,7 @@ public function testExecuteModelException() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } /** @@ -399,6 +399,6 @@ public function testExecuteException() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php index 5beb118dda9e4..7ddb6084b1db5 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php @@ -285,7 +285,7 @@ public function testExecute() ->method('create') ->will($this->returnValue($this->resultPageMock)); - $this->assertSame($this->resultPageMock, $this->controller->execute()); + $this->assertSame($this->resultPageMock, $this->controller->executeInternal()); } public function testExecuteNoOrder() @@ -329,6 +329,6 @@ public function testExecuteNoOrder() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php index 223e5e4311ea8..4ac90b4c26b96 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php @@ -147,6 +147,6 @@ public function testExecute() ->with('Magento\Framework\Stdlib\DateTime\DateTime') ->willReturn($dateTimeMock); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php index 619b6b0bbba4b..9d21a5e302799 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php @@ -128,6 +128,6 @@ public function testExecuteNotValidPost() ->with('sales/order/index') ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->controller->execute()); + $this->assertEquals($redirectMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php index 2be9749e0c70c..b3356c971a979 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php @@ -257,7 +257,7 @@ public function testExecute() $this->resultRawFactoryMock->expects($this->once())->method('create')->will($this->returnValue($resultRaw)); - $this->assertSame($resultRaw, $this->controller->execute()); + $this->assertSame($resultRaw, $this->controller->executeInternal()); } /** @@ -300,7 +300,7 @@ public function testExecuteModelException() ->method('create') ->will($this->returnValue($resultJsonMock)); - $this->assertSame($resultJsonMock, $this->controller->execute()); + $this->assertSame($resultJsonMock, $this->controller->executeInternal()); } /** @@ -343,6 +343,6 @@ public function testExecuteException() ->method('create') ->will($this->returnValue($resultJsonMock)); - $this->assertSame($resultJsonMock, $this->controller->execute()); + $this->assertSame($resultJsonMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/ViewTest.php index edb47e37f44f6..af2d51618d91f 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/ViewTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/ViewTest.php @@ -244,7 +244,7 @@ public function testExecute() ->method('create') ->will($this->returnValue($this->resultPageMock)); - $this->assertSame($this->resultPageMock, $this->controller->execute()); + $this->assertSame($this->resultPageMock, $this->controller->executeInternal()); } public function testExecuteNoInvoice() @@ -278,6 +278,6 @@ public function testExecuteNoInvoice() ->method('create') ->will($this->returnValue($resultForward)); - $this->assertSame($resultForward, $this->controller->execute()); + $this->assertSame($resultForward, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php index c2bfc012aa69e..a4b638984573c 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php @@ -255,7 +255,7 @@ public function testExecute() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } /** @@ -297,7 +297,7 @@ public function testExecuteNoInvoice() ->method('create') ->will($this->returnValue($resultForward)); - $this->assertSame($resultForward, $this->controller->execute()); + $this->assertSame($resultForward, $this->controller->executeInternal()); } /** @@ -354,6 +354,6 @@ public function testExecuteModelException() ->method('create') ->will($this->returnValue($resultRedirect)); - $this->assertSame($resultRedirect, $this->controller->execute()); + $this->assertSame($resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php index 40a5b450f042d..aa9ed541fad34 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php @@ -215,7 +215,7 @@ public function testExecuteCanCancelOneOrder() ->with('sales/*/') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } /** @@ -259,7 +259,7 @@ public function testExcludedCannotCancelOrders() ->with('sales/*/') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } /** @@ -287,6 +287,6 @@ public function testException() ->method('addError') ->with('Can not cancel'); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php index 5c4d78706854b..440d0dda48f79 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php @@ -217,7 +217,7 @@ public function testExecuteOneOrderPutOnHold() ->with('sales/*/') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } public function testExecuteNoOrdersPutOnHold() @@ -257,6 +257,6 @@ public function testExecuteNoOrdersPutOnHold() ->with('sales/*/') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php index 127ccc343ae2d..781834d3a1bf1 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php @@ -212,7 +212,7 @@ public function testExecuteOneOrdersReleasedFromHold() ->with('sales/*/') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } public function testExecuteNoReleasedOrderFromHold() @@ -251,6 +251,6 @@ public function testExecuteNoReleasedOrderFromHold() ->with('sales/*/') ->willReturnSelf(); - $this->massAction->execute(); + $this->massAction->executeInternal(); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php index 866c083c049a9..2fd32794370f6 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php @@ -163,7 +163,7 @@ public function testExecuteUpdateAction() ->with('sales/order/view') ->willReturnSelf(); - $result = $this->reviewPayment->execute(); + $result = $this->reviewPayment->executeInternal(); $this->assertEquals($this->resultRedirectMock, $result); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php index 1dbf1baafa60d..e25884e837a1a 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php @@ -137,6 +137,6 @@ public function testExecuteNotPost() ->with('sales/*/') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->controller->execute()); + $this->assertEquals($this->resultRedirect, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php index 3037e323da0ce..fdbd6bf306e2b 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php @@ -167,7 +167,7 @@ public function setUp() } /** - * @covers \Magento\Sales\Controller\Adminhtml\Order\View::execute + * @covers \Magento\Sales\Controller\Adminhtml\Order\View::executeInternal */ public function testExecute() { @@ -197,12 +197,12 @@ public function testExecute() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Page', - $this->viewAction->execute() + $this->viewAction->executeInternal() ); } /** - * @covers \Magento\Sales\Controller\Adminhtml\Order\View::execute + * @covers \Magento\Sales\Controller\Adminhtml\Order\View::executeInternal */ public function testExecuteNoOrder() { @@ -224,12 +224,12 @@ public function testExecuteNoOrder() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->viewAction->execute() + $this->viewAction->executeInternal() ); } /** - * @covers \Magento\Sales\Controller\Adminhtml\Order\View::execute + * @covers \Magento\Sales\Controller\Adminhtml\Order\View::executeInternal */ public function testGlobalException() { @@ -253,7 +253,7 @@ public function testGlobalException() $this->assertInstanceOf( 'Magento\Backend\Model\View\Result\Redirect', - $this->viewAction->execute() + $this->viewAction->executeInternal() ); } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php index 629cb0ce5eb71..0299f4841761b 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Download/DownloadCustomOptionTest.php @@ -209,7 +209,7 @@ public function testExecute($itemOptionValues, $productOptionValues, $noRouteOcc $this->objectMock->expects($this->once())->method('endExecute')->willReturn(true); } - $this->objectMock->execute(); + $this->objectMock->executeInternal(); } public function executeDataProvider() @@ -329,6 +329,6 @@ public function testExecuteBadSecretKey() $this->resultForwardMock->expects($this->once())->method('forward')->with('noroute')->willReturn(true); - $this->objectMock->execute(); + $this->objectMock->executeInternal(); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php index 78aa59f9eedaa..dbe89bc05333b 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php @@ -103,7 +103,7 @@ public function testExecuteOrderLoaded() ->method('getBreadcrumbs') ->with($this->resultPageMock); - $this->assertSame($this->resultPageMock, $this->viewController->execute()); + $this->assertSame($this->resultPageMock, $this->viewController->executeInternal()); } /** @@ -116,6 +116,6 @@ public function testExecuteOrderNotFound() ->with($this->requestMock) ->willReturn($this->resultRedirectMock); - $this->assertSame($this->resultRedirectMock, $this->viewController->execute()); + $this->assertSame($this->resultRedirectMock, $this->viewController->executeInternal()); } } diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php index 9e694ab9ea087..28d6a8eb392b1 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ApplyRules.php @@ -13,7 +13,7 @@ class ApplyRules extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction(); $this->_view->renderLayout(); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php index f88d58097f2cd..0a7563e34a9ee 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Chooser.php @@ -13,7 +13,7 @@ class Chooser extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $uniqId = $this->getRequest()->getParam('uniq_id'); $chooserBlock = $this->_view->getLayout()->createBlock( diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php index 565e1d7d8ca44..3ce01abaf9bc0 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsGrid.php @@ -13,7 +13,7 @@ class CouponsGrid extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $this->_initRule(); $this->_view->loadLayout(); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php index 623dedb6ae1b0..d938f67a30f76 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php @@ -13,7 +13,7 @@ class CouponsMassDelete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Qu * * @return void */ - public function execute() + public function executeInternal() { $this->_initRule(); $rule = $this->_coreRegistry->registry('current_promo_quote_rule'); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php index c88dc7494f895..a8e5ca176cd91 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); if ($id) { diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php index 6138a59b95ac2..636e0d548c34b 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php @@ -14,7 +14,7 @@ class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * @return void * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $model = $this->_objectManager->create('Magento\SalesRule\Model\Rule'); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php index bcbfee1049532..3d06d95e63034 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php @@ -15,7 +15,7 @@ class ExportCouponsCsv extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quo * * @return \Magento\Framework\App\ResponseInterface|null */ - public function execute() + public function executeInternal() { $this->_initRule(); $rule = $this->_coreRegistry->registry('current_promo_quote_rule'); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php index 22172e206f50e..717dc7246c64d 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php @@ -15,7 +15,7 @@ class ExportCouponsXml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quo * * @return \Magento\Framework\App\ResponseInterface|null */ - public function execute() + public function executeInternal() { $this->_initRule(); $rule = $this->_coreRegistry->registry('current_promo_quote_rule'); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php index 437f2573bc263..0bf21e978cf6b 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php @@ -13,7 +13,7 @@ class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->isAjax()) { $this->_forward('noroute'); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php index b27554f7fc6d0..8921d7c461b95 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction()->_addBreadcrumb(__('Catalog'), __('Catalog')); $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Cart Price Rules')); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php index dc8b49e02e2eb..324d2d07b6b1d 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php index cf383bfed2d0c..422ee2a38a631 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php @@ -13,7 +13,7 @@ class NewActionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type'))); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php index fb0c502a37e1a..48d05829f3274 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php @@ -13,7 +13,7 @@ class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quo * * @return void */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type'))); diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php index 9434b07ed0b07..c0d318d345338 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php @@ -15,7 +15,7 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { if ($this->getRequest()->getPostValue()) { try { diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php index 78a24106294be..e3dc4e5a7a813 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php @@ -13,7 +13,7 @@ class Delete extends TermController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */ diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php index ad6502e18ad19..df5c08a469372 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php @@ -35,7 +35,7 @@ public function __construct( * @return \Magento\Framework\Controller\ResultInterface * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $id = $this->getRequest()->getParam('id'); $model = $this->_objectManager->create('Magento\Search\Model\Query'); diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php index da777ec44e462..34fe89f51bee0 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Layout $resultLayout */ $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT); diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php index b287a1f6ea8b2..2a89f2fb339ae 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php @@ -35,7 +35,7 @@ public function __construct( * * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Layout $resultLayout */ $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT); diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php index 6bce708278a12..54e3a4b11c218 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Index.php @@ -12,7 +12,7 @@ class Index extends TermController /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->createPage(); $resultPage->getConfig()->getTitle()->prepend(__('Search Terms')); diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php index 97586e38d644e..a10b869a24c84 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php @@ -13,7 +13,7 @@ class MassDelete extends TermController /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $searchIds = $this->getRequest()->getParam('search'); if (!is_array($searchIds)) { diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php index 35f6d63e637f9..f049f45d9a00f 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends TermController /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD); diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php index 1c512961e58ed..f0e9c4dc0984c 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php @@ -15,7 +15,7 @@ class Report extends ReportsIndexController * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->_eventManager->dispatch('on_view_report', ['report' => 'search']); /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php index 3a31a0555a739..e50d11a84dee1 100644 --- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php +++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php @@ -36,7 +36,7 @@ public function __construct( * @return \Magento\Backend\Model\View\Result\Redirect * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); if ($this->getRequest()->isPost() && $data) { diff --git a/app/code/Magento/Search/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php index f39c7bf708b45..ca49bc1cceeee 100644 --- a/app/code/Magento/Search/Controller/Ajax/Suggest.php +++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php @@ -32,7 +32,7 @@ public function __construct( /** * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { if (!$this->getRequest()->getParam('q', false)) { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php index 687e17f62abe0..bcad10e4a1efd 100644 --- a/app/code/Magento/Search/Controller/Term/Popular.php +++ b/app/code/Magento/Search/Controller/Term/Popular.php @@ -35,7 +35,7 @@ public function __construct(Context $context, ScopeConfigInterface $scopeConfig) * @param \Magento\Framework\App\RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $searchTerms = $this->scopeConfig->getValue( 'catalog/seo/search_terms', @@ -45,13 +45,13 @@ public function dispatch(RequestInterface $request) $this->_redirect('noroute'); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); } - return parent::dispatch($request); + return parent::execute($request); } /** * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php index c8493a32a6bb3..1b097fb97a849 100644 --- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php +++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php @@ -126,7 +126,7 @@ public function testExecute() ->method('setData') ->willReturnSelf(); - $this->assertSame($this->resultJsonMock, $this->controller->execute()); + $this->assertSame($this->resultJsonMock, $this->controller->executeInternal()); } public function testExecuteEmptyQuery() @@ -146,6 +146,6 @@ public function testExecuteEmptyQuery() ->with($url) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->controller->execute()); + $this->assertSame($this->resultRedirectMock, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php index fd0e5f83a2594..8642f19bb4777 100644 --- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php +++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php @@ -114,7 +114,7 @@ public function testExecute() ->with('search/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->controller->execute()); + $this->assertSame($this->resultRedirectMock, $this->controller->executeInternal()); } /** diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php index 5197e7d83e450..3d17abf467780 100644 --- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php +++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php @@ -120,7 +120,7 @@ public function testExecuteIsPostData($isPost, $data) $this->request->expects($this->at(0))->method('getPostValue')->willReturn($data); $this->request->expects($this->at(1))->method('isPost')->willReturn($isPost); $this->redirect->expects($this->once())->method('setPath')->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } /** @@ -146,7 +146,7 @@ public function testExecuteLoadQueryQueryId() $this->messageManager->expects($this->once())->method('addSuccess'); $this->redirect->expects($this->once())->method('setPath')->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } public function testExecuteLoadQueryQueryIdQueryText() @@ -164,7 +164,7 @@ public function testExecuteLoadQueryQueryIdQueryText() $this->messageManager->expects($this->once())->method('addSuccess'); $this->redirect->expects($this->once())->method('setPath')->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } public function testExecuteLoadQueryQueryIdQueryText2() @@ -183,7 +183,7 @@ public function testExecuteLoadQueryQueryIdQueryText2() $this->messageManager->expects($this->once())->method('addSuccess'); $this->redirect->expects($this->once())->method('setPath')->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } public function testExecuteLoadQueryQueryIdQueryTextException() @@ -202,7 +202,7 @@ public function testExecuteLoadQueryQueryIdQueryTextException() $this->messageManager->expects($this->once())->method('addError'); $this->session->expects($this->once())->method('setPageData'); $this->redirect->expects($this->once())->method('setPath')->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } public function testExecuteException() @@ -219,7 +219,7 @@ public function testExecuteException() $this->messageManager->expects($this->once())->method('addException'); $this->session->expects($this->once())->method('setPageData'); $this->redirect->expects($this->once())->method('setPath')->willReturnSelf(); - $this->assertSame($this->redirect, $this->controller->execute()); + $this->assertSame($this->redirect, $this->controller->executeInternal()); } /** diff --git a/app/code/Magento/SendFriend/Controller/Product.php b/app/code/Magento/SendFriend/Controller/Product.php index 73a227ce32c9a..0532108e6e7d4 100644 --- a/app/code/Magento/SendFriend/Controller/Product.php +++ b/app/code/Magento/SendFriend/Controller/Product.php @@ -65,7 +65,7 @@ public function __construct( * @return \Magento\Framework\App\ResponseInterface * @throws \Magento\Framework\Exception\NotFoundException */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { /* @var $helper \Magento\SendFriend\Helper\Data */ $helper = $this->_objectManager->get('Magento\SendFriend\Helper\Data'); @@ -84,7 +84,7 @@ public function dispatch(RequestInterface $request) ->setSendfriendFormData($request->getPostValue()); } } - return parent::dispatch($request); + return parent::execute($request); } /** diff --git a/app/code/Magento/SendFriend/Controller/Product/Send.php b/app/code/Magento/SendFriend/Controller/Product/Send.php index c6d7f3b05ddc0..99e0f911710d2 100644 --- a/app/code/Magento/SendFriend/Controller/Product/Send.php +++ b/app/code/Magento/SendFriend/Controller/Product/Send.php @@ -45,7 +45,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $product = $this->_initProduct(); diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php index 048ce1060d8b3..aa34eefa5b2a8 100644 --- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php +++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php @@ -50,7 +50,7 @@ public function __construct( * @return \Magento\Framework\Controller\ResultInterface * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php index 090dc47f19b65..bc981416c8418 100644 --- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php +++ b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php @@ -175,7 +175,7 @@ public function testExecute() ->with($formData) ->willReturnSelf(); - $this->assertEquals($pageMock, $this->model->execute()); + $this->assertEquals($pageMock, $this->model->executeInternal()); } /** @@ -254,7 +254,7 @@ public function testExecuteWithoutBlock() ->with('sendfriend.send') ->willReturn(false); - $this->assertEquals($pageMock, $this->model->execute()); + $this->assertEquals($pageMock, $this->model->executeInternal()); } public function testExecuteWithNoticeAndNoData() @@ -320,7 +320,7 @@ public function testExecuteWithNoticeAndNoData() $pageMock->expects($this->never()) ->method('getLayout'); - $this->assertEquals($pageMock, $this->model->execute()); + $this->assertEquals($pageMock, $this->model->executeInternal()); } public function testExecuteWithoutParam() @@ -345,7 +345,7 @@ public function testExecuteWithoutParam() ->with('noroute') ->willReturnSelf(); - $this->assertEquals($forwardMock, $this->model->execute()); + $this->assertEquals($forwardMock, $this->model->executeInternal()); } public function testExecuteWithoutProduct() @@ -377,7 +377,7 @@ public function testExecuteWithoutProduct() ->with('noroute') ->willReturnSelf(); - $this->assertEquals($forwardMock, $this->model->execute()); + $this->assertEquals($forwardMock, $this->model->executeInternal()); } public function testExecuteWithNonVisibleProduct() @@ -418,6 +418,6 @@ public function testExecuteWithNonVisibleProduct() ->with('noroute') ->willReturnSelf(); - $this->assertEquals($forwardMock, $this->model->execute()); + $this->assertEquals($forwardMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php index 807cb8adf04ae..f6df2bc39b04c 100644 --- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php +++ b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php @@ -234,7 +234,7 @@ public function testExecute() ->with($productUrl) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** @@ -361,7 +361,7 @@ public function testExecuteWithoutValidationAndCategory() ->with($redirectUrl) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** @@ -488,7 +488,7 @@ public function testExecuteWithoutValidationAndCategoryWithProblems() ->with($redirectUrl) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** @@ -615,7 +615,7 @@ public function testExecuteWithLocalizedException() ->with($redirectUrl) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** @@ -743,7 +743,7 @@ public function testExecuteWithException() ->with($redirectUrl) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } /** @@ -799,7 +799,7 @@ public function testExecuteWithoutProduct() ->with('noroute') ->willReturnSelf(); - $this->assertEquals($forwardMock, $this->model->execute()); + $this->assertEquals($forwardMock, $this->model->executeInternal()); } /** @@ -873,7 +873,7 @@ public function testExecuteWithoutData() ->with('noroute') ->willReturnSelf(); - $this->assertEquals($forwardMock, $this->model->execute()); + $this->assertEquals($forwardMock, $this->model->executeInternal()); } public function testExecuteWithoutFormKey() @@ -901,6 +901,6 @@ public function testExecuteWithoutFormKey() ->with('sendfriend/product/send', ['_current' => true]) ->willReturnSelf(); - $this->assertEquals($redirectMock, $this->model->execute()); + $this->assertEquals($redirectMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php index fb24a2a32580e..d012a1d1ecee6 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php @@ -58,7 +58,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { try { $this->getRequest()->setParam('shipment_id', $this->getRequest()->getParam('id')); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php index ea5ab1d967769..8a47ed1ddaec5 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php @@ -41,7 +41,7 @@ protected function _isAllowed() * @return void * @throws \Magento\Framework\Exception\LocalizedException */ - public function execute() + public function executeInternal() { try { $carrier = $this->getRequest()->getPost('carrier'); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php index facbc5192d7a0..faac42d270ff2 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php @@ -48,7 +48,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(); try { diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php index 6d3bb9a49ed17..e0ea65f65fdf8 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php @@ -48,7 +48,7 @@ protected function _isAllowed() * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php index 26b2df96cb627..3c4dc9f49ee78 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/GetShippingItemsGrid.php @@ -41,7 +41,7 @@ protected function _isAllowed() * * @return ResponseInterface */ - public function execute() + public function executeInternal() { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id')); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php index a0917b813d1da..06e97644dfde6 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php @@ -40,7 +40,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id')); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php index 8cf58bc151fd5..fb3889761fa73 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php @@ -58,7 +58,7 @@ protected function _isAllowed() * * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { try { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php index d931e1e100625..db6903544d0f2 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php @@ -50,7 +50,7 @@ protected function _isAllowed() * * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id')); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php index 4b85739acc03d..7ef4f99eef241 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/RemoveTrack.php @@ -40,7 +40,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $trackId = $this->getRequest()->getParam('track_id'); /** @var \Magento\Sales\Model\Order\Shipment\Track $track */ diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php index 0704ac04041c3..3e5e9a3ac2d96 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php @@ -81,7 +81,7 @@ protected function _saveShipment($shipment) * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php index d4c6015870b20..e551117332303 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php @@ -21,7 +21,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { /** * Clear old values for shipment qty's diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php index 980486e3bc284..ebd8a6b111ea0 100644 --- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php +++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/View.php @@ -56,7 +56,7 @@ protected function _isAllowed() * * @return void */ - public function execute() + public function executeInternal() { $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id')); $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id')); diff --git a/app/code/Magento/Shipping/Controller/Tracking/Popup.php b/app/code/Magento/Shipping/Controller/Tracking/Popup.php index 9ae7590bdb444..d3fb5dbe349b9 100644 --- a/app/code/Magento/Shipping/Controller/Tracking/Popup.php +++ b/app/code/Magento/Shipping/Controller/Tracking/Popup.php @@ -52,7 +52,7 @@ public function __construct( * @return void * @throws NotFoundException */ - public function execute() + public function executeInternal() { $shippingInfoModel = $this->_shippingInfoFactory->create()->loadByHash($this->getRequest()->getParam('hash')); $this->_coreRegistry->register('current_shipping_info', $shippingInfoModel); diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php index 6a60d69bdfe58..9ab7b4844e46a 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddCommentTest.php @@ -223,7 +223,7 @@ public function testExecute() ->will($this->returnValue($resultLayoutMock)); $this->responseMock->expects($this->once())->method('setBody')->with($result); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -261,7 +261,7 @@ public function testExecuteLoadException() ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('message'))); $this->exceptionResponse(); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -278,7 +278,7 @@ public function testEmptyCommentData() $this->requestMock->expects($this->once())->method('getPost')->with('comment')->will($this->returnValue([])); $this->exceptionResponse(); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -322,6 +322,6 @@ public function testExecuteExceptionSave() $this->shipmentMock->expects($this->once())->method('save')->will($this->throwException(new \Exception())); $this->exceptionResponse(); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php index 1abeb9d3dacd9..d078e53203160 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php @@ -254,6 +254,6 @@ public function testExecute() $this->response->expects($this->once()) ->method('setBody') ->with($html); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php index d96ba63982437..a8cc7c8a3ac7c 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php @@ -179,7 +179,7 @@ public function testExecute() $this->messageManagerMock->expects($this->once())->method('addSuccess'); $this->responseMock->expects($this->once())->method('representJson'); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -192,7 +192,7 @@ public function testExecuteLoadException() ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('message'))); $this->responseMock->expects($this->once())->method('representJson'); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -217,7 +217,7 @@ public function testExecuteSaveException() ->will($this->returnValue($logerMock)); $this->responseMock->expects($this->once())->method('representJson'); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -236,6 +236,6 @@ public function testExecuteLabelGenerateFail() ); $this->responseMock->expects($this->once())->method('representJson'); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php index edcdbd764a1fd..793763607ab90 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php @@ -235,7 +235,7 @@ public function testEmail() $arguments = ['shipment_id' => $shipmentId]; $this->prepareRedirect($path, $arguments, 0); - $this->shipmentEmail->execute(); + $this->shipmentEmail->executeInternal(); $this->assertEquals($this->response, $this->shipmentEmail->getResponse()); } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/GetShippingItemsGridTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/GetShippingItemsGridTest.php index c62c9109a26a8..71239d0a1be5b 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/GetShippingItemsGridTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/GetShippingItemsGridTest.php @@ -152,6 +152,6 @@ public function testExecute() ->method('toHtml') ->will($this->returnValue($result)); - $this->assertNotEmpty('result-html', $this->controller->execute()); + $this->assertNotEmpty('result-html', $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php index df9cc23823b08..6179fb4eac651 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php @@ -282,6 +282,6 @@ public function testExecute() ->with('menu') ->will($this->returnValue($menuBlock)); - $this->assertNull($this->newAction->execute()); + $this->assertNull($this->newAction->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php index 6548503fbee20..1effd8c699b47 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php @@ -250,7 +250,7 @@ public function testExecute() ->method('getShippingLabel') ->will($this->returnValue($labelContent)); - $this->assertEquals($this->fileCreate(), $this->controller->execute()); + $this->assertEquals($this->fileCreate(), $this->controller->executeInternal()); } /** @@ -291,7 +291,7 @@ public function testExecuteFromImageString() ->method('getObject') ->will($this->returnSelf()); - $this->assertEquals($this->fileCreate(), $this->controller->execute()); + $this->assertEquals($this->fileCreate(), $this->controller->executeInternal()); } /** @@ -337,7 +337,7 @@ public function testExecuteImageStringFail() ->will($this->returnValue(1)); $this->redirectSection(); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -351,6 +351,6 @@ public function testExecuteLoadShipmentFail() $this->messageManagerMock->expects($this->once())->method('addError')->will($this->returnSelf()); $this->redirectSection(); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintPackageTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintPackageTest.php index 4c6b9608d3b2f..05487808f92b9 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintPackageTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/PrintPackageTest.php @@ -193,7 +193,7 @@ public function testExecute() 'application/pdf' )->will($this->returnValue('result-pdf-content')); - $this->assertEquals('result-pdf-content', $this->controller->execute()); + $this->assertEquals('result-pdf-content', $this->controller->executeInternal()); } /** @@ -215,6 +215,6 @@ public function testExecuteFail() ->method('setIsUrlNotice') ->with(true); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/RemoveTrackTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/RemoveTrackTest.php index bb0b1d21202a4..37d4634c0da42 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/RemoveTrackTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/RemoveTrackTest.php @@ -255,7 +255,7 @@ public function testExecute() ->method('setBody') ->with($response); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -275,7 +275,7 @@ public function testExecuteTrackIdFail() ->will($this->returnValue($trackId)); $this->representJson($errors); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -294,7 +294,7 @@ public function testExecuteShipmentLoadFail() ->will($this->returnValue(null)); $this->representJson($errors); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } /** @@ -313,6 +313,6 @@ public function testExecuteDeleteFail() ->will($this->throwException(new \Exception())); $this->representJson($errors); - $this->assertNull($this->controller->execute()); + $this->assertNull($this->controller->executeInternal()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php index fad9df01c3744..954714bbd9aa4 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php @@ -249,7 +249,7 @@ public function testExecute($formKeyIsValid, $isPost) $this->shipmentLoader->expects($this->never()) ->method('load'); - $this->assertEquals($this->resultRedirect, $this->saveAction->execute()); + $this->assertEquals($this->resultRedirect, $this->saveAction->executeInternal()); } else { $shipmentId = 1000012; $orderId = 10003; @@ -345,7 +345,7 @@ public function testExecute($formKeyIsValid, $isPost) ->will($this->returnValue($orderId)); $this->prepareRedirect($path, $arguments); - $this->saveAction->execute(); + $this->saveAction->executeInternal(); $this->assertEquals($this->response, $this->saveAction->getResponse()); } } diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php index 1dbf636942246..0f6aad7610e39 100644 --- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php +++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/ViewTest.php @@ -187,7 +187,7 @@ public function testExecute() ) ->willReturnSelf(); - $this->assertEquals($this->resultPageMock, $this->controller->execute()); + $this->assertEquals($this->resultPageMock, $this->controller->executeInternal()); } /** @@ -209,7 +209,7 @@ public function testExecuteNoShipment() ->with('noroute') ->willReturnSelf(); - $this->assertEquals($this->resultForwardMock, $this->controller->execute()); + $this->assertEquals($this->resultForwardMock, $this->controller->executeInternal()); } protected function loadShipment($orderId, $shipmentId, $shipment, $tracking, $comeFrom, $returnShipment) diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php index 70f12719c16cb..bdc70c0f8f88d 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php @@ -16,7 +16,7 @@ class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap * * @return void */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Filesystem\Directory\Write $directory */ $directory = $this->_objectManager->get( diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php index 47cf66a319c0e..87441bc158596 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php @@ -31,7 +31,7 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen * @return void * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { // 1. Get ID and create model $id = $this->getRequest()->getParam('sitemap_id'); diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php index b5a7e40d5a042..c162942061d0c 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php @@ -14,7 +14,7 @@ class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap * * @return void */ - public function execute() + public function executeInternal() { // init and load sitemap model $id = $this->getRequest()->getParam('sitemap_id'); diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php index 83aeca5ef8f4e..11b84772e3297 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Index.php @@ -15,7 +15,7 @@ class Index extends \Magento\Sitemap\Controller\Adminhtml\Sitemap * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction(); $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Site Map')); diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php index abfba8929a0bb..309c00a840dc5 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php @@ -14,7 +14,7 @@ class NewAction extends \Magento\Sitemap\Controller\Adminhtml\Sitemap * * @return void */ - public function execute() + public function executeInternal() { // the same form is used to create and edit $this->_forward('edit'); diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php index 2f28cf9818308..dd96a60dfceef 100644 --- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php +++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php @@ -133,7 +133,7 @@ protected function getResult($id) * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { // check if data sent $data = $this->getRequest()->getPostValue(); diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php index e067bf2059814..c59e5ff66310d 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php @@ -100,7 +100,7 @@ public function testSaveEmptyDataShouldRedirectToDefault() ->with('adminhtml/*/') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->saveController->execute()); + $this->assertSame($this->resultRedirectMock, $this->saveController->executeInternal()); } public function testTryToSaveInvalidDataShouldFailWithErrors() @@ -166,6 +166,6 @@ public function testTryToSaveInvalidDataShouldFailWithErrors() ->with('adminhtml/*/edit', ['sitemap_id' => $siteMapId]) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->saveController->execute()); + $this->assertSame($this->resultRedirectMock, $this->saveController->executeInternal()); } } diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php index 6e3e3f4e4f551..533104a5689e3 100644 --- a/app/code/Magento/Store/App/Action/Plugin/Context.php +++ b/app/code/Magento/Store/App/Action/Plugin/Context.php @@ -69,7 +69,7 @@ public function __construct( * @return mixed * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Framework\App\ActionInterface $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php index 46fa0bc004a13..8519652f11bd6 100644 --- a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php +++ b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php @@ -31,7 +31,7 @@ public function __construct( * @SuppressWarnings(PHPMD.UnusedFormalParameter) * @throws \Magento\Framework\Exception\State\InitException */ - public function aroundDispatch( + public function aroundExecute( \Magento\Framework\App\ActionInterface $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php index b527b7ad4fe70..052a8fc25fb2e 100644 --- a/app/code/Magento/Store/Controller/Store/SwitchAction.php +++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php @@ -68,7 +68,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { $storeCode = $this->_request->getParam( StoreResolver::PARAM_NAME, diff --git a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php index e6c679b2dd4d2..5614f45383994 100644 --- a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextTest.php @@ -185,7 +185,7 @@ public function setUp() ->will($this->returnValue(self::CURRENCY_CURRENT_STORE)); } - public function testAroundDispatchCurrencyFromSession() + public function testAroundExecuteCurrencyFromSession() { $this->sessionMock->expects($this->any()) ->method('getCurrencyCode') @@ -201,11 +201,11 @@ public function testAroundDispatchCurrencyFromSession() $this->assertEquals( 'ExpectedValue', - $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } - public function testDispatchCurrentStoreCurrency() + public function testExecuteCurrentStoreCurrency() { $this->httpContextMock->expects($this->at(0)) ->method('setValue') @@ -217,7 +217,7 @@ public function testDispatchCurrentStoreCurrency() $this->assertEquals( 'ExpectedValue', - $this->plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } } diff --git a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/StoreCheckTest.php b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/StoreCheckTest.php index feaca2ad45ebe..e83d629fb810b 100644 --- a/app/code/Magento/Store/Test/Unit/App/Action/Plugin/StoreCheckTest.php +++ b/app/code/Magento/Store/Test/Unit/App/Action/Plugin/StoreCheckTest.php @@ -64,21 +64,21 @@ protected function setUp() * @expectedException \Magento\Framework\Exception\State\InitException * @expectedExceptionMessage Current store is not active. */ - public function testAroundDispatchWhenStoreNotActive() + public function testAroundExecuteWhenStoreNotActive() { $this->_storeMock->expects($this->any())->method('isActive')->will($this->returnValue(false)); $this->assertEquals( 'Expected', - $this->_plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->_plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } - public function testAroundDispatchWhenStoreIsActive() + public function testAroundExecuteWhenStoreIsActive() { $this->_storeMock->expects($this->any())->method('isActive')->will($this->returnValue(true)); $this->assertEquals( 'Expected', - $this->_plugin->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock) + $this->_plugin->aroundExecute($this->subjectMock, $this->closureMock, $this->requestMock) ); } diff --git a/app/code/Magento/Swagger/Controller/Index/Index.php b/app/code/Magento/Swagger/Controller/Index/Index.php index b898836ccf37d..64cd2888984d1 100644 --- a/app/code/Magento/Swagger/Controller/Index/Index.php +++ b/app/code/Magento/Swagger/Controller/Index/Index.php @@ -35,7 +35,7 @@ public function __construct( /** * @return \Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { $this->pageConfig->addBodyClass('swagger-section'); return $this->pageFactory->create(); diff --git a/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php index 0143601c8995d..015064b2642b9 100644 --- a/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php @@ -8,7 +8,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase { - public function testExecute() + public function testExecuteInternal() { $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); @@ -22,6 +22,7 @@ public function testExecute() $pageConfigMock->expects($this->once())->method('addBodyClass')->with('swagger-section'); $resultPageFactory->expects($this->once())->method('create'); + /** @var \Magento\Swagger\Controller\Index\Index $model */ $model = $objectManager->getObject( 'Magento\Swagger\Controller\Index\Index', [ @@ -29,6 +30,6 @@ public function testExecute() 'pageFactory' => $resultPageFactory ] ); - $model->execute(); + $model->executeInternal(); } } diff --git a/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php b/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php index 180a777d1660a..362e2c7a6c551 100644 --- a/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php +++ b/app/code/Magento/Swatches/Controller/Adminhtml/Iframe/Show.php @@ -68,7 +68,7 @@ public function __construct( * * @return string */ - public function execute() + public function executeInternal() { try { $uploader = $this->uploaderFactory->create(['fileId' => 'datafile']); diff --git a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php index e9da825c657ce..1b9259fb0c610 100644 --- a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php +++ b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php @@ -22,7 +22,7 @@ class Save * @return array * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function beforeDispatch(Attribute\Save $subject, RequestInterface $request) + public function beforeExecute(Attribute\Save $subject, RequestInterface $request) { $data = $request->getPostValue(); if (isset($data['frontend_input'])) { diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php index 8827f6f46524a..a487115bbc049 100644 --- a/app/code/Magento/Swatches/Controller/Ajax/Media.php +++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php @@ -50,7 +50,7 @@ public function __construct( * * @return string */ - public function execute() + public function executeInternal() { $productMedia = []; if ($productId = (int)$this->getRequest()->getParam('product_id')) { diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php index 18ec75cb9664f..72099cb930faa 100644 --- a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php +++ b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php @@ -96,7 +96,7 @@ public function testExecuteException() ->expects($this->once()) ->method('create') ->will($this->throwException(new \Exception)); - $this->controller->execute(); + $this->controller->executeInternal(); } /** @@ -132,7 +132,7 @@ public function testExecute($fileResult, $expectedResult) $this->responseMock->expects($this->once())->method('setBody')->willReturn(json_encode($expectedResult)); - $this->controller->execute(); + $this->controller->executeInternal(); } public function dataForExecute() diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php index c1d0356f66d2d..ab54e2ceca46f 100644 --- a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php +++ b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Product/Attribute/Plugin/SaveTest.php @@ -11,7 +11,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase /** * @dataProvider dataRequest */ - public function testBeforeDispatch($dataRequest, $runTimes) + public function testBeforeExecute($dataRequest, $runTimes) { $subject = $this->getMock('\Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save', [], [], '', false); $request = $this->getMock( @@ -40,7 +40,7 @@ public function testBeforeDispatch($dataRequest, $runTimes) $request->expects($this->once())->method('getPostValue')->willReturn($dataRequest); $request->expects($this->exactly($runTimes))->method('setPostValue')->willReturn($this->returnSelf()); - $controller->beforeDispatch($subject, $request); + $controller->beforeExecute($subject, $request); } public function dataRequest() diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php index 6358b2d5ccf11..83466261a6141 100644 --- a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php +++ b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php @@ -137,7 +137,7 @@ public function testExecute() ->with($this->mediaGallery) ->will($this->returnSelf()); - $result = $this->controller->execute(); + $result = $this->controller->executeInternal(); $this->assertInstanceOf('\Magento\Framework\Controller\Result\Json', $result); } @@ -179,7 +179,7 @@ public function testExecuteNullProduct() ->with($this->mediaGallery) ->will($this->returnSelf()); - $result = $this->controller->execute(); + $result = $this->controller->executeInternal(); $this->assertInstanceOf('\Magento\Framework\Controller\Result\Json', $result); } diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php index 2fe8a5b1572e3..a7f555a170653 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Add.php @@ -15,7 +15,7 @@ class Add extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $this->_coreRegistry->register( RegistryConstants::CURRENT_TAX_RATE_FORM_DATA, diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php index 5f58a4147aceb..f8a99e226f73a 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxDelete.php @@ -15,7 +15,7 @@ class AjaxDelete extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $rateId = (int)$this->getRequest()->getParam('tax_calculation_rate_id'); try { diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php index 673ea280bab25..e824a8185ac12 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php @@ -16,7 +16,7 @@ class AjaxLoad extends \Magento\Tax\Controller\Adminhtml\Rate * * @return void */ - public function execute() + public function executeInternal() { $rateId = (int)$this->getRequest()->getParam('id'); try { diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php index 8dd31f2ca5b33..635d116a31d4c 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php @@ -15,7 +15,7 @@ class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { try { $rateData = $this->_processRateData($this->getRequest()->getPostValue()); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php index c11f420db32e3..c6794eaf0ab7e 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php @@ -16,7 +16,7 @@ class Delete extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Redirect|void */ - public function execute() + public function executeInternal() { if ($rateId = $this->getRequest()->getParam('rate')) { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php index e13ae2293e6c2..a5e2fbf1a05a8 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php @@ -17,7 +17,7 @@ class Edit extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $rateId = (int)$this->getRequest()->getParam('rate'); $this->_coreRegistry->register(RegistryConstants::CURRENT_TAX_RATE_ID, $rateId); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php index d38d6ddd9af14..145341f4f2035 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->initResultPage(); $resultPage->addBreadcrumb(__('Manage Tax Rates'), __('Manage Tax Rates')); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php index 442940fdfc5ea..85cf89a9e8570 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php @@ -16,7 +16,7 @@ class Save extends \Magento\Tax\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php index 9d862df7d5a79..7dd9f40e4df3b 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Tax\Controller\Adminhtml\Rule /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php index ebbabcf833aed..89b49f16feb43 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Tax\Controller\Adminhtml\Rule /** * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $taxRuleId = $this->getRequest()->getParam('rule'); $this->_coreRegistry->register('tax_rule_id', $taxRuleId); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php index b3ea7586cf90b..e3aab07b459f0 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php @@ -12,7 +12,7 @@ class Index extends \Magento\Tax\Controller\Adminhtml\Rule /** * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->initResultPage(); $resultPage->getConfig()->getTitle()->prepend(__('Tax Rules')); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php index 79f4fa7d752e7..74bd5b1c57ab5 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Tax\Controller\Adminhtml\Rule /** * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php index 27e75cf819b06..d050cbd6773c1 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\Tax\Controller\Adminhtml\Rule /** * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php index 8e5e003872d7d..37edd84177d6a 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxDelete.php @@ -15,7 +15,7 @@ class AjaxDelete extends \Magento\Tax\Controller\Adminhtml\Tax * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $classId = (int)$this->getRequest()->getParam('class_id'); try { diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php index 68527988b903b..92647155fbedb 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/AjaxSave.php @@ -15,7 +15,7 @@ class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Tax * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { try { $taxClassId = (int)$this->getRequest()->getPost('class_id') ?: null; diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php index 89ab88a5965a0..18860dd4891d6 100644 --- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php +++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php @@ -37,7 +37,7 @@ public function __construct( * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $section = $this->getRequest()->getParam('section'); if ($section) { diff --git a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php index 70c1e60007141..408cb5aad84f2 100644 --- a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php +++ b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php @@ -79,7 +79,7 @@ public function __construct( * @return mixed * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Framework\App\ActionInterface $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php b/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php index f8ab3eb71e9bc..7fc90aa1d649b 100644 --- a/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php +++ b/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php @@ -111,9 +111,9 @@ protected function setUp() * @param bool $cache * @param bool $taxEnabled * @param bool $loggedIn - * @dataProvider dataProviderAroundDispatch + * @dataProvider dataProviderAroundExecute */ - public function testAroundDispatch($cache, $taxEnabled, $loggedIn) + public function testAroundExecute($cache, $taxEnabled, $loggedIn) { $this->customerSessionMock->expects($this->any()) ->method('isLoggedIn') @@ -164,14 +164,14 @@ public function testAroundDispatch($cache, $taxEnabled, $loggedIn) $proceed = function ($request) use ($expectedResult) { return $expectedResult; }; - $this->contextPlugin->aroundDispatch($action, $proceed, $request); + $this->contextPlugin->aroundExecute($action, $proceed, $request); } } /** * @return array */ - public function dataProviderAroundDispatch() + public function dataProviderAroundExecute() { return [ [false, false, false], diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php index 6373e5aa514bf..ffc1521938206 100644 --- a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php +++ b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php @@ -52,7 +52,7 @@ public function setUp() /** * Executes the controller action and asserts non exception logic */ - public function testExecute() + public function testExecuteInternal() { $taxRateId=1; $returnArray=[ @@ -120,7 +120,8 @@ public function testExecute() ->with(\Magento\Framework\Controller\ResultFactory::TYPE_JSON) ->willReturn($jsonObject); - $notification = $objectManager->getObject( + /** @var \Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad $controller */ + $controller = $objectManager->getObject( 'Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad', [ 'taxRateRepository' => $this->taxRateRepository, @@ -132,14 +133,14 @@ public function testExecute() // No exception thrown - $this->assertSame($jsonObject, $notification->execute()); + $this->assertSame($jsonObject, $controller->executeInternal()); } /** * Check if validation throws a localized catched exception in case of incorrect id */ - public function testExecuteLocalizedException() + public function testExecuteInternalLocalizedException() { $taxRateId=999; $exceptionMessage='No such entity with taxRateId = '.$taxRateId; @@ -173,7 +174,8 @@ public function testExecuteLocalizedException() ->with(\Magento\Framework\Controller\ResultFactory::TYPE_JSON) ->willReturn($jsonObject); - $notification = $objectManager->getObject( + /** @var \Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad $controller */ + $controller = $objectManager->getObject( 'Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad', [ 'taxRateRepository' => $this->taxRateRepository, @@ -183,13 +185,13 @@ public function testExecuteLocalizedException() ); //exception thrown with catch - $this->assertSame($jsonObject, $notification->execute()); + $this->assertSame($jsonObject, $controller->executeInternal()); } /** * Check if validation throws a localized catched exception in case of incorrect id */ - public function testExecuteException() + public function testExecuteInternalException() { $taxRateId=999; $exceptionMessage=__('An error occurred while loading this tax rate.'); @@ -223,7 +225,8 @@ public function testExecuteException() ->with(\Magento\Framework\Controller\ResultFactory::TYPE_JSON) ->willReturn($jsonObject); - $notification = $objectManager->getObject( + /** @var \Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad $controller */ + $controller = $objectManager->getObject( 'Magento\Tax\Controller\Adminhtml\Rate\AjaxLoad', [ 'taxRateRepository' => $this->taxRateRepository, @@ -233,6 +236,6 @@ public function testExecuteException() ); //exception thrown with catch - $this->assertSame($jsonObject, $notification->execute()); + $this->assertSame($jsonObject, $controller->executeInternal()); } } diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php index cb3b6df297260..88656b9e4da94 100644 --- a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php +++ b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php @@ -10,7 +10,7 @@ class IgnoreTaxNotificationTest extends \PHPUnit_Framework_TestCase { - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManager($this); $cacheTypeList = $this->getMockBuilder('\Magento\Framework\App\Cache\TypeList') @@ -63,7 +63,8 @@ public function testExecute() ->method('get') ->willReturn($config); - $notification = $objectManager->getObject( + /** @var \Magento\Tax\Controller\Adminhtml\Tax\IgnoreTaxNotification $controller */ + $controller = $objectManager->getObject( 'Magento\Tax\Controller\Adminhtml\Tax\IgnoreTaxNotification', [ 'objectManager' => $manager, @@ -74,6 +75,6 @@ public function testExecute() ); // No exception thrown - $this->assertSame($resultRedirect, $notification->execute()); + $this->assertSame($resultRedirect, $controller->executeInternal()); } } diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php index 9f6f1cb8e6bee..2b23bd51aa6d7 100644 --- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php +++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php @@ -16,7 +16,7 @@ class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate * * @return ResponseInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Layout $resultLayout */ $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT); diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php index dc4e8987adc10..7685d61ee95f0 100644 --- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php +++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php @@ -15,7 +15,7 @@ class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate * * @return ResponseInterface */ - public function execute() + public function executeInternal() { /** start csv content and set template */ $headers = new \Magento\Framework\DataObject( diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php index 38fc277576cc6..546980d126fa0 100644 --- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php +++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php @@ -16,7 +16,7 @@ class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate * * @return ResponseInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\View\Result\Layout $resultLayout */ $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT); diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php index b37520a99f870..56d479a43cf14 100644 --- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php +++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php @@ -14,7 +14,7 @@ class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE); diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php index eb5efff3d5e9b..db37d19fa2641 100644 --- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php +++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php @@ -14,7 +14,7 @@ class ImportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { if ($this->getRequest()->isPost() && !empty($_FILES['import_rates_file']['tmp_name'])) { try { diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php index 12fbe2225fa2f..7f29bfb70161a 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php @@ -15,7 +15,7 @@ class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $themeId = $this->getRequest()->getParam('id'); try { diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php index 0113c1c59a4ad..badb051def8f2 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php @@ -16,7 +16,7 @@ class DownloadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Them * * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { $themeId = $this->getRequest()->getParam('theme_id'); $file = $this->getRequest()->getParam('file'); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php index 8653fa797f160..6432c23db6d78 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php @@ -16,7 +16,7 @@ class DownloadCustomCss extends \Magento\Theme\Controller\Adminhtml\System\Desig * * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { $themeId = $this->getRequest()->getParam('theme_id'); try { diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php index 367958d22fb13..2b8f9853de79a 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * * @return void */ - public function execute() + public function executeInternal() { $themeId = (int)$this->getRequest()->getParam('id'); /** @var $theme \Magento\Framework\View\Design\ThemeInterface */ diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php index e49cdb3e88320..8a8fb29abc4e0 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Grid.php @@ -13,7 +13,7 @@ class Grid extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php index 8216660eab1a5..599b01273022e 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_Theme::system_design_theme'); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php index 8e930a8c55d46..f699769c61575 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php index c3fabcb4d0232..6bb049c8be3bb 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php @@ -14,7 +14,7 @@ class Save extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute() + public function executeInternal() { $redirectBack = (bool)$this->getRequest()->getParam('back', false); $themeData = $this->getRequest()->getParam('theme'); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php index c201adf38e918..d576899f2dcb6 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php @@ -13,7 +13,7 @@ class UploadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * * @return void */ - public function execute() + public function executeInternal() { /** @var $serviceModel \Magento\Theme\Model\Uploader\Service */ $serviceModel = $this->_objectManager->get('Magento\Theme\Model\Uploader\Service'); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php index 58cf189c86f0b..84800872fc315 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php @@ -14,7 +14,7 @@ class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme * @return void * @throws \Magento\Framework\Exception\LocalizedException */ - public function execute() + public function executeInternal() { $themeId = $this->getRequest()->getParam('id'); /** @var $serviceModel \Magento\Theme\Model\Uploader\Service */ diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php index abc3ebd705a61..21fbd7eaa2b6f 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Contents.php @@ -13,7 +13,7 @@ class Contents extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg * * @return void */ - public function execute() + public function executeInternal() { try { $this->_view->loadLayout('empty'); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php index 2b59d4bba3b8e..4f3a4fda4ac82 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFiles.php @@ -14,7 +14,7 @@ class DeleteFiles extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysi * @return void * @throws \Exception */ - public function execute() + public function executeInternal() { try { if (!$this->getRequest()->isPost()) { diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php index 4958a6b3909e7..6c6258e7f5231 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolder.php @@ -13,7 +13,7 @@ class DeleteFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wys * * @return void */ - public function execute() + public function executeInternal() { try { $path = $this->storage->getCurrentPath(); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php index 7abdd3ee5eccf..7584377ecce96 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Fi * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout('overlay_popup'); $this->_view->renderLayout(); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php index 018e8194f37a2..119a5b8b9ca6c 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php @@ -13,7 +13,7 @@ class NewFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwy * * @return void */ - public function execute() + public function executeInternal() { $name = $this->getRequest()->getPost('name'); try { diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php index 92ef5e7bdc533..32ff7003905ad 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsert.php @@ -13,7 +13,7 @@ class OnInsert extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg * * @return void */ - public function execute() + public function executeInternal() { /** @var $helperStorage \Magento\Theme\Helper\Storage */ $helperStorage = $this->_objectManager->get('Magento\Theme\Helper\Storage'); diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php index d8f050d8d3f3d..cab5e4b78d65a 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php @@ -16,7 +16,7 @@ class PreviewImage extends \Magento\Theme\Controller\Adminhtml\System\Design\Wys * * @return ResponseInterface|void */ - public function execute() + public function executeInternal() { $file = $this->getRequest()->getParam('file'); /** @var $helper \Magento\Theme\Helper\Storage */ diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php index d3d8a244e73d5..3e789134e26d6 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php @@ -13,7 +13,7 @@ class TreeJson extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg * * @return void */ - public function execute() + public function executeInternal() { try { $this->getResponse()->representJson( diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php index 877b0fc83d9e8..420083086ed9b 100644 --- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php +++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/Upload.php @@ -13,7 +13,7 @@ class Upload extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\F * * @return void */ - public function execute() + public function executeInternal() { try { $path = $this->storage->getCurrentPath(); diff --git a/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php b/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php index 0f469442c15de..1e0f900a6ecb6 100644 --- a/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php +++ b/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php @@ -47,7 +47,7 @@ public function __construct( * @return void * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function beforeDispatch( + public function beforeExecute( AbstractAction $subject, RequestInterface $request ) { diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DeleteTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DeleteTest.php index 4323967aa478e..86f88c71aee83 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DeleteTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DeleteTest.php @@ -147,7 +147,7 @@ public function testExecute() ->with($path) ->willReturnSelf(); - $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->controller->execute()); + $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->controller->executeInternal()); } /** @@ -218,7 +218,7 @@ public function testExecuteInvalidArgument($themeIdInModel, $isVirtual) $logger->expects($this->once()) ->method('critical'); - $this->controller->execute(); + $this->controller->executeInternal(); } /** @@ -255,6 +255,6 @@ public function testExecuteLocalizedException() $this->messageManager->expects($this->once()) ->method('addError'); - $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->controller->execute()); + $this->assertInstanceOf('Magento\Framework\Controller\Result\Redirect', $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCssTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCssTest.php index 5beef00b2aed5..e9b058c7bdf09 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCssTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCssTest.php @@ -186,7 +186,7 @@ public function testExecute() ->with($relPath, ['type' => 'filename', 'value' => $relPath], DirectoryList::ROOT) ->willReturn($this->getMockBuilder('Magento\Framework\App\ResponseInterface')->getMock()); - $this->assertInstanceOf('Magento\Framework\App\ResponseInterface', $this->controller->execute()); + $this->assertInstanceOf('Magento\Framework\App\ResponseInterface', $this->controller->executeInternal()); } public function testExecuteInvalidArgument() @@ -243,6 +243,6 @@ public function testExecuteInvalidArgument() ->method('setRedirect') ->with($refererUrl); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCustomCssTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCustomCssTest.php index 891f455ee1dd7..04f013fb5e3d5 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCustomCssTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCustomCssTest.php @@ -173,7 +173,7 @@ public function testExecute() ->with($fileName, ['type' => 'filename', 'value' => $fullPath], DirectoryList::ROOT) ->willReturn($this->getMockBuilder('Magento\Framework\App\ResponseInterface')->getMock()); - $this->assertInstanceOf('Magento\Framework\App\ResponseInterface', $this->controller->execute()); + $this->assertInstanceOf('Magento\Framework\App\ResponseInterface', $this->controller->executeInternal()); } public function testExecuteInvalidArgument() @@ -213,6 +213,6 @@ public function testExecuteInvalidArgument() ->method('setRedirect') ->with($refererUrl); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/EditTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/EditTest.php index eac3f24f2fec7..d9481c4ccc294 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/EditTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/EditTest.php @@ -59,7 +59,7 @@ public function testExecuteWithoutLoadedTheme() ->method('getUrl') ->willReturn('http://return.url'); - $this->_model->execute(); + $this->_model->executeInternal(); } public function testExecuteWithException() @@ -125,7 +125,7 @@ public function testExecuteWithException() ->method('getUrl') ->willReturn('http://return.url'); - $this->_model->execute(); + $this->_model->executeInternal(); } /** @@ -245,6 +245,6 @@ public function testExecute() $this->view->expects($this->once()) ->method('renderLayout'); - $this->_model->execute(); + $this->_model->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/GridTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/GridTest.php index 850e4d09d11cb..e15f4b66d8e05 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/GridTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/GridTest.php @@ -35,7 +35,7 @@ class GridTest extends \PHPUnit_Framework_TestCase protected $view; /** - * @var Delete + * @var Grid */ protected $controller; @@ -70,13 +70,13 @@ public function setUp() ); } - public function testExecute() + public function testExecuteInternal() { $this->view->expects($this->once()) ->method('loadLayout') ->with(false); $this->view->expects($this->once()) ->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php index d504277d57f14..a3cf13f6fd494 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php @@ -40,6 +40,6 @@ public function testIndexAction() ->method('getLayout') ->will($this->returnValue($layout)); - $this->_model->execute(); + $this->_model->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php index 524dad54b8cb2..c260a330d2393 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php @@ -85,6 +85,6 @@ public function testSaveAction() ->with('Magento\Theme\Model\Theme\SingleFile') ->will($this->returnValue(null)); - $this->_model->execute(); + $this->_model->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadCssTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadCssTest.php index 1529c56175fd4..a90289e90626b 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadCssTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadCssTest.php @@ -39,7 +39,7 @@ public function testExecute() ->method('representJson') ->with('{"filename":"filename","content":"content"}'); - $this->_model->execute(); + $this->_model->executeInternal(); } public function testExecuteWithLocalizedException() @@ -67,7 +67,7 @@ public function testExecuteWithLocalizedException() ->with('Magento\Framework\Json\Helper\Data') ->willReturn($jsonData); - $this->_model->execute(); + $this->_model->executeInternal(); } public function testExecuteWithException() @@ -103,6 +103,6 @@ public function testExecuteWithException() ->with('Magento\Framework\Json\Helper\Data') ->willReturn($jsonData); - $this->_model->execute(); + $this->_model->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php index 6dbfdd62e0c54..271b084f5f680 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php @@ -99,7 +99,7 @@ public function testExecuteWithoutTheme() ->method('representJson') ->with('{"error":"true","message":"We cannot find a theme with id "' . $themeId . '"."}'); - $this->_model->execute(); + $this->_model->executeInternal(); } public function testExecuteWithException() @@ -149,7 +149,7 @@ public function testExecuteWithException() ->method('representJson') ->with('{"error":"true","message":"We can\'t upload the JS file right now."}'); - $this->_model->execute(); + $this->_model->executeInternal(); } public function testExecute() @@ -244,6 +244,6 @@ public function testExecute() ->method('representJson') ->with('{"error":false,"files":{"fileOne":{"name":"name"}}}'); - $this->_model->execute(); + $this->_model->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/ContentsTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/ContentsTest.php index 42292699b7d88..5251dcc759eb9 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/ContentsTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/ContentsTest.php @@ -96,6 +96,6 @@ public function testExecute() $this->response->expects($this->once()) ->method('representJson'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFilesTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFilesTest.php index 2a69f64be343e..3a34f63df2ccf 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFilesTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFilesTest.php @@ -69,7 +69,7 @@ public function testExecuteWithWrongRequest() ->method('representJson') ->with('{"error":"true","message":"Wrong request"}'); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecute() @@ -99,6 +99,6 @@ public function testExecute() ->method('deleteFile') ->with('file'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolderTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolderTest.php index 9bd042cfe2e58..2c6b5f2e642a7 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolderTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/DeleteFolderTest.php @@ -66,6 +66,6 @@ public function testExecute() ->with('Magento\Framework\Json\Helper\Data') ->willReturn($jsonData); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php index 63884649f39f4..cf913494623f2 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php @@ -34,6 +34,6 @@ public function testExecute() $this->view ->expects($this->once()) ->method('renderLayout'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsertTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsertTest.php index 0061013ed728c..48c23d765c224 100644 --- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsertTest.php +++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/OnInsertTest.php @@ -54,6 +54,6 @@ public function testExecute() ->method('setBody') ->with('http://relative.url/'); - $this->controller->execute(); + $this->controller->executeInternal(); } } diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php index faf0bdf983871..d9ac94ddbe718 100644 --- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php +++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php @@ -35,30 +35,30 @@ public function setUp() $this->appState = $this->getMock('Magento\Framework\App\State', [], [], '', false); } - public function testBeforeDispatch() + public function testBeforeExecute() { $this->appState->expects($this->once())->method('getMode')->willReturn('default'); $this->themeRegistration->expects($this->once())->method('register'); $this->logger->expects($this->never())->method('critical'); $object = new Registration($this->themeRegistration, $this->logger, $this->appState); - $object->beforeDispatch($this->abstractAction, $this->request); + $object->beforeExecute($this->abstractAction, $this->request); } - public function testBeforeDispatchWithProductionMode() + public function testBeforeExecuteWithProductionMode() { $this->appState->expects($this->once())->method('getMode')->willReturn('production'); $this->themeRegistration->expects($this->never())->method('register'); $this->logger->expects($this->never())->method('critical'); $object = new Registration($this->themeRegistration, $this->logger, $this->appState); - $object->beforeDispatch($this->abstractAction, $this->request); + $object->beforeExecute($this->abstractAction, $this->request); } - public function testBeforeDispatchWithException() + public function testBeforeExecuteWithException() { $exception = new LocalizedException(new Phrase('Phrase')); $this->themeRegistration->expects($this->once())->method('register')->willThrowException($exception); $this->logger->expects($this->once())->method('critical'); $object = new Registration($this->themeRegistration, $this->logger, $this->appState); - $object->beforeDispatch($this->abstractAction, $this->request); + $object->beforeExecute($this->abstractAction, $this->request); } } diff --git a/app/code/Magento/Translation/Controller/Ajax/Index.php b/app/code/Magento/Translation/Controller/Ajax/Index.php index 190b4046b465c..08c1fc1bce190 100644 --- a/app/code/Magento/Translation/Controller/Ajax/Index.php +++ b/app/code/Magento/Translation/Controller/Ajax/Index.php @@ -31,7 +31,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { $translate = (array)$this->getRequest()->getPost('translate'); diff --git a/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php b/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php index f6ab7eed8e13d..442f875e23af4 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php @@ -57,7 +57,7 @@ protected function getComponent() */ public function executeAjaxRequest() { - $this->execute(); + $this->executeInternal(); } /** diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php index 6a2bdccd51030..a4192d5013495 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php @@ -48,7 +48,7 @@ public function __construct( * * @return void */ - protected function execute() + protected function executeInternal() { $viewIds = explode('.', $this->_request->getParam('data')); $bookmark = $this->bookmarkManagement->getByIdentifierNamespace( diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php index bde48047b773f..55568937e9727 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php @@ -87,7 +87,7 @@ public function __construct( * * @return void */ - protected function execute() + protected function executeInternal() { $bookmark = $this->bookmarkFactory->create(); $jsonData = $this->_request->getParam('data'); diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php index 158f90512c6a1..2c0b22699f77d 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php @@ -46,7 +46,7 @@ public function __construct( * @throws \Magento\Framework\Exception\LocalizedException * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { return $this->fileFactory->create('export.csv', $this->converter->getCsvFile(), 'var'); } diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php index f4de9d2da2b87..c999f3f8fcd9b 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php @@ -46,7 +46,7 @@ public function __construct( * @throws \Magento\Framework\Exception\LocalizedException * @return \Magento\Framework\App\ResponseInterface */ - public function execute() + public function executeInternal() { return $this->fileFactory->create('export.xml', $this->converter->getXmlFile(), 'var'); } diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php index bd431cf33f4fe..f43135b162e34 100644 --- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php +++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php @@ -20,7 +20,7 @@ class Render extends AbstractAction * * @return void */ - protected function execute() + protected function executeInternal() { $component = $this->factory->create($this->_request->getParam('namespace')); $this->prepareComponent($component); diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToCsvTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToCsvTest.php index ad295672a6cad..daf5ba76d67ea 100644 --- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToCsvTest.php +++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToCsvTest.php @@ -66,6 +66,6 @@ public function testExecute() ->with('export.csv', $content, 'var') ->willReturn($content); - $this->assertEquals($content, $this->controller->execute()); + $this->assertEquals($content, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToXmlTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToXmlTest.php index 427a14e42dd40..c0314e99c13e2 100644 --- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToXmlTest.php +++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Export/GridToXmlTest.php @@ -66,6 +66,6 @@ public function testExecute() ->with('export.xml', $content, 'var') ->willReturn($content); - $this->assertEquals($content, $this->controller->execute()); + $this->assertEquals($content, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php index 2bc1ea519da5c..891ee3a1bbd39 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CategoriesJson.php @@ -13,7 +13,7 @@ class CategoriesJson extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrit * * @return void */ - public function execute() + public function executeInternal() { $categoryId = $this->getRequest()->getParam('id', null); $this->getResponse()->setBody( diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php index d277c5781bd07..9d7668e61a0ef 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/CmsPageGrid.php @@ -13,7 +13,7 @@ class CmsPageGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite * * @return void */ - public function execute() + public function executeInternal() { $this->getResponse()->setBody( $this->_view->getLayout()->createBlock('Magento\UrlRewrite\Block\Cms\Page\Grid')->toHtml() diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php index a0ed60907fd0d..f916999158de1 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite * * @return void */ - public function execute() + public function executeInternal() { if ($this->_getUrlRewrite()->getId()) { try { diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php index 3d172de74021d..1a84bdb99d3e5 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Edit.php @@ -43,7 +43,7 @@ protected function _getMode() * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_UrlRewrite::urlrewrite'); diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php index 13c87edc4edc2..55c42bec9dfb7 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_UrlRewrite::urlrewrite'); diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php index 42c14184066b4..e6c7258493724 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/ProductGrid.php @@ -13,7 +13,7 @@ class ProductGrid extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite * * @return void */ - public function execute() + public function executeInternal() { $this->getResponse()->setBody( $this->_view->getLayout()->createBlock('Magento\UrlRewrite\Block\Catalog\Product\Grid')->toHtml() diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php index 951b0885f72fb..a8da825fc502e 100644 --- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php +++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php @@ -136,7 +136,7 @@ private function _handleCmsPageUrlRewrite($model) /** * @return void */ - public function execute() + public function executeInternal() { $data = $this->getRequest()->getPostValue(); if ($data) { diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php index ca30b16916e65..82519182fdabc 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/Forgotpassword.php @@ -13,7 +13,7 @@ class Forgotpassword extends \Magento\User\Controller\Adminhtml\Auth * * @return void */ - public function execute() + public function executeInternal() { $email = (string)$this->getRequest()->getParam('email'); $params = $this->getRequest()->getParams(); diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php index b39d7c8400770..b3d5e52303f18 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPassword.php @@ -15,7 +15,7 @@ class ResetPassword extends \Magento\User\Controller\Adminhtml\Auth * * @return void */ - public function execute() + public function executeInternal() { $passwordResetToken = (string)$this->getRequest()->getQuery('token'); $userId = (int)$this->getRequest()->getQuery('id'); diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php index bae69c2415f3c..5e65f6103035e 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php +++ b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php @@ -15,7 +15,7 @@ class ResetPasswordPost extends \Magento\User\Controller\Adminhtml\Auth * * @return void */ - public function execute() + public function executeInternal() { $passwordResetToken = (string)$this->getRequest()->getQuery('token'); $userId = (int)$this->getRequest()->getQuery('id'); diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php index 971b87791f613..1eaa4e05d5a58 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php +++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Grid.php @@ -16,7 +16,7 @@ class Grid extends \Magento\User\Controller\Adminhtml\Locks * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php index b3e9f092fd1b1..f3ce5beda6069 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php +++ b/app/code/Magento/User/Controller/Adminhtml/Locks/Index.php @@ -16,7 +16,7 @@ class Index extends \Magento\User\Controller\Adminhtml\Locks * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_setActiveMenu('Magento_User::system_acl_locks'); diff --git a/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php b/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php index bf51556853963..ba0621b1d70b4 100644 --- a/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php +++ b/app/code/Magento/User/Controller/Adminhtml/Locks/MassUnlock.php @@ -18,7 +18,7 @@ class MassUnlock extends \Magento\User\Controller\Adminhtml\Locks * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { try { // unlock users diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php index 748e44e4fc289..576138df5cf46 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php @@ -11,7 +11,7 @@ class Delete extends \Magento\User\Controller\Adminhtml\User /** * @return void */ - public function execute() + public function executeInternal() { $currentUser = $this->_objectManager->get('Magento\Backend\Model\Auth\Session')->getUser(); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Edit.php b/app/code/Magento/User/Controller/Adminhtml/User/Edit.php index 39ac43d55391b..c74f350c79f36 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Edit.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\User\Controller\Adminhtml\User /** * @return void */ - public function execute() + public function executeInternal() { $userId = $this->getRequest()->getParam('user_id'); /** @var \Magento\User\Model\User $model */ diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Index.php index 875b26fcaf20f..214b634c06fa8 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Index.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\User\Controller\Adminhtml\User /** * @return void */ - public function execute() + public function executeInternal() { $this->_initAction(); $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Users')); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php index adc326644ef6a..611b2a4289082 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php @@ -40,7 +40,7 @@ public function __construct( /** * @return void */ - public function execute() + public function executeInternal() { if ($userId = $this->getRequest()->getParam('user_id')) { try { diff --git a/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php b/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php index 38cb07dae87ea..598d3b5c3d365 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/NewAction.php @@ -11,7 +11,7 @@ class NewAction extends \Magento\User\Controller\Adminhtml\User /** * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php index 1a8060e1e23db..fefed2867c467 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php @@ -15,7 +15,7 @@ class Delete extends \Magento\User\Controller\Adminhtml\User\Role * * @return \Magento\Backend\Model\View\Result\Redirect|void */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php index 21aef671de98c..a8950a9d711b9 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/EditRole.php @@ -13,7 +13,7 @@ class EditRole extends \Magento\User\Controller\Adminhtml\User\Role * * @return void */ - public function execute() + public function executeInternal() { $role = $this->_initRole(); $this->_initAction(); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php index ac6cf5350bdf9..053c65a4dca24 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php @@ -13,7 +13,7 @@ class Editrolegrid extends \Magento\User\Controller\Adminhtml\User\Role * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(); $this->_view->renderLayout(); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php index fe9c5c6138222..ce8f462264e6b 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\User\Controller\Adminhtml\User\Role * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction(); $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Roles')); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php index 32d360659bd64..e771d3dd87b5b 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/RoleGrid.php @@ -13,7 +13,7 @@ class RoleGrid extends \Magento\User\Controller\Adminhtml\User\Role * * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php index e45c6b110db78..83aa7ed1f3476 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php @@ -55,7 +55,7 @@ protected function _deleteUserFromRole($userId, $roleId) * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php index 03f19129f6bdc..5f405efca0fdc 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/RoleGrid.php @@ -11,7 +11,7 @@ class RoleGrid extends \Magento\User\Controller\Adminhtml\User /** * @return void */ - public function execute() + public function executeInternal() { $this->_view->loadLayout(false); $this->_view->renderLayout(); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php b/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php index 11b1569e9d77d..2689f3c9d77a9 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/RolesGrid.php @@ -11,7 +11,7 @@ class RolesGrid extends \Magento\User\Controller\Adminhtml\User /** * @return void */ - public function execute() + public function executeInternal() { $userId = $this->getRequest()->getParam('user_id'); /** @var \Magento\User\Model\User $model */ diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php index e9e5cad332073..f50ebcacb2714 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php @@ -14,7 +14,7 @@ class Save extends \Magento\User\Controller\Adminhtml\User * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $userId = (int)$this->getRequest()->getParam('user_id'); $data = $this->getRequest()->getPostValue(); diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Validate.php b/app/code/Magento/User/Controller/Adminhtml/User/Validate.php index 25b49ff3999c5..11262b0898cb0 100644 --- a/app/code/Magento/User/Controller/Adminhtml/User/Validate.php +++ b/app/code/Magento/User/Controller/Adminhtml/User/Validate.php @@ -13,7 +13,7 @@ class Validate extends \Magento\User\Controller\Adminhtml\User * * @return void */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(); $response->setError(0); diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php index 03190d55cac69..10b0c13383e23 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Variable\Controller\Adminhtml\System\Variable * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $variable = $this->_initVariable(); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php index adb7eaa317570..bd6db1b8f378c 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Variable\Controller\Adminhtml\System\Variable * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $variable = $this->_initVariable(); diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php index 521834f094df9..1dc0676e2e5f7 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Variable\Controller\Adminhtml\System\Variable * * @return \Magento\Backend\Model\View\Result\Page */ - public function execute() + public function executeInternal() { $resultPage = $this->createPage(); $resultPage->getConfig()->getTitle()->prepend(__('Custom Variables')); diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php index efbcf4c062b7f..465b50bfe448c 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Variable\Controller\Adminhtml\System\Variable * * @return \Magento\Backend\Model\View\Result\Forward */ - public function execute() + public function executeInternal() { /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */ $resultForward = $this->resultForwardFactory->create(); diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php index f3640c3918e2b..6353e57670700 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\Variable\Controller\Adminhtml\System\Variable * * @return \Magento\Backend\Model\View\Result\Redirect */ - public function execute() + public function executeInternal() { $variable = $this->_initVariable(); $data = $this->getRequest()->getPost('variable'); diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php index 75876b96cfe2c..7867af4006845 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/Validate.php @@ -13,7 +13,7 @@ class Validate extends \Magento\Variable\Controller\Adminhtml\System\Variable * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(['error' => false]); $variable = $this->_initVariable(); diff --git a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php index 04b1514cfab7f..42e801f50a461 100644 --- a/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php +++ b/app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php @@ -13,7 +13,7 @@ class WysiwygPlugin extends \Magento\Variable\Controller\Adminhtml\System\Variab * * @return \Magento\Framework\Controller\Result\Json */ - public function execute() + public function executeInternal() { $customVariables = $this->_objectManager->create('Magento\Variable\Model\Variable') ->getVariablesOptionArray(true); diff --git a/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php b/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php index cb653d6499d29..8da36180eb75e 100644 --- a/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php +++ b/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php @@ -152,7 +152,7 @@ public function testExecute($result, $responseArray) ->method('setData') ->with($responseArray); - $this->validateMock->execute(); + $this->validateMock->executeInternal(); } /** diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php index 0fe6235bc6ca0..48feb6eb4236b 100644 --- a/app/code/Magento/Version/Controller/Index/Index.php +++ b/app/code/Magento/Version/Controller/Index/Index.php @@ -37,7 +37,7 @@ public function __construct(Context $context, ProductMetadataInterface $productM * * @return void */ - public function execute() + public function executeInternal() { $versionParts = explode('.', $this->productMetadata->getVersion()); if (!isset($versionParts[0]) || !isset($versionParts[1])) { diff --git a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php index 19502e3d794c4..052e4679027f4 100644 --- a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php +++ b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php @@ -100,7 +100,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Framework\App\ActionInterface $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php b/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php index d910384f79e71..5f771f2748e32 100644 --- a/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php +++ b/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php @@ -123,7 +123,7 @@ protected function setUp() ); } - public function testAroundDispatchBasedOnDefault() + public function testAroundExecuteBasedOnDefault() { $this->customerSessionMock->expects($this->once()) ->method('isLoggedIn') @@ -191,10 +191,10 @@ public function testAroundDispatchBasedOnDefault() $proceed = function ($request) use ($expectedResult) { return $expectedResult; }; - $this->contextPlugin->aroundDispatch($action, $proceed, $request); + $this->contextPlugin->aroundExecute($action, $proceed, $request); } - public function testAroundDispatchBasedOnOrigin() + public function testAroundExecuteBasedOnOrigin() { $this->customerSessionMock->expects($this->once()) ->method('isLoggedIn') @@ -223,10 +223,10 @@ public function testAroundDispatchBasedOnOrigin() $proceed = function ($request) use ($expectedResult) { return $expectedResult; }; - $this->contextPlugin->aroundDispatch($action, $proceed, $request); + $this->contextPlugin->aroundExecute($action, $proceed, $request); } - public function testAroundDispatchBasedOnBilling() + public function testAroundExecuteBasedOnBilling() { $this->customerSessionMock->expects($this->once()) ->method('isLoggedIn') @@ -298,10 +298,10 @@ public function testAroundDispatchBasedOnBilling() $proceed = function ($request) use ($expectedResult) { return $expectedResult; }; - $this->contextPlugin->aroundDispatch($action, $proceed, $request); + $this->contextPlugin->aroundExecute($action, $proceed, $request); } - public function testAroundDispatchBasedOnShipping() + public function testAroundExecuteBasedOnShipping() { $this->customerSessionMock->expects($this->once()) ->method('isLoggedIn') @@ -373,6 +373,6 @@ public function testAroundDispatchBasedOnShipping() $proceed = function ($request) use ($expectedResult) { return $expectedResult; }; - $this->contextPlugin->aroundDispatch($action, $proceed, $request); + $this->contextPlugin->aroundExecute($action, $proceed, $request); } } diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php index 9a3459f897f3e..e29a01447ca07 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php @@ -30,7 +30,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { $type = $this->getRequest()->getPost('widget_type'); $params = $this->getRequest()->getPost('parameters', []); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php index a30ce4a2a84ce..3b0d39820dc7c 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php @@ -40,7 +40,7 @@ public function __construct( * * @return void */ - public function execute() + public function executeInternal() { // save extra params for widgets insertion form $skipped = $this->getRequest()->getParam('skip_widgets'); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php index c97ab7250fec0..2783889979cb1 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Blocks.php @@ -40,7 +40,7 @@ public function renderPageContainers() * * @return void */ - public function execute() + public function executeInternal() { $this->_objectManager->get( 'Magento\Framework\App\State' diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php index 468a5d1b7de41..76f624e2f48fb 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Categories.php @@ -40,7 +40,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Raw */ - public function execute() + public function executeInternal() { $selected = $this->getRequest()->getParam('selected', ''); $isAnchorOnly = $this->getRequest()->getParam('is_anchor_only', 0); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php index 0866ba1fb2e1e..14e0a85abbda7 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Delete.php @@ -13,7 +13,7 @@ class Delete extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $widgetInstance = $this->_initWidgetInstance(); if ($widgetInstance) { diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php index 978680baa01c2..8dfd2a8bc667b 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Edit.php @@ -13,7 +13,7 @@ class Edit extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $widgetInstance = $this->_initWidgetInstance(); if (!$widgetInstance) { diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php index 704730f02c5af..5b6d34743340d 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $this->_initAction(); $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Widgets')); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php index 3beb19c5d1dbe..289ec1ee1d03f 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/NewAction.php @@ -13,7 +13,7 @@ class NewAction extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $this->_forward('edit'); } diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php index e750e1f88e583..a651f040b5439 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Products.php @@ -13,7 +13,7 @@ class Products extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $selected = $this->getRequest()->getParam('selected', ''); $productTypeId = $this->getRequest()->getParam('product_type_id', ''); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php index 5435ef423cb22..14657be5478e6 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php @@ -13,7 +13,7 @@ class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $widgetInstance = $this->_initWidgetInstance(); if (!$widgetInstance) { diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php index 4dea5a9f972d0..e7ad7a9e31be0 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Template.php @@ -13,7 +13,7 @@ class Template extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { /* @var $widgetInstance \Magento\Widget\Model\Widget\Instance */ $widgetInstance = $this->_initWidgetInstance(); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php index fe2bb5aaf694c..e37a93e5e61e6 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php @@ -13,7 +13,7 @@ class Validate extends \Magento\Widget\Controller\Adminhtml\Widget\Instance * * @return void */ - public function execute() + public function executeInternal() { $response = new \Magento\Framework\DataObject(); $response->setError(false); diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php index 769b2d587cdd8..10fccc4c7246c 100644 --- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php +++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php @@ -13,7 +13,7 @@ class LoadOptions extends \Magento\Backend\App\Action * * @return void */ - public function execute() + public function executeInternal() { try { $this->_view->loadLayout(); diff --git a/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/CategoriesTest.php b/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/CategoriesTest.php index 5a03ca5702698..0def0e1383369 100644 --- a/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/CategoriesTest.php +++ b/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/CategoriesTest.php @@ -120,6 +120,6 @@ public function testExecute() 'layout' => $this->layout ] ); - $this->assertSame($this->resultRaw, $this->controller->execute()); + $this->assertSame($this->resultRaw, $this->controller->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php index 19b893de9f8a7..36c24b6176f2d 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Add.php +++ b/app/code/Magento/Wishlist/Controller/Index/Add.php @@ -59,7 +59,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ - public function execute() + public function executeInternal() { $wishlist = $this->wishlistProvider->getWishlist(); if (!$wishlist) { diff --git a/app/code/Magento/Wishlist/Controller/Index/Allcart.php b/app/code/Magento/Wishlist/Controller/Index/Allcart.php index 7cf5a187a5687..e8892270a7991 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Allcart.php +++ b/app/code/Magento/Wishlist/Controller/Index/Allcart.php @@ -53,7 +53,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Forward $resultForward */ $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD); diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php index 8075c8e6b6ea8..ca39fbb782b91 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Cart.php +++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php @@ -107,7 +107,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { $itemId = (int)$this->getRequest()->getParam('item'); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php index bc8e001e25055..3d1077464d9a7 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Configure.php +++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php @@ -53,7 +53,7 @@ public function __construct( * @return \Magento\Framework\Controller\ResultInterface * @throws NotFoundException */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('id'); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php index 1edd5e4426ee0..5dd0ff2c27867 100644 --- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php +++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php @@ -36,7 +36,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.ExitExpression) */ - public function execute() + public function executeInternal() { $option = $this->_objectManager->create( 'Magento\Wishlist\Model\Item\Option' diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php index 8ee09cc1d33b7..443d46f103dc1 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php +++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php @@ -78,7 +78,7 @@ public function __construct( * @throws NotFoundException * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ - public function execute() + public function executeInternal() { $wishlist = $this->wishlistProvider->getWishlist(); if (!$wishlist) { diff --git a/app/code/Magento/Wishlist/Controller/Index/Index.php b/app/code/Magento/Wishlist/Controller/Index/Index.php index dc0c7fcb96544..821df44186a44 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Index.php +++ b/app/code/Magento/Wishlist/Controller/Index/Index.php @@ -35,7 +35,7 @@ public function __construct( * @return \Magento\Framework\View\Result\Page * @throws NotFoundException */ - public function execute() + public function executeInternal() { if (!$this->wishlistProvider->getWishlist()) { throw new NotFoundException(__('Page not found.')); diff --git a/app/code/Magento/Wishlist/Controller/Index/Plugin.php b/app/code/Magento/Wishlist/Controller/Index/Plugin.php index 3f179a2e9a67b..10e6cdd0b0c42 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Plugin.php +++ b/app/code/Magento/Wishlist/Controller/Index/Plugin.php @@ -60,7 +60,7 @@ public function __construct( * @return void * @throws \Magento\Framework\Exception\NotFoundException */ - public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request) + public function beforeExecute(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request) { if ($this->authenticationState->isEnabled() && !$this->customerSession->authenticate()) { $subject->getActionFlag()->set('', 'no-dispatch', true); diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php index d74487a8f195d..66d068fc7f4db 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Remove.php +++ b/app/code/Magento/Wishlist/Controller/Index/Remove.php @@ -35,7 +35,7 @@ public function __construct( * @return \Magento\Framework\Controller\Result\Redirect * @throws NotFoundException */ - public function execute() + public function executeInternal() { $id = (int)$this->getRequest()->getParam('item'); $item = $this->_objectManager->create('Magento\Wishlist\Model\Item')->load($id); diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php index 6baaa3772cd54..9ee4f3cd1b87a 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Send.php +++ b/app/code/Magento/Wishlist/Controller/Index/Send.php @@ -119,7 +119,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Wishlist/Controller/Index/Share.php b/app/code/Magento/Wishlist/Controller/Index/Share.php index 502291b5078c4..4a8c92a37725e 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Share.php +++ b/app/code/Magento/Wishlist/Controller/Index/Share.php @@ -33,7 +33,7 @@ public function __construct( * * @return void|\Magento\Framework\View\Result\Page */ - public function execute() + public function executeInternal() { if ($this->customerSession->authenticate()) { /** @var \Magento\Framework\View\Result\Page $resultPage */ diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php index ccb46f1c44a8c..863904999a2fb 100644 --- a/app/code/Magento/Wishlist/Controller/Index/Update.php +++ b/app/code/Magento/Wishlist/Controller/Index/Update.php @@ -53,7 +53,7 @@ public function __construct( * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) */ - public function execute() + public function executeInternal() { /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php index 655844d6f116f..e1ff89db2c83b 100644 --- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php +++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $productId = (int)$this->getRequest()->getParam('product'); /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */ diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php index ffb6e34ea9639..2f9208c43e9a3 100644 --- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php +++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php @@ -41,7 +41,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $wishlist = $this->wishlistProvider->getWishlist(); if (!$wishlist) { diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php index b3ed5a3b33093..8f03270d5bead 100644 --- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php +++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php @@ -79,7 +79,7 @@ public function __construct( * * @return \Magento\Framework\Controller\Result\Redirect */ - public function execute() + public function executeInternal() { $itemId = (int)$this->getRequest()->getParam('item'); diff --git a/app/code/Magento/Wishlist/Controller/Shared/Index.php b/app/code/Magento/Wishlist/Controller/Shared/Index.php index 6f925099159fa..d54d52833044c 100644 --- a/app/code/Magento/Wishlist/Controller/Shared/Index.php +++ b/app/code/Magento/Wishlist/Controller/Shared/Index.php @@ -51,7 +51,7 @@ public function __construct( * * @return \Magento\Framework\Controller\ResultInterface */ - public function execute() + public function executeInternal() { $wishlist = $this->wishlistProvider->getWishlist(); $customerId = $this->customerSession->getCustomerId(); diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php index 8d58bf0be7592..e72f4c4a42f74 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php @@ -157,7 +157,7 @@ public function testExecuteInvalidFormKey() ->willReturnSelf(); $controller = $this->getController(); - $this->assertSame($this->resultForwardMock, $controller->execute()); + $this->assertSame($this->resultForwardMock, $controller->executeInternal()); } public function testExecuteWithoutWishlist() @@ -176,7 +176,7 @@ public function testExecuteWithoutWishlist() ->with('noroute') ->willReturnSelf(); - $this->assertSame($this->resultForwardMock, $this->getController()->execute()); + $this->assertSame($this->resultForwardMock, $this->getController()->executeInternal()); } public function testExecutePassed() @@ -204,6 +204,6 @@ public function testExecutePassed() ->with($url) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php index cdd8ea3b33372..937e5f843fd1b 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php @@ -259,7 +259,7 @@ public function testExecuteWithNoItem() ->with('*/*', []) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } public function testExecuteWithNoWishlist() @@ -300,7 +300,7 @@ public function testExecuteWithNoWishlist() ->with('*/*', []) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } public function testExecuteWithQuantityArray() @@ -312,7 +312,7 @@ public function testExecuteWithQuantityArray() ->with($refererUrl) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } public function testExecuteWithQuantityArrayAjax() @@ -324,7 +324,7 @@ public function testExecuteWithQuantityArrayAjax() ->with(['backUrl' => $refererUrl]) ->willReturnSelf(); - $this->assertSame($this->resultJsonMock, $this->model->execute()); + $this->assertSame($this->resultJsonMock, $this->model->executeInternal()); } /** @@ -698,7 +698,7 @@ public function testExecuteWithoutQuantityArrayAndOutOfStock() ->with($indexUrl) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } /** @@ -859,6 +859,6 @@ public function testExecuteWithoutQuantityArrayAndConfigurable() ->with($configureUrl) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->model->execute()); + $this->assertSame($this->resultRedirectMock, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php index 58109d6dc3d25..51afe2756ad5e 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php @@ -121,7 +121,7 @@ public function testExecutePageNotFound() ->method('getWishlist') ->willReturn(null); - $this->controller->execute(); + $this->controller->executeInternal(); } public function testExecuteNoCartItem() @@ -169,7 +169,7 @@ public function testExecuteNoCartItem() ->with($cartUrl) ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->controller->execute()); + $this->assertSame($this->resultRedirect, $this->controller->executeInternal()); } public function testExecute() @@ -235,7 +235,7 @@ public function testExecute() ->with($cartUrl) ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->controller->execute()); + $this->assertSame($this->resultRedirect, $this->controller->executeInternal()); } public function testExecuteWithException() @@ -271,7 +271,7 @@ public function testExecuteWithException() ->with($cartUrl) ->willReturnSelf(); - $this->assertSame($this->resultRedirect, $this->controller->execute()); + $this->assertSame($this->resultRedirect, $this->controller->executeInternal()); } protected function prepareContext() diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php index 12f3de81f386c..f49d76cc0a0cb 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/IndexTest.php @@ -139,7 +139,7 @@ public function testExecuteWithoutWishlist() ->method('getWishlist') ->willReturn(null); - $this->getController()->execute(); + $this->getController()->executeInternal(); } public function testExecutePassed() @@ -150,6 +150,6 @@ public function testExecutePassed() ->method('getWishlist') ->willReturn($wishlist); - $this->assertSame($this->resultPageMock, $this->getController()->execute()); + $this->assertSame($this->resultPageMock, $this->getController()->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php index 4c905abca2873..011eb067e36e3 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php @@ -66,7 +66,7 @@ protected function getPlugin() /** * @expectedException \Magento\Framework\Exception\NotFoundException */ - public function testBeforeDispatch() + public function testBeforeExecute() { $actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', [], [], '', false); $indexController = $this->getMock('Magento\Wishlist\Controller\Index\Index', [], [], '', false); @@ -124,6 +124,6 @@ public function testBeforeDispatch() ->with('wishlist/general/active') ->willReturn(false); - $this->getPlugin()->beforeDispatch($indexController, $this->request); + $this->getPlugin()->beforeExecute($indexController, $this->request); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php index 6b2a6b9a5959f..787d6ef272cac 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php @@ -164,7 +164,7 @@ public function testExecuteWithoutItem() ->with('Magento\Wishlist\Model\Item') ->willReturn($item); - $this->getController()->execute(); + $this->getController()->executeInternal(); } /** @@ -206,7 +206,7 @@ public function testExecuteWithoutWishlist() ->with(2) ->willReturn(null); - $this->getController()->execute(); + $this->getController()->executeInternal(); } public function testExecuteCanNotSaveWishlist() @@ -291,7 +291,7 @@ public function testExecuteCanNotSaveWishlist() ->with($referer) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } public function testExecuteCanNotSaveWishlistAndWithRedirect() @@ -387,6 +387,6 @@ public function testExecuteCanNotSaveWishlistAndWithRedirect() ->with('http://test.com/frontname/module/controller/action') ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php index dd6dca9871675..704e5b6fb0852 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php @@ -270,7 +270,7 @@ public function testExecuteNoFormKeyValidated() ->with('*/*/') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } /** @@ -288,7 +288,7 @@ public function testExecuteNoWishlistAvailable() ->method('getWishlist') ->willReturn(null); - $this->model->execute(); + $this->model->executeInternal(); } /** @@ -356,7 +356,7 @@ public function testExecuteWithError( ->with('*/*/share') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } /** @@ -514,7 +514,7 @@ public function testExecuteWithException() ->with('*/*/share') ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } /** @@ -693,6 +693,6 @@ public function testExecute() ->with('*/*', ['wishlist_id' => $wishlistId]) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/ShareTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/ShareTest.php index b65e8d11e43ad..e53d854cbefdc 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/ShareTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/ShareTest.php @@ -53,7 +53,7 @@ public function testExecute() $this->resultFactoryMock->expects($this->once())->method('create')->with(ResultFactory::TYPE_PAGE) ->willReturn($resultMock); - $this->assertEquals($resultMock, $this->model->execute()); + $this->assertEquals($resultMock, $this->model->executeInternal()); } public function testExecuteAuthenticationFail() @@ -61,6 +61,6 @@ public function testExecuteAuthenticationFail() $this->customerSessionMock->expects($this->once())->method('authenticate') ->willReturn(false); - $this->assertEmpty($this->model->execute()); + $this->assertEmpty($this->model->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php index f70306b60257a..1f811f7956321 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php @@ -186,7 +186,7 @@ public function testExecuteWithoutProductId() ->with('*/', []) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } /** @@ -218,7 +218,7 @@ public function testExecuteWithoutProduct() ->with('*/', []) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } /** @@ -286,7 +286,7 @@ public function testExecuteWithoutWishList() ->with('*/', []) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } /** @@ -407,7 +407,7 @@ public function testExecuteAddSuccessException() ->with('*/*', ['wishlist_id' => 56]) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } /** * Test execute add success critical exception @@ -545,6 +545,6 @@ public function testExecuteAddSuccessCriticalException() ->with('*/*', ['wishlist_id' => 56]) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->getController()->execute()); + $this->assertSame($this->resultRedirectMock, $this->getController()->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php index 09ea2bb42c74a..984c2e70c164c 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php @@ -132,7 +132,7 @@ public function testExecuteWithWishlist() ->with($url) ->willReturnSelf(); - $this->assertSame($this->resultRedirectMock, $this->allcartController->execute()); + $this->assertSame($this->resultRedirectMock, $this->allcartController->executeInternal()); } public function testExecuteWithNoWishlist() @@ -145,6 +145,6 @@ public function testExecuteWithNoWishlist() ->with('noroute') ->willReturnSelf(); - $this->assertSame($this->resultForwardMock, $this->allcartController->execute()); + $this->assertSame($this->resultForwardMock, $this->allcartController->executeInternal()); } } diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php index c42e48ba37b6d..a917ac8b2ba16 100644 --- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php +++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php @@ -275,7 +275,7 @@ public function testExecute( ->with($redirectUrl) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } /** @@ -329,7 +329,7 @@ public function testExecuteLocalizedException() ->with($productUrl) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } public function testExecuteProductException() @@ -360,7 +360,7 @@ public function testExecuteProductException() ->with($refererUrl) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } public function testExecuteException() @@ -391,6 +391,6 @@ public function testExecuteException() ->with($refererUrl) ->willReturnSelf(); - $this->assertEquals($this->resultRedirect, $this->model->execute()); + $this->assertEquals($this->resultRedirect, $this->model->executeInternal()); } } diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php index 01be1182f2b39..986be8b00f51a 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php +++ b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester.php @@ -61,7 +61,7 @@ protected function getCookieManager() * @param RequestInterface $request * @return mixed */ - abstract protected function execute(RequestInterface $request); + abstract protected function executeInternal(RequestInterface $request); /** * Dispatch request @@ -69,9 +69,9 @@ abstract protected function execute(RequestInterface $request); * @param RequestInterface $request * @return \Magento\Framework\App\ResponseInterface */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { - $result = $this->execute($request); + $result = $this->executeInternal($request); return $result ? $result : $this->_response; } } diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/DeleteCookie.php b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/DeleteCookie.php index 0baf5fdce982e..755aae0f0612b 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/DeleteCookie.php +++ b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/DeleteCookie.php @@ -16,7 +16,7 @@ class DeleteCookie extends \Magento\TestModule1\Controller\CookieTester * * @return void */ - public function execute(RequestInterface $request) + public function executeInternal(RequestInterface $request) { $cookieName = $request->getParam('cookie_name'); $this->getCookieManager()->deleteCookie($cookieName); diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetPublicCookie.php b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetPublicCookie.php index 6583b3bad168d..da6cde29dcd01 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetPublicCookie.php +++ b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetPublicCookie.php @@ -16,7 +16,7 @@ class SetPublicCookie extends \Magento\TestModule1\Controller\CookieTester * * @return void */ - public function execute(RequestInterface $request) + public function executeInternal(RequestInterface $request) { $publicCookieMetadata = $this->getCookieMetadataFactory()->createPublicCookieMetadata(); diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetSensitiveCookie.php b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetSensitiveCookie.php index 74ea42b69bc76..cf8cfd054c425 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetSensitiveCookie.php +++ b/dev/tests/api-functional/_files/Magento/TestModule1/Controller/CookieTester/SetSensitiveCookie.php @@ -16,7 +16,7 @@ class SetSensitiveCookie extends \Magento\TestModule1\Controller\CookieTester * * @return void */ - public function execute(RequestInterface $request) + public function executeInternal(RequestInterface $request) { $sensitiveCookieMetadata = $this->getCookieMetadataFactory()->createSensitiveCookieMetadata(); diff --git a/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/PlaceTest.php b/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/PlaceTest.php index 85b6564400494..d970637f41816 100644 --- a/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/PlaceTest.php +++ b/dev/tests/integration/testsuite/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/PlaceTest.php @@ -13,7 +13,7 @@ class PlaceTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle /** * Test requestToAuthorizenetData returning */ - public function testExecuteAuthorizenetDataReturning() + public function testExecuteInternalAuthorizenetDataReturning() { $requestToAuthorizenetData = ['Authorizenet' => 'data']; @@ -56,11 +56,12 @@ public function testExecuteAuthorizenetDataReturning() ] ); + /** @var \Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\PlaceTesting $controller */ $controller = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( 'Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment\PlaceTesting', ['context' => $context] ); - $controller->execute(); + $controller->executeInternal(); $this->assertContains(json_encode($requestToAuthorizenetData), $this->getResponse()->getBody()); } diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php index 6d0b535d0c615..6ae9fb368c2f1 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php @@ -58,7 +58,7 @@ protected function _logout() /** * Check not logged state - * @covers \Magento\Backend\Controller\Adminhtml\Auth\Login::execute + * @covers \Magento\Backend\Controller\Adminhtml\Auth\Login::executeInternal */ public function testNotLoggedLoginAction() { @@ -72,7 +72,7 @@ public function testNotLoggedLoginAction() /** * Check logged state - * @covers \Magento\Backend\Controller\Adminhtml\Auth\Login::execute + * @covers \Magento\Backend\Controller\Adminhtml\Auth\Login::executeInternal * @magentoDbIsolation enabled */ public function testLoggedLoginAction() @@ -120,7 +120,7 @@ public function testNotLoggedLoginActionWithRedirect() } /** - * @covers \Magento\Backend\Controller\Adminhtml\Auth\Logout::execute + * @covers \Magento\Backend\Controller\Adminhtml\Auth\Logout::executeInternal * @magentoDbIsolation enabled */ public function testLogoutAction() @@ -138,7 +138,7 @@ public function testLogoutAction() } /** - * @covers \Magento\Backend\Controller\Adminhtml\Auth\DeniedJson::execute + * @covers \Magento\Backend\Controller\Adminhtml\Auth\DeniedJson::executeInternal * @covers \Magento\Backend\Controller\Adminhtml\Auth\DeniedJson::_getDeniedJson * @magentoDbIsolation enabled */ @@ -158,7 +158,7 @@ public function testDeniedJsonAction() } /** - * @covers \Magento\Backend\Controller\Adminhtml\Auth\DeniedIframe::execute + * @covers \Magento\Backend\Controller\Adminhtml\Auth\DeniedIframe::executeInternal * @covers \Magento\Backend\Controller\Adminhtml\Auth\DeniedIframe::_getDeniedIframe * @magentoDbIsolation enabled */ diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php index 6575448913a4f..c5c1c1da1a478 100644 --- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php +++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php @@ -12,7 +12,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle { /** * Check not logged state - * @covers \Magento\Backend\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Backend\Controller\Adminhtml\Index\Index::executeInternal */ public function testNotLoggedIndexAction() { @@ -27,7 +27,7 @@ public function testNotLoggedIndexAction() /** * Check logged state - * @covers \Magento\Backend\Controller\Adminhtml\Index\Index::execute + * @covers \Magento\Backend\Controller\Adminhtml\Index\Index::executeInternal * @magentoDbIsolation enabled */ public function testLoggedIndexAction() @@ -37,7 +37,7 @@ public function testLoggedIndexAction() } /** - * @covers \Magento\Backend\Controller\Adminhtml\Index\GlobalSearch::execute + * @covers \Magento\Backend\Controller\Adminhtml\Index\GlobalSearch::executeInternal */ public function testGlobalSearchAction() { diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php index 276f752779f22..9f501e36fef65 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php @@ -11,7 +11,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController { /** - * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::execute + * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::executeInternal * * @magentoDataFixture Magento/Catalog/_files/product_simple.php */ @@ -46,7 +46,7 @@ public function testSaveActionRedirectsSuccessfully() } /** - * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate::execute + * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Validate::executeInternal * * @dataProvider validateActionDataProvider * diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/Stub/ProductControllerStub.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/Stub/ProductControllerStub.php index f4d8df15724a1..87dc9a7363b96 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/Stub/ProductControllerStub.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/Stub/ProductControllerStub.php @@ -8,7 +8,7 @@ class ProductControllerStub extends \Magento\Catalog\Controller\Product { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php index f170ad50089fc..7e845870171ff 100644 --- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php +++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRatesTest.php @@ -121,6 +121,6 @@ protected function runActionWithMockedImportService(array $messages = []) $context, $registry ); - $action->execute(); + $action->executeInternal(); } } diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php index 4a606bea53b37..1b098debc33f5 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php +++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php @@ -106,7 +106,7 @@ public function testReturnWizardAction() $customerSession->setCustomerId($fixtureCustomerId); /** Execute SUT */ - $billingAgreementController->execute(); + $billingAgreementController->executeInternal(); /** Ensure that billing agreement record was created in the DB */ /** @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection $billingAgreementCollection */ diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Stub/OrderCreateStub.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Stub/OrderCreateStub.php index 39153b5837067..0169bf3ff26aa 100644 --- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Stub/OrderCreateStub.php +++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Stub/OrderCreateStub.php @@ -8,7 +8,7 @@ class OrderCreateStub extends \Magento\Sales\Controller\Adminhtml\Order\Create { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/dev/tests/integration/testsuite/Magento/TestFixture/Controller/Adminhtml/Noroute.php b/dev/tests/integration/testsuite/Magento/TestFixture/Controller/Adminhtml/Noroute.php index 0116aa59ffaa5..ae88fa6378645 100644 --- a/dev/tests/integration/testsuite/Magento/TestFixture/Controller/Adminhtml/Noroute.php +++ b/dev/tests/integration/testsuite/Magento/TestFixture/Controller/Adminhtml/Noroute.php @@ -22,7 +22,7 @@ class Noroute implements \Magento\Framework\App\ActionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { } diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php index 052030a1552fd..031bab7ac1e55 100644 --- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php +++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php @@ -14,7 +14,7 @@ class AuthTest extends \Magento\TestFramework\TestCase\AbstractBackendController { /** * Test form existence - * @covers \Magento\User\Controller\Adminhtml\Auth\Forgotpassword::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\Forgotpassword::executeInternal */ public function testFormForgotpasswordAction() { @@ -26,7 +26,7 @@ public function testFormForgotpasswordAction() /** * Test redirection to startup page after success password recovering posting * - * @covers \Magento\User\Controller\Adminhtml\Auth\Forgotpassword::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\Forgotpassword::executeInternal */ public function testForgotpasswordAction() { @@ -44,7 +44,7 @@ public function testForgotpasswordAction() /** * Test reset password action * - * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPassword::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPassword::executeInternal * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPassword::_validateResetPasswordLinkToken * @magentoDataFixture Magento/User/_files/dummy_user.php */ @@ -73,7 +73,7 @@ public function testResetPasswordAction() } /** - * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPassword::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPassword::executeInternal * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPassword::_validateResetPasswordLinkToken */ public function testResetPasswordActionWithDummyToken() @@ -89,7 +89,7 @@ public function testResetPasswordActionWithDummyToken() /** * @dataProvider resetPasswordDataProvider - * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::executeInternal * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::_validateResetPasswordLinkToken * @magentoDataFixture Magento/User/_files/dummy_user.php */ @@ -162,7 +162,7 @@ public function resetPasswordDataProvider() } /** - * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::executeInternal * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::_validateResetPasswordLinkToken * @magentoDataFixture Magento/User/_files/dummy_user.php */ @@ -184,7 +184,7 @@ public function testResetPasswordPostActionWithDummyToken() } /** - * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::execute + * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::executeInternal * @covers \Magento\User\Controller\Adminhtml\Auth\ResetPasswordPost::_validateResetPasswordLinkToken * @magentoDataFixture Magento/User/_files/dummy_user.php */ diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/RoleTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/RoleTest.php index 932351fb427b7..384b2e3300ef9 100644 --- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/RoleTest.php +++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/RoleTest.php @@ -27,7 +27,7 @@ public function testEditRoleAction() } /** - * @covers \Magento\User\Controller\Adminhtml\User\Role\Editrolegrid::execute + * @covers \Magento\User\Controller\Adminhtml\User\Role\Editrolegrid::executeInternal */ public function testEditrolegridAction() { @@ -38,7 +38,7 @@ public function testEditrolegridAction() } /** - * @covers \Magento\User\Controller\Adminhtml\User\Role\RoleGrid::execute + * @covers \Magento\User\Controller\Adminhtml\User\Role\RoleGrid::executeInternal */ public function testRoleGridAction() { diff --git a/lib/internal/Magento/Framework/App/Action/Action.php b/lib/internal/Magento/Framework/App/Action/Action.php index 310f2f57d4d8b..da7a42f612222 100644 --- a/lib/internal/Magento/Framework/App/Action/Action.php +++ b/lib/internal/Magento/Framework/App/Action/Action.php @@ -83,7 +83,7 @@ public function __construct(Context $context) * @return ResponseInterface * @throws NotFoundException */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $this->_request = $request; $profilerKey = 'CONTROLLER_ACTION:' . $request->getFullActionName(); @@ -99,7 +99,7 @@ public function dispatch(RequestInterface $request) $result = null; if ($request->isDispatched() && !$this->_actionFlag->get('', self::FLAG_NO_DISPATCH)) { \Magento\Framework\Profiler::start('action_body'); - $result = $this->execute(); + $result = $this->executeInternal(); \Magento\Framework\Profiler::start('postdispatch'); if (!$this->_actionFlag->get('', self::FLAG_NO_POST_DISPATCH)) { $this->_eventManager->dispatch( @@ -122,7 +122,7 @@ public function dispatch(RequestInterface $request) /** * @return ResultInterface */ - abstract protected function execute(); + abstract protected function executeInternal(); /** * Throw control to different action (control and module if was specified). diff --git a/lib/internal/Magento/Framework/App/Action/Forward.php b/lib/internal/Magento/Framework/App/Action/Forward.php index 611b7413b4157..db11b6577f33c 100644 --- a/lib/internal/Magento/Framework/App/Action/Forward.php +++ b/lib/internal/Magento/Framework/App/Action/Forward.php @@ -17,7 +17,7 @@ class Forward extends AbstractAction * @return ResponseInterface * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { $request->setDispatched(false); return $this->_response; diff --git a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php index 5bb0556fe640d..3d2f794ad1497 100644 --- a/lib/internal/Magento/Framework/App/Action/Plugin/Design.php +++ b/lib/internal/Magento/Framework/App/Action/Plugin/Design.php @@ -30,7 +30,7 @@ public function __construct(\Magento\Framework\View\DesignLoader $designLoader) * @return mixed * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function aroundDispatch( + public function aroundExecute( \Magento\Framework\App\ActionInterface $subject, \Closure $proceed, \Magento\Framework\App\RequestInterface $request diff --git a/lib/internal/Magento/Framework/App/Action/Redirect.php b/lib/internal/Magento/Framework/App/Action/Redirect.php index 5904274e56187..23b3cfcb90d62 100644 --- a/lib/internal/Magento/Framework/App/Action/Redirect.php +++ b/lib/internal/Magento/Framework/App/Action/Redirect.php @@ -19,7 +19,7 @@ class Redirect extends AbstractAction * @return ResponseInterface * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function dispatch(RequestInterface $request) + public function execute(RequestInterface $request) { return $this->_response; } diff --git a/lib/internal/Magento/Framework/App/ActionInterface.php b/lib/internal/Magento/Framework/App/ActionInterface.php index 7e90fc49922b0..cf740250eb856 100644 --- a/lib/internal/Magento/Framework/App/ActionInterface.php +++ b/lib/internal/Magento/Framework/App/ActionInterface.php @@ -26,5 +26,5 @@ interface ActionInterface * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface * @throws \Magento\Framework\Exception\NotFoundException */ - public function dispatch(RequestInterface $request); + public function execute(RequestInterface $request); } diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php index c3a9b6b390bbb..49630bd4e6dda 100644 --- a/lib/internal/Magento/Framework/App/FrontController.php +++ b/lib/internal/Magento/Framework/App/FrontController.php @@ -51,7 +51,7 @@ public function dispatch(RequestInterface $request) if ($actionInstance) { $request->setDispatched(true); $this->response->setNoCacheHeaders(); - $result = $actionInstance->dispatch($request); + $result = $actionInstance->execute($request); break; } } catch (\Magento\Framework\Exception\NotFoundException $e) { diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php index 44a7937018127..e7b0a27ab64f5 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php @@ -170,7 +170,7 @@ public function testDispatchPostDispatch() $expectedEventParameters ); - $this->assertEquals($this->_responseMock, $this->action->dispatch($this->_requestMock)); + $this->assertEquals($this->_responseMock, $this->action->execute($this->_requestMock)); } } @@ -179,7 +179,7 @@ class ActionFake extends Action /** * Fake action to check a method call from a parent */ - public function execute() + public function executeInternal() { $this->_forward( ActionTest::ACTION_NAME, diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php index 2d15e0a290b33..5501546bc5914 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/ForwardTest.php @@ -62,7 +62,7 @@ protected function setUp() public function testDispatch() { $this->request->expects($this->once())->method('setDispatched')->with(false); - $this->actionAbstract->dispatch($this->request); + $this->actionAbstract->execute($this->request); } /** diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php index 2e86c5da43189..401e989615583 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/Plugin/DesignTest.php @@ -7,7 +7,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase { - public function testAroundDispatch() + public function testAroundExecute() { $subjectMock = $this->getMock('Magento\Framework\App\Action\Action', [], [], '', false); $designLoaderMock = $this->getMock('Magento\Framework\View\DesignLoader', [], [], '', false); @@ -17,6 +17,6 @@ public function testAroundDispatch() $requestMock = $this->getMock('Magento\Framework\App\RequestInterface'); $plugin = new \Magento\Framework\App\Action\Plugin\Design($designLoaderMock); $designLoaderMock->expects($this->once())->method('load'); - $this->assertEquals('Expected', $plugin->aroundDispatch($subjectMock, $closureMock, $requestMock)); + $this->assertEquals('Expected', $plugin->aroundExecute($subjectMock, $closureMock, $requestMock)); } } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php index a5c6d5cff8e40..4c654992ab234 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/Stub/ActionStub.php @@ -8,7 +8,7 @@ class ActionStub extends \Magento\Framework\App\Action\Action { - protected function execute() + protected function executeInternal() { // Empty method stub for test } diff --git a/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php index c87ab7af120aa..dc4f0b0c7c331 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php @@ -82,7 +82,7 @@ public function testDispatched() $response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); $controllerInstance = $this->getMock('Magento\Framework\App\ActionInterface'); $controllerInstance->expects($this->any()) - ->method('dispatch') + ->method('execute') ->with($this->request) ->will($this->returnValue($response)); $this->router->expects($this->at(0)) @@ -114,7 +114,7 @@ public function testDispatchedNotFoundException() $response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); $controllerInstance = $this->getMock('Magento\Framework\App\ActionInterface'); $controllerInstance->expects($this->any()) - ->method('dispatch') + ->method('execute') ->with($this->request) ->will($this->returnValue($response)); $this->router->expects($this->at(0)) diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php index adeccfb17019a..48c6ad840f366 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php +++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php @@ -112,7 +112,7 @@ public function getDataProvider() $mockClassName = 'Mock_Action_Class'; $actionClass = $this->getMockClass( 'Magento\Framework\App\ActionInterface', - ['dispatch', 'getResponse'], + ['execute', 'getResponse'], [], $mockClassName ); diff --git a/lib/internal/Magento/Framework/Controller/Index/Index.php b/lib/internal/Magento/Framework/Controller/Index/Index.php index bc8b9d70810a6..ad0c9a85ba6e1 100644 --- a/lib/internal/Magento/Framework/Controller/Index/Index.php +++ b/lib/internal/Magento/Framework/Controller/Index/Index.php @@ -11,7 +11,7 @@ class Index extends \Magento\Framework\App\Action\Action /** * @return void */ - public function execute() + public function executeInternal() { } } diff --git a/lib/internal/Magento/Framework/Controller/Noroute/Index.php b/lib/internal/Magento/Framework/Controller/Noroute/Index.php index 34154715366e5..cce6f4671f9b4 100644 --- a/lib/internal/Magento/Framework/Controller/Noroute/Index.php +++ b/lib/internal/Magento/Framework/Controller/Noroute/Index.php @@ -13,7 +13,7 @@ class Index extends \Magento\Framework\App\Action\Action * * @return void */ - public function execute() + public function executeInternal() { $status = $this->getRequest()->getParam('__status__'); if (!$status instanceof \Magento\Framework\DataObject) { diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/Index/IndexTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/Index/IndexTest.php index aac2c071fb0a4..b1a3be4984b4d 100644 --- a/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/Index/IndexTest.php +++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/Index/IndexTest.php @@ -9,7 +9,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase { - public function testExecute() + public function testExecuteInternal() { $objectManager = new ObjectManager($this); /** @@ -19,6 +19,6 @@ public function testExecute() // The execute method is empty and returns void, just calling to verify // the method exists and does not throw an exception - $controller->execute(); + $controller->executeInternal(); } } diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/NorouteTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/NorouteTest.php index eabedc51f1b87..1ad67c8f36616 100644 --- a/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/NorouteTest.php +++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Controller/NorouteTest.php @@ -8,7 +8,7 @@ class NorouteTest extends \PHPUnit_Framework_TestCase { /** - * @var \Magento\Framework\Controller\Noroute + * @var \Magento\Framework\Controller\Noroute\Index */ protected $_controller; @@ -53,7 +53,7 @@ public function testIndexActionWhenStatusNotLoaded() $this->_statusMock->expects($this->any())->method('getLoaded')->will($this->returnValue(false)); $this->_viewMock->expects($this->once())->method('loadLayout')->with(['default', 'noroute']); $this->_viewMock->expects($this->once())->method('renderLayout'); - $this->_controller->execute(); + $this->_controller->executeInternal(); } public function testIndexActionWhenStatusLoaded() @@ -77,7 +77,7 @@ public function testIndexActionWhenStatusLoaded() )->will( $this->returnValue($this->_requestMock) ); - $this->_controller->execute(); + $this->_controller->executeInternal(); } public function testIndexActionWhenStatusNotInstanceofMagentoObject() @@ -91,6 +91,6 @@ public function testIndexActionWhenStatusNotInstanceofMagentoObject() )->will( $this->returnValue('string') ); - $this->_controller->execute(); + $this->_controller->executeInternal(); } }