1.1.67 Release

    - Resolved conflict:
        ACSD-62272 and ACSD-66139
    - Updated patches-info.json

Author: apoltoratskyi

patches-info.json

@@ -1,5 +1,5 @@
 diff --git a/vendor/magento/module-graph-ql/Helper/Error/AggregateExceptionMessageFormatter.php b/vendor/magento/module-graph-ql/Helper/Error/AggregateExceptionMessageFormatter.php
-index 1eab96a3f229d..4c35168cc482d 100644
+index 1eab96a3f22..4c35168cc48 100644
 --- a/vendor/magento/module-graph-ql/Helper/Error/AggregateExceptionMessageFormatter.php
 +++ b/vendor/magento/module-graph-ql/Helper/Error/AggregateExceptionMessageFormatter.php
 @@ -1,7 +1,7 @@
@@ -21,7 +21,7 @@ index 1eab96a3f229d..4c35168cc482d 100644
 
      /**
       * @param ExceptionMessageFormatterInterface[] $messageFormatters
-@@ -54,11 +54,12 @@ public function getFormatted(
+@@ -54,11 +54,12 @@ class AggregateExceptionMessageFormatter
          ResolveInfo $info
      ): ClientAware {
          foreach ($this->messageFormatters as $formatter) {
@@ -38,7 +38,7 @@ index 1eab96a3f229d..4c35168cc482d 100644
      }
  }
 diff --git a/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForCheckout.php b/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForCheckout.php
-index 4b2d1afdea003..bd5f3d8cbaf2e 100644
+index 4b2d1afdea0..bd5f3d8cbaf 100644
 --- a/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForCheckout.php
 +++ b/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForCheckout.php
 @@ -1,7 +1,7 @@
@@ -51,7 +51,7 @@ index 4b2d1afdea003..bd5f3d8cbaf2e 100644
   */
  declare(strict_types=1);
 
-@@ -57,7 +57,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
+@@ -57,7 +57,7 @@ class GetCartForCheckout
          try {
              $cart = $this->getCartForUser->execute($cartHash, $customerId, $storeId);
          } catch (NoSuchEntityException $e) {
@@ -61,7 +61,7 @@ index 4b2d1afdea003..bd5f3d8cbaf2e 100644
          $this->checkoutAllowance->execute($cart);
 
 diff --git a/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForUser.php b/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForUser.php
-index 77a31cc3cd023..72b4da1188d3d 100644
+index 77a31cc3cd0..72b4da1188d 100644
 --- a/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForUser.php
 +++ b/vendor/magento/module-quote-graph-ql/Model/Cart/GetCartForUser.php
 @@ -1,7 +1,7 @@
@@ -74,7 +74,7 @@ index 77a31cc3cd023..72b4da1188d3d 100644
   */
  declare(strict_types=1);
 
-@@ -14,6 +14,7 @@
+@@ -14,6 +14,7 @@ use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
  use Magento\Quote\Api\CartRepositoryInterface;
  use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
  use Magento\Quote\Model\Quote;
@@ -135,7 +135,7 @@ index 77a31cc3cd023..72b4da1188d3d 100644
      }
 
      /**
-@@ -78,12 +87,18 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
+@@ -78,12 +87,18 @@ class GetCartForUser
              $cart = $this->cartRepository->get($cartId);
          } catch (NoSuchEntityException $exception) {
              throw new GraphQlNoSuchEntityException(
@@ -158,7 +158,7 @@ index 77a31cc3cd023..72b4da1188d3d 100644
          $cart = $this->updateCartCurrency->execute($cart, $storeId);
 diff --git a/vendor/magento/module-quote-graph-ql/Model/ErrorMapper.php b/vendor/magento/module-quote-graph-ql/Model/ErrorMapper.php
 new file mode 100644
-index 0000000000000..428903673dbc2
+index 00000000000..428903673db
 --- /dev/null
 +++ b/vendor/magento/module-quote-graph-ql/Model/ErrorMapper.php
 @@ -0,0 +1,101 @@
@@ -265,7 +265,7 @@ index 0000000000000..428903673dbc2
 +}
 diff --git a/vendor/magento/module-quote-graph-ql/Model/QuoteException.php b/vendor/magento/module-quote-graph-ql/Model/QuoteException.php
 new file mode 100644
-index 0000000000000..131bca64b8a68
+index 00000000000..131bca64b8a
 --- /dev/null
 +++ b/vendor/magento/module-quote-graph-ql/Model/QuoteException.php
 @@ -0,0 +1,28 @@
@@ -298,10 +298,10 @@ index 0000000000000..131bca64b8a68
 +    }
 +}
 diff --git a/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateShippingMethods.php b/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateShippingMethods.php
-index 50474ce1355c0..dfcd97dd2eef0 100644
+index 50474ce1355..dfcd97dd2ee 100644
 --- a/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateShippingMethods.php
 +++ b/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateShippingMethods.php
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ use Magento\Quote\Api\ShipmentEstimationInterface;
  use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
  use Magento\Quote\Model\Quote\AddressFactory;
  use Magento\Quote\Model\Cart\ShippingMethodConverter;
@@ -317,15 +317,15 @@ index 50474ce1355c0..dfcd97dd2eef0 100644
       */
      public function __construct(
          private MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
-@@ -46,6 +48,7 @@ public function __construct(
+@@ -46,6 +48,7 @@ class EstimateShippingMethods implements ResolverInterface
          private ExtensibleDataObjectConverter $dataObjectConverter,
          private ShippingMethodConverter $shippingMethodConverter,
          private FormatMoneyTypeData $formatMoneyTypeData,
 +        private ErrorMapper $errorMapper
      ) {
      }
 
-@@ -64,7 +67,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
+@@ -64,7 +67,9 @@ class EstimateShippingMethods implements ResolverInterface
                      [
                          'masked_id' => $args['input']['cart_id']
                      ]
@@ -337,7 +337,7 @@ index 50474ce1355c0..dfcd97dd2eef0 100644
          }
          return $this->getAvailableShippingMethodsForAddress($args['input']['address'], $cart);
 diff --git a/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateTotals.php b/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateTotals.php
-index 40c80e81bd023..54d036b76ca91 100644
+index 40c80e81bd0..54d036b76ca 100644
 --- a/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateTotals.php
 +++ b/vendor/magento/module-quote-graph-ql/Model/Resolver/EstimateTotals.php
 @@ -1,6 +1,6 @@
@@ -348,7 +348,7 @@ index 40c80e81bd023..54d036b76ca91 100644
   * All Rights Reserved.
   */
  declare(strict_types=1);
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ use Magento\Quote\Api\CartRepositoryInterface;
  use Magento\Quote\Api\Data\AddressInterface;
  use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
  use Magento\Quote\Model\Quote\AddressFactory;
@@ -373,7 +373,7 @@ index 40c80e81bd023..54d036b76ca91 100644
      ) {
      }
 
-@@ -61,7 +64,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
+@@ -61,7 +64,9 @@ class EstimateTotals implements ResolverInterface
                      [
                          'masked_id' => $args['input']['cart_id']
                      ]
@@ -385,7 +385,7 @@ index 40c80e81bd023..54d036b76ca91 100644
          }
 
 diff --git a/vendor/magento/module-quote-graph-ql/Model/Resolver/PlaceOrder.php b/vendor/magento/module-quote-graph-ql/Model/Resolver/PlaceOrder.php
-index ae581971120f9..416544c79a8d5 100644
+index ae581971120..416544c79a8 100644
 --- a/vendor/magento/module-quote-graph-ql/Model/Resolver/PlaceOrder.php
 +++ b/vendor/magento/module-quote-graph-ql/Model/Resolver/PlaceOrder.php
 @@ -1,7 +1,7 @@
@@ -398,7 +398,7 @@ index ae581971120f9..416544c79a8d5 100644
   */
  declare(strict_types=1);
 
-@@ -9,67 +9,41 @@
+@@ -9,67 +9,41 @@ namespace Magento\QuoteGraphQl\Model\Resolver;
 
  use Magento\Framework\Exception\AuthorizationException;
  use Magento\Framework\Exception\LocalizedException;
@@ -477,7 +477,7 @@ index ae581971120f9..416544c79a8d5 100644
      ) {
      }
 
-@@ -78,8 +52,6 @@ public function __construct(
+@@ -78,8 +52,6 @@ class PlaceOrder implements ResolverInterface, ResetAfterRequestInterface
       */
      public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
      {
@@ -486,7 +486,7 @@ index ae581971120f9..416544c79a8d5 100644
          if (empty($args['input']['cart_id'])) {
              throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
          }
-@@ -87,83 +59,39 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
+@@ -87,83 +59,39 @@ class PlaceOrder implements ResolverInterface, ResetAfterRequestInterface
          $maskedCartId = $args['input']['cart_id'];
          $userId = (int)$context->getUserId();
          $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
@@ -591,7 +591,7 @@ index ae581971120f9..416544c79a8d5 100644
 -    }
  }
 diff --git a/vendor/magento/module-quote-graph-ql/Model/Resolver/RemoveItemFromCart.php b/vendor/magento/module-quote-graph-ql/Model/Resolver/RemoveItemFromCart.php
-index 307087391b89d..4b4e5f5eb8db9 100644
+index 307087391b8..4b4e5f5eb8d 100644
 --- a/vendor/magento/module-quote-graph-ql/Model/Resolver/RemoveItemFromCart.php
 +++ b/vendor/magento/module-quote-graph-ql/Model/Resolver/RemoveItemFromCart.php
 @@ -1,7 +1,7 @@
@@ -604,7 +604,7 @@ index 307087391b89d..4b4e5f5eb8db9 100644
   */
  declare(strict_types=1);
 
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ use Magento\Quote\Api\CartItemRepositoryInterface;
  use Magento\Quote\Model\MaskedQuoteIdToQuoteId;
  use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
  use Magento\Framework\GraphQl\Query\Resolver\ArgumentsProcessorInterface;
@@ -665,7 +665,7 @@ index 307087391b89d..4b4e5f5eb8db9 100644
      }
 
      /**
-@@ -76,7 +85,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
+@@ -76,7 +85,9 @@ class RemoveItemFromCart implements ResolverInterface
              $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId);
          } catch (NoSuchEntityException $exception) {
              throw new GraphQlNoSuchEntityException(
@@ -677,7 +677,7 @@ index 307087391b89d..4b4e5f5eb8db9 100644
          }
 
 diff --git a/vendor/magento/module-quote-graph-ql/etc/schema.graphqls b/vendor/magento/module-quote-graph-ql/etc/schema.graphqls
-index 53da2d8751127..579324089256f 100644
+index 53da2d87511..57932408925 100644
 --- a/vendor/magento/module-quote-graph-ql/etc/schema.graphqls
 +++ b/vendor/magento/module-quote-graph-ql/etc/schema.graphqls
 @@ -261,12 +261,6 @@ type ApplyCouponToCartOutput @doc(description: "Contains details about the cart
@@ -707,4 +707,3 @@ index 53da2d8751127..579324089256f 100644
 
  type StoreConfig {
      is_guest_checkout_enabled: Boolean @doc(description: "Extended Config Data - checkout/options/guest_checkout")
-

patches/os/ACSD-66139_2.4.7-p5.patch

@@ -15338,7 +15338,10 @@
         "packages": {
             "magento/magento2-base": {
                 ">=2.4.7 <2.4.8": {
-                    "file": "os/ACSD-66139_2.4.7-p5.patch"
+                    "file": "os/ACSD-66139_2.4.7-p5.patch",
+                    "require": [
+                        "ACSD-55100"
+                    ]
                 }
             },
             "magento/magento2-ee-base": {