Skip to content

Commit b2b815e

Browse files
author
Olga Kopylova
committed
Merge remote-tracking branch 'mainline/develop' into PR_Branch
2 parents ee355fe + dc3aee6 commit b2b815e

File tree

1,357 files changed

+5547
-3205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,357 files changed

+5547
-3205
lines changed

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
1313
*
1414
* @return void
1515
*/
16-
public function execute()
16+
public function executeInternal()
1717
{
1818
if (!$this->getRequest()->getPostValue()) {
1919
return;

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$this->_view->loadLayout();
1717
$this->_setActiveMenu(

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notific
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$notificationId = (int)$this->getRequest()->getParam('id');
1717
if ($notificationId) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$ids = $this->getRequest()->getParam('notification');
1717
if (!is_array($ids)) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notific
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$ids = $this->getRequest()->getParam('notification');
1717
if (!is_array($ids)) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
if ($id = $this->getRequest()->getParam('id')) {
1717
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct(
3838
/**
3939
* @return void
4040
*/
41-
public function execute()
41+
public function executeInternal()
4242
{
4343
$severity = $this->getRequest()->getParam('severity');
4444
if ($severity) {

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class GetFilter extends ExportController
1717
*
1818
* @return \Magento\Framework\Controller\ResultInterface
1919
*/
20-
public function execute()
20+
public function executeInternal()
2121
{
2222
$data = $this->getRequest()->getParams();
2323
if ($this->getRequest()->isXmlHttpRequest() && $data) {

‎app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function __construct(
5151
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
5252
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
5353
*/
54-
public function execute()
54+
public function executeInternal()
5555
{
5656
$paymentParam = $this->getRequest()->getParam('payment');
5757
$controller = $this->getRequest()->getParam('controller');

0 commit comments

Comments
 (0)