MC-41917: Issue with 'catalog_product_alert' cron

Author: Serhii Balko

app/code/Magento/ProductAlert/Model/Mailing/Consumer.php

@@ -25,7 +25,7 @@ class Consumer
     /**
      * @var Json
      */
-    private $jsonHelper;
+    private $jsonSerializer;
 
     /**
      * @var EntityManager
@@ -39,18 +39,18 @@ class Consumer
 
     /**
      * @param LoggerInterface $logger
-     * @param Json $jsonHelper
+     * @param Json $jsonSerializer
      * @param EntityManager $entityManager
      * @param AlertProcessor $alertProcessor
      */
     public function __construct(
         LoggerInterface $logger,
-        Json $jsonHelper,
+        Json $jsonSerializer,
         EntityManager $entityManager,
         AlertProcessor $alertProcessor
     ) {
         $this->logger = $logger;
-        $this->jsonHelper = $jsonHelper;
+        $this->jsonSerializer = $jsonSerializer;
         $this->entityManager = $entityManager;
         $this->alertProcessor = $alertProcessor;
     }
@@ -67,7 +67,7 @@ public function process(OperationInterface $operation): void
         $errorCode = null;
 
         try {
-            $data = $this->jsonHelper->unserialize($operation->getSerializedData());
+            $data = $this->jsonSerializer->unserialize($operation->getSerializedData());
             $this->alertProcessor->process($data['alert_type'], $data['customer_ids'], (int)$data['website_id']);
         } catch (\Throwable $e) {
             $this->logger->critical($e->getMessage());

app/code/Magento/ProductAlert/Model/Mailing/ErrorEmailSender.php

@@ -68,8 +68,9 @@ public function __construct(
      *
      * @param array $errors
      * @param int $storeId
+     * @return void
      */
-    public function execute(array $errors, int $storeId)
+    public function execute(array $errors, int $storeId): void
     {
         if (!count($errors)) {
             return;

app/code/Magento/ProductAlert/Model/Mailing/Publisher.php

@@ -47,7 +47,7 @@ class Publisher
     /**
      * @var Json
      */
-    private $jsonHelper;
+    private $jsonSerializer;
 
     /**
      * @var int|null
@@ -59,22 +59,22 @@ class Publisher
      * @param OperationInterfaceFactory $operationFactory
      * @param IdentityGeneratorInterface $identityService
      * @param UserContextInterface $userContextInterface
-     * @param Json $jsonHelper
+     * @param Json $jsonSerializer
      * @param int|null $messageBunchSize
      */
     public function __construct(
         BulkManagementInterface $bulkManagement,
         OperationInterfaceFactory $operationFactory,
         IdentityGeneratorInterface $identityService,
         UserContextInterface $userContextInterface,
-        Json $jsonHelper,
+        Json $jsonSerializer,
         ?int $messageBunchSize = null
     ) {
         $this->bulkManagement = $bulkManagement;
         $this->operationFactory = $operationFactory;
         $this->identityService = $identityService;
         $this->userContext = $userContextInterface;
-        $this->jsonHelper = $jsonHelper;
+        $this->jsonSerializer = $jsonSerializer;
         $this->messageBunchSize = $messageBunchSize ?: self::MESSAGE_BUNCH_SIZE_DEFAULT;
     }
 
@@ -89,7 +89,7 @@ public function execute(string $alertType, array $customerIds, int $websiteId):
     {
         foreach (array_chunk($customerIds, $this->messageBunchSize) as $bunchOfIds) {
             $bulkUuid = $this->identityService->generateId();
-            $serializedData = $this->jsonHelper->serialize(
+            $serializedData = $this->jsonSerializer->serialize(
                 [
                     'alert_type' => $alertType,
                     'customer_ids' => $bunchOfIds,

app/code/Magento/ProductAlert/Model/Observer.php

@@ -22,23 +22,23 @@ class Observer
     /**
      * Error email template configuration
      *
-     * @depreceted
+     * @deprecated
      * @see \Magento\ProductAlert\Model\Mailing\ErrorEmailSender::XML_PATH_ERROR_TEMPLATE
      */
     const XML_PATH_ERROR_TEMPLATE = 'catalog/productalert_cron/error_email_template';
 
     /**
      * Error email identity configuration
      *
-     * @depreceted
+     * @deprecated
      * @see \Magento\ProductAlert\Model\Mailing\ErrorEmailSender::XML_PATH_ERROR_IDENTITY
      */
     const XML_PATH_ERROR_IDENTITY = 'catalog/productalert_cron/error_email_identity';
 
     /**
      * 'Send error emails to' configuration
      *
-     * @depreceted
+     * @deprecated
      * @see \Magento\ProductAlert\Model\Mailing\ErrorEmailSender::XML_PATH_ERROR_RECIPIENT
      */
     const XML_PATH_ERROR_RECIPIENT = 'catalog/productalert_cron/error_email';