From 7b18faed92c65e9647801f1a5f4a535dfd98612c Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 20 Mar 2024 22:04:12 +0000
Subject: [PATCH] MDL-78942 tool_mfa: replace deprecated coding standards
 annotation.

Replace with equivalent `phpcs` annotation as appropriate, same as
done previously in a5c91474ee (see that commit for further context).
---
 admin/tool/mfa/classes/local/form/verification_field.php | 4 ++--
 admin/tool/mfa/classes/manager.php                       | 4 +---
 admin/tool/mfa/factor/email/email.php                    | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/admin/tool/mfa/classes/local/form/verification_field.php b/admin/tool/mfa/classes/local/form/verification_field.php
index 67a68866c24..43cbae5e930 100644
--- a/admin/tool/mfa/classes/local/form/verification_field.php
+++ b/admin/tool/mfa/classes/local/form/verification_field.php
@@ -76,10 +76,11 @@ class verification_field extends \MoodleQuickForm_text {
         return parent::__construct($elementname, $elementlabel, $attributes);
     }
 
-    // @codingStandardsIgnoreStart
     /**
      * Returns HTML for this form element.
      *
+     * phpcs:disable moodle.NamingConventions.ValidFunctionName.LowercaseMethod
+     *
      * @return string
      */
     public function toHtml(): string {
@@ -101,7 +102,6 @@ class verification_field extends \MoodleQuickForm_text {
         }
         return $result;
     }
-    // @codingStandardsIgnoreEnd
 
     /**
      * Setup and return the script for autosubmission while inside the secure layout.
diff --git a/admin/tool/mfa/classes/manager.php b/admin/tool/mfa/classes/manager.php
index d8d093c44f1..a2899d6cc1f 100644
--- a/admin/tool/mfa/classes/manager.php
+++ b/admin/tool/mfa/classes/manager.php
@@ -349,12 +349,10 @@ class manager {
             try {
                 // Clear locked user factors, they may now reauth with anything.
                 @$DB->set_field('tool_mfa', 'lockcounter', 0, ['userid' => $USER->id]);
-            // @codingStandardsIgnoreStart
+                // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
             } catch (\Exception $e) {
                 // This occurs when upgrade.php hasn't been run. Nothing to do here.
-                // Coding standards ignored, they break on empty catches.
             }
-            // @codingStandardsIgnoreEnd
 
             // Fire post pass state factor actions.
             $factors = factor::get_active_user_factor_types();
diff --git a/admin/tool/mfa/factor/email/email.php b/admin/tool/mfa/factor/email/email.php
index 2a961a6fc38..be0517a85bf 100644
--- a/admin/tool/mfa/factor/email/email.php
+++ b/admin/tool/mfa/factor/email/email.php
@@ -22,13 +22,14 @@
  * @copyright   Catalyst IT
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
 // Ignore coding standards for login check, this page does not require login.
-// @codingStandardsIgnoreStart
+// phpcs:disable moodle.Files.RequireLogin.Missing
 require_once(__DIR__ . '/../../../../../config.php');
+
 $instanceid = required_param('instance', PARAM_INT);
 $pass = optional_param('pass', '0', PARAM_INT);
 $secret = optional_param('secret', 0, PARAM_INT);
-// @codingStandardsIgnoreEnds
 
 $context = context_system::instance();
 $PAGE->set_context($context);