🔃 [Magento Community Engineering] Community Contributions - 2.3-develop

Accepted Community Pull Requests:
 - #24150: Add .editorconfig file (by @ihor-sviziev)
 - #24179: Fix #22956 - make country names translatable (by @Bartlomiejsz)
 - #24167: getStoreValuesForForm($empty = false, $all = false) has bad logic (undefine variable) (by @edenduong)
 - #24170: resolve "Layered Navigation Price Step" must validate number issue24169 (by @edenduong)
 - #24171: Resolve undefined variable in getAvailableWidget(...) function (by @edenduong)
 - #24173: Resolve "Service->Oauth Settings" has no number validation issue24172 (by @edenduong)
 - #24177: ReadMe minor changes previous pr (by @diazwatson)
 - #24178: Update Magento_Amqp ReadMe (by @diazwatson)
 - #24165: Resolve "HTTP Strict Transport Security" has the Outdate Url issue24164 (by @edenduong)


Fixed GitHub Issues:
 - #22956: Unable to translate checkout country names (reported by @rokslavec77) has been fixed in #24179 by @Bartlomiejsz in 2.3-develop branch
   Related commits:
     1. b423aa0
     2. 23afffb
     3. 8dab512

 - #24169: "Layered Navigation Price Step" must validate number (reported by @edenduong) has been fixed in #24170 by @edenduong in 2.3-develop branch
   Related commits:
     1. a041a3e

 - #24172: "Service->Oauth Settings" has no number validation  (reported by @edenduong) has been fixed in #24173 by @edenduong in 2.3-develop branch
   Related commits:
     1. 0c0b470

 - #24164: "HTTP Strict Transport Security" has the Outdate Url (reported by @edenduong) has been fixed in #24165 by @edenduong in 2.3-develop branch
   Related commits:
     1. 274064c

Author: magento-engcom-team

.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

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
 

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.

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.

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>

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>

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>

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(' ', 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

app/code/Magento/Widget/Model/Widget/Config.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Widget\Model\Widget;
 
 /**
@@ -198,8 +201,9 @@ public function decodeWidgetsFromQuery($queryParam)
      */
     public function getAvailableWidgets($config)
     {
+        $result = [];
+
         if (!$config->hasData('widget_types')) {
-            $result = [];
             $allWidgets = $this->_widgetFactory->create()->getWidgetsArray();
             $skipped = $this->_getSkippedWidgets();
             foreach ($allWidgets as $widget) {

lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php

@@ -6,36 +6,42 @@
 
 namespace Magento\Framework\Locale\Test\Unit;
 
-class TranslatedListsTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\Locale\ConfigInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Locale\TranslatedLists;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class TranslatedListsTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\Locale\TranslatedLists
+     * @var TranslatedLists
      */
     protected $listsModel;
 
     /**
-     * @var  \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ConfigInterface
+     * @var  MockObject | ConfigInterface
      */
     protected $mockConfig;
 
     /**
-     * @var  \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ResolverInterface
+     * @var  MockObject | ResolverInterface
      */
     protected $mockLocaleResolver;
 
     protected function setUp()
     {
-        $this->mockConfig = $this->getMockBuilder(\Magento\Framework\Locale\ConfigInterface::class)
+        $this->mockConfig = $this->getMockBuilder(ConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->mockLocaleResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
+        $this->mockLocaleResolver = $this->getMockBuilder(ResolverInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->mockLocaleResolver->expects($this->once())
             ->method('getLocale')
-            ->will($this->returnValue('en_US'));
+            ->willReturn('en_US');
 
-        $this->listsModel = new \Magento\Framework\Locale\TranslatedLists(
+        $this->listsModel = new TranslatedLists(
             $this->mockConfig,
             $this->mockLocaleResolver
         );
@@ -67,13 +73,13 @@ public function testGetOptionCurrencies()
 
         $this->mockConfig->expects($this->once())
             ->method('getAllowedCurrencies')
-            ->will($this->returnValue($allowedCurrencies));
+            ->willReturn($allowedCurrencies);
 
         $expectedResults = ['USD', 'EUR', 'GBP', 'UAH'];
 
         $currencyList = $this->listsModel->getOptionCurrencies();
         $currencyCodes = array_map(
-            function ($data) {
+            static function ($data) {
                 return $data['value'];
             },
             $currencyList
@@ -166,6 +172,6 @@ protected function setupForOptionLocales()
         $allowedLocales = ['en_US', 'uk_UA', 'de_DE'];
         $this->mockConfig->expects($this->once())
             ->method('getAllowedLocales')
-            ->will($this->returnValue($allowedLocales));
+            ->willReturn($allowedLocales);
     }
 }

lib/internal/Magento/Framework/Locale/TranslatedLists.php

@@ -11,6 +11,9 @@
 use Magento\Framework\Locale\Bundle\LanguageBundle;
 use Magento\Framework\Locale\Bundle\RegionBundle;
 
+/**
+ * Translated lists.
+ */
 class TranslatedLists implements ListsInterface
 {
     /**
@@ -176,6 +179,8 @@ public function getOptionAllCurrencies()
     }
 
     /**
+     * Sort option array.
+     *
      * @param array $option
      * @return array
      */
@@ -199,9 +204,11 @@ protected function _sortOptionArray($option)
     public function getCountryTranslation($value, $locale = null)
     {
         if ($locale == null) {
-            return (new RegionBundle())->get($this->localeResolver->getLocale())['Countries'][$value];
-        } else {
-            return (new RegionBundle())->get($locale)['Countries'][$value];
+            $locale = $this->localeResolver->getLocale();
         }
+
+        $translation = (new RegionBundle())->get($locale)['Countries'][$value];
+
+        return $translation ? (string)__($translation) : $translation;
     }
 }