1.1.69 Release

    - resolved conflicts between ACSD-57477 and ACSD-59865
    - resolved conflicts between ACSD-66404 and ACSD-53583
    - Updated patches-info.json

Author: apoltoratskyi

patches-info.json

@@ -1,8 +1,8 @@
 diff --git a/vendor/magento/module-quote/Model/Quote/Address.php b/vendor/magento/module-quote/Model/Quote/Address.php
-index 2d3c072d5d88..c759266d2e69 100644
+index 2d3c072d5d8..c759266d2e6 100644
 --- a/vendor/magento/module-quote/Model/Quote/Address.php
 +++ b/vendor/magento/module-quote/Model/Quote/Address.php
-@@ -86,7 +86,6 @@
+@@ -86,7 +86,6 @@ use Magento\Store\Model\StoreManagerInterface;
   * @method float getDiscountAmount()
   * @method Address setDiscountAmount(float $value)
   * @method float getBaseDiscountAmount()
@@ -19,7 +19,7 @@ index 2d3c072d5d88..c759266d2e69 100644
      /**
       * Prefix of model events
       *
-@@ -1796,4 +1797,17 @@ protected function getCustomAttributesCodes()
+@@ -1796,4 +1797,17 @@ class Address extends AbstractAddress implements
      {
          return array_keys($this->attributeList->getAttributes());
      }
@@ -38,7 +38,7 @@ index 2d3c072d5d88..c759266d2e69 100644
 +    }
  }
 diff --git a/vendor/magento/module-quote-graph-ql/Plugin/ProductAttributesExtender.php b/vendor/magento/module-quote-graph-ql/Plugin/ProductAttributesExtender.php
-index bcacd58fcb7e..eeed8e84d8ef 100644
+index bcacd58fcb7..eeed8e84d8e 100644
 --- a/vendor/magento/module-quote-graph-ql/Plugin/ProductAttributesExtender.php
 +++ b/vendor/magento/module-quote-graph-ql/Plugin/ProductAttributesExtender.php
 @@ -26,6 +26,11 @@ class ProductAttributesExtender
@@ -53,7 +53,7 @@ index bcacd58fcb7e..eeed8e84d8ef 100644
      /**
       * @param Fields $fields
       * @param AttributeCollectionFactory $attributeCollectionFactory
-@@ -48,12 +53,15 @@ public function __construct(
+@@ -48,12 +53,15 @@ class ProductAttributesExtender
       */
      public function afterGetProductAttributes(QuoteConfig $subject, array $result): array
      {
@@ -76,10 +76,10 @@ index bcacd58fcb7e..eeed8e84d8ef 100644
          return array_unique(array_merge($result, $attributes));
      }
 diff --git a/vendor/magento/module-sales-rule/Helper/CartFixedDiscount.php b/vendor/magento/module-sales-rule/Helper/CartFixedDiscount.php
-index eeab18e9c360..a518a00c7352 100644
+index eeab18e9c36..a518a00c735 100644
 --- a/vendor/magento/module-sales-rule/Helper/CartFixedDiscount.php
 +++ b/vendor/magento/module-sales-rule/Helper/CartFixedDiscount.php
-@@ -138,6 +138,7 @@ public function getDiscountedAmountProportionally(
+@@ -138,6 +138,7 @@ class CartFixedDiscount
          $baseItemPriceTotal = $baseItemPrice * $qty - $baseItemDiscountAmount;
          $ratio = $baseRuleTotalsDiscount != 0 ? $baseItemPriceTotal / $baseRuleTotalsDiscount : 0;
          $discountAmount = $this->deltaPriceRound->round($ruleDiscount * $ratio, $discountType);
@@ -88,10 +88,10 @@ index eeab18e9c360..a518a00c7352 100644
      }
 
 diff --git a/vendor/magento/module-sales-rule/Model/Quote/Discount.php b/vendor/magento/module-sales-rule/Model/Quote/Discount.php
-index 19e9bdf377bf..f2de09f3024f 100644
+index fcefae81780..ae996ae8a96 100644
 --- a/vendor/magento/module-sales-rule/Model/Quote/Discount.php
 +++ b/vendor/magento/module-sales-rule/Model/Quote/Discount.php
-@@ -20,11 +20,10 @@
+@@ -20,11 +20,10 @@ use Magento\SalesRule\Api\Data\DiscountDataInterface;
  use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
  use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
  use Magento\SalesRule\Model\Data\RuleDiscount;
@@ -104,7 +104,7 @@ index 19e9bdf377bf..f2de09f3024f 100644
 
  /**
   * Discount totals calculation model.
-@@ -177,11 +176,14 @@ public function collect(
+@@ -177,11 +176,14 @@ class Discount extends AbstractTotal
          $this->calculator->init($store->getWebsiteId(), $quote->getCustomerGroupId(), $quote->getCouponCode());
          $this->calculator->initTotals($items, $address);
          $items = $this->calculator->sortItemsByPriority($items, $address);
@@ -120,8 +120,8 @@ index 19e9bdf377bf..f2de09f3024f 100644
                  if ($quote->getIsMultiShipping() && $item->getAddress()->getId() !== $address->getId()) {
                      continue;
                  }
-@@ -190,14 +192,18 @@ public function collect(
-                 }
+@@ -205,14 +207,18 @@ class Discount extends AbstractTotal
+ 
                  $eventArgs['item'] = $item;
                  $this->eventManager->dispatch('sales_quote_address_discount_item', $eventArgs);
 +
@@ -145,10 +145,10 @@ index 19e9bdf377bf..f2de09f3024f 100644
              if (!isset($itemsAggregate[$item->getId()])) {
                  continue;
 diff --git a/vendor/magento/module-sales-rule/Model/ResourceModel/Rule/Collection.php b/vendor/magento/module-sales-rule/Model/ResourceModel/Rule/Collection.php
-index c7a344230698..a2d4af289004 100644
+index c7a34423069..a2d4af28900 100644
 --- a/vendor/magento/module-sales-rule/Model/ResourceModel/Rule/Collection.php
 +++ b/vendor/magento/module-sales-rule/Model/ResourceModel/Rule/Collection.php
-@@ -113,26 +113,29 @@ protected function mapAssociatedEntities($entityType, $objectField)
+@@ -113,26 +113,29 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
 
          $entityInfo = $this->_getAssociatedEntityInfo($entityType);
          $ruleIdField = $entityInfo['rule_id_field'];
@@ -190,18 +190,18 @@ index c7a344230698..a2d4af289004 100644
 
      /**
 diff --git a/vendor/magento/module-sales-rule/Model/Rule.php b/vendor/magento/module-sales-rule/Model/Rule.php
-index 386642c22ab1..d35ed63e908f 100644
+index 386642c22ab..d35ed63e908 100644
 --- a/vendor/magento/module-sales-rule/Model/Rule.php
 +++ b/vendor/magento/module-sales-rule/Model/Rule.php
-@@ -38,7 +38,6 @@
+@@ -38,7 +38,6 @@ use Magento\Quote\Model\Quote\Address;
   * @method \Magento\SalesRule\Model\Rule setProductIds(string $value)
   * @method int getSortOrder()
   * @method \Magento\SalesRule\Model\Rule setSortOrder(int $value)
 - * @method string getSimpleAction()
   * @method \Magento\SalesRule\Model\Rule setSimpleAction(string $value)
   * @method float getDiscountAmount()
   * @method \Magento\SalesRule\Model\Rule setDiscountAmount(float $value)
-@@ -547,6 +546,17 @@ public function getFromDate()
+@@ -547,6 +546,17 @@ class Rule extends \Magento\Rule\Model\AbstractModel
          return $this->getData('from_date');
      }
 
@@ -220,18 +220,18 @@ index 386642c22ab1..d35ed63e908f 100644
       * Get to date.
       *
 diff --git a/vendor/magento/module-sales-rule/Model/Rule/Action/Discount/CartFixed.php b/vendor/magento/module-sales-rule/Model/Rule/Action/Discount/CartFixed.php
-index 2f9dbb9faea2..485b98c22565 100644
+index 2f9dbb9faea..485b98c2256 100644
 --- a/vendor/magento/module-sales-rule/Model/Rule/Action/Discount/CartFixed.php
 +++ b/vendor/magento/module-sales-rule/Model/Rule/Action/Discount/CartFixed.php
-@@ -80,7 +80,6 @@ public function calculate($rule, $item, $qty)
+@@ -80,7 +80,6 @@ class CartFixed extends AbstractDiscount
 
          $ruleTotals = $this->validator->getRuleItemTotalsInfo($rule->getId());
          $baseRuleTotals = $ruleTotals['base_items_price'] ?? 0.0;
 -        $baseRuleTotalsDiscount = $ruleTotals['base_items_discount_amount'] ?? 0.0;
          $ruleItemsCount = $ruleTotals['items_count'] ?? 0;
 
          $address = $item->getAddress();
-@@ -134,7 +133,7 @@ public function calculate($rule, $item, $qty)
+@@ -134,7 +133,7 @@ class CartFixed extends AbstractDiscount
                          $qty,
                          $baseItemPrice,
                          $baseItemDiscountAmount,
@@ -241,10 +241,10 @@ index 2f9dbb9faea2..485b98c22565 100644
                      );
              }
 diff --git a/vendor/magento/module-sales-rule/Model/Validator.php b/vendor/magento/module-sales-rule/Model/Validator.php
-index 998d1c3a2a8e..c6a0ecf60ffd 100644
+index 998d1c3a2a8..c6a0ecf60ff 100644
 --- a/vendor/magento/module-sales-rule/Model/Validator.php
 +++ b/vendor/magento/module-sales-rule/Model/Validator.php
-@@ -460,6 +460,7 @@ public function initTotals($items, Address $address)
+@@ -460,6 +460,7 @@ class Validator extends \Magento\Framework\Model\AbstractModel
              $ruleTotalBaseItemsDiscountAmount = 0;
              $validItemsCount = 0;
 
@@ -253,10 +253,10 @@ index 998d1c3a2a8e..c6a0ecf60ffd 100644
                  if (!$this->isValidItemForRule($item, $rule)
                      || ($item->getChildren() && $item->isChildrenCalculated())
 diff --git a/vendor/magento/framework/GraphQl/Query/Fields.php b/vendor/magento/framework/GraphQl/Query/Fields.php
-index 78062effe3d4..009048cdb1af 100644
+index 78062effe3d..009048cdb1a 100644
 --- a/vendor/magento/framework/GraphQl/Query/Fields.php
 +++ b/vendor/magento/framework/GraphQl/Query/Fields.php
-@@ -44,7 +44,7 @@ public function setQuery($query, array $variables = null)
+@@ -44,7 +44,7 @@ class Fields
                  ]
              );
              if (isset($variables)) {
@@ -265,7 +265,7 @@ index 78062effe3d4..009048cdb1af 100644
              }
              // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
          } catch (\Exception $e) {
-@@ -73,21 +73,21 @@ public function getFieldsUsedInQuery()
+@@ -73,21 +73,21 @@ class Fields
      /**
       * Extract and return list of all used fields in GraphQL query's variables
       *

patches/os/ACSD-57477_2.4.6-p2.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/magento/module-indexer/etc/crontab.xml b/vendor/magento/module-indexer/etc/crontab.xml
-index 2984f47912f45..a0248a0b3b173 100644
+index 2984f47912f..a0248a0b3b1 100644
 --- a/vendor/magento/module-indexer/etc/crontab.xml
 +++ b/vendor/magento/module-indexer/etc/crontab.xml
 @@ -1,8 +1,8 @@
@@ -23,12 +23,12 @@ index 2984f47912f45..a0248a0b3b173 100644
      </group>
  </config>
 diff --git a/vendor/magento/framework/Mview/View/Changelog.php b/vendor/magento/framework/Mview/View/Changelog.php
-index 4cb55ced7d9df..174bb8b0c3dcd 100644
+index c7529a69d2f..4b73ecb1269 100644
 --- a/vendor/magento/framework/Mview/View/Changelog.php
 +++ b/vendor/magento/framework/Mview/View/Changelog.php
 @@ -34,6 +34,11 @@ class Changelog implements ChangelogInterface
       */
-     const VERSION_ID_COLUMN_NAME = 'version_id';
+     public const VERSION_ID_COLUMN_NAME = 'version_id';
 
 +    /**
 +     * Batch size for changelog cleaning operation
@@ -38,7 +38,7 @@ index 4cb55ced7d9df..174bb8b0c3dcd 100644
      /**
       * Database connection
       *
-@@ -191,7 +196,14 @@ public function clear($versionId)
+@@ -191,7 +196,14 @@ class Changelog implements ChangelogInterface
              throw new ChangelogTableNotExistsException(new Phrase("Table %1 does not exist", [$changelogTableName]));
          }
 
@@ -54,4 +54,3 @@ index 4cb55ced7d9df..174bb8b0c3dcd 100644
 
          return true;
      }
-

patches/os/ACSD-66755_2.4.6-p6.patch

@@ -15874,7 +15874,10 @@
         "packages": {
             "magento/magento2-base": {
                 ">=2.4.6 <2.4.7": {
-                    "file": "os/ACSD-57477_2.4.6-p2.patch"
+                    "file": "os/ACSD-57477_2.4.6-p2.patch",
+                    "require": [
+                        "ACSD-59865"
+                    ]
                 }
             }
         }
@@ -15995,10 +15998,14 @@
             "Admin"
         ],
         "title": "Fixes the issue where the cron job fails to clear changelog tables, causing Galera Cluster crashes when handling large amounts of data.",
+        "requirements": "For 2.4.4-2.4.7 versions do not install if you have Live Search. Check KB article (ACSD-53583) for more details.",
         "packages": {
             "magento/magento2-base": {
                 ">=2.4.4 <2.4.7": {
-                    "file": "os/ACSD-66755_2.4.6-p6.patch"
+                    "file": "os/ACSD-66755_2.4.6-p6.patch",
+                    "require": [
+                        "ACSD-53583"
+                    ]
                 },
                 ">=2.4.7 <2.4.9": {
                     "file": "os/ACSD-66404_2.4.7-p6.patch"