Revert "Merge branch 'develop' into master"

This reverts commit 66e2290, reversing
changes made to d43d2a4.

Author: KevinBKozan

etc/config/command.php

@@ -96,7 +96,6 @@ function escapeCommand($command)
  */
 function validateCommand($magentoBinary, $command)
 {
-    // phpcs:ignore Magento2.Security.InsecureFunction
     exec($magentoBinary . ' list', $commandList);
     // Trim list of commands after first whitespace
     $commandList = array_map("trimAfterWhitespace", $commandList);

src/Magento/FunctionalTestingFramework/Allure/AllureHelper.php

@@ -24,7 +24,6 @@ public static function addAttachmentToCurrentStep($data, $caption): void
     {
         if (!is_string($data)) {
             try {
-                // phpcs:ignore Magento2.Security.InsecureFunction
                 $data = serialize($data);
             } catch (\Exception $exception) {
                 throw  new \Exception($data->getMessage());
@@ -49,7 +48,6 @@ public static function addAttachmentToCurrentStep($data, $caption): void
     public static function addAttachmentToLastStep($data, $caption): void
     {
         if (!is_string($data)) {
-            // phpcs:ignore Magento2.Security.InsecureFunction
             $data = serialize($data);
         }
         if (@file_exists($data) && is_file($data)) {

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/SecretStorage/VaultStorage.php

@@ -251,7 +251,6 @@ private function getTokenHelperScript($lines)
      */
     private function execVaultTokenHelper($cmd)
     {
-        // phpcs:ignore Magento2.Security.InsecureFunction
         exec($cmd, $out, $status);
         if ($status === 0 && isset($out[0]) && !empty($out[0])) {
             return $out[0];

src/Magento/FunctionalTestingFramework/DataTransport/Auth/Tfa/Clock.php

@@ -57,14 +57,7 @@ private static function create($path)
                 throw new TestFrameworkException('Unable to get OTP' . PHP_EOL . $e->getMessage());
             }
 
-            self::$totps[$path] = TOTP::create(
-                $secret,
-                TOTP::DEFAULT_PERIOD,
-                TOTP::DEFAULT_DIGEST,
-                TOTP::DEFAULT_DIGITS,
-                TOTP::DEFAULT_EPOCH,
-                new Clock()
-            );
+            self::$totps[$path] = TOTP::create($secret);
             self::$totps[$path]->setIssuer('MFTF');
             self::$totps[$path]->setLabel('MFTF Testing');
         }

src/Magento/FunctionalTestingFramework/DataTransport/Auth/Tfa/OTP.php

@@ -383,6 +383,7 @@ public function stepName(\Codeception\Event\StepEvent $e)
         //Hard set to 200; we don't expose this config in MFTF
         $argumentsLength = 200;
         $stepKey = null;
+
         if (!($e->getStep() instanceof Comment)) {
             $stepKey = $this->retrieveStepKeyForAllure($e->getStep(), $e->getTest()->getMetadata()->getFilename());
             $isActionGroup = (
@@ -400,10 +401,15 @@ public function stepName(\Codeception\Event\StepEvent $e)
         }
         // DO NOT alter action if actionGroup is starting, need the exact actionGroup name for good logging
         if (strpos($stepAction, ActionGroupObject::ACTION_GROUP_CONTEXT_START) === false
+            && !($e->getStep() instanceof Comment)
         ) {
             $stepAction = $e->getStep()->getHumanizedActionWithoutArguments();
         }
         $stepArgs = $e->getStep()->getArgumentsAsString($argumentsLength);
+        if (!trim($stepAction)) {
+            $stepAction = $e->getStep()->getMetaStep()->getHumanizedActionWithoutArguments();
+            $stepArgs = $e->getStep()->getMetaStep()->getArgumentsAsString($argumentsLength);
+        }
         $stepName = '';
 
         if (isset($stepName)) {