diff --git a/libraries/classes/Controllers/Controller.php b/libraries/classes/Controllers/Controller.php
index 24df284cb2ef..3dd212d2b1f9 100644
--- a/libraries/classes/Controllers/Controller.php
+++ b/libraries/classes/Controllers/Controller.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers;
 
 use PhpMyAdmin\DatabaseInterface;
diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php
index b394714093cd..f3fb5877d68e 100644
--- a/libraries/classes/Controllers/Database/DatabaseStructureController.php
+++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Database;
 
 use PhpMyAdmin\Charsets;
diff --git a/libraries/classes/Controllers/DatabaseController.php b/libraries/classes/Controllers/DatabaseController.php
index af0ffc10b6db..c7220e9f0c3c 100644
--- a/libraries/classes/Controllers/DatabaseController.php
+++ b/libraries/classes/Controllers/DatabaseController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers;
 
 /**
diff --git a/libraries/classes/Controllers/Server/ServerBinlogController.php b/libraries/classes/Controllers/Server/ServerBinlogController.php
index e496a2ac588e..22dcbe199ea8 100644
--- a/libraries/classes/Controllers/Server/ServerBinlogController.php
+++ b/libraries/classes/Controllers/Server/ServerBinlogController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Server;
 
 use PhpMyAdmin\Controllers\Controller;
diff --git a/libraries/classes/Controllers/Server/ServerCollationsController.php b/libraries/classes/Controllers/Server/ServerCollationsController.php
index cead8ab1efc0..4ae7a0893aee 100644
--- a/libraries/classes/Controllers/Server/ServerCollationsController.php
+++ b/libraries/classes/Controllers/Server/ServerCollationsController.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;
 
diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php
index 800f7143392d..07529d373b25 100644
--- a/libraries/classes/Controllers/Server/ServerDatabasesController.php
+++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;
 
diff --git a/libraries/classes/Controllers/Server/ServerEnginesController.php b/libraries/classes/Controllers/Server/ServerEnginesController.php
index 794060d70b91..1f4ffcafecfd 100644
--- a/libraries/classes/Controllers/Server/ServerEnginesController.php
+++ b/libraries/classes/Controllers/Server/ServerEnginesController.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;
 
diff --git a/libraries/classes/Controllers/Server/ServerPluginsController.php b/libraries/classes/Controllers/Server/ServerPluginsController.php
index 009417840529..0fcb83e94b70 100644
--- a/libraries/classes/Controllers/Server/ServerPluginsController.php
+++ b/libraries/classes/Controllers/Server/ServerPluginsController.php
@@ -6,6 +6,7 @@
 *
 * @package PhpMyAdmin\Controllers
 */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;
 
diff --git a/libraries/classes/Controllers/Server/ServerVariablesController.php b/libraries/classes/Controllers/Server/ServerVariablesController.php
index 58f8b47d8fd8..da3c8278dadf 100644
--- a/libraries/classes/Controllers/Server/ServerVariablesController.php
+++ b/libraries/classes/Controllers/Server/ServerVariablesController.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;
 
diff --git a/libraries/classes/Controllers/Table/TableChartController.php b/libraries/classes/Controllers/Table/TableChartController.php
index 82bb1c113897..51d84a73e14c 100644
--- a/libraries/classes/Controllers/Table/TableChartController.php
+++ b/libraries/classes/Controllers/Table/TableChartController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Table;
 
 use PhpMyAdmin\Controllers\TableController;
diff --git a/libraries/classes/Controllers/Table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php
index 69a9a2a5aebd..4e612d379436 100644
--- a/libraries/classes/Controllers/Table/TableGisVisualizationController.php
+++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Table;
 
 use PhpMyAdmin\Controllers\TableController;
diff --git a/libraries/classes/Controllers/Table/TableIndexesController.php b/libraries/classes/Controllers/Table/TableIndexesController.php
index 68bddc65dd9e..afde49c9aed9 100644
--- a/libraries/classes/Controllers/Table/TableIndexesController.php
+++ b/libraries/classes/Controllers/Table/TableIndexesController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Table;
 
 use PhpMyAdmin\Controllers\TableController;
diff --git a/libraries/classes/Controllers/Table/TableRelationController.php b/libraries/classes/Controllers/Table/TableRelationController.php
index 9a5c6dc6830c..0a4f3c801ace 100644
--- a/libraries/classes/Controllers/Table/TableRelationController.php
+++ b/libraries/classes/Controllers/Table/TableRelationController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Table;
 
 use PhpMyAdmin\Controllers\TableController;
diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php
index 9b79d4675385..337e6b6b7427 100644
--- a/libraries/classes/Controllers/Table/TableSearchController.php
+++ b/libraries/classes/Controllers/Table/TableSearchController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Table;
 
 use PhpMyAdmin\Controllers\TableController;
diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php
index b3101eb4ca1b..c3a741464351 100644
--- a/libraries/classes/Controllers/Table/TableStructureController.php
+++ b/libraries/classes/Controllers/Table/TableStructureController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers\Table;
 
 use PhpMyAdmin\CentralColumns;
@@ -917,7 +919,7 @@ protected function updateColumns()
             );
             // if the old column name is part of the remembered sort expression
             if (mb_strpos(
-                $sorted_col,
+                (string) $sorted_col,
                 Util::backquote($_REQUEST['field_orig'][$i])
             ) !== false) {
                 // delete the whole remembered sort expression
diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php
index 60651ab8905a..0aa6cf566e40 100644
--- a/libraries/classes/Controllers/TableController.php
+++ b/libraries/classes/Controllers/TableController.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin\Controllers
  */
+declare(strict_types=1);
+
 namespace PhpMyAdmin\Controllers;
 
 /**