Merge branch 'develop' into MQE-2683

Author: jilu1

Diff for: composer.json

@@ -25,7 +25,7 @@
         "csharpru/vault-php": "^4.2.1",
         "csharpru/vault-php-guzzle6-transport": "^2.0",
         "hoa/console": "~3.0",
-        "monolog/monolog": "^1.17",
+        "monolog/monolog": "^2.2",
         "mustache/mustache": "~2.5",
         "php-webdriver/webdriver": "^1.9.0",
         "spomky-labs/otphp": "^10.0",

Diff for: composer.lock

@@ -210,7 +210,7 @@ protected function verifyFileEmpty($content, $fileName)
     {
         if (empty($content)) {
             if (MftfApplicationConfig::getConfig()->verboseEnabled()) {
-                LoggingUtil::getInstance()->getLogger(Filesystem::class)->warn(
+                LoggingUtil::getInstance()->getLogger(Filesystem::class)->warning(
                     "XML File is empty.",
                     ["File" => $fileName]
                 );

Diff for: src/Magento/FunctionalTestingFramework/Config/Reader/Filesystem.php

@@ -193,7 +193,7 @@ public function retrieveEntityField($stepKey, $field, $scope)
             $warnMsg = "Undefined field {$field} in entity object with a stepKey of {$stepKey}\n";
             $warnMsg .= "Please fix the invalid reference. This will result in fatal error in next major release.";
             //TODO: change this to throw an exception in next major release
-            LoggingUtil::getInstance()->getLogger(PersistedObjectHandler::class)->warn($warnMsg);
+            LoggingUtil::getInstance()->getLogger(PersistedObjectHandler::class)->warning($warnMsg);
             if (MftfApplicationConfig::getConfig()->verboseEnabled()
                 && MftfApplicationConfig::getConfig()->getPhase() !== MftfApplicationConfig::UNIT_TEST_PHASE) {
                 print("\n$warnMsg\n");

Diff for: src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/PersistedObjectHandler.php

@@ -305,7 +305,7 @@ private function auditMergeSteps($stepKeyRefs, $testName)
         });
 
         foreach ($atRiskStepRef as $stepKey => $stepRefs) {
-            LoggingUtil::getInstance()->getLogger(ActionObjectExtractor::class)->warn(
+            LoggingUtil::getInstance()->getLogger(ActionObjectExtractor::class)->warning(
                 'multiple actions referencing step key',
                 ['test' => $testName, 'stepKey' => $stepKey, 'ref' => $stepRefs]
             );

Diff for: src/Magento/FunctionalTestingFramework/Test/Util/ActionObjectExtractor.php

@@ -585,7 +585,7 @@ private function setArrayValueWithLogging($inArray, $index, $value)
         } else {
             $warnMsg = 'Path: ' . $value . ' is ignored by ModuleResolver. ' . PHP_EOL . 'Path: ';
             $warnMsg .= $inArray[$index] . ' is set for Module: ' . $index . PHP_EOL;
-            LoggingUtil::getInstance()->getLogger(ModuleResolver::class)->warn($warnMsg);
+            LoggingUtil::getInstance()->getLogger(ModuleResolver::class)->warning($warnMsg);
         }
         return $outArray;
     }

Diff for: src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

@@ -362,7 +362,7 @@ private function assembleAllTestPhp($testManifest, array $testsToIgnore)
                         if (MftfApplicationConfig::getConfig()->verboseEnabled()) {
                             print("NOTICE: {$errMessage}");
                         }
-                        LoggingUtil::getInstance()->getLogger(self::class)->warn($errMessage);
+                        LoggingUtil::getInstance()->getLogger(self::class)->warning($errMessage);
                         continue;
                     }
                 }