Merge branch '2.3-develop' of github.com:magento-engcom/magento2ce into coding-standard-update

# Conflicts:
#	composer.lock

Author: lenaorobei

app/code/Magento/Analytics/etc/adminhtml/system.xml

@@ -15,7 +15,7 @@
                 <label>Advanced Reporting</label>
                 <comment><![CDATA[This service provides a dynamic suite of reports with rich insights about your business.
                 Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
-                "Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
+                "Go to Advanced Reporting" link. </br> For more information, see our <a target="_blank" href="https://magento.com/legal/terms/cloud-terms">
                 terms and conditions</a>.]]></comment>
                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Advanced Reporting Service</label>

app/code/Magento/AsynchronousOperations/Model/BulkStatus.php

@@ -87,22 +87,6 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
      */
     public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
     {
-        if ($status === OperationInterface::STATUS_TYPE_OPEN) {
-            /**
-             * Total number of operations that has been scheduled within the given bulk
-             */
-            $allOperationsQty = $this->getOperationCount($bulkUuid);
-
-            /**
-             * Number of operations that has been processed (i.e. operations with any status but 'open')
-             */
-            $allProcessedOperationsQty = (int)$this->operationCollectionFactory->create()
-                ->addFieldToFilter('bulk_uuid', $bulkUuid)
-                ->getSize();
-
-            return $allOperationsQty - $allProcessedOperationsQty;
-        }
-
         /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
         $collection = $this->operationCollectionFactory->create();
         return $collection->addFieldToFilter('bulk_uuid', $bulkUuid)

app/code/Magento/Backend/Model/Menu/Item/Validator.php

@@ -6,6 +6,9 @@
 namespace Magento\Backend\Model\Menu\Item;
 
 /**
+ * Class Validator
+ *
+ * @package Magento\Backend\Model\Menu\Item
  * @api
  * @since 100.0.2
  */
@@ -49,7 +52,7 @@ public function __construct()
 
         $attributeValidator = new \Zend_Validate();
         $attributeValidator->addValidator(new \Zend_Validate_StringLength(['min' => 3]));
-        $attributeValidator->addValidator(new \Zend_Validate_Regex('/^[A-Za-z0-9\/_]+$/'));
+        $attributeValidator->addValidator(new \Zend_Validate_Regex('/^[A-Za-z0-9\/_\-]+$/'));
 
         $textValidator = new \Zend_Validate_StringLength(['min' => 3, 'max' => 50]);
 
@@ -101,6 +104,7 @@ private function checkMenuItemIsRemoved($data)
 
     /**
      * Check that menu item contains all required data
+     *
      * @param array $data
      *
      * @throws \BadMethodCallException

app/code/Magento/Backend/Test/Unit/Model/Menu/Config/_files/invalidMenuXmlArray.php

@@ -10,7 +10,7 @@
         ' resource="Test_Value::value"/></menu></config>',
         [
             "Element 'add', attribute 'action': [facet 'pattern'] The value '' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'add', attribute 'action': '' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -20,7 +20,7 @@
         'resource="Test_Value::value"/></menu></config>',
         [
             "Element 'add', attribute 'action': [facet 'pattern'] The value 'ad' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'add', attribute 'action': 'ad' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -31,7 +31,7 @@
         '</menu></config>',
         [
             "Element 'add', attribute 'action': [facet 'pattern'] The value 'adm$#@inhtml/notification' is not " .
-            "accepted by the pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "accepted by the pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'add', attribute 'action': 'adm$#@inhtml/notification' is not a valid value of the atomic " .
             "type 'typeAction'.\nLine: 1\n"
         ],
@@ -452,7 +452,7 @@
         '<?xml version="1.0"?><config><menu><update action="" ' . 'id="Test_Value::some_value"/></menu></config>',
         [
             "Element 'update', attribute 'action': [facet 'pattern'] The value '' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'update', attribute 'action': '' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -462,7 +462,7 @@
         'resource="Test_Value::value"/></menu></config>',
         [
             "Element 'update', attribute 'action': [facet 'pattern'] The value 'v' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'update', attribute 'action': 'v' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -471,7 +471,7 @@
         'id="Test_Value::some_value"/></menu></config>',
         [
             "Element 'update', attribute 'action': [facet 'pattern'] The value '/@##gt;' is not " .
-            "accepted by the pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "accepted by the pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'update', attribute 'action': '/@##gt;' is not a valid value of the atomic" .
             " type 'typeAction'.\nLine: 1\n"
         ],

app/code/Magento/Backend/etc/menu.xsd

@@ -100,7 +100,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z0-9/_]{3,}" />
+            <xs:pattern value="[a-zA-Z0-9/_\-]{3,}" />
         </xs:restriction>
     </xs:simpleType>
 

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml

@@ -10,7 +10,7 @@
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 
-<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' required _required'; } ?>">
+<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' _required'; } ?>">
     <label class="label admin__field-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml

@@ -9,7 +9,7 @@
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
-<div class="field admin__field <?php if ($_option->getRequired()) { echo ' required'; } ?><?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
+<div class="field admin__field <?php if ($_option->getRequired()) { echo ' _required'; } ?><?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if (count($_selections) == 1 && $_option->getRequired()) : ?>

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml

@@ -12,7 +12,7 @@
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' required'; } ?>">
+<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' _required'; } ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <div class="nested<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
@@ -39,7 +39,7 @@
             <?php foreach ($_selections as $_selection) : ?>
                 <div class="field choice admin__field admin__field-option">
                     <input type="radio"
-                           class="radio admin__control-radio <?= $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
+                           class="radio admin__control-radio <?= $_option->getRequired() ? ' required-entry' : '' ?> change-container-classname"
                            id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                            name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                            <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
@@ -66,7 +66,7 @@
                 </label>
                 <div class="control admin__field-control"><input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
                         id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
+                        class="input-text admin__control-text qty validate-greater-than-zero<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                         type="text"
                         name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                         value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml

@@ -12,7 +12,7 @@
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?><?php if ($_option->getRequired()) { echo ' required _required'; } ?>">
+<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?><?php if ($_option->getRequired()) { echo ' _required'; } ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if ($block->showSingle()) : ?>
@@ -49,7 +49,7 @@
                 <div class="control admin__field-control">
                     <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
                         id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
+                        class="input-text admin__control-text qty validate-greater-than-zero<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                         type="text"
                         name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                         value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />

app/code/Magento/Captcha/Test/Unit/CustomerData/CaptchaTest.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\CustomerData;
+
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Captcha\CustomerData\Captcha;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Customer\Api\Data\CustomerInterface as CustomerData;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\TestCase;
+
+class CaptchaTest extends TestCase
+{
+    /**
+     * @var CaptchaHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * @var CustomerSession|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var Captcha
+     */
+    private $model;
+
+    /**
+     * @var array
+     */
+    private $formIds;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * Create mocks and model
+     */
+    protected function setUp()
+    {
+        $this->helperMock = $this->createMock(CaptchaHelper::class);
+        $this->customerSessionMock = $this->createMock(CustomerSession::class);
+        $this->formIds = [
+            'user_login'
+        ];
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            Captcha::class,
+            [
+                'helper' => $this->helperMock,
+                'formIds' => $this->formIds,
+                'customerSession' => $this->customerSessionMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData() when user is login and require captcha
+     */
+    public function testGetSectionDataWhenLoginAndRequireCaptcha()
+    {
+        $emailLogin = 'test@localhost.com';
+
+        $userLoginModel = $this->createMock(DefaultModel::class);
+        $userLoginModel->expects($this->any())->method('isRequired')->with($emailLogin)
+            ->willReturn(true);
+        $this->helperMock->expects($this->any())->method('getCaptcha')->with('user_login')->willReturn($userLoginModel);
+
+        $this->customerSessionMock->expects($this->any())->method('isLoggedIn')
+            ->willReturn(true);
+
+        $customerDataMock = $this->createMock(CustomerData::class);
+        $customerDataMock->expects($this->any())->method('getEmail')->willReturn($emailLogin);
+        $this->customerSessionMock->expects($this->any())->method('getCustomerData')
+            ->willReturn($customerDataMock);
+
+        /* Assert to test */
+        $this->assertEquals(
+            [
+                "user_login" => [
+                    "isRequired" => true,
+                    "timestamp" => time()
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+}