Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-23215

Author: dhorytskyi

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/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php

@@ -49,21 +49,6 @@ public function getData(array $data): array
                 __('Required parameter "authorizenet_acceptjs" for "payment_method" is missing.')
             );
         }
-        if (!isset($data[self::PATH_ADDITIONAL_DATA]['opaque_data_descriptor'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "opaque_data_descriptor" for "authorizenet_acceptjs" is missing.')
-            );
-        }
-        if (!isset($data[self::PATH_ADDITIONAL_DATA]['opaque_data_value'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "opaque_data_value" for "authorizenet_acceptjs" is missing.')
-            );
-        }
-        if (!isset($data[self::PATH_ADDITIONAL_DATA]['cc_last_4'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "cc_last_4" for "authorizenet_acceptjs" is missing.')
-            );
-        }
 
         $additionalData = $this->arrayManager->get(static::PATH_ADDITIONAL_DATA, $data);
         foreach ($additionalData as $key => $value) {

app/code/Magento/Backend/Block/Media/Uploader.php

@@ -87,7 +87,7 @@ protected function _construct()
 
         $this->setId($this->getId() . '_Uploader');
 
-        $uploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('adminhtml/*/upload');
+        $uploadUrl = $this->_urlBuilder->getUrl('adminhtml/*/upload');
         $this->getConfig()->setUrl($uploadUrl);
         $this->getConfig()->setParams(['form_key' => $this->getFormKey()]);
         $this->getConfig()->setFileField('file');

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/Backend/view/adminhtml/web/js/translate.js

@@ -35,7 +35,7 @@ define([
                  * @return {String}
                  */
                 this.translate = function (text) {
-                    return _data[text] ? _data[text] : text;
+                    return typeof _data[text] === 'string' ? _data[text] : text;
                 };
 
                 return this;

app/code/Magento/BraintreeGraphQl/Model/BraintreeDataProvider.php

@@ -31,19 +31,6 @@ public function getData(array $args): array
                 __('Required parameter "braintree" for "payment_method" is missing.')
             );
         }
-
-        if (!isset($args[self::PATH_ADDITIONAL_DATA]['payment_method_nonce'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "payment_method_nonce" for "braintree" is missing.')
-            );
-        }
-
-        if (!isset($args[self::PATH_ADDITIONAL_DATA]['is_active_payment_token_enabler'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "is_active_payment_token_enabler" for "braintree" is missing.')
-            );
-        }
-
         return $args[self::PATH_ADDITIONAL_DATA];
     }
 }

app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php

@@ -45,6 +45,7 @@ protected function setUp()
         $this->locatorMock = $this->getMockBuilder(LocatorInterface::class)
             ->getMockForAbstractClass();
         $this->productMock = $this->getMockBuilder(ProductInterface::class)
+            ->setMethods(['getPriceType'])
             ->getMockForAbstractClass();
 
         $this->locatorMock->expects($this->any())

app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundlePriceTest.php

@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Bundle\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
+
+use Magento\Bundle\Ui\DataProvider\Product\Form\Modifier\BundlePrice;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\Stdlib\ArrayManager;
+
+class BundlePriceTest extends AbstractModifierTest
+{
+    /**
+     * @return BundlePrice
+     */
+    protected function createModel()
+    {
+        return $this->objectManager->getObject(
+            BundlePrice::class,
+            [
+                'locator' => $this->locatorMock,
+                'arrayManager' => $this->arrayManagerMock
+            ]
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testModifyMeta()
+    {
+        $this->productMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(true);
+        $this->productMock->expects($this->any())
+            ->method('getPriceType')
+            ->willReturn(0);
+        $priceTypePath = 'bundle-items/children/' . BundlePrice::CODE_PRICE_TYPE;
+        $priceTypeConfigPath = $priceTypePath . BundlePrice::META_CONFIG_PATH;
+        $pricePath = 'product-details/children/' . ProductAttributeInterface::CODE_PRICE;
+        $priceConfigPath = $pricePath . BundlePrice::META_CONFIG_PATH;
+        $sourceMeta = [
+            'bundle-items' => [
+                'children' => [
+                    BundlePrice::CODE_PRICE_TYPE => []
+                ]
+            ]
+        ];
+        $priceTypeParams = [
+            'disabled' => true,
+            'valueMap' => [
+                'false' => '1',
+                'true' => '0'
+            ],
+            'validation' => [
+                'required-entry' => false
+            ]
+        ];
+        $priceTypeMeta = [
+            'bundle-items' => [
+                'children' => [
+                    BundlePrice::CODE_PRICE_TYPE => $priceTypeParams
+                ]
+            ]
+        ];
+        $priceParams = [
+            'imports' => [
+                    'disabled' => 'ns = ${ $.ns }, index = ' . BundlePrice::CODE_PRICE_TYPE . ':checked'
+                ]
+        ];
+        $priceMeta = [
+            'product-details' => [
+                'children' => [
+                    BundlePrice::CODE_PRICE_TYPE => []
+                ]
+            ],
+            'bundle-items' => [
+                'children' => [
+                    ProductAttributeInterface::CODE_PRICE => $priceParams
+                ]
+            ]
+        ];
+        $taxParams = [
+            'service' => [
+                'template' => ''
+            ]
+        ];
+
+        $this->arrayManagerMock->expects(static::any())
+            ->method('findPath')
+            ->willReturnMap(
+                [
+                    [
+                        BundlePrice::CODE_PRICE_TYPE,
+                        $sourceMeta,
+                        null,
+                        'children',
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $priceTypePath
+                    ],
+                    [
+                        ProductAttributeInterface::CODE_PRICE,
+                        $priceTypeMeta,
+                        BundlePrice::DEFAULT_GENERAL_PANEL . '/children',
+                        'children',
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $pricePath
+                    ],
+                    [
+                        BundlePrice::CODE_TAX_CLASS_ID,
+                        $priceMeta,
+                        null,
+                        'children',
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $pricePath
+                    ],
+                    [
+                        BundlePrice::CODE_TAX_CLASS_ID,
+                        $priceMeta,
+                        null,
+                        'children',
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $pricePath
+                    ]
+                ]
+            );
+        $this->arrayManagerMock->expects($this->exactly(4))
+            ->method('merge')
+            ->willReturnMap(
+                [
+                    [
+                        $priceTypeConfigPath,
+                        $sourceMeta,
+                        $priceTypeParams,
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $priceTypeMeta
+                    ],
+                    [
+                        $priceConfigPath,
+                        $priceTypeMeta,
+                        $priceParams,
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $priceMeta
+                    ],
+                    [
+                        $priceConfigPath,
+                        $priceMeta,
+                        $priceParams,
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $priceMeta
+                    ],
+                    [
+                        $priceConfigPath,
+                        $priceMeta,
+                        $taxParams,
+                        ArrayManager::DEFAULT_PATH_DELIMITER,
+                        $priceMeta
+                    ]
+                ]
+            );
+
+        $this->assertSame($priceMeta, $this->getModel()->modifyMeta($sourceMeta));
+    }
+
+    public function testModifyData()
+    {
+        $expectedData = [];
+        $this->assertEquals($expectedData, $this->getModel()->modifyData($expectedData));
+    }
+}