From 0a559c796dd0ce0ec5c820bf79e33d9a4ed81eda Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Wed, 15 Jul 2020 14:21:28 +0300 Subject: [PATCH 1/7] remove redundant methods --- .../Controller/Adminhtml/Index/Index.php | 28 +++++++++---------- .../Adminhtml/Order/Create/Newsletter.php | 14 +++------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php index 5a2b9c0a34e64..8156caddecf33 100644 --- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php @@ -6,7 +6,12 @@ namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index; -class Index extends \Magento\Backend\App\Action +use Magento\Backend\App\Action; +use Magento\Backend\App\Action\Context; +use Magento\Framework\View\Result\Page; +use Magento\Framework\View\Result\PageFactory; + +class Index extends Action { /** * Authorization level of a basic admin session @@ -16,7 +21,7 @@ class Index extends \Magento\Backend\App\Action const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations'; /** - * @var \Magento\Framework\View\Result\PageFactory + * @var PageFactory */ private $resultPageFactory; @@ -27,13 +32,14 @@ class Index extends \Magento\Backend\App\Action /** * Details constructor. - * @param \Magento\Backend\App\Action\Context $context - * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory + * + * @param Context $context + * @param PageFactory $resultPageFactory * @param string $menuId */ public function __construct( - \Magento\Backend\App\Action\Context $context, - \Magento\Framework\View\Result\PageFactory $resultPageFactory, + Context $context, + PageFactory $resultPageFactory, $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations' ) { $this->resultPageFactory = $resultPageFactory; @@ -41,18 +47,10 @@ public function __construct( parent::__construct($context); } - /** - * @inheritDoc - */ - protected function _isAllowed() - { - return parent::_isAllowed(); - } - /** * Bulk list action * - * @return \Magento\Framework\View\Result\Page + * @return Page */ public function execute() { diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php index 49e72dd3c3128..fe61fe7b2f435 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php @@ -5,6 +5,8 @@ */ namespace Magento\Sales\Block\Adminhtml\Order\Create; +use Magento\Framework\Phrase; + /** * Adminhtml sales order create newsletter block * @@ -12,7 +14,7 @@ * @author Magento Core Team * @since 100.0.2 */ -class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate +class Newsletter extends AbstractCreate { /** * Constructor @@ -28,7 +30,7 @@ protected function _construct() /** * Get header text * - * @return \Magento\Framework\Phrase + * @return Phrase */ public function getHeaderText() { @@ -44,12 +46,4 @@ public function getHeaderCssClass() { return 'head-newsletter-list'; } - - /** - * {@inheritdoc} - */ - protected function _toHtml() - { - return parent::_toHtml(); - } } From 076a13ec4315dd5858c730d63e7687715562d73b Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Wed, 15 Jul 2020 16:20:40 +0300 Subject: [PATCH 2/7] revert return parament --- .../Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php index fe61fe7b2f435..6d03ce8e3957a 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php @@ -5,8 +5,6 @@ */ namespace Magento\Sales\Block\Adminhtml\Order\Create; -use Magento\Framework\Phrase; - /** * Adminhtml sales order create newsletter block * @@ -30,7 +28,7 @@ protected function _construct() /** * Get header text * - * @return Phrase + * @return \Magento\Framework\Phrase */ public function getHeaderText() { From 865339e87d52343c7596b887771338dbaab52eda Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Thu, 16 Jul 2020 10:15:55 +0300 Subject: [PATCH 3/7] remove redundunt description --- .../AsynchronousOperations/Controller/Adminhtml/Index/Index.php | 2 -- .../Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php index 8156caddecf33..d3f891f13b371 100644 --- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php @@ -31,8 +31,6 @@ class Index extends Action private $menuId; /** - * Details constructor. - * * @param Context $context * @param PageFactory $resultPageFactory * @param string $menuId diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php index 6d03ce8e3957a..e4c7d6fc1d898 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php @@ -15,8 +15,6 @@ class Newsletter extends AbstractCreate { /** - * Constructor - * * @return void */ protected function _construct() From 59c9adb04c074a9361505bc259a683456c9e120c Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Wed, 26 Aug 2020 14:06:56 +0300 Subject: [PATCH 4/7] Remove redundant methods - static tests fix. --- .../Controller/Adminhtml/Index/Index.php | 3 ++- .../Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php index d3f891f13b371..f2b15289ddc80 100644 --- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php @@ -8,10 +8,11 @@ use Magento\Backend\App\Action; use Magento\Backend\App\Action\Context; +use Magento\Framework\App\Action\HttpGetActionInterface; use Magento\Framework\View\Result\Page; use Magento\Framework\View\Result\PageFactory; -class Index extends Action +class Index extends Action implements HttpGetActionInterface { /** * Authorization level of a basic admin session diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php index e4c7d6fc1d898..d61c43474f850 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php @@ -15,7 +15,7 @@ class Newsletter extends AbstractCreate { /** - * @return void + * @inheritdoc */ protected function _construct() { From 5242810271d761df01dbb36790bba960c0533f73 Mon Sep 17 00:00:00 2001 From: glo24157 Date: Wed, 9 Aug 2023 15:17:36 +0530 Subject: [PATCH 5/7] Resolve Static tests failure --- .../AsynchronousOperations/Controller/Adminhtml/Index/Index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php index f2b15289ddc80..2d6c9c66459c5 100644 --- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php @@ -19,7 +19,7 @@ class Index extends Action implements HttpGetActionInterface * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations'; + public const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations'; /** * @var PageFactory From 2e5d7b7fc7dcc4370a9c8f6a901921ef1c54ab39 Mon Sep 17 00:00:00 2001 From: engcom-Charlie Date: Thu, 24 Apr 2025 15:53:32 +0530 Subject: [PATCH 6/7] Fixed the static tests and updated copyright --- .../Controller/Adminhtml/Index/Index.php | 4 ++-- .../Sales/Block/Adminhtml/Order/Create/Newsletter.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php index 2d6c9c66459c5..8946d63dc3d0d 100644 --- a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php +++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php @@ -1,7 +1,7 @@ + * Magento Core Team * @since 100.0.2 */ class Newsletter extends AbstractCreate From b76bb481f1323a28d416bd02a36e3a71a548ccaa Mon Sep 17 00:00:00 2001 From: engcom-Charlie Date: Fri, 25 Apr 2025 19:35:20 +0530 Subject: [PATCH 7/7] Worked on review comments --- .../Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php index 9e4a14688eb4a..7bf4f6dab52c6 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php @@ -9,7 +9,6 @@ * Adminhtml sales order create newsletter block * * @api - * Magento Core Team * @since 100.0.2 */ class Newsletter extends AbstractCreate