Merge remote-tracking branch 'mainline/2.3-develop' into MC-19245

adifucan · adifucan · commit b82a164fe20a · 2019-08-23T09:49:30.000-05:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/app/code/Magento/AdminNotification/README.md b/app/code/Magento/AdminNotification/README.md
@@ -4,15 +4,25 @@ The Magento_AdminNotification module provides the ability to alert administrator
 
 ## Installation details
 
+The Magento_AdminNotification module creates the following tables in the database:
+- `adminnotification_inbox`
+- `admin_system_messages`
+
 Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
 
+## Extensibility
+
+Extension developers can interact with the Magento_AdminNotification 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_AdminNotification module.
+
 ### Events
 
 This module observes the following events:
 
- - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver`
+ - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver` file.
 
 ### Layouts
 
diff --git a/app/code/Magento/AdvancedPricingImportExport/README.md b/app/code/Magento/AdvancedPricingImportExport/README.md
@@ -2,3 +2,8 @@
 
 The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
 
+## Extensibility
+
+Extension developers can interact with the Magento_AdvancedPricingImportExport 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_AdvancedPricingImportExport module.
diff --git a/app/code/Magento/Amqp/README.md b/app/code/Magento/Amqp/README.md
@@ -1,3 +1,9 @@
-# Amqp
+# Magento_Amqp module
 
-**Amqp** provides functionality to publish/consume messages with Amqp.
+Magento_Amqp module provides functionality to publish/consume messages with the Advanced Message Queuing Protocol (AMQP).
+
+## Extensibility
+
+Extension developers can interact with the Magento_Amqp 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_Amqp module.
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -536,7 +536,7 @@
                     <label>Enable HTTP Strict Transport Security (HSTS)</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-                    <comment><![CDATA[See <a href="https://www.owasp.org/index.php/HTTP_Strict_Transport_Security" target="_blank">HTTP Strict Transport Security</a> page for details.]]></comment>
+                    <comment><![CDATA[See <a href="https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Strict_Transport_Security_Cheat_Sheet.html" target="_blank">HTTP Strict Transport Security</a> page for details.]]></comment>
                     <depends>
                         <field id="use_in_frontend">1</field>
                         <field id="use_in_adminhtml">1</field>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -349,6 +349,7 @@
                 <settings>
                     <validation>
                         <rule name="required-entry" xsi:type="boolean">true</rule>
+                        <rule name="validate-number" xsi:type="boolean">true</rule>
                     </validation>
                     <additionalClasses>
                         <class name="admin__field-small">true</class>
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
@@ -61,7 +61,8 @@
             <description>Clicks on Delete Template. Accepts the Popup. Validates that the Email Template is NOT present in the Email Templates Grid.</description>
         </annotations>
         <click selector="{{AdminEmailTemplateEditSection.deleteTemplateButton}}" after="checkTemplateName" stepKey="deleteTemplate"/>
-        <acceptPopup after="deleteTemplate" stepKey="acceptPopup"/>
+        <waitForElementVisible selector="{{AdminEmailTemplateEditSection.acceptPopupButton}}" after="deleteTemplate" stepKey="waitForConfirmButton"/>
+        <click selector="{{AdminEmailTemplateEditSection.acceptPopupButton}}" after="waitForConfirmButton" stepKey="acceptPopup"/>
         <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" after="acceptPopup" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the email template." after="waitForSuccessMessage" stepKey="seeSuccessfulMessage"/>
     </actionGroup>
diff --git a/app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateEditSection.xml b/app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateEditSection.xml
@@ -16,5 +16,6 @@
         <element name="loadTemplateButton" type="button" selector="#load" timeout="30"/>
         <element name="deleteTemplateButton" type="button" selector="#delete"/>
         <element name="previewTemplateButton" type="button" selector="#preview" timeout="30"/>
+        <element name="acceptPopupButton" type="button" selector=".action-accept" />
     </section>
 </sections>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -61,10 +61,11 @@ require([
     "jquery",
     "wysiwygAdapter",
     "Magento_Ui/js/modal/alert",
+    'Magento_Ui/js/modal/confirm',
     "mage/mage",
     "Magento_Email/js/variables",
     "prototype"
-], function(jQuery, tinyMCE, alert){
+], function(jQuery, tinyMCE, alert, confirm){
 
 //<![CDATA[
     jQuery('#email_template_edit_form').mage('form').mage('validation');
@@ -113,18 +114,22 @@ require([
         },
 
         stripTags: function () {
-            if(!window.confirm("<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>")) {
-                return false;
-            }
-            this.unconvertedText = $('template_text').value;
-            $('convert_button').hide();
-            $('template_text').value =  $('template_text').value.stripScripts().replace(
-                new RegExp('<style[^>]*>[\\S\\s]*?</style>', 'img'), ''
-            ).stripTags().strip();
-            $('convert_button_back').show();
-            $('field_template_styles').hide();
-            this.typeChange = true;
-            return false;
+            confirm({
+                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>",
+                actions: {
+                    confirm: function () {
+                        this.unconvertedText = $('template_text').value;
+                        $('convert_button').hide();
+                        $('template_text').value =  $('template_text').value.stripScripts().replace(
+                            new RegExp('<style[^>]*>[\\S\\s]*?</style>', 'img'), ''
+                        ).stripTags().strip();
+                        $('convert_button_back').show();
+                        $('field_template_styles').hide();
+                        this.typeChange = true;
+                        return false;
+                    }
+                }
+            });
         },
         unStripTags: function () {
             $('convert_button').show();
@@ -164,9 +169,14 @@ require([
         },
 
         deleteTemplate: function() {
-            if(window.confirm("<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>")) {
-                   window.location.href = '<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>';
-            }
+            confirm({
+                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>",
+                actions: {
+                    confirm: function () {
+                        window.location.href = '<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>';
+                    }
+                }
+            });
         },
 
         load: function() {
diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
@@ -16,50 +16,58 @@
                 <field id="customer" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Customer Token Lifetime (hours)</label>
                     <comment>We will disable this feature if the value is empty.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
                 <field id="admin" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Admin Token Lifetime (hours)</label>
                     <comment>We will disable this feature if the value is empty.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="cleanup" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Cleanup Settings</label>
                 <field id="cleanup_probability" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Cleanup Probability</label>
                     <comment>Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup</comment>
+                    <validate>required-entry validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="expiration_period" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Expiration Period</label>
                     <comment>Cleanup entries older than X minutes.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="consumer" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Consumer Settings</label>
                 <field id="expiration_period" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Expiration Period</label>
                     <comment>Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
                 <field id="post_maxredirects" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>OAuth consumer credentials HTTP Post maxredirects</label>
                     <comment>Number of maximum redirects for OAuth consumer credentials Post request.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="post_timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>OAuth consumer credentials HTTP Post timeout</label>
                     <comment>Timeout for OAuth consumer credentials Post request within X seconds.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="authentication_lock" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Authentication Locks</label>
                 <field id="max_failures_count" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Maximum Login Failures to Lock Out Account</label>
                     <comment>Maximum Number of authentication failures to lock out account.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="timeout" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Lockout Time (seconds)</label>
                     <comment>Period of time in seconds after which account will be unlocked.</comment>
+                    <validate>required-entry validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
-
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -293,7 +293,7 @@ public function isMethodActive($method)
             case Config::METHOD_WPS_BML:
             case Config::METHOD_WPP_BML:
                 $disabledFunding = $this->_scopeConfig->getValue(
-                    'payment/paypal_express/disable_funding_options',
+                    'paypal/style/disable_funding_options',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 );
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -306,7 +306,7 @@ public function testIsMethodActiveBml($disableFundingOptions, $expectedFlag, $ex
     {
         $this->scopeConfigMock->method('getValue')
             ->with(
-                self::equalTo('payment/paypal_express/disable_funding_options'),
+                self::equalTo('paypal/style/disable_funding_options'),
                 self::equalTo('store')
             )
             ->willReturn($disableFundingOptions);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -9,6 +9,9 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
+/**
+ * Class ConfigTest
+ */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -122,7 +125,7 @@ public function testIsMethodAvailableForIsMethodActive($methodName, $expected)
             $valueMap = [
                 ['paypal/general/merchant_country', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, 'US'],
                 ['paypal/general/merchant_country', ScopeInterface::SCOPE_STORE, null, 'US'],
-                ['payment/paypal_express/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
+                ['paypal/style/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
             ];
             $this->scopeConfig
                 ->method('getValue')
@@ -362,11 +365,15 @@ public function testGetBmlDisplay($section, $expectedValue, $expectedFlag, $expe
             ->will($this->returnValue($expectedFlag));
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->will($this->returnValueMap([
-                ['payment/' . Config::METHOD_WPP_BML . '/' . $section . '_display', 'store', 1, $expectedValue],
-                ['payment/' . Config::METHOD_WPP_BML . '/active', 'store', 1, $expectedValue],
-                ['payment/' . Config::METHOD_WPP_PE_BML . '/active', 'store', 1, $expectedValue],
-            ]));
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['payment/' . Config::METHOD_WPP_BML . '/' . $section . '_display', 'store', 1, $expectedValue],
+                        ['payment/' . Config::METHOD_WPP_BML . '/active', 'store', 1, $expectedValue],
+                        ['payment/' . Config::METHOD_WPP_PE_BML . '/active', 'store', 1, $expectedValue],
+                    ]
+                )
+            );
         $this->assertEquals($expected, $this->model->getBmlDisplay($section));
     }
 
@@ -407,11 +414,13 @@ public function testGetExpressCheckoutShortcutImageUrl(
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->willReturnMap([
-                ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
-                ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
-                ['paypal/wpp/button_type', ScopeInterface::SCOPE_STORE, 123, $buttonType],
-            ]);
+            ->willReturnMap(
+                [
+                    ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
+                    ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
+                    ['paypal/wpp/button_type', ScopeInterface::SCOPE_STORE, 123, $buttonType],
+                ]
+            );
 
         $this->assertEquals(
             $result,
@@ -475,10 +484,12 @@ public function testGetPaymentMarkImageUrl(
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->willReturnMap([
-                ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
-                ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
-            ]);
+            ->willReturnMap(
+                [
+                    ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
+                    ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
+                ]
+            );
 
         $this->assertEquals(
             $result,
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Store\Model\System;
 
 use Magento\Framework\Data\OptionSourceInterface;
@@ -118,6 +121,7 @@ public function getStoreValuesForForm($empty = false, $all = false)
             $options[] = ['label' => __('All Store Views'), 'value' => 0];
         }
 
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $nonEscapableNbspChar = html_entity_decode('&#160;', ENT_NOQUOTES, 'UTF-8');
 
         foreach ($this->_websiteCollection as $website) {
@@ -126,7 +130,7 @@ public function getStoreValuesForForm($empty = false, $all = false)
                 if ($website->getId() != $group->getWebsiteId()) {
                     continue;
                 }
-                $groupShow = false;
+                $values = [];
                 foreach ($this->_storeCollection as $store) {
                     if ($group->getId() != $store->getGroupId()) {
                         continue;
@@ -135,16 +139,12 @@ public function getStoreValuesForForm($empty = false, $all = false)
                         $options[] = ['label' => $website->getName(), 'value' => []];
                         $websiteShow = true;
                     }
-                    if (!$groupShow) {
-                        $groupShow = true;
-                        $values = [];
-                    }
                     $values[] = [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $store->getName(),
                         'value' => $store->getId(),
                     ];
                 }
-                if ($groupShow) {
+                if (!empty($values)) {
                     $options[] = [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $group->getName(),
                         'value' => $values,
@@ -398,6 +398,7 @@ public function getStoreCollection()
 
     /**
      * Load/Reload collection(s) by type
+     *
      * Allowed types: website, group, store or null for all
      *
      * @param string $type
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php
diff --git a/lib/internal/Magento/Framework/Locale/TranslatedLists.php b/lib/internal/Magento/Framework/Locale/TranslatedLists.php
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
