Merge remote-tracking branch 'mainline/2.4-develop' into 2.4.1-develop

Author: slavvka

app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

@@ -149,7 +149,6 @@
             <item>Magento_Backend::custom</item>
             <item>Magento_Backend::tools</item>
             <item>Magento_Backend::cache</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Backup::rollback</item>
             <item>Magento_Indexer::index</item>

app/code/Magento/Backend/Model/Setup/MenuBuilder.php

@@ -53,7 +53,6 @@
                                 <resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
                             </resource>
                         </resource>
-                        <resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title"  sortOrder="80" />
                 </resource>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToSetupWizardPageActionGroup.xml

@@ -138,9 +138,6 @@
             <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Menu\Builder">
-        <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
-    </type>
     <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
         <arguments>
             <argument name="configs" xsi:type="array">

app/code/Magento/Backend/Test/Mftf/Page/AdminSetupWizardPage.xml

@@ -27,6 +27,5 @@
         <add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
         <add id="Magento_Backend::other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
         <add id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
-        <add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
     </menu>
 </config>

app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml

@@ -153,20 +153,6 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Setup\BackendApp" type="Magento\Backend\App\BackendApp">
-        <arguments>
-            <argument name="cookiePath" xsi:type="string">setup</argument>
-            <argument name="startupPage" xsi:type="string">setup</argument>
-            <argument name="aclResourceName" xsi:type="string">Magento_Backend::setup_wizard</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Backend\App\BackendAppList">
-        <arguments>
-            <argument name="backendApps" xsi:type="array">
-                <item name="setup" xsi:type="object">Magento\Setup\BackendApp</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Response\HeaderManager">
         <arguments>
             <argument name="headerProviderList" xsi:type="array">

app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php

@@ -312,7 +312,6 @@ Attributes,Attributes
 "Connect Manager","Connect Manager"
 "Package Extensions","Package Extensions"
 Tools,Tools
-"Web Setup Wizard","Web Setup Wizard"
 Currency,Currency
 Communications,Communications
 Services,Services

app/code/Magento/Backend/etc/acl.xml

@@ -8,5 +8,9 @@
 <view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
     <vars module="Magento_Catalog">
         <var name="product_image_white_borders">1</var>
+        <!-- Variable to enable lazy loading for catalog product images without borders.
+        If you enable this setting your small size images without borders may be stretched in template.
+        So be sure you have correct image sizes. -->
+        <var name="enable_lazy_loading_for_images_without_borders">0</var>
     </vars>
 </view>

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -8,7 +8,7 @@
 /** @var $block \Magento\Catalog\Block\Product\Image */
 /** @var $escaper \Magento\Framework\Escaper */
 ?>
-
+<!--deprecated template as image_with_borders is a primary one-->
 <img class="photo image <?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
     <?php foreach ($block->getCustomAttributes() as $name => $value): ?>
         <?= $escaper->escapeHtmlAttr($name) ?>="<?= $escaper->escapeHtmlAttr($value) ?>"

app/code/Magento/Backend/etc/adminhtml/menu.xml

@@ -7,6 +7,16 @@
 <?php
 /** @var $block \Magento\Catalog\Block\Product\Image */
 /** @var $escaper \Magento\Framework\Escaper */
+/**
+ * Enable lazy loading for images with borders and if variable enable_lazy_loading_for_images_without_borders
+ * is enabled in view.xml. Otherwise small size images without borders may be distorted. So max-width is used for them
+ * to prevent stretching and lazy loading does not work.
+ */
+$borders = (bool)$block->getVar('product_image_white_borders', 'Magento_Catalog');
+$enableLazyLoadingWithoutBorders = (bool)$block->getVar(
+    'enable_lazy_loading_for_images_without_borders',
+    'Magento_Catalog'
+);
 ?>
 
 <span class="product-image-container"
@@ -19,7 +29,12 @@
             <?php endforeach; ?>
             src="<?= $escaper->escapeUrl($block->getImageUrl()) ?>"
             loading="lazy"
-            width="<?= $escaper->escapeHtmlAttr($block->getWidth()) ?>"
-            height="<?= $escaper->escapeHtmlAttr($block->getHeight()) ?>"
+            <?php if ($borders || $enableLazyLoadingWithoutBorders): ?>
+                width="<?= $escaper->escapeHtmlAttr($block->getWidth()) ?>"
+                height="<?= $escaper->escapeHtmlAttr($block->getHeight()) ?>"
+            <?php else: ?>
+                max-width="<?= $escaper->escapeHtmlAttr($block->getWidth()) ?>"
+                max-height="<?= $escaper->escapeHtmlAttr($block->getHeight()) ?>"
+            <?php endif; ?>
             alt="<?= $escaper->escapeHtmlAttr($block->getLabel()) ?>"/></span>
 </span>

app/code/Magento/Backend/etc/di.xml

@@ -68,14 +68,6 @@
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
                     <item name="optional" xsi:type="boolean">false</item>
                 </item>
-                <item name="cronUpdate" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}update/cron.php >> {magentoLog}update.cron.log</item>
-                    <item name="optional" xsi:type="boolean">true</item>
-                </item>
-                <item name="cronSetup" xsi:type="array">
-                    <item name="command" xsi:type="string">{magentoRoot}bin/magento setup:cron:run >> {magentoLog}setup.cron.log</item>
-                    <item name="optional" xsi:type="boolean">true</item>
-                </item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Backend/i18n/en_US.csv

@@ -14,7 +14,9 @@
             </action>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="Magento_Customer::account/dashboard/info.phtml" cacheable="false"/>
+            <block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="Magento_Customer::account/dashboard/info.phtml" cacheable="false">
+                <container name="customer.account.dashboard.info.blocks" as="additional_blocks"/>
+            </block>
             <block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="Magento_Customer::account/dashboard/address.phtml" cacheable="false"/>
         </referenceContainer>
     </body>

app/code/Magento/Catalog/etc/view.xml

@@ -29,24 +29,26 @@
                 </a>
             </div>
         </div>
-        <?php if ($block->isNewsletterEnabled()) : ?>
+        <?php if ($block->isNewsletterEnabled()): ?>
             <div class="box box-newsletter">
                 <strong class="box-title">
                     <span><?= $block->escapeHtml(__('Newsletters')) ?></span>
                 </strong>
                 <div class="box-content">
                     <p>
-                        <?php if ($block->getIsSubscribed()) : ?>
+                        <?php if ($block->getIsSubscribed()): ?>
                             <?= $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
-                        <?php else : ?>
+                        <?php else: ?>
                             <?= $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
                         <?php endif; ?>
                     </p>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
+                    <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>">
+                        <span><?= $block->escapeHtml(__('Edit')) ?></span></a>
                 </div>
             </div>
         <?php endif; ?>
+        <?= $block->getChildHtml('additional_blocks'); ?>
     </div>
 </div>

app/code/Magento/Catalog/view/frontend/templates/product/image.phtml

@@ -9,35 +9,45 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface;
-use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
+use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
+use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
 
 /**
  * @inheritdoc
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
-class AuthenticateCustomer implements AuthenticateCustomerInterface
+class AuthenticateCustomerBySecret implements AuthenticateCustomerBySecretInterface
 {
+    /**
+     * @var GetAuthenticationDataBySecretInterface
+     */
+    private $getAuthenticationDataBySecret;
+
     /**
      * @var Session
      */
     private $customerSession;
 
     /**
+     * @param GetAuthenticationDataBySecretInterface $getAuthenticationDataBySecret
      * @param Session $customerSession
      */
     public function __construct(
+        GetAuthenticationDataBySecretInterface $getAuthenticationDataBySecret,
         Session $customerSession
     ) {
+        $this->getAuthenticationDataBySecret = $getAuthenticationDataBySecret;
         $this->customerSession = $customerSession;
     }
 
     /**
      * @inheritdoc
      */
-    public function execute(AuthenticationDataInterface $authenticationData): void
+    public function execute(string $secret): void
     {
+        $authenticationData = $this->getAuthenticationDataBySecret->execute($secret);
+
         if ($this->customerSession->getId()) {
             $this->customerSession->logout();
         }

app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml

@@ -10,12 +10,12 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
+use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
 
 /**
  * @inheritdoc
  */
-class DeleteExpiredAuthenticationData implements DeleteExpiredAuthenticationDataInterface
+class DeleteAuthenticationDataForUser implements DeleteAuthenticationDataForUserInterface
 {
     /**
      * @var ResourceConnection