Merge pull request #468 from magento-commerce/master

Sync PR to develop

Author: KevinBKozan

.github/workflows/main.yml

@@ -149,5 +149,3 @@ jobs:
 
       - name: Run tests
         run: bin/functional
-
-

CHANGELOG.md

@@ -1,6 +1,13 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+5.0.6
+---------
+### Fixes
+* Updated copyright check to use the new Adobe copyright.
+* Resolved errors caused by whitespace-only comments.
+* Addressed deprecation warnings from spomky-labs/otphp.
+
 5.0.5
 ---------
 ### Enhancements

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "5.0.5",
+    "version": "5.0.6",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

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

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\FunctionalTestingFramework\DataTransport\Auth\Tfa;
+
+use DateTimeImmutable;
+use Psr\Clock\ClockInterface;
+
+class Clock implements ClockInterface
+{
+    /**
+     * Return DateTimeImmutable class object
+     *
+     * @return DateTimeImmutable
+     */
+    public function now(): DateTimeImmutable
+    {
+        return new DateTimeImmutable();
+    }
+}

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

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

src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php

@@ -383,7 +383,6 @@ 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,16 +399,10 @@ 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)
-        ) {
+        if (strpos($stepAction, ActionGroupObject::ACTION_GROUP_CONTEXT_START) === false) {
             $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)) {