Skip to content

Commit 24e7dd7

Browse files
david-fuehrdavid-fuehr
committed
Merge branch '2.3-develop' of github.com:magento/magento2 into 2.3-develop
2 parents 4f23251 + 5569b86 commit 24e7dd7

File tree

1,356 files changed

+43608
-8256
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,356 files changed

+43608
-8256
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="notifications">
11-
<uiComponent name="notification_area"/>
11+
<uiComponent name="notification_area" aclResource="Magento_AdminNotification::show_list"/>
1212
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup"
1313
name="unread_system_messages"
1414
as="unread_system_messages"

‎app/code/Magento/AsynchronousOperations/Model/MassConsumer.php

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
namespace Magento\AsynchronousOperations\Model;
1010

1111
use Magento\Framework\App\ResourceConnection;
12+
use Magento\Framework\Registry;
1213
use Psr\Log\LoggerInterface;
1314
use Magento\Framework\MessageQueue\MessageLockException;
1415
use Magento\Framework\MessageQueue\ConnectionLostException;
@@ -58,6 +59,11 @@ class MassConsumer implements ConsumerInterface
5859
*/
5960
private $operationProcessor;
6061

62+
/**
63+
* @var Registry
64+
*/
65+
private $registry;
66+
6167
/**
6268
* Initialize dependencies.
6369
*
@@ -67,14 +73,16 @@ class MassConsumer implements ConsumerInterface
6773
* @param ConsumerConfigurationInterface $configuration
6874
* @param OperationProcessorFactory $operationProcessorFactory
6975
* @param LoggerInterface $logger
76+
* @param Registry $registry
7077
*/
7178
public function __construct(
7279
CallbackInvoker $invoker,
7380
ResourceConnection $resource,
7481
MessageController $messageController,
7582
ConsumerConfigurationInterface $configuration,
7683
OperationProcessorFactory $operationProcessorFactory,
77-
LoggerInterface $logger
84+
LoggerInterface $logger,
85+
Registry $registry = null
7886
) {
7987
$this->invoker = $invoker;
8088
$this->resource = $resource;
@@ -84,20 +92,26 @@ public function __construct(
8492
'configuration' => $configuration
8593
]);
8694
$this->logger = $logger;
95+
$this->registry = $registry ?? \Magento\Framework\App\ObjectManager::getInstance()
96+
->get(Registry::class);
8797
}
8898

8999
/**
90-
* {@inheritdoc}
100+
* @inheritdoc
91101
*/
92102
public function process($maxNumberOfMessages = null)
93103
{
104+
$this->registry->register('isSecureArea', true, true);
105+
94106
$queue = $this->configuration->getQueue();
95107

96108
if (!isset($maxNumberOfMessages)) {
97109
$queue->subscribe($this->getTransactionCallback($queue));
98110
} else {
99111
$this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
100112
}
113+
114+
$this->registry->unregister('isSecureArea');
101115
}
102116

103117
/**

‎app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;
79

810
use Magento\Authorizenet\Model\Directpost;
911

1012
/**
13+
* Fraud information block for Authorize.net payment method
14+
*
1115
* @api
1216
* @since 100.0.2
17+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1318
*/
1419
class FraudDetails extends \Magento\Backend\Block\Template
1520
{
@@ -33,6 +38,8 @@ public function __construct(
3338
}
3439

3540
/**
41+
* Return payment method model
42+
*
3643
* @return \Magento\Sales\Model\Order\Payment
3744
*/
3845
public function getPayment()
@@ -42,6 +49,8 @@ public function getPayment()
4249
}
4350

4451
/**
52+
* Produce and return the block's HTML output
53+
*
4554
* @return string
4655
*/
4756
protected function _toHtml()

‎app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
/**
1414
* Payment information block for Authorize.net payment method
15+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1516
*/
1617
class PaymentDetails extends ConfigurableInfo
1718
{

‎app/code/Magento/Authorizenet/Block/Transparent/Iframe.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorizenet\Block\Transparent;
79

810
use Magento\Payment\Block\Transparent\Iframe as TransparentIframe;
911

1012
/**
13+
* Transparent Iframe block for Authorize.net payments
1114
* @api
1215
* @since 100.0.2
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1317
*/
1418
class Iframe extends TransparentIframe
1519
{

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
11+
use Magento\Framework\App\Action\HttpPutActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured as BaseAddConfigured;
13+
14+
/**
15+
* Class AddConfigured
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class AddConfigured extends BaseAddConfigured implements HttpPutActionInterface
1019
{
1120
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
11+
use Magento\Framework\App\Action\HttpPostActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\Cancel as BaseCancel;
13+
14+
/**
15+
* Class Cancel
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class Cancel extends BaseCancel implements HttpPostActionInterface
1019
{
1120
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
11+
use Magento\Framework\App\Action\HttpPutActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd as BaseConfigureProductToAdd;
13+
14+
/**
15+
* Class ConfigureProductToAdd
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class ConfigureProductToAdd extends BaseConfigureProductToAdd implements HttpPutActionInterface
1019
{
1120
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems
11+
use Magento\Framework\App\Action\HttpPutActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems as BaseConfigureQuoteItems;
13+
14+
/**
15+
* Class ConfigureQuoteItems
16+
* @deprecated 2.3 Authorize.net is removing all support for this payment method
17+
*/
18+
class ConfigureQuoteItems extends BaseConfigureQuoteItems implements HttpPutActionInterface
1019
{
1120
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

11+
/**
12+
* Class Index
13+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
14+
*/
915
class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create\Index
1016
{
1117
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

11+
/**
12+
* Class LoadBlock
13+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
14+
*/
915
class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create\LoadBlock
1016
{
1117
}

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,26 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
79

8-
use Magento\Framework\Escaper;
9-
use Magento\Catalog\Helper\Product;
10+
use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
1011
use Magento\Backend\App\Action\Context;
11-
use Magento\Framework\View\Result\PageFactory;
1212
use Magento\Backend\Model\View\Result\ForwardFactory;
13-
use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
13+
use Magento\Catalog\Helper\Product;
14+
use Magento\Framework\Escaper;
15+
use Magento\Framework\View\Result\PageFactory;
16+
use Magento\Framework\App\Action\HttpPostActionInterface;
17+
use Magento\Sales\Controller\Adminhtml\Order\Create;
1418

1519
/**
1620
* Class Place
1721
*
1822
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
23+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1924
*/
20-
class Place extends \Magento\Sales\Controller\Adminhtml\Order\Create
25+
class Place extends Create implements HttpPostActionInterface
2126
{
2227
/**
2328
* @var DataHelper

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData
11+
use Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData as BaseProcessData;
12+
use Magento\Framework\App\Action\HttpPostActionInterface;
13+
14+
/**
15+
* Class ProcessData
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class ProcessData extends BaseProcessData implements HttpPostActionInterface
1019
{
1120
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
79

810
use Magento\Backend\App\Action;
911
use Magento\Backend\Model\View\Result\ForwardFactory;
1012
use Magento\Framework\View\Result\LayoutFactory;
1113
use Magento\Framework\View\Result\PageFactory;
1214
use Magento\Payment\Block\Transparent\Iframe;
15+
use Magento\Framework\App\Action\HttpGetActionInterface;
16+
use Magento\Framework\App\Action\HttpPostActionInterface;
17+
use Magento\Sales\Controller\Adminhtml\Order\Create;
1318

1419
/**
20+
* Class Redirect
1521
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
22+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
1623
*/
17-
class Redirect extends \Magento\Sales\Controller\Adminhtml\Order\Create
24+
class Redirect extends Create implements HttpGetActionInterface, HttpPostActionInterface
1825
{
1926
/**
2027
* Core registry

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
11+
use Magento\Framework\App\Action\HttpPostActionInterface;
12+
use Magento\Sales\Controller\Adminhtml\Order\Create\Reorder as BaseReorder;
13+
14+
/**
15+
* Class Reorder
16+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
17+
*/
18+
class Reorder extends BaseReorder implements HttpPostActionInterface
1019
{
1120
}

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

9-
class ReturnQuote extends \Magento\Sales\Controller\Adminhtml\Order\Create
11+
use Magento\Framework\App\Action\HttpGetActionInterface;
12+
use Magento\Framework\App\Action\HttpPostActionInterface;
13+
use Magento\Sales\Controller\Adminhtml\Order\Create;
14+
15+
/**
16+
* Class ReturnQuote
17+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
18+
*/
19+
class ReturnQuote extends Create implements HttpPostActionInterface, HttpGetActionInterface
1020
{
1121
/**
1222
* Return quote

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

11+
/**
12+
* Class Save
13+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
14+
*/
915
class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create\Save
1016
{
1117
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
810

11+
/**
12+
* Class ShowUpdateResult
13+
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
14+
*/
915
class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create\ShowUpdateResult
1016
{
1117
}

0 commit comments

Comments
 (0)