Merge pull request #7924 from magento-gl/Hammer_PlatForm_Health_246_Scope_04102022

[Hammer]_platform_health_246_scope_04102022

Author: sidolov

app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

@@ -15,6 +15,6 @@
 
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
-        <seeInCurrentUrl url="reports/advanced-reporting" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <seeInCurrentUrl url="report"  stepKey="seeAssertAdvancedReportingPageUrl"/>
     </actionGroup>
 </actionGroups>

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

@@ -9,6 +9,8 @@
  */
 namespace Magento\Config\Model\Config\Backend\Currency;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Cron job configuration for currency
  *
@@ -17,8 +19,7 @@
  */
 class Cron extends \Magento\Framework\App\Config\Value
 {
-    const CRON_STRING_PATH = 'crontab/default/jobs/currency_rates_update/schedule/cron_expr';
-
+    public const CRON_STRING_PATH = 'crontab/default/jobs/currency_rates_update/schedule/cron_expr';
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
      */
@@ -52,13 +53,28 @@ public function __construct(
      * After save handler
      *
      * @return $this
-     * @throws \Exception
+     * @throws LocalizedException
      */
     public function afterSave()
     {
         $time = $this->getData('groups/import/fields/time/value');
-        $frequency = $this->getData('groups/import/fields/frequency/value');
-
+        if (empty($time)) {
+            $time = explode(
+                ',',
+                $this->_config->getValue(
+                    'currency/import/time',
+                    $this->getScope(),
+                    $this->getScopeId()
+                ) ?: '0,0,0'
+            );
+            $frequency = $this->_config->getValue(
+                'currency/import/frequency',
+                $this->getScope(),
+                $this->getScopeId()
+            );
+        } else {
+            $frequency = $this->getData('groups/import/fields/frequency/value');
+        }
         $frequencyWeekly = \Magento\Cron\Model\Config\Source\Frequency::CRON_WEEKLY;
         $frequencyMonthly = \Magento\Cron\Model\Config\Source\Frequency::CRON_MONTHLY;
 
@@ -78,7 +94,7 @@ public function afterSave()
             $configValue->load(self::CRON_STRING_PATH, 'path');
             $configValue->setValue($cronExprString)->setPath(self::CRON_STRING_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();
     }

composer.json

@@ -38,7 +38,7 @@
         "colinmollenhour/cache-backend-redis": "1.14.2",
         "colinmollenhour/credis": "1.13.0",
         "colinmollenhour/php-redis-session-abstract": "v1.5.0",
-        "composer/composer": "^1.9 || ^2.0, !=2.2.16",
+        "composer/composer": "^2.0, !=2.2.16",
         "elasticsearch/elasticsearch": "~7.17.0",
         "ezyang/htmlpurifier": "^4.14",
         "guzzlehttp/guzzle": "^7.4.2",
@@ -78,7 +78,8 @@
         "phpseclib/mcrypt_compat": "~2.0.2",
         "phpseclib/phpseclib": "~3.0.13",
         "ramsey/uuid": "~4.2.0",
-        "symfony/console": "~5.4.10",
+        "symfony/console": "~5.4.12",
+        "symfony/string": "~5.4.12",
         "symfony/intl": "~5.4.11",
         "symfony/process": "~5.4.8",
         "tedivm/jshrink": "~1.4.0",