Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit e7794223d1bb · 2022-05-19T12:22:31.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 
 5.2.1 (not yet released)
 - issue #17522 Fix case where the routes cache file is invalid
+- issue #17506 Fix error when configuring 2FA without XMLWriter or Imagick
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php
@@ -15,9 +15,11 @@
 use PhpMyAdmin\Plugins\TwoFactor\Key;
 use PhpMyAdmin\Plugins\TwoFactorPlugin;
 use PragmaRX\Google2FAQRCode\Google2FA;
+use XMLWriter;
 
 use function array_merge;
 use function class_exists;
+use function extension_loaded;
 use function in_array;
 use function ucfirst;
 
@@ -123,7 +125,11 @@ public function getAvailableBackends()
             $result[] = 'simple';
         }
 
-        if (class_exists(Google2FA::class) && class_exists(ImageRenderer::class)) {
+        if (
+            class_exists(Google2FA::class)
+            && class_exists(ImageRenderer::class)
+            && (class_exists(XMLWriter::class) || extension_loaded('imagick'))
+        ) {
             $result[] = 'application';
         }
 
