diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php index 41311abee5da8..fd5004ae0548f 100644 --- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php +++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Customer\Observer; @@ -17,6 +18,7 @@ use Magento\Framework\App\State as AppState; use Magento\Framework\DataObject; use Magento\Framework\Escaper; +use Magento\Framework\Event\Observer; use Magento\Framework\Event\ObserverInterface; use Magento\Framework\Message\ManagerInterface; use Magento\Framework\Registry; @@ -25,6 +27,7 @@ /** * Customer Observer Model * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) */ class AfterAddressSaveObserver implements ObserverInterface { @@ -114,11 +117,11 @@ public function __construct( /** * Address after save event handler * - * @param \Magento\Framework\Event\Observer $observer + * @param Observer $observer * @return void * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - public function execute(\Magento\Framework\Event\Observer $observer) + public function execute(Observer $observer) { /** @var $customerAddress Address */ $customerAddress = $observer->getCustomerAddress(); @@ -280,7 +283,7 @@ protected function addInvalidMessage($customerAddress) $message[] = (string)__('You will be charged tax.'); } - $this->messageManager->addError(implode(' ', $message)); + $this->messageManager->addErrorMessage(implode(' ', $message)); return $this; } @@ -307,7 +310,7 @@ protected function addErrorMessage($customerAddress) $email = $this->scopeConfig->getValue('trans_email/ident_support/email', ScopeInterface::SCOPE_STORE); $message[] = (string)__('If you believe this is an error, please contact us at %1', $email); - $this->messageManager->addError(implode(' ', $message)); + $this->messageManager->addErrorMessage(implode(' ', $message)); return $this; } diff --git a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php index 7232317af8ade..f72cbbc281e90 100644 --- a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php +++ b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php @@ -80,29 +80,23 @@ class AfterAddressSaveObserverTest extends TestCase protected $appState; /** - * @var Customer|MockObject + * @var Session|MockObject */ - protected $customerMock; + protected $customerSessionMock; /** - * @var Session|MockObject + * @var GroupInterface|MockObject */ - protected $customerSessionMock; + protected $group; protected function setUp(): void { - $this->vat = $this->getMockBuilder(Vat::class) - ->disableOriginalConstructor() - ->getMock(); - - $this->helperAddress = $this->getMockBuilder(\Magento\Customer\Helper\Address::class) - ->disableOriginalConstructor() - ->getMock(); - - $this->registry = $this->getMockBuilder(Registry::class) - ->disableOriginalConstructor() - ->getMock(); - + $this->vat = $this->createMock(Vat::class); + $this->helperAddress = $this->createMock(HelperAddress::class); + $this->registry = $this->createMock(Registry::class); + $this->escaper = $this->createMock(Escaper::class); + $this->appState = $this->createMock(AppState::class); + $this->customerSessionMock = $this->createMock(Session::class); $this->group = $this->getMockBuilder(GroupInterface::class) ->setMethods(['getId']) ->getMockForAbstractClass(); @@ -114,22 +108,9 @@ protected function setUp(): void $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class) ->getMockForAbstractClass(); - $this->messageManager = $this->getMockBuilder(ManagerInterface::class) ->getMockForAbstractClass(); - $this->escaper = $this->getMockBuilder(Escaper::class) - ->disableOriginalConstructor() - ->getMock(); - - $this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class) - ->disableOriginalConstructor() - ->getMock(); - - $this->customerSessionMock = $this->getMockBuilder(Session::class) - ->disableOriginalConstructor() - ->getMock(); - $this->model = new AfterAddressSaveObserver( $this->vat, $this->helperAddress, @@ -595,7 +576,7 @@ public function testAfterAddressSaveNewGroup( ->with($vatId) ->willReturn($vatId); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($resultInvalidMessage) ->willReturnSelf(); } @@ -605,7 +586,7 @@ public function testAfterAddressSaveNewGroup( ->with('trans_email/ident_support/email', ScopeInterface::SCOPE_STORE) ->willReturn('admin@example.com'); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($resultErrorMessage) ->willReturnSelf(); } 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 8d5f64e02be47..1b53afc520731 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 @@ -4,27 +4,36 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Edit as ProductEdit; use Magento\Downloadable\Helper\Download as DownloadHelper; +use Magento\Downloadable\Helper\File; +use Magento\Downloadable\Model\Link as ModelLink; use Magento\Framework\App\Response\Http as HttpResponse; -class Link extends \Magento\Catalog\Controller\Adminhtml\Product\Edit +class Link extends ProductEdit { /** - * @return \Magento\Downloadable\Model\Link + * Create link + * + * @return ModelLink */ protected function _createLink() { - return $this->_objectManager->create(\Magento\Downloadable\Model\Link::class); + return $this->_objectManager->create(ModelLink::class); } /** - * @return \Magento\Downloadable\Model\Link + * Get link + * + * @return ModelLink */ protected function _getLink() { - return $this->_objectManager->get(\Magento\Downloadable\Model\Link::class); + return $this->_objectManager->get(ModelLink::class); } /** @@ -34,10 +43,10 @@ protected function _getLink() * @param string $resourceType * @return void */ - protected function _processDownload($resource, $resourceType) + protected function _processDownload(string $resource, string $resourceType) { - /* @var $helper \Magento\Downloadable\Helper\Download */ - $helper = $this->_objectManager->get(\Magento\Downloadable\Helper\Download::class); + /* @var $helper DownloadHelper */ + $helper = $this->_objectManager->get(DownloadHelper::class); $helper->setResource($resource, $resourceType); $fileName = $helper->getFilename(); @@ -77,7 +86,7 @@ protected function _processDownload($resource, $resourceType) //Rendering $response->clearBody(); $response->sendHeaders(); - + $helper->output(); } @@ -90,7 +99,7 @@ public function execute() { $linkId = $this->getRequest()->getParam('id', 0); $type = $this->getRequest()->getParam('type', 0); - /** @var \Magento\Downloadable\Model\Link $link */ + /** @var ModelLink $link */ $link = $this->_createLink()->load($linkId); if ($link->getId()) { $resource = ''; @@ -101,7 +110,7 @@ public function execute() $resourceType = DownloadHelper::LINK_TYPE_URL; } elseif ($link->getLinkType() == DownloadHelper::LINK_TYPE_FILE) { $resource = $this->_objectManager->get( - \Magento\Downloadable\Helper\File::class + File::class )->getFilePath( $this->_getLink()->getBasePath(), $link->getLinkFile() @@ -114,7 +123,7 @@ public function execute() $resourceType = DownloadHelper::LINK_TYPE_URL; } elseif ($link->getSampleType() == DownloadHelper::LINK_TYPE_FILE) { $resource = $this->_objectManager->get( - \Magento\Downloadable\Helper\File::class + File::class )->getFilePath( $this->_getLink()->getBaseSamplePath(), $link->getSampleFile() @@ -125,7 +134,7 @@ public function execute() try { $this->_processDownload($resource, $resourceType); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError(__('Something went wrong while getting the requested content.')); + $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.')); } } } 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 2e115e1ce18d3..84bd21904ea18 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 @@ -4,26 +4,33 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; use Magento\Downloadable\Helper\Download as DownloadHelper; +use Magento\Downloadable\Model\Sample as ModelSample; -class Sample extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Link +class Sample extends Link { /** - * @return \Magento\Downloadable\Model\Sample + * Create link + * + * @return ModelSample */ protected function _createLink() { - return $this->_objectManager->create(\Magento\Downloadable\Model\Sample::class); + return $this->_objectManager->create(ModelSample::class); } /** - * @return \Magento\Downloadable\Model\Sample + * Get link + * + * @return ModelSample */ protected function _getLink() { - return $this->_objectManager->get(\Magento\Downloadable\Model\Sample::class); + return $this->_objectManager->get(ModelSample::class); } /** @@ -34,7 +41,7 @@ protected function _getLink() public function execute() { $sampleId = $this->getRequest()->getParam('id', 0); - /** @var \Magento\Downloadable\Model\Sample $sample */ + /** @var ModelSample $sample */ $sample = $this->_createLink()->load($sampleId); if ($sample->getId()) { $resource = ''; @@ -54,7 +61,7 @@ public function execute() try { $this->_processDownload($resource, $resourceType); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError(__('Something went wrong while getting the requested content.')); + $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.')); } } } diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php index 4766f1699afb6..2b131806fa022 100644 --- a/app/code/Magento/Downloadable/Controller/Download/Link.php +++ b/app/code/Magento/Downloadable/Controller/Download/Link.php @@ -125,7 +125,7 @@ public function execute() // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage exit(0); } catch (\Exception $e) { - $this->messageManager->addError(__('Something went wrong while getting the requested content.')); + $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.')); } } elseif ($status == PurchasedLink::LINK_STATUS_EXPIRED) { $this->messageManager->addNotice(__('The link has expired.')); @@ -133,7 +133,7 @@ public function execute() ) { $this->messageManager->addNotice(__('The link is not available.')); } else { - $this->messageManager->addError(__('Something went wrong while getting the requested content.')); + $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.')); } return $this->_redirect('*/customer/products'); } diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php index c449f8f54872f..1be97435fff84 100644 --- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php +++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php @@ -69,7 +69,7 @@ public function execute() // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage exit(0); } catch (\Exception $e) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __('Sorry, there was an error getting requested content. Please contact the store owner.') ); } 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 193b001f305b2..31cba7b601eec 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 @@ -184,6 +184,8 @@ public function testExecuteUrl() ->willReturn('1'); $this->sampleModel->expects($this->any())->method('getSampleType') ->willReturn('url'); + $this->sampleModel->expects($this->once())->method('getSampleUrl') + ->willReturn('http://example.com/simple.jpg'); $this->objectManager->expects($this->once())->method('create') ->willReturn($this->sampleModel); 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 b7483f3658d69..f9e464a3948f1 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php @@ -327,7 +327,7 @@ public function testExceptionInUpdateLinkStatus($mimeType, $disposition) $this->linkPurchasedItem->expects($this->any())->method('setStatus')->with('expired')->willReturnSelf(); $this->linkPurchasedItem->expects($this->any())->method('save')->willThrowException(new \Exception()); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('Something went wrong while getting the requested content.') ->willReturnSelf(); $this->redirect->expects($this->once())->method('redirect')->with($this->response, '*/customer/products', []); @@ -494,7 +494,7 @@ public function linkNotAvailableDataProvider() ['addNotice', 'expired', 'The link has expired.'], ['addNotice', 'pending', 'The link is not available.'], ['addNotice', 'payment_review', 'The link is not available.'], - ['addError', 'wrong_status', 'Something went wrong while getting the requested content.'] + ['addErrorMessage', 'wrong_status', 'Something went wrong while getting the requested content.'] ]; } diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php index dff6560ebf768..43cc467ad390b 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php @@ -99,10 +99,10 @@ public function execute() ); } catch (\Exception $e) { $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); - $this->messageManager->addError(__('Please correct the data sent value.')); + $this->messageManager->addErrorMessage(__('Please correct the data sent value.')); } } else { - $this->messageManager->addError(__('Please correct the data sent value.')); + $this->messageManager->addErrorMessage(__('Please correct the data sent value.')); } /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php index 722d32c9eb21a..789df5dbc466f 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php @@ -35,10 +35,10 @@ public function execute() ); return $resultLayout; } catch (\Exception $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } } else { - $this->messageManager->addError(__('Please correct the data sent value.')); + $this->messageManager->addErrorMessage(__('Please correct the data sent value.')); } /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php index 7c119e1dd683d..9918ef8908956 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php @@ -3,62 +3,71 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\ImportExport\Controller\Adminhtml\Import; +use Magento\Backend\App\Action\Context; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\Response\Http\FileFactory; use Magento\Framework\Component\ComponentRegistrar; +use Magento\Framework\Controller\Result\Raw; +use Magento\Framework\Controller\Result\RawFactory; use Magento\Framework\Controller\Result\Redirect; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Framework\Filesystem\Directory\ReadFactory; use Magento\ImportExport\Controller\Adminhtml\Import as ImportController; +use Magento\ImportExport\Model\Import\SampleFileProvider; /** * Download sample file controller */ -class Download extends ImportController +class Download extends ImportController implements HttpGetActionInterface { const SAMPLE_FILES_MODULE = 'Magento_ImportExport'; /** - * @var \Magento\Framework\Controller\Result\RawFactory + * @var RawFactory */ protected $resultRawFactory; /** - * @var \Magento\Framework\Filesystem\Directory\ReadFactory + * @var ReadFactory */ protected $readFactory; /** - * @var \Magento\Framework\Component\ComponentRegistrar + * @var ComponentRegistrar */ protected $componentRegistrar; /** - * @var \Magento\Framework\App\Response\Http\FileFactory + * @var FileFactory */ protected $fileFactory; /** - * @var \Magento\ImportExport\Model\Import\SampleFileProvider + * @var SampleFileProvider */ private $sampleFileProvider; /** - * @param \Magento\Backend\App\Action\Context $context - * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory - * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory - * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory - * @param \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider + * @param Context $context + * @param FileFactory $fileFactory + * @param RawFactory $resultRawFactory + * @param ReadFactory $readFactory * @param ComponentRegistrar $componentRegistrar - * @param \Magento\ImportExport\Model\Import\SampleFileProvider|null $sampleFileProvider + * @param SampleFileProvider|null $sampleFileProvider */ public function __construct( - \Magento\Backend\App\Action\Context $context, - \Magento\Framework\App\Response\Http\FileFactory $fileFactory, - \Magento\Framework\Controller\Result\RawFactory $resultRawFactory, - \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory, - \Magento\Framework\Component\ComponentRegistrar $componentRegistrar, - \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider = null + Context $context, + FileFactory $fileFactory, + RawFactory $resultRawFactory, + ReadFactory $readFactory, + ComponentRegistrar $componentRegistrar, + SampleFileProvider $sampleFileProvider = null ) { parent::__construct( $context @@ -68,14 +77,14 @@ public function __construct( $this->readFactory = $readFactory; $this->componentRegistrar = $componentRegistrar; $this->sampleFileProvider = $sampleFileProvider - ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\ImportExport\Model\Import\SampleFileProvider::class); + ?: ObjectManager::getInstance() + ->get(SampleFileProvider::class); } /** * Download sample file action * - * @return \Magento\Framework\Controller\Result\Raw + * @return Raw */ public function execute() { @@ -89,7 +98,7 @@ public function execute() try { $fileContents = $this->sampleFileProvider->getFileContents($entityName); } catch (NoSuchEntityException $e) { - $this->messageManager->addError(__('There is no sample file for this entity.')); + $this->messageManager->addErrorMessage(__('There is no sample file for this entity.')); return $this->getResultRedirect(); } @@ -105,13 +114,15 @@ public function execute() $fileSize ); - /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */ $resultRaw = $this->resultRawFactory->create(); $resultRaw->setContents($fileContents); + return $resultRaw; } /** + * Get redirect result + * * @return Redirect */ private function getResultRedirect(): Redirect diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php index c18e666260898..4be73fe384ae0 100644 --- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php +++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php @@ -3,15 +3,18 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\ImportExport\Controller\Adminhtml\Import; +use Magento\Backend\Model\View\Result\Redirect; use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Controller\ResultInterface; +use Magento\Framework\View\Result\Layout; +use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result; use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController; use Magento\ImportExport\Model\Import; -use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\Filesystem\DirectoryList; -use Magento\ImportExport\Model\Import\Adapter as ImportAdapter; /** * Import validate controller action. @@ -27,16 +30,16 @@ class Validate extends ImportResultController implements HttpPostActionInterface /** * Validate uploaded files action * - * @return \Magento\Framework\Controller\ResultInterface - * @SuppressWarnings(PHPMD.Superglobals) + * @return ResultInterface */ public function execute() { $data = $this->getRequest()->getPostValue(); - /** @var \Magento\Framework\View\Result\Layout $resultLayout */ + /** @var Layout $resultLayout */ $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT); /** @var $resultBlock Result */ $resultBlock = $resultLayout->getLayout()->getBlock('import.frame.result'); + //phpcs:disable Magento2.Security.Superglobal if ($data) { // common actions $resultBlock->addAction( @@ -44,7 +47,6 @@ public function execute() 'import_validation_container' ); - /** @var $import \Magento\ImportExport\Model\Import */ $import = $this->getImport()->setData($data); try { $source = $import->uploadFileAndGetSource(); @@ -59,8 +61,8 @@ public function execute() $resultBlock->addError(__('The file was not uploaded.')); return $resultLayout; } - $this->messageManager->addError(__('Sorry, but the data is invalid or the file is not uploaded.')); - /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ + $this->messageManager->addErrorMessage(__('Sorry, but the data is invalid or the file is not uploaded.')); + /** @var Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); $resultRedirect->setPath('adminhtml/*/index'); return $resultRedirect; @@ -100,7 +102,7 @@ private function processValidationResult($validationResult, $resultBlock) $errorAggregator->getErrorsCount() ) ); - + $this->addErrorMessages($resultBlock, $errorAggregator); } else { if ($errorAggregator->getErrorsCount()) { diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php index 06c89a3e9e543..e54b1e470b54d 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php +++ b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php @@ -164,7 +164,7 @@ public function testNoDataWasPosted() ]); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with(__('Sorry, but the data is invalid or the file is not uploaded.')); $this->assertEquals($resultRedirectMock, $this->validate->execute()); diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php index 6934284c8e65e..8909fa999528a 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php @@ -22,7 +22,7 @@ public function execute() { $indexerIds = $this->getRequest()->getParam('indexer_ids'); if (!is_array($indexerIds)) { - $this->messageManager->addError(__('Please select indexers.')); + $this->messageManager->addErrorMessage(__('Please select indexers.')); } else { try { foreach ($indexerIds as $indexerId) { @@ -36,7 +36,7 @@ public function execute() __('%1 indexer(s) are in "Update by Schedule" mode.', count($indexerIds)) ); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { $this->messageManager->addException( $e, diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php index 0cc203a547b3a..2fec3aac698b6 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php @@ -40,7 +40,7 @@ public function execute() { $indexerIds = $this->getRequest()->getParam('indexer_ids'); if (!is_array($indexerIds)) { - $this->messageManager->addError(__('Please select indexers.')); + $this->messageManager->addErrorMessage(__('Please select indexers.')); } else { try { foreach ($indexerIds as $indexerId) { @@ -52,7 +52,7 @@ public function execute() __('%1 indexer(s) were invalidated.', count($indexerIds)) ); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { $this->messageManager->addException( $e, diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php index 21fa7a61c621f..f8c3c58f5413b 100644 --- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php +++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php @@ -22,7 +22,7 @@ public function execute() { $indexerIds = $this->getRequest()->getParam('indexer_ids'); if (!is_array($indexerIds)) { - $this->messageManager->addError(__('Please select indexers.')); + $this->messageManager->addErrorMessage(__('Please select indexers.')); } else { try { foreach ($indexerIds as $indexerId) { @@ -36,7 +36,7 @@ public function execute() __('%1 indexer(s) are in "Update on Save" mode.', count($indexerIds)) ); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { $this->messageManager->addException( $e, 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 329e392ea1a8d..a5fc5e7bf68d1 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 @@ -171,7 +171,7 @@ protected function setUp(): void $this->title = $this->createMock(Title::class); $this->messageManager = $this->getMockForAbstractClass( ManagerInterface::class, - ['addError', 'addSuccess'], + ['addErrorMessage', 'addSuccess'], '', false ); @@ -206,7 +206,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues) if (!is_array($indexerIds)) { $this->messageManager->expects($this->once()) - ->method('addError')->with(__('Please select indexers.')) + ->method('addErrorMessage')->with(__('Please select indexers.')) ->willReturn(1); } else { $this->objectManager->expects($this->any()) @@ -235,7 +235,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues) if ($exception !== null) { $this->messageManager ->expects($this->exactly($expectsExceptionValues[2])) - ->method('addError') + ->method('addErrorMessage') ->with($exception->getMessage()); $this->messageManager->expects($this->exactly($expectsExceptionValues[1])) ->method('addException') diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php index 9c43b8a84d1ba..a49b128681bbc 100644 --- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php +++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php @@ -196,7 +196,7 @@ protected function setUp(): void $this->title = $this->createMock(Title::class); $this->messageManager = $this->getMockForAbstractClass( ManagerInterface::class, - ['addError', 'addSuccess'], + ['addErrorMessage', 'addSuccess'], '', false ); @@ -233,7 +233,7 @@ public function testExecute($indexerIds, $exception) if (!is_array($indexerIds)) { $this->messageManager->expects($this->once()) - ->method('addError')->with(__('Please select indexers.')) + ->method('addErrorMessage')->with(__('Please select indexers.')) ->willReturn(1); } else { $indexerInterface = $this->getMockForAbstractClass( @@ -261,7 +261,7 @@ public function testExecute($indexerIds, $exception) if ($exception instanceof LocalizedException) { $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($exception->getMessage()); } else { $this->messageManager->expects($this->once()) 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 727f5965f9fe4..649db0282d12d 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 @@ -171,7 +171,7 @@ protected function setUp(): void $this->title = $this->createMock(Title::class); $this->messageManager = $this->getMockForAbstractClass( ManagerInterface::class, - ['addError', 'addSuccess'], + ['addErrorMessage', 'addSuccess'], '', false ); @@ -206,7 +206,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues) if (!is_array($indexerIds)) { $this->messageManager->expects($this->once()) - ->method('addError')->with(__('Please select indexers.')) + ->method('addErrorMessage')->with(__('Please select indexers.')) ->willReturn(1); } else { $this->objectManager->expects($this->any()) @@ -234,7 +234,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues) if ($exception !== null) { $this->messageManager->expects($this->exactly($expectsExceptionValues[2])) - ->method('addError') + ->method('addErrorMessage') ->with($exception->getMessage()); $this->messageManager->expects($this->exactly($expectsExceptionValues[1])) ->method('addException') diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php index 4ce462bb44c89..1e4f58d0b1250 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php @@ -27,7 +27,7 @@ public function execute() if ($integrationId) { $integrationData = $this->_integrationService->get($integrationId); if ($this->_integrationData->isConfigType($integrationData)) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __( "Uninstall the extension to remove integration '%1'.", $this->escaper->escapeHtml($integrationData[Info::DATA_NAME]) @@ -37,7 +37,7 @@ public function execute() } $integrationData = $this->_integrationService->delete($integrationId); if (!$integrationData[Info::DATA_ID]) { - $this->messageManager->addError(__('This integration no longer exists.')); + $this->messageManager->addErrorMessage(__('This integration no longer exists.')); } else { //Integration deleted successfully, now safe to delete the associated consumer data if (isset($integrationData[Info::DATA_CONSUMER_ID])) { @@ -52,10 +52,10 @@ public function execute() ); } } else { - $this->messageManager->addError(__('Integration ID is not specified or is invalid.')); + $this->messageManager->addErrorMessage(__('Integration ID is not specified or is invalid.')); } } catch (IntegrationException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { $this->_logger->critical($e); } diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php index 599b6017059e1..25b23065f308e 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php @@ -27,12 +27,12 @@ public function execute() $integrationData = $this->_integrationService->get($integrationId)->getData(); $originalName = $this->escaper->escapeHtml($integrationData[Info::DATA_NAME]); } catch (IntegrationException $e) { - $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage())); + $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage())); $this->_redirect('*/*/'); return; } catch (\Exception $e) { $this->_logger->critical($e); - $this->messageManager->addError(__('Internal error. Check exception log for details.')); + $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.')); $this->_redirect('*/*'); return; } @@ -41,7 +41,7 @@ public function execute() $integrationData = array_merge($integrationData, $restoredIntegration); } } else { - $this->messageManager->addError(__('Integration ID is not specified or is invalid.')); + $this->messageManager->addErrorMessage(__('Integration ID is not specified or is invalid.')); $this->_redirect('*/*/'); return; } diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php index 8b2a94da01d70..e418fa9de1d97 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php @@ -24,17 +24,17 @@ public function execute() $integrationData = $this->_integrationService->get($integrationId)->getData(); $this->_registry->register(self::REGISTRY_KEY_CURRENT_INTEGRATION, $integrationData); } catch (IntegrationException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*/'); return; } catch (\Exception $e) { $this->_logger->critical($e); - $this->messageManager->addError(__('Internal error. Check exception log for details.')); + $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.')); $this->_redirect('*/*'); return; } } else { - $this->messageManager->addError(__('Integration ID is not specified or is invalid.')); + $this->messageManager->addErrorMessage(__('Integration ID is not specified or is invalid.')); $this->_redirect('*/*/'); return; } diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php index ea255487b9df1..ac237750e7152 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php @@ -69,19 +69,19 @@ public function execute() ); $this->_redirect('*'); } catch (\Magento\Framework\Exception\AuthenticationException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_getSession()->setIntegrationData($this->getRequest()->getPostValue()); $this->_redirectOnSaveError(); } catch (IntegrationException $e) { - $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage())); + $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage())); $this->_getSession()->setIntegrationData($this->getRequest()->getPostValue()); $this->_redirectOnSaveError(); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage())); + $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage())); $this->_redirectOnSaveError(); } catch (\Exception $e) { $this->_logger->critical($e); - $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage())); + $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage())); $this->_redirectOnSaveError(); } } diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php index 4c99dafb1d997..f4ebad4954946 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php @@ -51,12 +51,12 @@ public function execute() $this->_integrationService->get($integrationId)->getData() ); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*'); return; } catch (\Exception $e) { $this->_logger->critical($e); - $this->messageManager->addError(__('Internal error. Check exception log for details.')); + $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.')); $this->_redirect('*/*'); return; } diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php index a49561dd95ade..2f1884b8db735 100644 --- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php +++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php @@ -4,12 +4,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); namespace Magento\Integration\Controller\Adminhtml\Integration; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Integration\Controller\Adminhtml\Integration; use Magento\Integration\Model\Integration as IntegrationModel; -class TokensExchange extends \Magento\Integration\Controller\Adminhtml\Integration +class TokensExchange extends Integration implements HttpPostActionInterface { /** * Let the admin know that integration has been sent for activation and token exchange is in process. @@ -72,12 +75,12 @@ public function execute() ]; $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result)); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*'); return; } catch (\Exception $e) { $this->_logger->critical($e); - $this->messageManager->addError(__('Internal error. Check exception log for details.')); + $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.')); $this->_redirect('*/*'); return; } 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 aa1393be6534c..074c6ff2c2ae2 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 @@ -120,7 +120,7 @@ public function testDeleteActionConfigSetUp() ->willReturn(true); // verify error message $this->_messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with(__('Uninstall the extension to remove integration \'%1\'.', $intData[Info::DATA_NAME])); $this->_integrationSvcMock->expects($this->never())->method('delete'); // Use real translate model @@ -143,7 +143,7 @@ public function testDeleteActionMissingId() $this->_translateModelMock = null; // verify error message $this->_messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with(__('Integration ID is not specified or is invalid.')); $this->integrationController->execute(); @@ -166,7 +166,7 @@ public function testDeleteActionForServiceIntegrationException() $this->_integrationSvcMock->expects($this->once()) ->method('delete') ->willThrowException($invalidIdException); - $this->_messageManager->expects($this->once())->method('addError'); + $this->_messageManager->expects($this->once())->method('addErrorMessage'); $this->integrationController->execute(); } @@ -188,7 +188,7 @@ public function testDeleteActionForServiceGenericException() $this->_integrationSvcMock->expects($this->once()) ->method('delete') ->willThrowException($invalidIdException); - $this->_messageManager->expects($this->never())->method('addError'); + $this->_messageManager->expects($this->never())->method('addErrorMessage'); $this->integrationController->execute(); } 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 5cfa8b290b6b9..a9dc8ec616674 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 @@ -62,7 +62,7 @@ public function testEditActionNonExistentIntegration() { $exceptionMessage = 'This integration no longer exists.'; // verify the error - $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage); $this->_requestMock->expects($this->any())->method('getParam')->willReturn(self::INTEGRATION_ID); // put data in session, the magic function getFormData is called so, must match __call method name $this->_backendSessionMock->expects( @@ -93,7 +93,7 @@ public function testEditActionNoDataAdd() { $exceptionMessage = 'Integration ID is not specified or is invalid.'; // verify the error - $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage); $this->_verifyLoadAndRenderLayout(); $integrationContr = $this->_createIntegrationController('Edit'); $integrationContr->execute(); @@ -103,7 +103,7 @@ public function testEditException() { $exceptionMessage = 'Integration ID is not specified or is invalid.'; // verify the error - $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage); $this->_controller = $this->_createIntegrationController('Edit'); $this->_controller->execute(); } 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 8de8b45833043..f3b0c65b6a706 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 @@ -180,7 +180,7 @@ public function testSaveActionExceptionDuringServiceCreation() // Use real translate model $this->_translateModelMock = null; // Verify success message - $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage); $integrationController = $this->_createIntegrationController('Save'); $integrationController->execute(); } @@ -211,7 +211,7 @@ public function testSaveActionExceptionOnIntegrationsCreatedFromConfigFile() ->willReturnArgument(0); // Verify error - $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage); $integrationContr = $this->_createIntegrationController('Save'); $integrationContr->execute(); } @@ -283,7 +283,7 @@ public function testSaveActionAuthenticationException() ->willThrowException(new AuthenticationException(__($exceptionMessage))); // Verify error - $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage); $integrationContr = $this->_createIntegrationController('Save'); $integrationContr->execute(); } diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php index 92417c7cb3a18..e4711d8766c8b 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout.php +++ b/app/code/Magento/Multishipping/Controller/Checkout.php @@ -3,88 +3,79 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Controller; +use Magento\Checkout\Controller\Action; +use Magento\Checkout\Controller\Express\RedirectLoginInterface; +use Magento\Checkout\Model\Session as ModelSession; use Magento\Customer\Api\AccountManagementInterface; use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Customer\Model\Session; +use Magento\Framework\App\Action\Context; use Magento\Framework\App\RequestInterface; +use Magento\Framework\App\ResponseInterface; +use Magento\Framework\Controller\ResultInterface; use Magento\Framework\Exception\StateException; +use Magento\Multishipping\Helper\Url; +use Magento\Multishipping\Model\Checkout\Type\Multishipping; +use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; /** * Multishipping checkout controller + * * @SuppressWarnings(PHPMD.NumberOfChildren) * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -abstract class Checkout extends \Magento\Checkout\Controller\Action implements - \Magento\Checkout\Controller\Express\RedirectLoginInterface +abstract class Checkout extends Action implements RedirectLoginInterface { - /** - * Constructor - * - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession - * @param CustomerRepositoryInterface $customerRepository - * @param AccountManagementInterface $accountManagement - */ - public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, - CustomerRepositoryInterface $customerRepository, - AccountManagementInterface $accountManagement - ) { - parent::__construct( - $context, - $customerSession, - $customerRepository, - $accountManagement - ); - } /** * Retrieve checkout model * - * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping + * @return Multishipping */ protected function _getCheckout() { - return $this->_objectManager->get(\Magento\Multishipping\Model\Checkout\Type\Multishipping::class); + return $this->_objectManager->get(Multishipping::class); } /** * Retrieve checkout state model * - * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping\State + * @return State */ protected function _getState() { - return $this->_objectManager->get(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::class); + return $this->_objectManager->get(State::class); } /** * Retrieve checkout url helper * - * @return \Magento\Multishipping\Helper\Url + * @return Url */ protected function _getHelper() { - return $this->_objectManager->get(\Magento\Multishipping\Helper\Url::class); + return $this->_objectManager->get(Url::class); } /** * Retrieve checkout session * - * @return \Magento\Checkout\Model\Session + * @return ModelSession */ protected function _getCheckoutSession() { - return $this->_objectManager->get(\Magento\Checkout\Model\Session::class); + return $this->_objectManager->get(ModelSession::class); } /** * Dispatch request * * @param RequestInterface $request - * @return \Magento\Framework\App\ResponseInterface + * @return ResponseInterface * @throws \Magento\Framework\Exception\NotFoundException * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) @@ -104,7 +95,7 @@ public function dispatch(RequestInterface $request) */ if ($action == 'index') { $checkoutSessionQuote->setIsMultiShipping(true); - $this->_getCheckoutSession()->setCheckoutState(\Magento\Checkout\Model\Session::CHECKOUT_STATE_BEGIN); + $this->_getCheckoutSession()->setCheckoutState(ModelSession::CHECKOUT_STATE_BEGIN); } elseif (!$checkoutSessionQuote->getIsMultiShipping() && !in_array( $action, ['login', 'register', 'success'] @@ -116,7 +107,7 @@ public function dispatch(RequestInterface $request) } if (!in_array($action, ['login', 'register'])) { - $customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class); + $customerSession = $this->_objectManager->get(Session::class); if (!$customerSession->authenticate($this->_getHelper()->getMSLoginUrl())) { $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); } @@ -125,7 +116,7 @@ public function dispatch(RequestInterface $request) \Magento\Multishipping\Helper\Data::class )->isMultishippingCheckoutAvailable()) { $error = $this->_getCheckout()->getMinimumAmountError(); - $this->messageManager->addError($error); + $this->messageManager->addErrorMessage($error); $this->getResponse()->setRedirect($this->_getHelper()->getCartUrl()); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); return parent::dispatch($request); @@ -133,7 +124,7 @@ public function dispatch(RequestInterface $request) } $result = $this->_preDispatchValidateCustomer(); - if ($result instanceof \Magento\Framework\Controller\ResultInterface) { + if ($result instanceof ResultInterface) { return $result; } @@ -180,7 +171,7 @@ protected function _validateMinimumAmount() { if (!$this->_getCheckout()->validateMinimumAmount()) { $error = $this->_getCheckout()->getMinimumAmountError(); - $this->messageManager->addError($error); + $this->messageManager->addErrorMessage($error); $this->_forward('backToAddresses'); return false; } diff --git a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php index 060a1bdd5ac4e..2a4cb47b421c0 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php @@ -4,11 +4,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Controller\Checkout; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Multishipping\Controller\Checkout; use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; -class AddressesPost extends \Magento\Multishipping\Controller\Checkout +class AddressesPost extends Checkout implements HttpPostActionInterface { /** * Multishipping checkout process posted addresses @@ -36,7 +40,7 @@ public function execute() $this->_getCheckout()->setShippingItemsInformation($shipToInfo); } } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*/addresses'); } catch (\Exception $e) { $this->messageManager->addException($e, __('Data saving problem')); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php index d97226a393c25..623ced14c2fa9 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php @@ -4,14 +4,19 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Controller\Checkout; +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; use Magento\Framework\Exception\LocalizedException; +use Magento\Multishipping\Controller\Checkout; use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; use Magento\Payment\Model\Method\AbstractMethod; use Psr\Log\LoggerInterface; -class Overview extends \Magento\Multishipping\Controller\Checkout +class Overview extends Checkout implements HttpPostActionInterface, HttpGetActionInterface { /** * Multishipping checkout place order page @@ -42,7 +47,7 @@ public function execute() $this->_view->loadLayout(); $this->_view->renderLayout(); } catch (LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*/billing'); } catch (\Exception $e) { $this->_objectManager->get(LoggerInterface::class)->critical($e); diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php index f05a7f43b8118..762b0f5cca59c 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php @@ -3,33 +3,40 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Controller\Checkout; -use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; +use Magento\Checkout\Api\AgreementsValidatorInterface; use Magento\Customer\Api\AccountManagementInterface; use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Customer\Model\Session; +use Magento\Framework\App\Action\Context; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\Data\Form\FormKey\Validator; use Magento\Framework\Exception\PaymentException; use Magento\Framework\Session\SessionManagerInterface; +use Magento\Multishipping\Controller\Checkout; +use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; +use Psr\Log\LoggerInterface; /** - * Class OverviewPost - * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class OverviewPost extends \Magento\Multishipping\Controller\Checkout +class OverviewPost extends Checkout implements HttpPostActionInterface { /** - * @var \Magento\Framework\Data\Form\FormKey\Validator + * @var Validator */ protected $formKeyValidator; /** - * @var \Psr\Log\LoggerInterface + * @var LoggerInterface */ protected $logger; /** - * @var \Magento\Checkout\Api\AgreementsValidatorInterface + * @var AgreementsValidatorInterface */ protected $agreementsValidator; @@ -39,23 +46,23 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout private $session; /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Magento\Customer\Model\Session $customerSession + * @param Context $context + * @param Session $customerSession * @param CustomerRepositoryInterface $customerRepository * @param AccountManagementInterface $accountManagement - * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator - * @param \Psr\Log\LoggerInterface $logger - * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator + * @param Validator $formKeyValidator + * @param LoggerInterface $logger + * @param AgreementsValidatorInterface $agreementValidator * @param SessionManagerInterface $session */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Magento\Customer\Model\Session $customerSession, + Context $context, + Session $customerSession, CustomerRepositoryInterface $customerRepository, AccountManagementInterface $accountManagement, - \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator, - \Psr\Log\LoggerInterface $logger, - \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator, + Validator $formKeyValidator, + LoggerInterface $logger, + AgreementsValidatorInterface $agreementValidator, SessionManagerInterface $session ) { $this->formKeyValidator = $formKeyValidator; @@ -89,7 +96,7 @@ public function execute() try { if (!$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __('Please agree to all Terms and Conditions before placing the order.') ); $this->_redirect('*/*/billing'); @@ -119,7 +126,7 @@ public function execute() } catch (PaymentException $e) { $message = $e->getMessage(); if (!empty($message)) { - $this->messageManager->addError($message); + $this->messageManager->addErrorMessage($message); } $this->_redirect('*/*/billing'); } catch (\Magento\Checkout\Exception $e) { @@ -131,7 +138,7 @@ public function execute() 'multi-shipping' ); $this->_getCheckout()->getCheckoutSession()->clearQuote(); - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/cart'); } catch (\Magento\Framework\Exception\LocalizedException $e) { $this->_objectManager->get( @@ -141,7 +148,7 @@ public function execute() $e->getMessage(), 'multi-shipping' ); - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*/billing'); } catch (\Exception $e) { $this->logger->critical($e); @@ -156,7 +163,7 @@ public function execute() } catch (\Exception $e) { $this->logger->error($e->getMessage()); } - $this->messageManager->addError(__('Order place error')); + $this->messageManager->addErrorMessage(__('Order place error')); $this->_redirect('*/*/billing'); } } diff --git a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php index 1e1d3dbace623..d8ab9faa24a36 100644 --- a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php +++ b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php @@ -4,13 +4,19 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Multishipping\Controller\Checkout; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Multishipping\Controller\Checkout; use Magento\Multishipping\Model\Checkout\Type\Multishipping\State; -class ShippingPost extends \Magento\Multishipping\Controller\Checkout +class ShippingPost extends Checkout implements HttpPostActionInterface { /** + * Shipping action + * * @return void */ public function execute() @@ -26,7 +32,7 @@ public function execute() $this->_getState()->setCompleteStep(State::STEP_SHIPPING); $this->_redirect('*/*/billing'); } catch (\Exception $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_redirect('*/*/shipping'); } } diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php index f7eb658f40784..00060c8f94ca5 100644 --- a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php +++ b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\NewRelicReporting\Model\Observer; use Magento\Framework\Event\Observer; @@ -11,9 +13,6 @@ use Magento\Framework\Message\ManagerInterface; use Magento\NewRelicReporting\Model\NewRelicWrapper; -/** - * Class CheckConfig - */ class CheckConfig implements ObserverInterface { /** @@ -58,9 +57,9 @@ public function execute(Observer $observer) if ($this->config->isNewRelicEnabled()) { if (!$this->newRelicWrapper->isExtensionInstalled()) { $this->config->disableModule(); - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __( - 'The New Relic integration requires the newrelic-php5 agent, which is not installed. More + 'The New Relic integration requires the newrelic-php5 agent, which is not installed. More information on installing the agent is available here.', 'https://docs.newrelic.com/docs/agents/php-agent/installation/php-agent-installation-overview' ), diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php index 6bb1ee7214609..f64acdc71d2a8 100644 --- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php +++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php @@ -125,7 +125,7 @@ public function testCheckConfig() $this->config->expects($this->once()) ->method('disableModule'); $this->messageManager->expects($this->once()) - ->method('addError'); + ->method('addErrorMessage'); $this->model->execute($eventObserver); } diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php index 2dbe10bf1bdc9..4f93e3e4f73a3 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php @@ -88,7 +88,7 @@ public function execute() $this->_redirect('*/*'); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $id = $this->getRequest()->getParam('id'); if ($id) { $this->_redirect('*/*/edit', ['id' => $id]); diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php index cdef44b2da757..e8ec57f7a153e 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php @@ -46,7 +46,7 @@ public function execute() { $subscribersIds = $this->getRequest()->getParam('subscriber'); if (!is_array($subscribersIds)) { - $this->messageManager->addError(__('Please select one or more subscribers.')); + $this->messageManager->addErrorMessage(__('Please select one or more subscribers.')); } else { try { foreach ($subscribersIds as $subscriberId) { @@ -57,7 +57,7 @@ public function execute() } $this->messageManager->addSuccess(__('Total of %1 record(s) were deleted.', count($subscribersIds))); } catch (\Exception $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } } diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php index b61494f795905..5e0890215c815 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php @@ -4,21 +4,24 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Newsletter\Controller\Adminhtml\Subscriber; -use Magento\Newsletter\Controller\Adminhtml\Subscriber; use Magento\Backend\App\Action\Context; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Framework\App\ObjectManager; use Magento\Framework\App\Response\Http\FileFactory; +use Magento\Newsletter\Controller\Adminhtml\Subscriber; use Magento\Newsletter\Model\SubscriberFactory; -use Magento\Framework\App\ObjectManager; -class MassUnsubscribe extends Subscriber +class MassUnsubscribe extends Subscriber implements HttpPostActionInterface { /** * @var SubscriberFactory */ private $subscriberFactory; - + /** * @param Context $context * @param FileFactory $fileFactory @@ -32,17 +35,17 @@ public function __construct( $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class); parent::__construct($context, $fileFactory); } - + /** * Unsubscribe one or more subscribers action * * @return void */ - public function execute() + public function execute(): void { $subscribersIds = $this->getRequest()->getParam('subscriber'); if (!is_array($subscribersIds)) { - $this->messageManager->addError(__('Please select one or more subscribers.')); + $this->messageManager->addErrorMessage(__('Please select one or more subscribers.')); } else { try { foreach ($subscribersIds as $subscriberId) { @@ -53,7 +56,7 @@ public function execute() } $this->messageManager->addSuccess(__('A total of %1 record(s) were updated.', count($subscribersIds))); } catch (\Exception $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } } diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php index d327d44feceb8..c8352a028fe2d 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php @@ -4,9 +4,15 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Newsletter\Controller\Adminhtml\Template; -class Delete extends \Magento\Newsletter\Controller\Adminhtml\Template +use Magento\Framework\App\Action\HttpGetActionInterface; +use Magento\Framework\App\Action\HttpPostActionInterface; +use Magento\Newsletter\Controller\Adminhtml\Template; + +class Delete extends Template implements HttpGetActionInterface, HttpPostActionInterface { /** * Delete newsletter Template @@ -26,7 +32,7 @@ public function execute() $this->messageManager->addSuccess(__('The newsletter template has been deleted.')); $this->_getSession()->setFormData(false); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { $this->messageManager->addException($e, __('We can\'t delete this template right now.')); } diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php index dc4d50c22b162..cf4aad2059a01 100644 --- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php +++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php @@ -69,7 +69,7 @@ public function execute() $this->_redirect('*/template'); return; } catch (LocalizedException $e) { - $this->messageManager->addError(nl2br($e->getMessage())); + $this->messageManager->addErrorMessage(nl2br($e->getMessage())); $this->_getSession()->setData('newsletter_template_form_data', $this->getRequest()->getParams()); } catch (\Exception $e) { $this->messageManager->addException($e, __('Something went wrong while saving this template.')); diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php index 01012e39a992a..b70c84a6d1099 100644 --- a/app/code/Magento/Newsletter/Controller/Manage/Save.php +++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php @@ -77,7 +77,7 @@ public function execute() $customerId = $this->_customerSession->getCustomerId(); if ($customerId === null) { - $this->messageManager->addError(__('Something went wrong while saving your subscription.')); + $this->messageManager->addErrorMessage(__('Something went wrong while saving your subscription.')); } else { try { $customer = $this->customerRepository->getById($customerId); @@ -105,7 +105,7 @@ public function execute() $this->messageManager->addSuccess(__('We have updated your subscription.')); } } catch (\Exception $e) { - $this->messageManager->addError(__('Something went wrong while saving your subscription.')); + $this->messageManager->addErrorMessage(__('Something went wrong while saving your subscription.')); } } return $this->_redirect('customer/account/'); 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 f333467732e30..e5b09c2e89852 100644 --- a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php +++ b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php @@ -122,7 +122,7 @@ public function testSaveActionInvalidFormKey() $this->messageManagerMock->expects($this->never()) ->method('addSuccess'); $this->messageManagerMock->expects($this->never()) - ->method('addError'); + ->method('addErrorMessage'); $this->action->execute(); } @@ -140,7 +140,7 @@ public function testSaveActionNoCustomerInSession() $this->messageManagerMock->expects($this->never()) ->method('addSuccess'); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('Something went wrong while saving your subscription.'); $this->action->execute(); } @@ -169,7 +169,7 @@ public function testSaveActionWithException() $this->messageManagerMock->expects($this->never()) ->method('addSuccess'); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('Something went wrong while saving your subscription.'); $this->action->execute(); }