Skip to content

Commit 30d83ac

Browse files
ENGCOM-3995: Granular Magento_Customer ACL #20436
- Merge Pull Request #20436 from kassner/magento2:patch-13 - Merged commits: 1. 3cd2be1 2. 4dee7d2 3. f87179b 4. 2b23ca3
2 parents be72706 + 2b23ca3 commit 30d83ac

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

app/code/Magento/Customer/Block/Adminhtml/Edit/DeleteButton.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
/**
1212
* Class DeleteButton
13+
*
1314
* @package Magento\Customer\Block\Adminhtml\Edit
1415
*/
1516
class DeleteButton extends GenericButton implements ButtonProviderInterface
@@ -36,6 +37,8 @@ public function __construct(
3637
}
3738

3839
/**
40+
* Get button data.
41+
*
3942
* @return array
4043
*/
4144
public function getButtonData()
@@ -60,6 +63,8 @@ public function getButtonData()
6063
}
6164

6265
/**
66+
* Get delete url.
67+
*
6368
* @return string
6469
*/
6570
public function getDeleteUrl()

app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99

1010
/**
1111
* Class InvalidateTokenButton
12+
*
1213
* @package Magento\Customer\Block\Adminhtml\Edit
1314
*/
1415
class InvalidateTokenButton extends GenericButton implements ButtonProviderInterface
1516
{
1617
/**
18+
* Get button data.
19+
*
1720
* @return array
1821
*/
1922
public function getButtonData()
@@ -34,6 +37,8 @@ public function getButtonData()
3437
}
3538

3639
/**
40+
* Get invalidate token url.
41+
*
3742
* @return string
3843
*/
3944
public function getInvalidateTokenUrl()

app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\Customer\Controller\Adminhtml\Customer;
99

10+
use Magento\Framework\App\Action\HttpGetActionInterface;
1011
use Magento\Integration\Api\CustomerTokenServiceInterface;
1112
use Magento\Customer\Api\AccountManagementInterface;
1213
use Magento\Customer\Api\AddressRepositoryInterface;
@@ -25,7 +26,7 @@
2526
* @SuppressWarnings(PHPMD.TooManyFields)
2627
* @SuppressWarnings(PHPMD.NumberOfChildren)
2728
*/
28-
class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
29+
class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index implements HttpGetActionInterface
2930
{
3031
/**
3132
* Authorization level of a basic admin session

app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
99
use Magento\Framework\Controller\ResultFactory;
1010

11+
/**
12+
* Delete customer action.
13+
*/
1114
class Delete extends \Magento\Customer\Controller\Adminhtml\Index implements HttpPostActionInterface
1215
{
1316
/**

app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ public function __construct(
4747
}
4848

4949
/**
50-
* @param AbstractCollection $collection
51-
* @return \Magento\Backend\Model\View\Result\Redirect
50+
* @inheritdoc
5251
*/
5352
protected function massAction(AbstractCollection $collection)
5453
{

0 commit comments

Comments
 (0)