@@ -8902,17 +8902,8 @@ parameters:
 			path: src/Plugins/Export/ExportTexytext.php
 
 		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\:
-				Use dependency injection instead\.$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: src/Plugins/Export/ExportToon.php
-
-		-
-			message: '#^Cannot cast mixed to int\.$#'
-			identifier: cast.int
+			message: '#^Cannot cast mixed to string\.$#'
+			identifier: cast.string
 			count: 1
 			path: src/Plugins/Export/ExportToon.php
 
@@ -17123,4 +17114,3 @@ parameters:
 			identifier: staticMethod.alreadyNarrowedType
 			count: 1
 			path: tests/unit/WebAuthn/WebauthnLibServerTest.php
-
@@ -5998,10 +5998,6 @@
     </PossiblyUndefinedVariable>
   </file>
   <file src="src/Plugins/Export/ExportToon.php">
-    <DeprecatedMethod>
-      <code><![CDATA[DatabaseInterface::getInstance()]]></code>
-      <code><![CDATA[DatabaseInterface::getInstance()]]></code>
-    </DeprecatedMethod>
     <RedundantCondition>
       <code><![CDATA[$exportConfig->toon_indent]]></code>
       <code><![CDATA[$exportConfig->toon_separator]]></code>
 
@@ -8,6 +8,7 @@
 namespace PhpMyAdmin\Plugins\Export;
 
 use PhpMyAdmin\Config\Settings\Export;
+use PhpMyAdmin\Dbal\ConnectionType;
 use PhpMyAdmin\Dbal\DatabaseInterface;
 use PhpMyAdmin\Export\StructureOrData;
 use PhpMyAdmin\Http\ServerRequest;
@@ -20,7 +21,7 @@
 
 use function __;
 use function array_key_last;
-use function is_int;
+use function ctype_digit;
 use function is_string;
 use function sprintf;
 use function str_repeat;
@@ -95,12 +96,11 @@ public function exportData(
     ): void {
         $dbAlias = $this->getDbAlias($aliases, $db);
         $tableAlias = $this->getTableAlias($aliases, $db, $table);
-        $dbi = DatabaseInterface::getInstance();
-        $result = $dbi->query($sqlQuery);
+        $result = $this->dbi->query($sqlQuery, ConnectionType::User, DatabaseInterface::QUERY_UNBUFFERED);
 
         $columnsCnt = $result->numFields();
         $rowsCnt = $result->numRows();
-        $fieldsMeta = $dbi->getFieldsMeta($result);
+        $fieldsMeta = $this->dbi->getFieldsMeta($result);
 
         $columns = [];
         foreach ($fieldsMeta as $i => $field) {
@@ -166,7 +166,7 @@ public function exportData(
     public function exportRawQuery(string $db, string $sqlQuery): void
     {
         if ($db !== '') {
-            DatabaseInterface::getInstance()->selectDb($db);
+            $this->dbi->selectDb($db);
         }
 
         $this->exportData($db, '', $sqlQuery);
@@ -192,37 +192,33 @@ public function setExportOptions(ServerRequest $request, Export $exportConfig):
         );
 
         $this->indent = $this->setIntValue(
-            (int) $request->getParsedBodyParam('toon_indent'),
+            $request->getParsedBodyParam('toon_indent'),
             $exportConfig->toon_indent ?? $this->indent,
         );
         // phpcs:enable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
 
         $this->setupExportConfiguration();
     }
 
-    private function setStringValue(mixed $fromRequest, mixed $fromConfig): string
+    private function setStringValue(mixed $fromRequest, string $fromConfig): string
     {
         if (is_string($fromRequest) && $fromRequest !== '') {
             return $fromRequest;
         }
 
-        if (is_string($fromConfig) && $fromConfig !== '') {
+        if ($fromConfig !== '') {
             return $fromConfig;
         }
 
         return '';
     }
 
-    private function setIntValue(mixed $fromRequest, mixed $fromConfig): int
+    private function setIntValue(mixed $fromRequest, int $fromConfig): int
     {
-        if (is_int($fromRequest)) {
-            return $fromRequest;
-        }
-
-        if (is_int($fromConfig)) {
-            return $fromConfig;
+        if (ctype_digit((string) $fromRequest)) {
+            return (int) $fromRequest;
         }
 
-        return 0;
+        return $fromConfig;
     }
 }