Merge branch '2.4-develop' of github.com:magento/magento2ce into MC-33884

Author: svera

app/code/Magento/Catalog/etc/view.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/Catalog/view/frontend/templates/product/image.phtml

@@ -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/Catalog/view/frontend/templates/product/image_with_borders.phtml

@@ -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/Customer/view/frontend/layout/customer_account_index.xml

@@ -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/Customer/view/frontend/templates/account/dashboard/info.phtml

@@ -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/LoginAsCustomer/Model/AuthenticateCustomer.php renamed to app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php

@@ -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/LoginAsCustomer/Model/ResourceModel/DeleteExpiredAuthenticationData.php renamed to app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteAuthenticationDataForUser.php

@@ -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

app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php

@@ -61,7 +61,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(string $secretKey): AuthenticationDataInterface
+    public function execute(string $secret): AuthenticationDataInterface
     {
         $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection->getTableName('login_as_customer');
@@ -73,7 +73,7 @@ public function execute(string $secretKey): AuthenticationDataInterface
 
         $select = $connection->select()
             ->from(['main_table' => $tableName])
-            ->where('main_table.secret = ?', $secretKey)
+            ->where('main_table.secret = ?', $secret)
             ->where('main_table.created_at > ?', $timePoint);
 
         $data = $connection->fetchRow($select);

app/code/Magento/LoginAsCustomerUi/Plugin/AdminLogoutPlugin.php renamed to app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php

@@ -5,11 +5,11 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomerUi\Plugin;
+namespace Magento\LoginAsCustomer\Plugin;
 
 use Magento\Backend\Model\Auth;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
+use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
 
 /**
  * Delete all Login as Customer sessions for logging out admin.
@@ -22,20 +22,20 @@ class AdminLogoutPlugin
     private $config;
 
     /**
-     * @var DeleteExpiredAuthenticationDataInterface
+     * @var DeleteAuthenticationDataForUserInterface
      */
-    private $deleteExpiredAuthenticationData;
+    private $deleteAuthenticationDataForUser;
 
     /**
      * @param ConfigInterface $config
-     * @param DeleteExpiredAuthenticationDataInterface $deleteExpiredAuthenticationData
+     * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      */
     public function __construct(
         ConfigInterface $config,
-        DeleteExpiredAuthenticationDataInterface $deleteExpiredAuthenticationData
+        DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
     ) {
         $this->config = $config;
-        $this->deleteExpiredAuthenticationData = $deleteExpiredAuthenticationData;
+        $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
     }
 
     /**
@@ -47,7 +47,7 @@ public function beforeLogout(Auth $subject): void
     {
         if ($this->config->isEnabled()) {
             $userId = (int)$subject->getUser()->getId();
-            $this->deleteExpiredAuthenticationData->execute($userId);
+            $this->deleteAuthenticationDataForUser->execute($userId);
         }
     }
 }

app/code/Magento/LoginAsCustomer/composer.json

@@ -7,6 +7,9 @@
         "magento/module-customer": "*",
         "magento/module-login-as-customer-api": "*"
     },
+    "suggest": {
+        "magento/module-backend": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",