Merge remote-tracking branch 'origin/AC-988' into GL_PR_21102021

Author: glo71317

app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php

@@ -11,18 +11,20 @@
  */
 namespace Magento\Cron\Model\Config\Backend\Product;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Cron job Alert configuration
  */
 class Alert extends \Magento\Framework\App\Config\Value
 {
     /**
-     * Cron expression config path
+     * Cron string path for product alerts
      */
     const CRON_STRING_PATH = 'crontab/default/jobs/catalog_product_alert/schedule/cron_expr';
 
     /**
-     * Cron model config path
+     * Cron model path for product alerts
      */
     const CRON_MODEL_PATH = 'crontab/default/jobs/catalog_product_alert/run/model';
 
@@ -67,7 +69,7 @@ public function __construct(
      * @inheritdoc
      *
      * @return $this
-     * @throws \Exception
+     * @throws LocalizedException
      */
     public function afterSave()
     {
@@ -83,8 +85,8 @@ public function afterSave()
         $frequency = $this->getValue();
 
         $cronExprArray = [
-            (int)$time[1], //Minute
-            (int)$time[0], //Hour
+            (int)($time[1] ?? 0), //Minute
+            (int)($time[0] ?? 0), //Hour
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY ? '1' : '*', //Day of the Month
             '*', //Month of the Year
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY ? '1' : '*', //Day of the Week
@@ -110,8 +112,7 @@ public function afterSave()
                 self::CRON_MODEL_PATH
             )->save();
         } catch (\Exception $e) {
-            // phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception(__('We can\'t save the cron expression.'));
+            throw new LocalizedException(__('We can\'t save the cron expression.'));
         }
 
         return parent::afterSave();

app/code/Magento/Cron/Model/Config/Backend/Sitemap.php

@@ -11,13 +11,15 @@
  */
 namespace Magento\Cron\Model\Config\Backend;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Sitemap configuration
  */
 class Sitemap extends \Magento\Framework\App\Config\Value
 {
     /**
-     * Cron string path
+     * Cron string path for product alerts
      */
     const CRON_STRING_PATH = 'crontab/default/jobs/sitemap_generate/schedule/cron_expr';
 
@@ -67,16 +69,16 @@ public function __construct(
      * After save handler
      *
      * @return $this
-     * @throws \Exception
+     * @throws LocalizedException
      */
     public function afterSave()
     {
         $time = $this->getData('groups/generate/fields/time/value');
         $frequency = $this->getData('groups/generate/fields/frequency/value');
 
         $cronExprArray = [
-            (int)$time[1], //Minute
-            (int)$time[0], //Hour
+            (int)($time[1] ?? 0), //Minute
+            (int)($time[0] ?? 0), //Hour
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY ? '1' : '*', //Day of the Month
             '*', //Month of the Year
             $frequency == \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY ? '1' : '*', //# Day of the Week
@@ -102,7 +104,7 @@ public function afterSave()
                 self::CRON_MODEL_PATH
             )->save();
         } catch (\Exception $e) {
-            throw new \Exception(__('We can\'t save the cron expression.'));
+            throw new LocalizedException(__('We can\'t save the cron expression.'));
         }
         return parent::afterSave();
     }