ACQE-5871: Add ability to increase default MagentoCLI timeout

Author: jilu1

Diff for: etc/config/command.php

@@ -14,7 +14,7 @@
     $tokenPassedIn = urldecode($_POST['token'] ?? '');
     $command = urldecode($_POST['command'] ?? '');
     $arguments = urldecode($_POST['arguments'] ?? '');
-    $timeout = floatval(urldecode($_POST['timeout'] ?? getenv('MAGENTO_CLI_WAIT_TIMEOUT')));
+    $timeout = floatval(urldecode($_POST['timeout'] ?? 60));
 
     // Token returned will be null if the token we passed in is invalid
     $tokenFromMagento = $tokenModel->loadByToken($tokenPassedIn)->getToken();

Diff for: src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -530,9 +530,9 @@ public function scrollToTopOfPage()
     /**
      * Takes given $command and executes it against bin/magento or custom exposed entrypoint. Returns command output.
      *
-     * @param string  $command
-     * @param integer $timeout
-     * @param string  $arguments
+     * @param string       $command
+     * @param integer|null $timeout
+     * @param string|null  $arguments
      * @return string
      *
      * @throws TestFrameworkException
@@ -846,9 +846,9 @@ public function fillSecretField($field, $value)
      * Function used to create data that contains sensitive credentials in a <createData> <field> override.
      * The data is decrypted immediately prior to data creation to avoid exposure in console or log.
      *
-     * @param string $command
-     * @param null   $timeout
-     * @param null   $arguments
+     * @param string       $command
+     * @param integer|null $timeout
+     * @param string|null  $arguments
      * @throws TestFrameworkException
      * @return string
      */

Diff for: src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -192,7 +192,7 @@ public static function getDefaultWaitTimeout()
     public static function getDefaultMagentoCLIWaitTimeout()
     {
         $timeout = getenv('MAGENTO_CLI_WAIT_TIMEOUT');
-        return $timeout !== false ? $timeout : self::DEFAULT_COMMAND_WAIT_TIMEOUT;
+        return !empty($timeout) ? $timeout : self::DEFAULT_COMMAND_WAIT_TIMEOUT;
     }
 
     /**