Merge branch '2.4-develop' into COMDOX-1220

Author: magento-devops-queue-mgr-svc

app/code/Magento/Backend/Model/Config/Password/MinimumLength.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Config\Password;
+
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\User\Model\UserValidationRules;
+
+/**
+ * Backend model for admin minimum password length configuration
+ */
+class MinimumLength extends Value
+{
+    /**
+     * Validate the minimum password length value
+     *
+     * @return $this
+     * @throws LocalizedException
+     */
+    public function beforeSave()
+    {
+        $value = (int) $this->getValue();
+
+        if ($value < UserValidationRules::MIN_PASSWORD_LENGTH) {
+            throw new LocalizedException(
+                __(
+                    'The minimum admin password length must be at least %1 characters.',
+                    UserValidationRules::MIN_PASSWORD_LENGTH
+                )
+            );
+        }
+
+        return parent::beforeSave();
+    }
+}

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

@@ -461,6 +461,12 @@
                     <validate>required-entry integer validate-greater-than-zero</validate>
                     <backend_model>Magento\Config\Model\Config\Backend\Admin\Password\Link\Expirationperiod</backend_model>
                 </field>
+                <field id="minimum_password_length" translate="label comment" type="text" sortOrder="8" showInDefault="1" canRestore="1">
+                    <label>Minimum Admin Password Length</label>
+                    <comment>Minimum number of characters required for admin user passwords. Values below 7 are not allowed.</comment>
+                    <validate>required-entry validate-digits validate-digits-range digits-range-7-65535</validate>
+                    <backend_model>Magento\Backend\Model\Config\Password\MinimumLength</backend_model>
+                </field>
                 <field id="use_form_key" translate="label" type="select" sortOrder="10" showInDefault="1" canRestore="1">
                     <label>Add Secret Key to URLs</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>

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

@@ -11,6 +11,9 @@
             <dashboard>
                 <enable_charts>0</enable_charts>
             </dashboard>
+            <security>
+                <minimum_password_length>7</minimum_password_length>
+            </security>
         </admin>
         <dev>
             <template>

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

@@ -467,3 +467,5 @@ Pagination,Pagination
 "Use URL parameter to enable template path hints for Storefront","Use URL parameter to enable template path hints for Storefront"
 "Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]","Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]"
 "URL key "%1" matches a reserved endpoint name (%2). Use another URL key.","URL key "%1" matches a reserved endpoint name (%2). Use another URL key."
+"Minimum Admin Password Length","Minimum Admin Password Length"
+"Minimum number of characters required for admin user passwords. Values below 7 are not allowed.","Minimum number of characters required for admin user passwords. Values below 7 are not allowed."

app/code/Magento/Catalog/Pricing/Price/SpecialPriceBulkResolver.php

@@ -13,6 +13,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class SpecialPriceBulkResolver implements SpecialPriceBulkResolverInterface, ArgumentInterface
 {
@@ -31,19 +32,27 @@ class SpecialPriceBulkResolver implements SpecialPriceBulkResolverInterface, Arg
      */
     private SessionManagerInterface $customerSession;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private StoreManagerInterface $storeManager;
+
     /**
      * @param ResourceConnection $resource
      * @param MetadataPool $metadataPool
      * @param SessionManagerInterface $customerSession
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ResourceConnection $resource,
         MetadataPool $metadataPool,
-        SessionManagerInterface $customerSession
+        SessionManagerInterface $customerSession,
+        StoreManagerInterface $storeManager
     ) {
         $this->resource = $resource;
         $this->metadataPool = $metadataPool;
         $this->customerSession = $customerSession;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -59,7 +68,7 @@ public function generateSpecialPriceMap(int $storeId, ?AbstractCollection $produ
         if (!$productCollection) {
             return [];
         }
-
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
         $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
         $connection = $this->resource->getConnection();
         $select = $connection->select()
@@ -76,7 +85,7 @@ public function generateSpecialPriceMap(int $storeId, ?AbstractCollection $produ
             )
             ->joinLeft(
                 ['price' => $this->resource->getTableName('catalog_product_index_price')],
-                'price.entity_id = COALESCE(link.product_id, e.entity_id) AND price.website_id = ' . $storeId .
+                'price.entity_id = COALESCE(link.product_id, e.entity_id) AND price.website_id = ' . $websiteId .
                 ' AND price.customer_group_id = ' . $this->customerSession->getCustomerGroupId()
             )
             ->where('e.entity_id IN (' . implode(',', $productCollection->getAllIds()) . ')')

app/code/Magento/Catalog/Test/Unit/Pricing/Price/SpecialPriceBulkResolverTest.php

@@ -16,9 +16,14 @@
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SpecialPriceBulkResolverTest extends TestCase
 {
     /**
@@ -37,10 +42,15 @@ class SpecialPriceBulkResolverTest extends TestCase
     private SpecialPriceBulkResolver $specialPriceBulkResolver;
 
     /**
-     * @var SessionManagerInterface
+     * @var SessionManagerInterface|MockObject
      */
     private SessionManagerInterface $customerSession;
 
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private StoreManagerInterface $storeManager;
+
     /**
      * @return void
      */
@@ -52,11 +62,12 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->addMethods(['getCustomerGroupId'])
             ->getMockForAbstractClass();
-
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
         $this->specialPriceBulkResolver = new SpecialPriceBulkResolver(
             $this->resource,
             $this->metadataPool,
-            $this->customerSession
+            $this->customerSession,
+            $this->storeManager
         );
     }
 
@@ -75,9 +86,19 @@ public function testGenerateSpecialPriceMapNoCollection(): void
      */
     public function testGenerateSpecialPriceMapCollection(): void
     {
+        $storeId = 2;
+        $websiteId = 1;
+        $customerGroupId = 3;
         $product = $this->createMock(Product::class);
-
-        $this->customerSession->expects($this->once())->method('getCustomerGroupId')->willReturn(1);
+        $store = $this->createMock(StoreInterface::class);
+        $store->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->with($storeId)
+            ->willReturn($store);
+        $this->customerSession->expects($this->once())
+            ->method('getCustomerGroupId')
+            ->willReturn($customerGroupId);
         $collection = $this->getMockBuilder(AbstractCollection::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getAllIds', 'getIterator'])
@@ -92,14 +113,13 @@ public function testGenerateSpecialPriceMapCollection(): void
             ->method('getMetadata')
             ->with(ProductInterface::class)
             ->willReturn($metadata);
-
         $connection = $this->getMockBuilder(AdapterInterface::class)
             ->addMethods(['from', 'joinInner', 'where', 'columns', 'joinLeft'])
             ->getMockForAbstractClass();
         $connection->expects($this->once())->method('select')->willReturnSelf();
         $connection->expects($this->once())
             ->method('from')
-            ->with(['e' => 'catalog_product_super_link'])
+            ->with(['e' => 'catalog_product_entity'])
             ->willReturnSelf();
         $connection->expects($this->exactly(3))
             ->method('joinLeft')
@@ -130,12 +150,13 @@ public function testGenerateSpecialPriceMapCollection(): void
         $this->resource->expects($this->exactly(4))
             ->method('getTableName')
             ->willReturnOnConsecutiveCalls(
-                'catalog_product_super_link',
                 'catalog_product_entity',
+                'catalog_product_super_link',
                 'catalog_product_website',
                 'catalog_product_index_price'
             );
-
-        $this->specialPriceBulkResolver->generateSpecialPriceMap(1, $collection);
+        $result = $this->specialPriceBulkResolver->generateSpecialPriceMap($storeId, $collection);
+        $expectedResult = [1 => true];
+        $this->assertEquals($expectedResult, $result);
     }
 }

app/code/Magento/CatalogRule/Plugin/Model/Indexer/RecollectQuoteAfterRuleChange.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Plugin\Model\Indexer;
+
+use Magento\Catalog\Model\Indexer\Product\Price;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResourceModel;
+
+/**
+ * Recollect quote on product ids after rule change.
+ */
+class RecollectQuoteAfterRuleChange
+{
+    /**
+     * @param QuoteResourceModel $quoteResourceModel
+     */
+    public function __construct(
+        private readonly QuoteResourceModel $quoteResourceModel
+    ) {
+    }
+
+    /**
+     * Recollect quote on product ids after rule change.
+     *
+     * @param Price $subject
+     * @param void $result
+     * @param array $ids
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(Price $subject, $result, array $ids)
+    {
+        $this->quoteResourceModel->markQuotesRecollect($ids);
+    }
+}

app/code/Magento/CatalogRule/composer.json

@@ -13,7 +13,8 @@
         "magento/module-eav": "*",
         "magento/module-rule": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/module-ui": "*",
+        "magento/module-quote": "*"
     },
     "suggest": {
         "magento/module-import-export": "*",

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

@@ -164,4 +164,7 @@
             <argument name="customConditionProvider" xsi:type="object">CatalogRuleCustomConditionProvider</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Indexer\Product\Price">
+        <plugin name="recollect_quote_after_rule_change" type="Magento\CatalogRule\Plugin\Model\Indexer\RecollectQuoteAfterRuleChange"/>
+    </type>
 </config>

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

@@ -85,6 +85,7 @@ Keyword,Keyword
 "Please enter a valid email address (Ex: [email protected]).","Please enter a valid email address (Ex: [email protected])."
 "Please enter 6 or more characters. Leading and trailing spaces will be ignored.","Please enter 6 or more characters. Leading and trailing spaces will be ignored."
 "Please enter 7 or more characters, using both numeric and alphabetic.","Please enter 7 or more characters, using both numeric and alphabetic."
+"Please enter %1 or more characters, using both numeric and alphabetic.","Please enter %1 or more characters, using both numeric and alphabetic."
 "Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored."
 "Minimum of different classes of characters in password is %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters.","Minimum of different classes of characters in password is %1. Classes of characters: Lower Case, Upper Case, Digits, Special Characters."
 "Please enter a valid URL. Protocol is required (http://, https:// or ftp://).","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)."