Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.3-develop' into base-shipping-…
Browse files Browse the repository at this point in the history 
…methods-checkout

# Conflicts:
#	app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php
#	app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
#	app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
#	app/code/Magento/QuoteGraphQl/etc/schema.graphqls
#	dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingMethodOnCartTest.php
  • Loading branch information
@naydav
naydav committed Feb 15, 2019
2 parents c88e975 + 3b2e305 commit b1a0bb6
Show file tree
Hide file tree
Showing 1,141 changed files with 39,460 additions and 4,191 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="notifications">
<uiComponent name="notification_area"/>
<uiComponent name="notification_area" aclResource="Magento_AdminNotification::show_list"/>
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup"
name="unread_system_messages"
as="unread_system_messages"
Expand Down
18 changes: 16 additions & 2 deletions app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace Magento\AsynchronousOperations\Model;

use Magento\Framework\App\ResourceConnection;
use Magento\Framework\Registry;
use Psr\Log\LoggerInterface;
use Magento\Framework\MessageQueue\MessageLockException;
use Magento\Framework\MessageQueue\ConnectionLostException;
Expand Down Expand Up @@ -58,6 +59,11 @@ class MassConsumer implements ConsumerInterface
*/
private $operationProcessor;

/**
* @var Registry
*/
private $registry;

/**
* Initialize dependencies.
*
Expand All @@ -67,14 +73,16 @@ class MassConsumer implements ConsumerInterface
* @param ConsumerConfigurationInterface $configuration
* @param OperationProcessorFactory $operationProcessorFactory
* @param LoggerInterface $logger
* @param Registry $registry
*/
public function __construct(
CallbackInvoker $invoker,
ResourceConnection $resource,
MessageController $messageController,
ConsumerConfigurationInterface $configuration,
OperationProcessorFactory $operationProcessorFactory,
LoggerInterface $logger
LoggerInterface $logger,
Registry $registry = null
) {
$this->invoker = $invoker;
$this->resource = $resource;
Expand All @@ -84,20 +92,26 @@ public function __construct(
'configuration' => $configuration
]);
$this->logger = $logger;
$this->registry = $registry ?? \Magento\Framework\App\ObjectManager::getInstance()
->get(Registry::class);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function process($maxNumberOfMessages = null)
{
$this->registry->register('isSecureArea', true, true);

$queue = $this->configuration->getQueue();

if (!isset($maxNumberOfMessages)) {
$queue->subscribe($this->getTransactionCallback($queue));
} else {
$this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
}

$this->registry->unregister('isSecureArea');
}

/**
Expand Down
9 changes: 9 additions & 0 deletions app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;

use Magento\Authorizenet\Model\Directpost;

/**
* Fraud information block for Authorize.net payment method
*
* @api
* @since 100.0.2
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class FraudDetails extends \Magento\Backend\Block\Template
{
Expand All @@ -33,6 +38,8 @@ public function __construct(
}

/**
* Return payment method model
*
* @return \Magento\Sales\Model\Order\Payment
*/
public function getPayment()
Expand All @@ -42,6 +49,8 @@ public function getPayment()
}

/**
* Produce and return the block's HTML output
*
* @return string
*/
protected function _toHtml()
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

/**
* Payment information block for Authorize.net payment method
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class PaymentDetails extends ConfigurableInfo
{
Expand Down
4 changes: 4 additions & 0 deletions app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Block\Transparent;

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

/**
* Transparent Iframe block for Authorize.net payments
* @api
* @since 100.0.2
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Iframe extends TransparentIframe
{
Expand Down
11 changes: 10 additions & 1 deletion ...gento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class AddConfigured extends \Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured
use Magento\Framework\App\Action\HttpPutActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create\AddConfigured as BaseAddConfigured;

/**
* Class AddConfigured
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class AddConfigured extends BaseAddConfigured implements HttpPutActionInterface
{
}
11 changes: 10 additions & 1 deletion ...code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class Cancel extends \Magento\Sales\Controller\Adminhtml\Order\Create\Cancel
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create\Cancel as BaseCancel;

/**
* Class Cancel
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Cancel extends BaseCancel implements HttpPostActionInterface
{
}
11 changes: 10 additions & 1 deletion ...thorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class ConfigureProductToAdd extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd
use Magento\Framework\App\Action\HttpPutActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureProductToAdd as BaseConfigureProductToAdd;

/**
* Class ConfigureProductToAdd
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class ConfigureProductToAdd extends BaseConfigureProductToAdd implements HttpPutActionInterface
{
}
11 changes: 10 additions & 1 deletion ...Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class ConfigureQuoteItems extends \Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems
use Magento\Framework\App\Action\HttpPutActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create\ConfigureQuoteItems as BaseConfigureQuoteItems;

/**
* Class ConfigureQuoteItems
* @deprecated 2.3 Authorize.net is removing all support for this payment method
*/
class ConfigureQuoteItems extends BaseConfigureQuoteItems implements HttpPutActionInterface
{
}
6 changes: 6 additions & 0 deletions app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

/**
* Class Index
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create\Index
{
}
6 changes: 6 additions & 0 deletions ...e/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

/**
* Class LoadBlock
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create\LoadBlock
{
}
15 changes: 10 additions & 5 deletions app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,26 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

use Magento\Framework\Escaper;
use Magento\Catalog\Helper\Product;
use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
use Magento\Backend\App\Action\Context;
use Magento\Framework\View\Result\PageFactory;
use Magento\Backend\Model\View\Result\ForwardFactory;
use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
use Magento\Catalog\Helper\Product;
use Magento\Framework\Escaper;
use Magento\Framework\View\Result\PageFactory;
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create;

/**
* Class Place
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Place extends \Magento\Sales\Controller\Adminhtml\Order\Create
class Place extends Create implements HttpPostActionInterface
{
/**
* @var DataHelper
Expand Down
11 changes: 10 additions & 1 deletion ...Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ProcessData.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class ProcessData extends \Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData
use Magento\Sales\Controller\Adminhtml\Order\Create\ProcessData as BaseProcessData;
use Magento\Framework\App\Action\HttpPostActionInterface;

/**
* Class ProcessData
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class ProcessData extends BaseProcessData implements HttpPostActionInterface
{
}
9 changes: 8 additions & 1 deletion ...de/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,25 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

use Magento\Backend\App\Action;
use Magento\Backend\Model\View\Result\ForwardFactory;
use Magento\Framework\View\Result\LayoutFactory;
use Magento\Framework\View\Result\PageFactory;
use Magento\Payment\Block\Transparent\Iframe;
use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create;

/**
* Class Redirect
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Redirect extends \Magento\Sales\Controller\Adminhtml\Order\Create
class Redirect extends Create implements HttpGetActionInterface, HttpPostActionInterface
{
/**
* Core registry
Expand Down
11 changes: 10 additions & 1 deletion ...ode/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Reorder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create\Reorder as BaseReorder;

/**
* Class Reorder
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Reorder extends BaseReorder implements HttpPostActionInterface
{
}
12 changes: 11 additions & 1 deletion ...Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

class ReturnQuote extends \Magento\Sales\Controller\Adminhtml\Order\Create
use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Sales\Controller\Adminhtml\Order\Create;

/**
* Class ReturnQuote
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class ReturnQuote extends Create implements HttpPostActionInterface, HttpGetActionInterface
{
/**
* Return quote
Expand Down
6 changes: 6 additions & 0 deletions app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Save.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

/**
* Class Save
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create\Save
{
}
6 changes: 6 additions & 0 deletions ...to/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ShowUpdateResult.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;

/**
* Class ShowUpdateResult
* @deprecated 2.3.1 Authorize.net is removing all support for this payment method
*/
class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create\ShowUpdateResult
{
}
Loading

0 comments on commit b1a0bb6

Please sign in to comment.