🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #18430: [Backport] Fix documentation typos in registry.js (by @lewisvoncken)
 - #18432: [Backport] Removed commented code (by @lewisvoncken)
 - #18433: [Backport] Improve code quality subscriber new action (by @lewisvoncken)
 - #18429: [Backport] Fix documentation grammar errors and typos in actions.js (by @lewisvoncken)
 - #18426: [Backport] Removed unnecessary characters from comments (by @lewisvoncken)
 - #18428: [Backport] small misspelling fixed (by @lewisvoncken)
 - #18415: [Backport] Added unit test for CRON converter plugin (by @dmytro-ch)
 - #18414: [Backport] Fix the issue with customer inline edit when password is expired (by @dmytro-ch)
 - #18400: Admin Login Form > Aliging Label (by @rafaelstz)
 - #18391: Backport 2.2 - Allow keyboard navigation in browser on product detail� (by @hostep)
 - #18376: Backport 2.2 - Fix issue 17152 - prevent email being marked as not se� (by @sambolek)


Fixed GitHub Issues:
 - #18162: Cannot edit customer using inline edit if password is expired (reported by @JeroenVanLeusden) has been fixed in #18414 by @dmytro-ch in 2.2-develop branch
   Related commits:
     1. 33ba243
     2. 2668f2d

 - #17152: Failure of "Send Order Email Copy" spams customers, every minute, forever. (reported by @lingwooc) has been fixed in #18376 by @sambolek in 2.2-develop branch
   Related commits:
     1. 058c254

Author: magento-engcom-team

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php

@@ -18,7 +18,7 @@
 class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\ConfigurableProduct\Api\Data\OptionInterface
 {
-    /**#@+
+    /**
      * Constants for field names
      */
     const KEY_ATTRIBUTE_ID = 'attribute_id';
@@ -27,9 +27,10 @@ class Attribute extends \Magento\Framework\Model\AbstractExtensibleModel impleme
     const KEY_IS_USE_DEFAULT = 'is_use_default';
     const KEY_VALUES = 'values';
     const KEY_PRODUCT_ID = 'product_id';
-    /**#@-*/
 
-    /**#@-*/
+    /**
+     * @var MetadataPool|\Magento\Framework\EntityManager\MetadataPool
+     */
     private $metadataPool;
 
     /**

app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cron\Test\Unit\Model\System\Config\Initial;
+
+use Magento\Cron\Model\Groups\Config\Data as GroupsConfigModel;
+use Magento\Cron\Model\System\Config\Initial\Converter as ConverterPlugin;
+use Magento\Framework\App\Config\Initial\Converter;
+
+/**
+ * Class ConverterTest
+ *
+ * Unit test for \Magento\Cron\Model\System\Config\Initial\Converter
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GroupsConfigModel|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupsConfigMock;
+
+    /**
+     * @var Converter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterMock;
+
+    /**
+     * @var ConverterPlugin
+     */
+    private $converterPlugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->groupsConfigMock = $this->getMockBuilder(
+            GroupsConfigModel::class
+        )->disableOriginalConstructor()->getMock();
+        $this->converterMock = $this->getMockBuilder(Converter::class)->getMock();
+        $this->converterPlugin = new ConverterPlugin($this->groupsConfigMock);
+    }
+
+    /**
+     * Tests afterConvert method with no $result['data']['default']['system'] set
+     */
+    public function testAfterConvertWithNoData()
+    {
+        $expectedResult = ['test'];
+        $this->groupsConfigMock->expects($this->never())
+            ->method('get');
+
+        $result = $this->converterPlugin->afterConvert($this->converterMock, $expectedResult);
+
+        self::assertSame($expectedResult, $result);
+    }
+
+    /**
+     * Tests afterConvert method with $result['data']['default']['system'] set
+     */
+    public function testAfterConvertWithData()
+    {
+        $groups = [
+            'group1' => ['val1' => ['value' => '1']],
+            'group2' => ['val2' => ['value' => '2']]
+        ];
+        $expectedResult['data']['default']['system']['cron'] = [
+            'group1' => [
+                'val1' => '1'
+            ],
+            'group2' => [
+                'val2' => '2'
+            ]
+        ];
+        $result['data']['default']['system']['cron'] = '1';
+
+        $this->groupsConfigMock->expects($this->once())
+            ->method('get')
+            ->willReturn($groups);
+
+        $result = $this->converterPlugin->afterConvert($this->converterMock, $result);
+
+        self::assertEquals($expectedResult, $result);
+    }
+}

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

@@ -6,13 +6,15 @@
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Customer\Test\Block\Form\Login;
 use Magento\Customer\Ui\Component\Listing\AttributeRepository;
-use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Message\MessageInterface;
 
 /**
+ * Customer inline edit action
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class InlineEdit extends \Magento\Backend\App\Action
@@ -101,7 +103,11 @@ private function getEmailNotification()
     }
 
     /**
+     * Inline edit action execute
+     *
      * @return \Magento\Framework\Controller\Result\Json
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute()
     {
@@ -249,7 +255,7 @@ protected function processAddressData(array $data)
     protected function getErrorMessages()
     {
         $messages = [];
-        foreach ($this->getMessageManager()->getMessages()->getItems() as $error) {
+        foreach ($this->getMessageManager()->getMessages()->getErrors() as $error) {
             $messages[] = $error->getText();
         }
         return $messages;
@@ -262,7 +268,7 @@ protected function getErrorMessages()
      */
     protected function isErrorExists()
     {
-        return (bool)$this->getMessageManager()->getMessages(true)->getCount();
+        return (bool)$this->getMessageManager()->getMessages(true)->getCountByType(MessageInterface::TYPE_ERROR);
     }
 
     /**

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\Message\MessageInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -242,10 +243,11 @@ protected function prepareMocksForErrorMessagesProcessing()
             ->method('getMessages')
             ->willReturn($this->messageCollection);
         $this->messageCollection->expects($this->once())
-            ->method('getItems')
+            ->method('getErrors')
             ->willReturn([$this->message]);
         $this->messageCollection->expects($this->once())
-            ->method('getCount')
+            ->method('getCountByType')
+            ->with(MessageInterface::TYPE_ERROR)
             ->willReturn(1);
         $this->message->expects($this->once())
             ->method('getText')

app/code/Magento/CustomerImportExport/Model/Export/Customer.php

@@ -15,7 +15,7 @@
  */
 class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 {
-    /**#@+
+    /**
      * Permanent column names.
      *
      * Names that begins with underscore is not an attribute. This name convention is for
@@ -27,23 +27,19 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 
     const COLUMN_STORE = '_store';
 
-    /**#@-*/
-
-    /**#@+
+    /**
      * Attribute collection name
      */
     const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
 
-    /**#@-*/
-
-    /**#@+
+    /**
      * XML path to page size parameter
      */
     const XML_PATH_PAGE_SIZE = 'export/customer_page_size/customer';
 
-    /**#@-*/
-
-    /**#@-*/
+    /**
+     * @var array
+     */
     protected $_attributeOverrides = [
         'created_at' => ['backend_type' => 'datetime'],
         'reward_update_notification' => ['source_model' => \Magento\Eav\Model\Entity\Attribute\Source\Boolean::class],

app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CarrierFinder.php

@@ -11,7 +11,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Collect shipping rates for customer address without packaging estiamtion.
+ * Collect shipping rates for customer address without packaging estimation.
  */
 class CarrierFinder
 {

app/code/Magento/Multishipping/Helper/Data.php

@@ -13,16 +13,19 @@
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    /**#@+
+    /*
      * Xml paths for multishipping checkout
+     *
      **/
     const XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE = 'multishipping/options/checkout_multiple';
 
     const XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY = 'multishipping/options/checkout_multiple_maximum_qty';
 
-    /**#@-*/
-
-    /**#@-*/
+    /**
+     * Checkout session
+     *
+     * @var \Magento\Checkout\Model\Session
+     */
     protected $checkoutSession;
 
     /**