MC-30537: Test automation with the new 2FA enabled by default

- Static fixes

Author: nathanjosiah

TwoFactorAuth/Api/TfaInterface.php

@@ -96,6 +96,7 @@ public function getProvidersToActivate(int $userId): array;
      * @param int $userId
      * @param string $providerCode
      * @return bool
+     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getProviderIsAllowed(int $userId, string $providerCode): bool;
 

TwoFactorAuth/Block/Provider/Authy/Configure.php

@@ -37,7 +37,7 @@ public function __construct(
     /**
      * Get a country list
      *
-     * return array
+     * @return array
      */
     private function getCountriesList()
     {

TwoFactorAuth/Command/TfaProviders.php

@@ -55,5 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($providers as $provider) {
             $output->writeln(sprintf("%16s: %s", $provider->getCode(), $provider->getName()));
         }
+
+        return 0;
     }
 }

TwoFactorAuth/Command/TfaReset.php

@@ -98,5 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->userConfigManager->resetProviderConfig((int) $user->getId(), $providerCode);
 
         $output->writeln('' . __('Provider %1 has been reset for user %2', $provider->getName(), $userName));
+
+        return 0;
     }
 }

TwoFactorAuth/Controller/Adminhtml/Duo/Auth.php

@@ -48,6 +48,14 @@ class Auth extends AbstractAction implements HttpGetActionInterface
      */
     private $tokenVerifier;
 
+    /**
+     * @param Action\Context $context
+     * @param Session $session
+     * @param PageFactory $pageFactory
+     * @param UserConfigManagerInterface $userConfigManager
+     * @param TfaInterface $tfa
+     * @param HtmlAreaTokenVerifier $tokenVerifier
+     */
     public function __construct(
         Action\Context $context,
         Session $session,
@@ -66,6 +74,7 @@ public function __construct(
 
     /**
      * Get current user
+     *
      * @return \Magento\User\Model\User|null
      */
     private function getUser()

TwoFactorAuth/Controller/Adminhtml/Tfa/Index.php

@@ -89,6 +89,8 @@ public function __construct(
      * @inheritdoc
      *
      * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {

TwoFactorAuth/Model/EmailUserNotifier.php

@@ -45,16 +45,6 @@ class EmailUserNotifier implements UserNotifierInterface
      */
     private $logger;
 
-    /**
-     * @var UrlInterface
-     */
-    private $url;
-
-    /**
-     * @var State
-     */
-    private $appState;
-
     /**
      * @var UserNotifierConfig
      */
@@ -66,7 +56,6 @@ class EmailUserNotifier implements UserNotifierInterface
      * @param StoreManagerInterface $storeManager
      * @param LoggerInterface $logger
      * @param UrlInterface $url
-     * @param State $appState
      * @param UserNotifierConfig $userNotifierConfig
      */
     public function __construct(
@@ -75,15 +64,13 @@ public function __construct(
         StoreManagerInterface $storeManager,
         LoggerInterface $logger,
         UrlInterface $url,
-        State $appState,
         UserNotifierConfig $userNotifierConfig
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->transportBuilder = $transportBuilder;
         $this->storeManager = $storeManager;
         $this->logger = $logger;
         $this->url = $url;
-        $this->appState = $appState;
         $this->userNotifierConfig = $userNotifierConfig;
     }
 
@@ -154,14 +141,4 @@ public function sendAppConfigRequestMessage(User $user, string $token): void
             $this->userNotifierConfig->getAppRequestConfigUrl($token)
         );
     }
-
-    /**
-     * Determine if the environment is webapi or not
-     *
-     * @return bool
-     */
-    private function isWebapi(): bool
-    {
-        return in_array($this->appState->getAreaCode(), [Area::AREA_WEBAPI_REST, Area::AREA_WEBAPI_SOAP]);
-    }
 }

TwoFactorAuth/Model/Provider/Engine/Authy/Authenticate.php

@@ -21,6 +21,8 @@
 
 /**
  * Authenticate a user with authy
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Authenticate implements AuthyAuthenticateInterface
 {

TwoFactorAuth/Model/Provider/Engine/Google.php

@@ -26,6 +26,8 @@
 
 /**
  * Google authenticator engine
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Google implements EngineInterface
 {

TwoFactorAuth/Model/Provider/Engine/U2fKey/Authenticate.php

@@ -25,6 +25,8 @@
 
 /**
  * Authenticate with the u2f provider and get an admin token
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Authenticate implements U2fKeyAuthenticateInterface
 {