Merge remote-tracking branch 'origin/2.3-develop' into MC-6353

Author: dimonovp

app/code/Magento/Authorizenet/README.md

@@ -1 +1,42 @@
+# Magento_Authorizenet module
+
 The Magento_Authorizenet module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
+
+## Extensibility
+
+Extension developers can interact with the Magento_Authorizenet module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_Authorizenet module.
+
+### Events
+
+This module dispatches the following events:
+
+ - `checkout_directpost_placeOrder` event in the `\Magento\Authorizenet\Controller\Directpost\Payment\Place::placeCheckoutOrder()` method. Parameters:
+   - `result` is a data object (`\Magento\Framework\DataObject` class).
+   - `action` is a controller object (`\Magento\Authorizenet\Controller\Directpost\Payment\Place`).
+ 
+ - `order_cancel_after` event in the `\Magento\Authorizenet\Model\Directpost::declineOrder()` method. Parameters:
+   - `order` is an order object (`\Magento\Sales\Model\Order` class).
+   
+
+This module observes the following events:
+
+ - `checkout_submit_all_after` event in the `Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver` file.
+ - `checkout_directpost_placeOrder` event in the `Magento\Authorizenet\Observer\AddFieldsToResponseObserver` file.
+
+For information about events in Magento 2, see [Events and observers](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `adminhtml_authorizenet_directpost_payment_redirect`
+
+This module introduces the following layouts and layout handles in the `view/frontend/layout` directory:
+
+- `authorizenet_directpost_payment_backendresponse`
+- `authorizenet_directpost_payment_redirect`
+- `authorizenet_directpost_payment_response`
+
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).

app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php

@@ -9,6 +9,9 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Class CheckContactUsFormObserver
+ */
 class CheckContactUsFormObserver implements ObserverInterface
 {
     /**
@@ -76,7 +79,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             /** @var \Magento\Framework\App\Action\Action $controller */
             $controller = $observer->getControllerAction();
             if (!$captcha->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
-                $this->messageManager->addError(__('Incorrect CAPTCHA.'));
+                $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA.'));
                 $this->getDataPersistor()->set($formId, $controller->getRequest()->getPostValue());
                 $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                 $this->redirect->redirect($controller->getResponse(), 'contact/index/index');

app/code/Magento/Captcha/Observer/CheckForgotpasswordObserver.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class CheckForgotpasswordObserver
+ */
 class CheckForgotpasswordObserver implements ObserverInterface
 {
     /**
@@ -69,7 +72,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             /** @var \Magento\Framework\App\Action\Action $controller */
             $controller = $observer->getControllerAction();
             if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
-                $this->messageManager->addError(__('Incorrect CAPTCHA'));
+                $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
                 $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                 $this->redirect->redirect($controller->getResponse(), '*/*/forgotpassword');
             }

app/code/Magento/Captcha/Observer/CheckUserCreateObserver.php

@@ -7,6 +7,11 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class CheckUserCreateObserver
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class CheckUserCreateObserver implements ObserverInterface
 {
     /**
@@ -86,7 +91,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             /** @var \Magento\Framework\App\Action\Action $controller */
             $controller = $observer->getControllerAction();
             if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
-                $this->messageManager->addError(__('Incorrect CAPTCHA'));
+                $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
                 $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                 $this->_session->setCustomerFormData($controller->getRequest()->getPostValue());
                 $url = $this->_urlManager->getUrl('*/*/create', ['_nosecret' => true]);

app/code/Magento/Captcha/Observer/CheckUserEditObserver.php

@@ -11,13 +11,12 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Class CheckUserEditObserver
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CheckUserEditObserver implements ObserverInterface
 {
-    /**
-     * Form ID
-     */
     const FORM_ID = 'user_edit';
 
     /**
@@ -96,7 +95,8 @@ public function __construct(
      * Check Captcha On Forgot Password Page
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
+     * @return $this|void
+     * @throws \Magento\Framework\Exception\SessionException
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -119,9 +119,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         'The account is locked. Please wait and try again or contact %1.',
                         $this->scopeConfig->getValue('contact/email/recipient_email')
                     );
-                    $this->messageManager->addError($message);
+                    $this->messageManager->addErrorMessage($message);
                 }
-                $this->messageManager->addError(__('Incorrect CAPTCHA'));
+                $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
                 $this->actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                 $this->redirect->redirect($controller->getResponse(), '*/*/edit');
             }

app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php

@@ -7,6 +7,11 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class CheckUserForgotPasswordBackendObserver
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class CheckUserForgotPasswordBackendObserver implements ObserverInterface
 {
     /**
@@ -76,7 +81,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         ) {
             $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
             $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-            $this->messageManager->addError(__('Incorrect CAPTCHA'));
+            $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
             $controller->getResponse()->setRedirect(
                 $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
             );

app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php

@@ -6,10 +6,10 @@
 
 namespace Magento\Captcha\Observer;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * Check captcha on user login page observer.
@@ -64,6 +64,8 @@ class CheckUserLoginObserver implements ObserverInterface
     protected $authentication;
 
     /**
+     * CheckUserLoginObserver constructor.
+     *
      * @param \Magento\Captcha\Helper\Data $helper
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
@@ -125,8 +127,7 @@ private function getAuthentication()
      * Check captcha on user login page
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @throws NoSuchEntityException
-     * @return $this
+     * @return $this|void
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -143,10 +144,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 try {
                     $customer = $this->getCustomerRepository()->get($login);
                     $this->getAuthentication()->processAuthenticationFailure($customer->getId());
+                    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
                 } catch (NoSuchEntityException $e) {
                     //do nothing as customer existence is validated later in authenticate method
                 }
-                $this->messageManager->addError(__('Incorrect CAPTCHA'));
+                $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
                 $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                 $this->_session->setUsername($login);
                 $beforeUrl = $this->_session->getBeforeAuthUrl();

app/code/Magento/Captcha/Test/Unit/Observer/CheckContactUsFormObserverTest.php

@@ -69,7 +69,10 @@ protected function setUp()
         $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
         $this->redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
         $this->captchaStringResolverMock = $this->createMock(\Magento\Captcha\Observer\CaptchaStringResolver::class);
-        $this->sessionMock = $this->createPartialMock(\Magento\Framework\Session\SessionManager::class, ['addError']);
+        $this->sessionMock = $this->createPartialMock(
+            \Magento\Framework\Session\SessionManager::class,
+            ['addErrorMessage']
+        );
         $this->dataPersistorMock = $this->getMockBuilder(\Magento\Framework\App\Request\DataPersistorInterface::class)
             ->getMockForAbstractClass();
 
@@ -116,7 +119,7 @@ public function testCheckContactUsFormWhenCaptchaIsRequiredAndValid()
         $this->helperMock->expects($this->any())
             ->method('getCaptcha')
             ->with($formId)->willReturn($this->captchaMock);
-        $this->sessionMock->expects($this->never())->method('addError');
+        $this->sessionMock->expects($this->never())->method('addErrorMessage');
 
         $this->checkContactUsFormObserver->execute(
             new \Magento\Framework\Event\Observer(['controller_action' => $controller])
@@ -163,7 +166,7 @@ public function testCheckContactUsFormRedirectsCustomerWithWarningMessageWhenCap
             ->method('getCaptcha')
             ->with($formId)
             ->willReturn($this->captchaMock);
-        $this->messageManagerMock->expects($this->once())->method('addError')->with($warningMessage);
+        $this->messageManagerMock->expects($this->once())->method('addErrorMessage')->with($warningMessage);
         $this->actionFlagMock->expects($this->once())
             ->method('set')
             ->with('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);

app/code/Magento/Captcha/Test/Unit/Observer/CheckForgotpasswordObserverTest.php

@@ -138,7 +138,7 @@ public function testCheckForgotpasswordRedirects()
         )->will(
             $this->returnValue($this->_captcha)
         );
-        $this->_messageManager->expects($this->once())->method('addError')->with($warningMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($warningMessage);
         $this->_actionFlag->expects(
             $this->once()
         )->method(

app/code/Magento/Captcha/Test/Unit/Observer/CheckUserCreateObserverTest.php

@@ -151,7 +151,7 @@ public function testCheckUserCreateRedirectsError()
         )->will(
             $this->returnValue($this->_captcha)
         );
-        $this->_messageManager->expects($this->once())->method('addError')->with($warningMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($warningMessage);
         $this->_actionFlag->expects(
             $this->once()
         )->method(