Skip to content

Commit 2ba60df

Browse files
Merge remote-tracking branch '29147/remove-redundant-methods-1' into julprs
2 parents af8b297 + 4aec0f3 commit 2ba60df

File tree

2 files changed

+16
-30
lines changed
  • app/code/Magento

2 files changed

+16
-30
lines changed

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@
66

77
namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index;
88

9-
class Index extends \Magento\Backend\App\Action
9+
use Magento\Backend\App\Action;
10+
use Magento\Backend\App\Action\Context;
11+
use Magento\Framework\App\Action\HttpGetActionInterface;
12+
use Magento\Framework\View\Result\Page;
13+
use Magento\Framework\View\Result\PageFactory;
14+
15+
class Index extends Action implements HttpGetActionInterface
1016
{
1117
/**
1218
* Authorization level of a basic admin session
1319
*
1420
* @see _isAllowed()
1521
*/
16-
const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
22+
public const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
1723

1824
/**
19-
* @var \Magento\Framework\View\Result\PageFactory
25+
* @var PageFactory
2026
*/
2127
private $resultPageFactory;
2228

@@ -26,33 +32,24 @@ class Index extends \Magento\Backend\App\Action
2632
private $menuId;
2733

2834
/**
29-
* Details constructor.
30-
* @param \Magento\Backend\App\Action\Context $context
31-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
35+
* @param Context $context
36+
* @param PageFactory $resultPageFactory
3237
* @param string $menuId
3338
*/
3439
public function __construct(
35-
\Magento\Backend\App\Action\Context $context,
36-
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
40+
Context $context,
41+
PageFactory $resultPageFactory,
3742
$menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
3843
) {
3944
$this->resultPageFactory = $resultPageFactory;
4045
$this->menuId = $menuId;
4146
parent::__construct($context);
4247
}
4348

44-
/**
45-
* @inheritDoc
46-
*/
47-
protected function _isAllowed()
48-
{
49-
return parent::_isAllowed();
50-
}
51-
5249
/**
5350
* Bulk list action
5451
*
55-
* @return \Magento\Framework\View\Result\Page
52+
* @return Page
5653
*/
5754
public function execute()
5855
{

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
* @api
1212
* @since 100.0.2
1313
*/
14-
class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
14+
class Newsletter extends AbstractCreate
1515
{
1616
/**
17-
* Constructor
18-
*
19-
* @return void
17+
* @inheritdoc
2018
*/
2119
protected function _construct()
2220
{
@@ -43,13 +41,4 @@ public function getHeaderCssClass()
4341
{
4442
return 'head-newsletter-list';
4543
}
46-
47-
/**
48-
* @inheritdoc
49-
* phpcs:disable
50-
*/
51-
protected function _toHtml()
52-
{
53-
return parent::_toHtml();
54-
}
5544
}

0 commit comments

Comments
 (0)