Merge remote-tracking branch 'origin/2.4-develop' into AC-13818

Author: glo71317

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Model;
@@ -159,7 +159,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         if (!$stockItem->getIsInStock()) {
             $result->setHasError(true)
                 ->setErrorCode('out_stock')
-                ->setMessage(__('This product is out of stock.'))
+                ->setMessage(__('Product %name is out of stock.', ['name' => $stockItem->getProductName()]))
                 ->setQuoteMessage(__('Some of the products are out of stock.'))
                 ->setQuoteMessageIndex('stock');
             $result->setItemUseOldQty(true);

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

@@ -77,3 +77,4 @@ Stock,Stock
 "Only %s of %s available","Only %s of %s available"
 "Not enough items for sale","Not enough items for sale"
 "The requested qty. is not available","The requested qty. is not available"
+"Product %name is out of stock.","Product %name is out of stock."

app/code/Magento/Csp/Test/Unit/Plugin/StoreAssetIntegrityHashesTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -62,7 +62,6 @@ protected function setUp(): void
      * Test After Deploy method of plugin
      *
      * @return void
-     * @doesNotPerformAssertions
      */
     public function testAfterDeploy(): void
     {

app/code/Magento/Customer/Test/Unit/Model/AccountManagementApiTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -433,8 +433,6 @@ public function testBeforeCreateAccount(
     ): void {
         if ($willThrowException) {
             $this->expectException(AuthorizationException::class);
-        } else {
-            $this->expectNotToPerformAssertions();
         }
         $this->authorizationMock
             ->expects($this->once())

app/code/Magento/Customer/Test/Unit/Plugin/AsyncRequestCustomerGroupAuthorizationTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -86,7 +86,6 @@ public function testBeforePublishMass(
             [$customer, 'Password1', '']
         ];
         $this->authorizationMock
-            ->expects($this->once())
             ->method('isAllowed')
             ->with('Magento_Customer::manage')
             ->willReturn($isAllowed);

app/code/Magento/OrderCancellation/Model/Email/ConfirmationKeySender.php

@@ -51,36 +51,28 @@ public function __construct(
      * Send email to guest user with confirmation key.
      *
      * @param Order $order
-     * @param string $confirmationKey
+     * @param array $confirmationDetails
      * @return void
      * @throws LocalizedException
      */
     public function execute(
         Order $order,
-        string $confirmationKey,
+        array $confirmationDetails
     ):void {
         try {
             $storeId = (int)$order->getStoreId();
-            $guestOrderUrl = $this->url->getUrl(
-                self::ORDER_VIEW_PATH,
-                [
-                    '_query' => [
-                        'confirmation_key' => $confirmationKey,
-                        'order_id' => $order->getIncrementId()
-                    ]
-                ]
-            );
-            $templateParams = [
-                'customer_name' => $order->getCustomerName(),
-                'order_id' => $order->getIncrementId(),
-                'guest_order_url' => $guestOrderUrl,
-                'escaper' => $this->escaper,
-            ];
-
             $this->transportBuilder
                 ->setTemplateIdentifier(self::TEMPLATE_ID)
                 ->setTemplateOptions(['area' => Area::AREA_FRONTEND, 'store' => $storeId])
-                ->setTemplateVars($templateParams)
+                ->setTemplateVars([
+                    'customer_name' => $order->getCustomerName(),
+                    'order_id' => $order->getIncrementId(),
+                    'guest_order_url' => $this->url->getUrl(
+                        self::ORDER_VIEW_PATH,
+                        ['_query' => $confirmationDetails]
+                    ),
+                    'escaper' => $this->escaper,
+                ])
                 ->setFromByScope($this->orderIdentity->getEmailIdentity(), $storeId)
                 ->addTo($order->getCustomerEmail(), $order->getCustomerName())
                 ->getTransport()

app/code/Magento/OrderCancellation/Model/ResourceModel/SalesOrderConfirmCancel.php

@@ -40,7 +40,7 @@ public function get(int $orderId): ?array
         $connection = $this->resourceConnection->getConnection();
         return $connection->fetchRow(
             $connection->select()->from(
-                self::TABLE_NAME
+                $this->resourceConnection->getTableName(self::TABLE_NAME)
             )->where(
                 'order_id = ?',
                 $orderId
@@ -60,7 +60,7 @@ public function insert(int $orderId, string $confirmationKey, string $reason): v
     {
         $connection = $this->resourceConnection->getConnection();
         $connection->insertOnDuplicate(
-            self::TABLE_NAME,
+            $this->resourceConnection->getTableName(self::TABLE_NAME),
             [
                 'order_id' => $orderId,
                 'confirmation_key' => $confirmationKey,

app/code/Magento/OrderCancellationGraphQl/Model/CancelOrderGuest.php

@@ -8,6 +8,7 @@
 namespace Magento\OrderCancellationGraphQl\Model;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Uid;
 use Magento\OrderCancellation\Model\Email\ConfirmationKeySender;
 use Magento\OrderCancellation\Model\GetConfirmationKey;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -23,12 +24,14 @@ class CancelOrderGuest
      * @param OrderRepositoryInterface $orderRepository
      * @param ConfirmationKeySender $confirmationKeySender
      * @param GetConfirmationKey $confirmationKey
+     * @param Uid $idEncoder
      */
     public function __construct(
         private readonly OrderFormatter           $orderFormatter,
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly ConfirmationKeySender    $confirmationKeySender,
         private readonly GetConfirmationKey       $confirmationKey,
+        private readonly Uid                      $idEncoder
     ) {
     }
 
@@ -65,7 +68,13 @@ public function execute(Order $order, array $input): array
      */
     private function sendConfirmationKeyEmail(Order $order, string $reason): void
     {
-        $this->confirmationKeySender->execute($order, $this->confirmationKey->execute($order, $reason));
+        $this->confirmationKeySender->execute(
+            $order,
+            [
+                'order_id' => $this->idEncoder->encode((string)$order->getEntityId()),
+                'confirmation_key' => $this->confirmationKey->execute($order, $reason)
+            ]
+        );
 
         // add comment in order about confirmation key send
         $order->addCommentToStatusHistory(

app/code/Magento/OrderCancellationGraphQl/Model/Resolver/CancelOrder.php

@@ -11,6 +11,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\OrderCancellation\Model\CancelOrder as CancelOrderAction;
 use Magento\OrderCancellationGraphQl\Model\Validator\ValidateOrder;
@@ -31,13 +32,15 @@ class CancelOrder implements ResolverInterface
      * @param OrderRepositoryInterface $orderRepository
      * @param CancelOrderAction $cancelOrderAction
      * @param ValidateOrder $validateOrder
+     * @param Uid $idEncoder
      */
     public function __construct(
         private readonly ValidateRequest          $validateRequest,
         private readonly OrderFormatter           $orderFormatter,
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly CancelOrderAction        $cancelOrderAction,
-        private readonly ValidateOrder            $validateOrder
+        private readonly ValidateOrder            $validateOrder,
+        private readonly Uid                      $idEncoder
     ) {
     }
 
@@ -54,7 +57,7 @@ public function resolve(
         $this->validateRequest->execute($context, $args['input'] ?? []);
 
         try {
-            $order = $this->orderRepository->get($args['input']['order_id']);
+            $order = $this->orderRepository->get($this->idEncoder->decode($args['input']['order_id']));
 
             if ((int)$order->getCustomerId() !== $context->getUserId()) {
                 throw new GraphQlAuthorizationException(__('Current user is not authorized to cancel this order'));

app/code/Magento/OrderCancellationGraphQl/Model/Resolver/ConfirmCancelOrder.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\OrderCancellationGraphQl\Model\ConfirmCancelOrder as ConfirmCancelOrderGuest;
 use Magento\OrderCancellationGraphQl\Model\Validator\ValidateOrder;
@@ -28,12 +29,14 @@ class ConfirmCancelOrder implements ResolverInterface
      * @param OrderRepositoryInterface $orderRepository
      * @param ConfirmCancelOrderGuest $confirmCancelOrder
      * @param ValidateOrder $validateOrder
+     * @param Uid $idEncoder
      */
     public function __construct(
         private readonly ValidateConfirmRequest   $validateRequest,
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly ConfirmCancelOrderGuest  $confirmCancelOrder,
-        private readonly ValidateOrder            $validateOrder
+        private readonly ValidateOrder            $validateOrder,
+        private readonly Uid                      $idEncoder
     ) {
     }
 
@@ -50,7 +53,7 @@ public function resolve(
         $this->validateRequest->execute($args['input'] ?? []);
 
         try {
-            $order = $this->orderRepository->get($args['input']['order_id']);
+            $order = $this->orderRepository->get((int)$this->idEncoder->decode($args['input']['order_id']));
 
             if (!$order->getCustomerIsGuest()) {
                 return [