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

- Static fixes

Author: nathanjosiah

TwoFactorAuth/Controller/Adminhtml/AbstractAction.php

@@ -12,6 +12,8 @@
 
 /**
  * Abstraction for 2FA controllers
+ *
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
 abstract class AbstractAction extends Action
 {

TwoFactorAuth/Model/EmailUserNotifier.php

@@ -8,10 +8,7 @@
 
 namespace Magento\TwoFactorAuth\Model;
 
-use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\State;
-use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TwoFactorAuth\Model\Config\UserNotifier as UserNotifierConfig;
 use Magento\User\Model\User;
@@ -55,22 +52,19 @@ class EmailUserNotifier implements UserNotifierInterface
      * @param TransportBuilder $transportBuilder
      * @param StoreManagerInterface $storeManager
      * @param LoggerInterface $logger
-     * @param UrlInterface $url
      * @param UserNotifierConfig $userNotifierConfig
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         TransportBuilder $transportBuilder,
         StoreManagerInterface $storeManager,
         LoggerInterface $logger,
-        UrlInterface $url,
         UserNotifierConfig $userNotifierConfig
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->transportBuilder = $transportBuilder;
         $this->storeManager = $storeManager;
         $this->logger = $logger;
-        $this->url = $url;
         $this->userNotifierConfig = $userNotifierConfig;
     }
 

TwoFactorAuth/view/adminhtml/templates/tfa/configure.phtml

@@ -22,12 +22,12 @@ $list = $block->getProvidersList();
             )); ?>
         </p>
     <?php else: ?>
-        <form class="tfa-configure-providers" method="post" action="<?= $block->getActionUrl() ?>">
+        <form class="tfa-configure-providers" method="post" action="<?= $block->escapeHtmlAttr($block->getActionUrl()) ?>">
             <ul class="tfa-provider_list">
                 <?php foreach ($list as $providerData): ?>
                     <li class="tfa-provider">
                         <input type="checkbox"
-                               name="tfa_selected[<?= /* @noEscape*/ $block->escapeHtmlAttr($providerData['code']) ?>]"
+                               name="tfa_selected[<?= $block->escapeHtmlAttr($providerData['code']) ?>]"
                                class="tfa-checkbox"
                                id="2fa_checkbox-<?= $block->escapeHtmlAttr($providerData['code']) ?>"/>
                         <label for="2fa_checkbox-<?= $block->escapeHtmlAttr($providerData['code']) ?>">