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

Accepted Community Pull Requests:
 - #25905: [Checkout] Cover DirectoryData by Unit Test (by @edenduong)
 - #25774: [Config] Giving the possibility to have a config dependency based on empty config value (by @eduard13)
 - #25541: Removes hardcoded references to country selector component (by @krzksz)
 - #25604: Moving Ui message.js hide speed and timeout into variables for easier… (by @edward-simpson)
 - #25790: Don't disable FPC for maintenance, instead send "no cache" headers (by @Parakoopa)
 - #25808: No marginal white space validation added (by @ajithkumar-maragathavel)


Fixed GitHub Issues:
 - #22416: Coupling beetwen Magento_Checkout::js/view/shipping.js:validateShippingInformation() and layout definition or view.  (reported by @funkyproject) has been fixed in #25541 by @krzksz in 2.4-develop branch
   Related commits:
     1. 666cca8

 - #24229: Unable to enable maintenance mode when env.php is read only (reported by @ihor-sviziev) has been fixed in #25790 by @Parakoopa in 2.4-develop branch
   Related commits:
     1. acd42b8
     2. d1b81aa

Author: VladimirZaets

app/code/Magento/Checkout/Test/Unit/CustomerData/DirectoryDataTest.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\CustomerData;
+
+use Magento\Checkout\CustomerData\DirectoryData;
+use Magento\Directory\Helper\Data as HelperData;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Directory\Model\Country;
+use PHPUnit\Framework\TestCase;
+
+class DirectoryDataTest extends TestCase
+{
+    /**
+     * @var DirectoryData
+     */
+    private $model;
+
+    /**
+     * @var HelperData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryHelperMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->directoryHelperMock = $this->createMock(HelperData::class);
+
+        $this->model = $this->objectManager->getObject(
+            DirectoryData::class,
+            [
+                'directoryHelper' => $this->directoryHelperMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData() function
+     */
+    public function testGetSectionData()
+    {
+        $regions = [
+            'US' => [
+                'TX' => [
+                    'code' => 'TX',
+                    'name' => 'Texas'
+                ]
+            ]
+        ];
+
+        $testCountryInfo = $this->objectManager->getObject(Country::class);
+        $testCountryInfo->setData('country_id', 'US');
+        $testCountryInfo->setData('iso2_code', 'US');
+        $testCountryInfo->setData('iso3_code', 'USA');
+        $testCountryInfo->setData('name_default', 'United States of America');
+        $testCountryInfo->setData('name_en_US', 'United States of America');
+        $countries = ['US' => $testCountryInfo];
+
+        $this->directoryHelperMock->expects($this->any())
+            ->method('getRegionData')
+            ->willReturn($regions);
+
+        $this->directoryHelperMock->expects($this->any())
+            ->method('getCountryCollection')
+            ->willReturn($countries);
+
+        /* Assert result */
+        $this->assertEquals(
+            [
+                'US' => [
+                    'name' => 'United States of America',
+                    'regions' => [
+                        'TX' => [
+                            'code' => 'TX',
+                            'name' => 'Texas'
+                        ]
+                    ]
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+}

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -60,7 +60,10 @@ define([
             template: 'Magento_Checkout/shipping',
             shippingFormTemplate: 'Magento_Checkout/shipping-address/form',
             shippingMethodListTemplate: 'Magento_Checkout/shipping-address/shipping-method-list',
-            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item'
+            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item',
+            imports: {
+                countryOptions: '${ $.parentName }.shippingAddress.shipping-address-fieldset.country_id:indexedOptions'
+            }
         },
         visible: ko.observable(!quote.isVirtual()),
         errorValidationMessage: ko.observable(false),
@@ -276,9 +279,7 @@ define([
                 loginFormSelector = 'form[data-role=email-with-possible-login]',
                 emailValidationResult = customer.isLoggedIn(),
                 field,
-                country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
-                countryIndexedOptions = country.indexedOptions,
-                option = countryIndexedOptions[quote.shippingAddress().countryId],
+                option = _.isObject(this.countryOptions) && this.countryOptions[quote.shippingAddress().countryId],
                 messageContainer = registry.get('checkout.errors').messageContainer;
 
             if (!quote.shippingMethod()) {

app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php

@@ -373,6 +373,58 @@ public function testSaveAndClose()
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
+    public function testSaveActionWithMarginalSpace()
+    {
+        $postData = [
+            'title' => 'unique_title_123',
+            'identifier' => '  unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '',
+            'back' => 'continue'
+        ];
+
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                    ['block_id', null, 1],
+                    ['back', null, true],
+                ]
+            );
+
+        $this->blockFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($this->blockMock);
+
+            $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
+        $this->blockMock->expects($this->once())->method('setData');
+        $this->blockRepository->expects($this->once())->method('save')
+            ->with($this->blockMock)
+            ->willThrowException(new \Exception('No marginal white space please.'));
+
+        $this->messageManagerMock->expects($this->never())
+            ->method('addSuccessMessage');
+        $this->messageManagerMock->expects($this->once())
+            ->method('addExceptionMessage');
+
+        $this->dataPersistorMock->expects($this->any())
+            ->method('set')
+            ->with('cms_block', array_merge($postData, ['block_id' => null]));
+
+        $this->resultRedirect->expects($this->atLeastOnce())
+            ->method('setPath')
+            ->with('*/*/edit', ['block_id' => $this->blockId])
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirect, $this->saveController->execute());
+    }
+
     public function testSaveActionThrowsException()
     {
         $postData = [

app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml

@@ -105,6 +105,7 @@
             <settings>
                 <validation>
                     <rule name="required-entry" xsi:type="boolean">true</rule>
+                    <rule name="no-marginal-whitespace" xsi:type="boolean">true</rule>
                 </validation>
                 <dataType>text</dataType>
                 <label translate="true">Identifier</label>

app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php

@@ -9,6 +9,12 @@
  * @api
  * @since 100.0.2
  */
+
+/**
+ * Class Field
+ *
+ * Fields are used to describe possible values for a type/interface.
+ */
 class Field
 {
     /**
@@ -41,7 +47,7 @@ public function __construct(array $fieldData = [], $fieldPrefix = "")
         if (isset($fieldData['separator'])) {
             $this->_values = explode($fieldData['separator'], $fieldData['value']);
         } else {
-            $this->_values = [$fieldData['value']];
+            $this->_values = [isset($fieldData['value']) ? $fieldData['value'] : ''];
         }
         $fieldId = $fieldPrefix . (isset(
             $fieldData['dependPath']

app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/FieldTest.php

@@ -12,6 +12,8 @@ class FieldTest extends \PHPUnit\Framework\TestCase
      */
     const SIMPLE_VALUE = 'someValue';
 
+    const EMPTY_VALUE = '';
+
     const COMPLEX_VALUE1 = 'value_1';
 
     const COMPLEX_VALUE2 = 'value_2';
@@ -150,8 +152,19 @@ public function getValuesDataProvider()
         return [
             [$this->_getSimpleData(), true, [self::SIMPLE_VALUE]],
             [$this->_getSimpleData(), false, [self::SIMPLE_VALUE]],
+            [$this->_getSimpleEmptyData(), false, [static::EMPTY_VALUE]],
             [$this->_getComplexData(), true, $complexDataValues],
             [$this->_getComplexData(), false, $complexDataValues]
         ];
     }
+
+    /**
+     * Providing a field data with no field value
+     *
+     * @return array
+     */
+    protected function _getSimpleEmptyData(): array
+    {
+        return ['dependPath' => ['section_2', 'group_3', 'field_4']];
+    }
 }

app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php

@@ -7,6 +7,8 @@
 
 /**
  * Class LayoutPlugin
+ *
+ * Plugin for Magento\Framework\View\Layout
  */
 class LayoutPlugin
 {
@@ -20,22 +22,31 @@ class LayoutPlugin
      */
     protected $response;
 
+    /**
+     * @var \Magento\Framework\App\MaintenanceMode
+     */
+    private $maintenanceMode;
+
     /**
      * Constructor
      *
      * @param \Magento\Framework\App\ResponseInterface $response
-     * @param \Magento\PageCache\Model\Config $config
+     * @param \Magento\PageCache\Model\Config          $config
+     * @param \Magento\Framework\App\MaintenanceMode   $maintenanceMode
      */
     public function __construct(
         \Magento\Framework\App\ResponseInterface $response,
-        \Magento\PageCache\Model\Config $config
+        \Magento\PageCache\Model\Config $config,
+        \Magento\Framework\App\MaintenanceMode $maintenanceMode
     ) {
         $this->response = $response;
         $this->config = $config;
+        $this->maintenanceMode = $maintenanceMode;
     }
 
     /**
      * Set appropriate Cache-Control headers
+     *
      * We have to set public headers in order to tell Varnish and Builtin app that page should be cached
      *
      * @param \Magento\Framework\View\Layout $subject
@@ -44,7 +55,7 @@ public function __construct(
      */
     public function afterGenerateXml(\Magento\Framework\View\Layout $subject, $result)
     {
-        if ($subject->isCacheable() && $this->config->isEnabled()) {
+        if ($subject->isCacheable() && !$this->maintenanceMode->isOn() && $this->config->isEnabled()) {
             $this->response->setPublicHeaders($this->config->getTtl());
         }
         return $result;
@@ -68,6 +79,7 @@ public function afterGetOutput(\Magento\Framework\View\Layout $subject, $result)
                     if ($isVarnish && $isEsiBlock) {
                         continue;
                     }
+                    // phpcs:ignore
                     $tags = array_merge($tags, $block->getIdentities());
                 }
             }