diff --git a/libraries/classes/Advisor.php b/libraries/classes/Advisor.php index 4b086afb74..223c6e6579 100644 --- a/libraries/classes/Advisor.php +++ b/libraries/classes/Advisor.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Server\SysInfo\SysInfo; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; use Throwable; +use function __; use function array_merge; use function htmlspecialchars; use function implode; diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index 826539e10f..2f3a076aec 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function asort; use function ceil; use function floor; diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php index cb2525f22f..3b3bb1a099 100644 --- a/libraries/classes/Charsets.php +++ b/libraries/classes/Charsets.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Charsets\Charset; use PhpMyAdmin\Charsets\Collation; +use function __; use function array_keys; use function count; use function explode; diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index a1c3e6b708..efa24a76ea 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Charsets; +use function __; +use function _pgettext; use function count; use function explode; use function implode; diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 72e24f11e6..8650a720b9 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function array_filter; use function array_merge; use function array_replace_recursive; diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php index 04d40044ad..ccb1f5e7c0 100644 --- a/libraries/classes/Config/Descriptions.php +++ b/libraries/classes/Config/Descriptions.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin\Config; use PhpMyAdmin\Sanitize; +use function __; use function htmlspecialchars; use function sprintf; use function str_replace; diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index b89f8abaa0..f6a8391de5 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Util; +use function __; use function array_flip; use function array_keys; use function array_search; diff --git a/libraries/classes/Config/Forms/Setup/ServersForm.php b/libraries/classes/Config/Forms/Setup/ServersForm.php index 57f0755e9b..de1e946089 100644 --- a/libraries/classes/Config/Forms/Setup/ServersForm.php +++ b/libraries/classes/Config/Forms/Setup/ServersForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\Setup; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class ServersForm extends BaseForm { /** diff --git a/libraries/classes/Config/Forms/User/ExportForm.php b/libraries/classes/Config/Forms/User/ExportForm.php index 905431f736..a6e28ca989 100644 --- a/libraries/classes/Config/Forms/User/ExportForm.php +++ b/libraries/classes/Config/Forms/User/ExportForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class ExportForm extends BaseForm { /** diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php index 57bffe1130..297cfbcea1 100644 --- a/libraries/classes/Config/Forms/User/FeaturesForm.php +++ b/libraries/classes/Config/Forms/User/FeaturesForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class FeaturesForm extends BaseForm { /** diff --git a/libraries/classes/Config/Forms/User/ImportForm.php b/libraries/classes/Config/Forms/User/ImportForm.php index 37992c2aa4..e5e61a5433 100644 --- a/libraries/classes/Config/Forms/User/ImportForm.php +++ b/libraries/classes/Config/Forms/User/ImportForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class ImportForm extends BaseForm { /** diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php index 1838dc57d8..618cf73956 100644 --- a/libraries/classes/Config/Forms/User/MainForm.php +++ b/libraries/classes/Config/Forms/User/MainForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class MainForm extends BaseForm { /** diff --git a/libraries/classes/Config/Forms/User/NaviForm.php b/libraries/classes/Config/Forms/User/NaviForm.php index 7fe62f1ee3..802953b1ee 100644 --- a/libraries/classes/Config/Forms/User/NaviForm.php +++ b/libraries/classes/Config/Forms/User/NaviForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class NaviForm extends BaseForm { /** diff --git a/libraries/classes/Config/Forms/User/SqlForm.php b/libraries/classes/Config/Forms/User/SqlForm.php index 1e4a7b64a0..3fd12ed6ff 100644 --- a/libraries/classes/Config/Forms/User/SqlForm.php +++ b/libraries/classes/Config/Forms/User/SqlForm.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +use function __; + class SqlForm extends BaseForm { /** diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php index a5dcac7b36..1a516014c4 100644 --- a/libraries/classes/Config/PageSettings.php +++ b/libraries/classes/Config/PageSettings.php @@ -13,6 +13,8 @@ use PhpMyAdmin\Message; use PhpMyAdmin\Response; use PhpMyAdmin\UserPreferences; +use function __; + /** * Page-related settings */ diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php index 9c93792e48..42fe3042ed 100644 --- a/libraries/classes/Config/ServerConfigChecks.php +++ b/libraries/classes/Config/ServerConfigChecks.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Setup\Index as SetupIndex; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function function_exists; use function htmlspecialchars; diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php index f887811c0a..9c0f57a568 100644 --- a/libraries/classes/Config/Validator.php +++ b/libraries/classes/Config/Validator.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Config; use PhpMyAdmin\Core; use PhpMyAdmin\Util; +use function __; use function array_map; use function array_merge; use function array_shift; diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index 0da99bb097..069ca08c39 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; +use function _ngettext; use function count; use function sprintf; diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index 9ee8058317..fa074a89b1 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -10,6 +10,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; use function strlen; abstract class AbstractController diff --git a/libraries/classes/Controllers/ChangeLogController.php b/libraries/classes/Controllers/ChangeLogController.php index 0f5022d54c..d600a89636 100644 --- a/libraries/classes/Controllers/ChangeLogController.php +++ b/libraries/classes/Controllers/ChangeLogController.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use function __; use function array_keys; use function file_get_contents; use function htmlspecialchars; diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index bd12e8950d..8a7616f7aa 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Message; use PhpMyAdmin\Response; use PhpMyAdmin\Template; +use function __; use function is_bool; use function parse_str; use function sprintf; diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 05f1f6268a..651177c346 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function in_array; use function sprintf; diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 55ba242a29..291967c2e7 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_merge; use function is_array; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 892a3d4b12..e219e8a87c 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -20,6 +20,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function intval; final class ImportController extends AbstractController diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index 9882390415..d9644ab6c7 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -20,6 +20,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function mb_strtolower; use function strlen; diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index 6e7972be3d..9682ba5cb9 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -12,6 +12,8 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; + class SearchController extends AbstractController { /** @var DatabaseInterface */ diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 283c56e786..1a94ceea58 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -30,6 +30,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function array_search; use function ceil; use function count; diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 66c6b8564b..89b6509bcc 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Tracking; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function htmlspecialchars; use function sprintf; diff --git a/libraries/classes/Controllers/ErrorReportController.php b/libraries/classes/Controllers/ErrorReportController.php index 1e12ae4c2c..c30985a8cd 100644 --- a/libraries/classes/Controllers/ErrorReportController.php +++ b/libraries/classes/Controllers/ErrorReportController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\UserPreferences; +use function __; use function count; use function in_array; use function is_string; diff --git a/libraries/classes/Controllers/ExportController.php b/libraries/classes/Controllers/ExportController.php index e4dcb110da..8e45ad67ec 100644 --- a/libraries/classes/Controllers/ExportController.php +++ b/libraries/classes/Controllers/ExportController.php @@ -22,6 +22,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function function_exists; use function in_array; diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index ae3b796d99..e47bff78e6 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -24,6 +24,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Version; +use function __; use function count; use function extension_loaded; use function file_exists; diff --git a/libraries/classes/Controllers/ImportController.php b/libraries/classes/Controllers/ImportController.php index 7d599f4899..324d212329 100644 --- a/libraries/classes/Controllers/ImportController.php +++ b/libraries/classes/Controllers/ImportController.php @@ -24,6 +24,8 @@ use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; use Throwable; +use function __; +use function _ngettext; use function define; use function htmlspecialchars; use function in_array; diff --git a/libraries/classes/Controllers/ImportStatusController.php b/libraries/classes/Controllers/ImportStatusController.php index 36fa184214..02035bff80 100644 --- a/libraries/classes/Controllers/ImportStatusController.php +++ b/libraries/classes/Controllers/ImportStatusController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Import\Ajax; use PhpMyAdmin\Message; use PhpMyAdmin\Template; +use function __; use function header; use function ini_get; use function session_start; diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php index 70669e942e..9e7f639696 100644 --- a/libraries/classes/Controllers/JavaScriptMessagesController.php +++ b/libraries/classes/Controllers/JavaScriptMessagesController.php @@ -6,6 +6,8 @@ namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Theme; +use function __; +use function _pgettext; use function json_encode; /** diff --git a/libraries/classes/Controllers/LicenseController.php b/libraries/classes/Controllers/LicenseController.php index 05acec4a71..125784e978 100644 --- a/libraries/classes/Controllers/LicenseController.php +++ b/libraries/classes/Controllers/LicenseController.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; +use function __; use function is_readable; use function printf; use function readfile; diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index 83573f1fe9..41ddc38b06 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -12,6 +12,8 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Utils\SessionCache; +use function __; + /** * The navigation panel * diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index 2e37512c29..c893f312b8 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -10,6 +10,8 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; +use function _pgettext; use function intval; use function json_decode; use function json_encode; diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index 6c4b675037..e6564e90e9 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -18,6 +18,7 @@ use PhpMyAdmin\ThemeManager; use PhpMyAdmin\UserPreferences; use PhpMyAdmin\Util; +use function __; use function array_merge; use function define; use function file_exists; diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index 5ce723fa2a..016aa9c1a8 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\TwoFactor; +use function __; use function count; class TwoFactorController extends AbstractController diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index 0167ea7007..2fe19db494 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -21,6 +21,8 @@ use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; +use function _ngettext; use function array_key_exists; use function array_keys; use function array_search; diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 60c4fd67c0..3740aad44b 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; use function array_merge; final class ExportController extends AbstractController diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index 19ecdf0000..8e1f7c7b90 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function intval; final class ImportController extends AbstractController diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index eb6186f7ed..e2a0b1f63f 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function header; use function implode; use function is_array; diff --git a/libraries/classes/Controllers/Server/Status/ProcessesController.php b/libraries/classes/Controllers/Server/Status/ProcessesController.php index 0d6a84a608..5032a2fd6d 100644 --- a/libraries/classes/Controllers/Server/Status/ProcessesController.php +++ b/libraries/classes/Controllers/Server/Status/ProcessesController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_keys; use function count; use function mb_strtolower; diff --git a/libraries/classes/Controllers/Server/Status/QueriesController.php b/libraries/classes/Controllers/Server/Status/QueriesController.php index a5bf9fc266..ea529be325 100644 --- a/libraries/classes/Controllers/Server/Status/QueriesController.php +++ b/libraries/classes/Controllers/Server/Status/QueriesController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; use function array_sum; use function arsort; use function count; diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index fc202ed904..33c604bc60 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function implode; /** diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index f401fee4b4..795cafa857 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; use function in_array; use function is_numeric; use function mb_strpos; diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php index 3fad753662..e6798e2b4a 100644 --- a/libraries/classes/Controllers/Server/UserGroupsController.php +++ b/libraries/classes/Controllers/Server/UserGroupsController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Server\UserGroups; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function sprintf; use function strlen; diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index d2c03091b4..5f2c9034a1 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function header; use function htmlspecialchars; use function implode; diff --git a/libraries/classes/Controllers/Setup/FormController.php b/libraries/classes/Controllers/Setup/FormController.php index 1bc0c1a097..956015e9a6 100644 --- a/libraries/classes/Controllers/Setup/FormController.php +++ b/libraries/classes/Controllers/Setup/FormController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Config\Forms\Setup\SetupFormList; use PhpMyAdmin\Core; use PhpMyAdmin\Setup\FormProcessing; +use function __; use function ob_get_clean; use function ob_start; diff --git a/libraries/classes/Controllers/Setup/HomeController.php b/libraries/classes/Controllers/Setup/HomeController.php index 17433577e9..8eb1614a5c 100644 --- a/libraries/classes/Controllers/Setup/HomeController.php +++ b/libraries/classes/Controllers/Setup/HomeController.php @@ -10,6 +10,7 @@ use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Setup\Index; +use function __; use function preg_replace; use function uniqid; diff --git a/libraries/classes/Controllers/SqlController.php b/libraries/classes/Controllers/SqlController.php index d39d31fad7..2dee8c5195 100644 --- a/libraries/classes/Controllers/SqlController.php +++ b/libraries/classes/Controllers/SqlController.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function htmlentities; use function mb_strpos; use function strlen; diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 10617ce354..0173c44945 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function intval; use function is_array; use function min; diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index f932bc0c85..7ad1715c3f 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; use function array_fill; use function count; use function is_array; diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index 3e2618d01f..8ed54d18a5 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_keys; use function htmlspecialchars; use function json_encode; diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 960db3ca79..7e732ad540 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function is_array; use function mb_strtolower; diff --git a/libraries/classes/Controllers/Table/DeleteController.php b/libraries/classes/Controllers/Table/DeleteController.php index db6ccd185d..3f633b8fe2 100644 --- a/libraries/classes/Controllers/Table/DeleteController.php +++ b/libraries/classes/Controllers/Table/DeleteController.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function is_array; use function sprintf; diff --git a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php index 32161134ee..241d80f602 100644 --- a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php +++ b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php @@ -8,6 +8,8 @@ use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; + final class DropColumnConfirmationController extends AbstractController { public function process(): void diff --git a/libraries/classes/Controllers/Table/DropColumnController.php b/libraries/classes/Controllers/Table/DropColumnController.php index 72e20c90bf..0257061575 100644 --- a/libraries/classes/Controllers/Table/DropColumnController.php +++ b/libraries/classes/Controllers/Table/DropColumnController.php @@ -12,6 +12,8 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; +use function _ngettext; use function count; final class DropColumnController extends AbstractController diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index ade06b3a1b..b26ecfa82b 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_merge; use function implode; use function is_array; diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 78e9b337e7..65f660cce4 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_key_exists; use function count; use function is_array; diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index 269f64df2a..53ff0a7619 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function ini_set; use function sprintf; diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index be7a1faad1..696966319e 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_merge; /** diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index e33aaa39ac..1033260484 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function intval; final class ImportController extends AbstractController diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 9ef75f91de..a3d66d1997 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -16,6 +16,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function is_array; use function json_decode; diff --git a/libraries/classes/Controllers/Table/MaintenanceController.php b/libraries/classes/Controllers/Table/MaintenanceController.php index 06fe3338e9..cea392b489 100644 --- a/libraries/classes/Controllers/Table/MaintenanceController.php +++ b/libraries/classes/Controllers/Table/MaintenanceController.php @@ -9,6 +9,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Table\Maintenance; use PhpMyAdmin\Template; +use function __; use function count; use function is_array; diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index c0495ec396..224dd9156c 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -22,6 +22,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function implode; use function mb_strstr; diff --git a/libraries/classes/Controllers/Table/PartitionController.php b/libraries/classes/Controllers/Table/PartitionController.php index dda3d79977..9eed761f01 100644 --- a/libraries/classes/Controllers/Table/PartitionController.php +++ b/libraries/classes/Controllers/Table/PartitionController.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Table\Partition; use PhpMyAdmin\Template; use Throwable; +use function __; use function strlen; final class PartitionController extends AbstractController diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index 233c15c7fd..e7fd1837b8 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function array_key_exists; use function array_keys; use function array_values; diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index 992db473bb..d521d73635 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; +use function __; use function array_values; use function class_exists; use function count; diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index 02d399bd7e..4e64c46500 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -41,6 +41,8 @@ use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; use stdClass; +use function __; +use function _ngettext; use function array_keys; use function array_splice; use function count; diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index e0015b7ca7..1ce9644f12 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Tracking; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_map; use function define; use function explode; diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index e0ba7376c0..1f7d507a76 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; +use function __; use function define; use function htmlspecialchars; use function imagecopyresampled; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index 3bba66618a..239172d135 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -11,6 +11,8 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\UserPassword; +use function __; + /** * Displays and handles the form where the user can change their password. */ diff --git a/libraries/classes/Controllers/ViewCreateController.php b/libraries/classes/Controllers/ViewCreateController.php index 51ede8c9eb..ef5d4db5eb 100644 --- a/libraries/classes/Controllers/ViewCreateController.php +++ b/libraries/classes/Controllers/ViewCreateController.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_merge; use function explode; use function htmlspecialchars; diff --git a/libraries/classes/Controllers/ViewOperationsController.php b/libraries/classes/Controllers/ViewOperationsController.php index d28cd508b3..b4ec7007e3 100644 --- a/libraries/classes/Controllers/ViewOperationsController.php +++ b/libraries/classes/Controllers/ViewOperationsController.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; + /** * View manipulations */ diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 42fc1a9e17..93521a5da7 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -15,6 +15,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; +use function __; use function array_keys; use function array_pop; use function array_walk_recursive; diff --git a/libraries/classes/Database/CentralColumns.php b/libraries/classes/Database/CentralColumns.php index fa50847861..e669cbb158 100644 --- a/libraries/classes/Database/CentralColumns.php +++ b/libraries/classes/Database/CentralColumns.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Relation; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function array_unique; use function bin2hex; use function ceil; diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index 9727be42be..12a7d0efaa 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Util; use stdClass; +use function __; use function count; use function intval; use function is_array; diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index e3b7939a8e..c9794a0d63 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -12,6 +12,8 @@ use PhpMyAdmin\Table; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; +use function __; +use function _pgettext; use function count; use function explode; use function in_array; diff --git a/libraries/classes/Database/Events.php b/libraries/classes/Database/Events.php index 04ad12ee79..2c496dad8e 100644 --- a/libraries/classes/Database/Events.php +++ b/libraries/classes/Database/Events.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function count; use function explode; use function htmlspecialchars; diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index e8c1e8ec13..79bab23708 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Table; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function array_diff; use function array_fill; use function array_keys; diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index 3c4d7ae555..eb449abe5d 100644 --- a/libraries/classes/Database/Routines.php +++ b/libraries/classes/Database/Routines.php @@ -16,6 +16,8 @@ use PhpMyAdmin\SqlParser\Utils\Routine; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; +use function _ngettext; use function array_merge; use function count; use function explode; diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php index ced95313e0..864d73a27d 100644 --- a/libraries/classes/Database/Search.php +++ b/libraries/classes/Database/Search.php @@ -11,6 +11,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function array_intersect; use function array_key_exists; use function count; diff --git a/libraries/classes/Database/Triggers.php b/libraries/classes/Database/Triggers.php index 0366eb640e..8e952dac83 100644 --- a/libraries/classes/Database/Triggers.php +++ b/libraries/classes/Database/Triggers.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Util; +use function __; use function count; use function explode; use function htmlspecialchars; diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 72e3c1fc8a..8f5cacf197 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\Utils\SessionCache; +use function __; use function array_diff; use function array_keys; use function array_map; diff --git a/libraries/classes/DbTableExists.php b/libraries/classes/DbTableExists.php index 0c01d60316..49f77cd87f 100644 --- a/libraries/classes/DbTableExists.php +++ b/libraries/classes/DbTableExists.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Controllers\Database\SqlController; +use function __; use function defined; use function strlen; diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index 7d25e08d5e..64e86baa38 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -15,6 +15,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Query\Utilities; use stdClass; +use function __; use function defined; use function is_array; use function is_bool; diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index aec1996028..7cb445412b 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -31,6 +31,8 @@ use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\Gis; +use function __; +use function _pgettext; use function array_filter; use function array_keys; use function array_merge; diff --git a/libraries/classes/Engines/Bdb.php b/libraries/classes/Engines/Bdb.php index 8752d1cdba..6c1a8da880 100644 --- a/libraries/classes/Engines/Bdb.php +++ b/libraries/classes/Engines/Bdb.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; +use function __; + /** * The BDB storage engine */ diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php index 973ef562ae..3222605393 100644 --- a/libraries/classes/Engines/Innodb.php +++ b/libraries/classes/Engines/Innodb.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function implode; diff --git a/libraries/classes/Engines/Myisam.php b/libraries/classes/Engines/Myisam.php index 706f9dd8cd..fca8053600 100644 --- a/libraries/classes/Engines/Myisam.php +++ b/libraries/classes/Engines/Myisam.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; +use function __; + /** * The MyISAM storage engine */ diff --git a/libraries/classes/Engines/Pbxt.php b/libraries/classes/Engines/Pbxt.php index 49186651da..fd5c932bc9 100644 --- a/libraries/classes/Engines/Pbxt.php +++ b/libraries/classes/Engines/Pbxt.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\StorageEngine; use PhpMyAdmin\Util; +use function __; use function is_string; use function preg_match; use function sprintf; diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index 2ea93473f7..e1fd65fa8f 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin; use ErrorException; +use function __; use function array_splice; use function count; use function defined; diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index f0cbdb72e6..3402d4e434 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Controllers\Table\ExportController as TableExportController; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Plugins\SchemaPlugin; +use function __; use function array_merge_recursive; use function error_get_last; use function fclose; diff --git a/libraries/classes/File.php b/libraries/classes/File.php index 34fe94ee9e..12d1c8dcb4 100644 --- a/libraries/classes/File.php +++ b/libraries/classes/File.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin; use ZipArchive; +use function __; use function basename; use function bin2hex; use function bzopen; diff --git a/libraries/classes/FlashMessages.php b/libraries/classes/FlashMessages.php index 40b5da34a4..b0faa40945 100644 --- a/libraries/classes/FlashMessages.php +++ b/libraries/classes/FlashMessages.php @@ -6,6 +6,8 @@ namespace PhpMyAdmin; use RuntimeException; +use function __; + final class FlashMessages { private const STORAGE_KEY = 'flashMessages'; diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 8b60b8207e..37daa627e1 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\Navigation; +use function __; use function defined; use function gmdate; use function header; diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php index a91231bd58..a94d653c4a 100644 --- a/libraries/classes/Html/Generator.php +++ b/libraries/classes/Html/Generator.php @@ -23,6 +23,8 @@ use Twig\Error\LoaderError; use Twig\Error\RuntimeError; use Twig\Error\SyntaxError; +use function __; +use function _pgettext; use function addslashes; use function array_key_exists; use function ceil; diff --git a/libraries/classes/Html/MySQLDocumentation.php b/libraries/classes/Html/MySQLDocumentation.php index e98199e1bd..8fb36c0fba 100644 --- a/libraries/classes/Html/MySQLDocumentation.php +++ b/libraries/classes/Html/MySQLDocumentation.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Html; use PhpMyAdmin\Core; use PhpMyAdmin\Util; +use function __; use function defined; use function file_exists; use function htmlspecialchars; diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index 2c423a8c0e..24252b2bc7 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -11,6 +11,7 @@ use PhpMyAdmin\SqlParser\Statements\ReplaceStatement; use PhpMyAdmin\SqlParser\Statements\UpdateStatement; use PhpMyAdmin\SqlParser\Utils\Query; +use function __; use function abs; use function count; use function explode; diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index c517b6cbc9..4c2f2b0144 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function array_pop; use function count; use function htmlspecialchars; diff --git a/libraries/classes/IndexColumn.php b/libraries/classes/IndexColumn.php index 5b759dca09..82343de614 100644 --- a/libraries/classes/IndexColumn.php +++ b/libraries/classes/IndexColumn.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; + /** * Index column wrapper */ diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index c9e55c9b45..0cbfb18ca3 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Utils\Gis; +use function __; use function array_fill; use function array_merge; use function array_values; diff --git a/libraries/classes/Language.php b/libraries/classes/Language.php index 2753064827..8af30923de 100644 --- a/libraries/classes/Language.php +++ b/libraries/classes/Language.php @@ -4,6 +4,10 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; +use function _bindtextdomain; +use function _setlocale; +use function _textdomain; use function addcslashes; use function function_exists; use function in_array; diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index 110a518a0b..6466f847c0 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function closedir; use function count; use function explode; diff --git a/libraries/classes/Linter.php b/libraries/classes/Linter.php index a165ab817e..c12f00e508 100644 --- a/libraries/classes/Linter.php +++ b/libraries/classes/Linter.php @@ -12,6 +12,7 @@ use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\UtfString; use PhpMyAdmin\SqlParser\Utils\Error as ParserError; +use function __; use function defined; use function htmlspecialchars; use function mb_strlen; diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index 56365c7593..f5aef39773 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Utils\SessionCache; +use function __; use function array_key_exists; use function count; use function in_array; diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php index 54469f8e5e..1ae1f2b4b1 100644 --- a/libraries/classes/Message.php +++ b/libraries/classes/Message.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; +use function _ngettext; use function array_unshift; use function count; use function htmlspecialchars; diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index 0cb02ac7e5..eb654a302e 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Theme; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function count; use function defined; use function file_exists; diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index adb8cb6aa9..6b299624cb 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -20,6 +20,8 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Url; +use function __; +use function _ngettext; use function array_intersect_key; use function array_key_exists; use function array_keys; diff --git a/libraries/classes/Navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php index d17fab5a8e..49a6b476ba 100644 --- a/libraries/classes/Navigation/NodeFactory.php +++ b/libraries/classes/Navigation/NodeFactory.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Navigation\Nodes\Node; +use function __; use function class_exists; use function preg_match; use function sprintf; diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index 8f5611a914..1a25adc89c 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Relation; use PhpMyAdmin\Util; +use function __; use function array_keys; use function array_reverse; use function array_slice; diff --git a/libraries/classes/Navigation/Nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php index ac5ea874d4..94ddf3fa90 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; use function strlen; use function substr; diff --git a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php index 9b117fb96b..5360d309f5 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for column nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php index 7c520fbf56..3f6539671d 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function in_array; use function intval; use function substr; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index dde0e1bfa5..a5aeaa990e 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -10,6 +10,8 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; +use function __; + /** * Represents a node that is a child of a database node * This may either be a concrete child such as table or a container diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php index 0db0e46957..e4ccf172f1 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -10,6 +10,8 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Navigation\NodeFactory; +use function _pgettext; + /** * Represents a container for database nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php index 08aab073f1..8b57cfb229 100644 --- a/libraries/classes/Navigation/Nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; + /** * Represents a event node in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php index e1823a487b..9c4fd47f2a 100644 --- a/libraries/classes/Navigation/Nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for events nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php index bfe6d3aff2..8f25cc0749 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; + /** * Represents a function node in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index 5e5c7efbc5..98b4f9c5dd 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for functions nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php index aa91f0ddff..8640b55fab 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; + /** * Represents a index node in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 58ecddaf0b..53b5914e1a 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for index nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php index b63c082b59..b12efa10d8 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; + /** * Represents a procedure node in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index 65f6560768..3382165ca2 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for procedure nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php index 137fd2fc15..0ee0b2b6d9 100644 --- a/libraries/classes/Navigation/Nodes/NodeTable.php +++ b/libraries/classes/Navigation/Nodes/NodeTable.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function in_array; use function intval; diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php index 8a3c30e350..43689eee10 100644 --- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for table nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php index 1bd72a61e7..a09a7bfdf1 100644 --- a/libraries/classes/Navigation/Nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; + /** * Represents a trigger node in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index e595d353b7..6945f00f1f 100644 --- a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for trigger nodes in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php index f426f5c311..128cd5af89 100644 --- a/libraries/classes/Navigation/Nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; +use function __; + /** * Represents a view node in the navigation tree */ diff --git a/libraries/classes/Navigation/Nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php index cb381977b2..7fa73d6f59 100644 --- a/libraries/classes/Navigation/Nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -9,6 +9,9 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; +use function __; +use function _pgettext; + /** * Represents a container for view nodes in the navigation tree */ diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index c8936a02f1..04b583639d 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -9,6 +9,8 @@ use PhpMyAdmin\Charsets\Collation; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Query\Compatibility; +use function __; +use function _pgettext; use function array_merge; use function array_pop; use function array_unique; diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index fd575e04c9..6a59fdc7f9 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Engines\Innodb; use PhpMyAdmin\Plugins\Export\ExportSql; +use function __; use function array_merge; use function count; use function explode; diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php index c4e1fe9030..ff90f7dd27 100644 --- a/libraries/classes/Pdf.php +++ b/libraries/classes/Pdf.php @@ -11,6 +11,7 @@ use Exception; use TCPDF; use TCPDF_FONTS; +use function __; use function count; use function strlen; use function strtr; diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php index 0b1f7e3740..e9e3d2622d 100644 --- a/libraries/classes/Plugins.php +++ b/libraries/classes/Plugins.php @@ -26,6 +26,7 @@ use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Properties\Plugins\PluginPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use function __; use function array_pop; use function class_exists; use function count; diff --git a/libraries/classes/Plugins/Auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php index 80a77f72ac..a4d1888999 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Server\Select; use PhpMyAdmin\Util; +use function __; use function count; use function defined; use function sprintf; diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index 870f7d444f..1f27c69f1b 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -22,6 +22,7 @@ use phpseclib3\Crypt\AES; use phpseclib3\Crypt\Random; use ReCaptcha; +use function __; use function base64_decode; use function base64_encode; use function class_exists; diff --git a/libraries/classes/Plugins/Auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php index a257dc9b23..1efb6b4903 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationHttp.php +++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Response; +use function __; use function base64_decode; use function defined; use function hash_equals; diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php index 79fa083615..200726e8be 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationSignon.php +++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Util; +use function __; use function array_merge; use function defined; use function file_exists; diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index f1f49250ee..c446a26854 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -18,6 +18,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; +use function __; use function defined; use function htmlspecialchars; use function intval; diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php index 83ace9266c..a63ef8eb00 100644 --- a/libraries/classes/Plugins/Export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -16,6 +16,7 @@ use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; +use function __; use function implode; use function preg_match; use function preg_replace; diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php index 680476ccb4..c15aec77e3 100644 --- a/libraries/classes/Plugins/Export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -16,6 +16,7 @@ use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use function __; use function mb_strtolower; use function mb_substr; use function preg_replace; diff --git a/libraries/classes/Plugins/Export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php index d0d04a1232..68f8ed3669 100644 --- a/libraries/classes/Plugins/Export/ExportExcel.php +++ b/libraries/classes/Plugins/Export/ExportExcel.php @@ -15,6 +15,8 @@ use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use function __; + /** * Handles the export for the CSV-Excel format */ diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index 0defd6ddeb..febd53d439 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function in_array; use function str_replace; diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index d96c799da5..f42d89b4cb 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Version; +use function __; use function bin2hex; use function explode; use function json_encode; diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php index a5f91b5673..859cc90fed 100644 --- a/libraries/classes/Plugins/Export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -18,6 +18,7 @@ use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; use PhpMyAdmin\Version; +use function __; use function count; use function in_array; use function mb_strpos; diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php index 1bc981b624..978add3811 100644 --- a/libraries/classes/Plugins/Export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; +use function __; use function array_values; use function count; use function htmlspecialchars; diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php index a7ba85e340..e538a633d6 100644 --- a/libraries/classes/Plugins/Export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -18,6 +18,7 @@ use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use function __; use function bin2hex; use function date; use function htmlspecialchars; diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index c7ecaa60d1..b540f36769 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; +use function __; use function bin2hex; use function htmlspecialchars; use function str_replace; diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index 27bf616736..e170f4573a 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use function __; use function class_exists; // phpcs:disable PSR1.Files.SideEffects diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php index 3a908ac242..67b65d6f7a 100644 --- a/libraries/classes/Plugins/Export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -16,6 +16,7 @@ use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; use PhpMyAdmin\Version; +use function __; use function preg_match; use function preg_replace; use function stripslashes; diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index 1ab57e79b3..a03cecc713 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -29,6 +29,7 @@ use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\Util; use PhpMyAdmin\Version; +use function __; use function bin2hex; use function count; use function defined; diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index 4feed79a92..22c2af5be0 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function in_array; use function str_replace; diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index f12d884278..297b4beaa3 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Util; use PhpMyAdmin\Version; +use function __; use function count; use function htmlspecialchars; use function is_array; diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php index 4bb1e7b528..e9fd74115e 100644 --- a/libraries/classes/Plugins/Export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; +use function __; use function array_key_exists; use function is_numeric; use function str_replace; diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index df527ee001..61ab562637 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; use TCPDF_STATIC; +use function __; use function array_key_exists; use function count; use function ksort; diff --git a/libraries/classes/Plugins/Import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php index 73bffd89aa..c41c6ac1e1 100644 --- a/libraries/classes/Plugins/Import/AbstractImportCsv.php +++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; +use function __; + /** * Super class of the import plugins for the CSV format */ diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index 8476082c33..49ead1103b 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Util; +use function __; use function array_splice; use function basename; use function count; diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php index 43d2df0bd0..68105cc58d 100644 --- a/libraries/classes/Plugins/Import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Util; +use function __; use function count; use function is_array; use function preg_split; diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php index 72d63b1687..c8c0697b27 100644 --- a/libraries/classes/Plugins/Import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; +use function __; use function count; use function explode; use function mb_strlen; diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index cb6a563c68..cbbb826832 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -20,6 +20,7 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; use SimpleXMLElement; +use function __; use function count; use function implode; use function libxml_disable_entity_loader; diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php index aa323fbe4c..fbb9aa0835 100644 --- a/libraries/classes/Plugins/Import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Sanitize; use PhpMyAdmin\ZipExtension; use ZipArchive; +use function __; use function count; use function extension_loaded; use function file_exists; diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php index 9e600b50a9..d5245018fb 100644 --- a/libraries/classes/Plugins/Import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; use PhpMyAdmin\SqlParser\Utils\BufferedQuery; +use function __; use function count; use function implode; use function mb_strlen; diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index fe824e2da2..aa82f49304 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; use PhpMyAdmin\Util; use SimpleXMLElement; +use function __; use function count; use function in_array; use function libxml_disable_entity_loader; diff --git a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php index 0e5d5b8bb5..5ef588a922 100644 --- a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php +++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Schema\Dia; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\TableStats; +use function __; use function in_array; use function shuffle; use function sprintf; diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index 41aa9007d1..ab9e520699 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf; use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; use PhpMyAdmin\Version; +use function __; use function date; use function in_array; use function sprintf; diff --git a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php index 0a3af51462..5d39bedc69 100644 --- a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Schema\Eps; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\TableStats; +use function __; use function count; use function max; use function sprintf; diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index 627a084d15..c556826e30 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Relation; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function rawurldecode; diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php index 58e909f6ae..446838dd6a 100644 --- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Pdf as PdfLib; use PhpMyAdmin\Relation; use PhpMyAdmin\Util; +use function __; use function class_exists; use function count; use function getcwd; diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index a2680364cf..a43746fbab 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; +use function __; use function ceil; use function class_exists; use function getcwd; diff --git a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php index 696ccda343..47fc73abdd 100644 --- a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Pdf as PdfLib; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\TableStats; +use function __; use function count; use function in_array; use function max; diff --git a/libraries/classes/Plugins/Schema/SchemaDia.php b/libraries/classes/Plugins/Schema/SchemaDia.php index 033aab7946..3ae00f9627 100644 --- a/libraries/classes/Plugins/Schema/SchemaDia.php +++ b/libraries/classes/Plugins/Schema/SchemaDia.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use function __; + /** * Handles the schema export for the Dia format */ diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php index a43ec257db..ad73938cbf 100644 --- a/libraries/classes/Plugins/Schema/SchemaEps.php +++ b/libraries/classes/Plugins/Schema/SchemaEps.php @@ -15,6 +15,8 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use function __; + /** * Handles the schema export for the EPS format */ diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php index 2fd92e2f48..7d9e3518d0 100644 --- a/libraries/classes/Plugins/Schema/SchemaPdf.php +++ b/libraries/classes/Plugins/Schema/SchemaPdf.php @@ -15,6 +15,8 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use function __; + /** * Handles the schema export for the PDF format */ diff --git a/libraries/classes/Plugins/Schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php index f85aab1d7f..14a8fa6753 100644 --- a/libraries/classes/Plugins/Schema/SchemaSvg.php +++ b/libraries/classes/Plugins/Schema/SchemaSvg.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use function __; + /** * Handles the schema export for the SVG format */ diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index 3a65a049ae..81d6c57867 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf; use PhpMyAdmin\Version; +use function __; use function in_array; use function max; use function min; diff --git a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php index fff49043f5..c7906d0294 100644 --- a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Schema\Svg; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\TableStats; +use function __; use function count; use function in_array; use function max; diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php index 0d4cb603bd..0c8e40538d 100644 --- a/libraries/classes/Plugins/SchemaPlugin.php +++ b/libraries/classes/Plugins/SchemaPlugin.php @@ -11,6 +11,8 @@ use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; +use function __; + /** * Provides a common interface that will have to be implemented by all of the * schema export plugins. Some of the plugins will also implement other public diff --git a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php index e714daeeb6..637f285828 100644 --- a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php @@ -10,6 +10,8 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; + /** * Provides common methods for all of the Bool2Text transformations plugins. */ diff --git a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php index 38a9b98cac..1cce5a6bf3 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Util; +use function __; use function checkdate; use function gmdate; use function htmlspecialchars; diff --git a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php index c3cc89f4f9..9a1fd7877d 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Url; +use function __; use function array_merge; use function htmlspecialchars; diff --git a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php index ae4b7ecee5..7519a07f72 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; use function count; use function fclose; use function feof; diff --git a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php index 0d66a7526a..21af094bb4 100644 --- a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; use function strtr; /** diff --git a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php index 5df7fc5743..5904dc01ef 100644 --- a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; use function bin2hex; use function chunk_split; use function intval; diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php index f022d80619..dabc219bb4 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Url; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php index eda491fe6a..c726d845b2 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\IOTransformationsPlugin; use PhpMyAdmin\Url; +use function __; use function bin2hex; use function intval; diff --git a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php index cea6f61d75..2217b0deca 100644 --- a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Url; +use function __; use function array_merge; use function defined; use function htmlspecialchars; diff --git a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php index 5ed675b48c..aac53e9b0f 100644 --- a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Utils\FormatConverter; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php index a9e90fb895..adb8384865 100644 --- a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php index 8ae9e493e3..7a16c81ad5 100644 --- a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\IOTransformationsPlugin; +use function __; use function htmlspecialchars; use function preg_match; use function sprintf; diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php index b8477b4ea0..da3b2687a3 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php @@ -11,6 +11,8 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; + /** * Provides common methods for all of the SQL transformations plugins. */ diff --git a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php index 27829e11ff..d81a748494 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; +use function __; use function htmlspecialchars; use function mb_strlen; use function mb_substr; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php index 36802c02a0..95d059434c 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\IOTransformationsPlugin; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php index aa9d3d8b7f..04636ac69c 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Template; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php index c429651edb..e043e652f7 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Sanitize; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php index 0940ebaaba..16469c521d 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\IOTransformationsPlugin; use PhpMyAdmin\Utils\FormatConverter; +use function __; use function htmlspecialchars; use function inet_ntop; use function pack; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php index d11f43acfe..39459a277f 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\IOTransformationsPlugin; use PhpMyAdmin\Utils\FormatConverter; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php index 50eda014d9..7bc002b16c 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin; +use function __; + /** * JSON editing with syntax highlighted CodeMirror editor */ diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php index 4a2565af71..6bcf96c9fe 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin; +use function __; + /** * SQL editing with syntax highlighted CodeMirror editor */ diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php index 7f16e8a14a..6c85170220 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin; +use function __; + /** * XML (and HTML) editing with syntax highlighted CodeMirror editor */ diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php index 3320ffa741..d36bfb456d 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php @@ -11,6 +11,8 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Utils\FormatConverter; +use function __; + /** * Handles the binary to IPv4/IPv6 transformation for text plain */ diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php index 2b23d6641a..0ac1aec753 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Response; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php index 5deaf5d407..5a582f93a8 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php @@ -11,6 +11,7 @@ use PhpMyAdmin\FieldMetadata; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Response; +use function __; use function htmlspecialchars; /** diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index 65e611c54f..c451351f24 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -15,6 +15,7 @@ use PragmaRX\Google2FA\Exceptions\InvalidCharactersException; use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException; use PragmaRX\Google2FAQRCode\Google2FA; +use function __; use function extension_loaded; /** diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php index 70929a8ea4..57678f6940 100644 --- a/libraries/classes/Plugins/TwoFactor/Key.php +++ b/libraries/classes/Plugins/TwoFactor/Key.php @@ -18,6 +18,7 @@ use Twig\Error\LoaderError; use Twig\Error\RuntimeError; use Twig\Error\SyntaxError; +use function __; use function json_decode; use function json_encode; diff --git a/libraries/classes/Plugins/TwoFactor/Simple.php b/libraries/classes/Plugins/TwoFactor/Simple.php index 5c366a1e69..f96c4c25b7 100644 --- a/libraries/classes/Plugins/TwoFactor/Simple.php +++ b/libraries/classes/Plugins/TwoFactor/Simple.php @@ -9,6 +9,8 @@ namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Plugins\TwoFactorPlugin; +use function __; + /** * Simple two-factor authentication auth asking just for confirmation. * diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index bf264a752b..0b3ab1c767 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -12,6 +12,7 @@ use PhpMyAdmin\Message; use PhpMyAdmin\Template; use PhpMyAdmin\TwoFactor; +use function __; use function is_array; use function parse_url; use function sprintf; diff --git a/libraries/classes/Query/Utilities.php b/libraries/classes/Query/Utilities.php index 441232b3ac..119bac3274 100644 --- a/libraries/classes/Query/Utilities.php +++ b/libraries/classes/Query/Utilities.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Query; use PhpMyAdmin\Error; use PhpMyAdmin\Url; +use function __; use function array_slice; use function debug_backtrace; use function explode; diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index bcb41cf28c..f16dfcb0fb 100644 --- a/libraries/classes/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Html\Generator; +use function __; use function array_key_exists; use function array_merge; use function array_pop; diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index cd496a0b7f..5041677a6a 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -12,6 +12,8 @@ use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\SqlParser\Utils\Table as TableUtils; +use function __; +use function _pgettext; use function array_reverse; use function array_search; use function array_shift; diff --git a/libraries/classes/ReplicationGui.php b/libraries/classes/ReplicationGui.php index 0e109f52b0..b6053aa119 100644 --- a/libraries/classes/ReplicationGui.php +++ b/libraries/classes/ReplicationGui.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Query\Utilities; +use function __; use function htmlspecialchars; use function in_array; use function is_array; diff --git a/libraries/classes/Routing.php b/libraries/classes/Routing.php index 996d5b063a..20ba25b431 100644 --- a/libraries/classes/Routing.php +++ b/libraries/classes/Routing.php @@ -12,6 +12,7 @@ use FastRoute\RouteParser\Std as RouteParserStd; use Psr\Container\ContainerInterface; use RuntimeException; +use function __; use function fclose; use function file_exists; use function fopen; diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php index 9b30e71897..41bdf9e80b 100644 --- a/libraries/classes/Sanitize.php +++ b/libraries/classes/Sanitize.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Html\MySQLDocumentation; +use function __; use function array_keys; use function array_merge; use function count; diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php index 22b04d1747..09977efbc4 100644 --- a/libraries/classes/SavedSearches.php +++ b/libraries/classes/SavedSearches.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function count; use function intval; use function is_string; diff --git a/libraries/classes/Server/Plugins.php b/libraries/classes/Server/Plugins.php index 06aac30ce2..9e7df3f52a 100644 --- a/libraries/classes/Server/Plugins.php +++ b/libraries/classes/Server/Plugins.php @@ -6,6 +6,8 @@ namespace PhpMyAdmin\Server; use PhpMyAdmin\DatabaseInterface; +use function __; + class Plugins { /** @var DatabaseInterface */ diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index c8b06e2aa5..3d3c7728bf 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function array_map; use function array_merge; use function array_unique; diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php index d40af62237..4d6f13b951 100644 --- a/libraries/classes/Server/Status/Data.php +++ b/libraries/classes/Server/Status/Data.php @@ -11,6 +11,7 @@ namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\ReplicationInfo; use PhpMyAdmin\Url; +use function __; use function basename; use function mb_strpos; use function mb_strtolower; diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php index d979c2d265..165ffc861f 100644 --- a/libraries/classes/Server/UserGroups.php +++ b/libraries/classes/Server/UserGroups.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use function __; use function htmlspecialchars; use function implode; use function in_array; diff --git a/libraries/classes/Setup/Index.php b/libraries/classes/Setup/Index.php index 6c02d760fe..bb93135d37 100644 --- a/libraries/classes/Setup/Index.php +++ b/libraries/classes/Setup/Index.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Sanitize; use PhpMyAdmin\Version; use PhpMyAdmin\VersionInformation; +use function __; use function htmlspecialchars; use function is_array; use function sprintf; diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index b43b20eaf8..e37b5877b9 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -15,6 +15,7 @@ use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Utils\Query; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function array_map; use function array_sum; use function bin2hex; diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php index fc13454468..d6c5daaced 100644 --- a/libraries/classes/SqlQueryForm.php +++ b/libraries/classes/SqlQueryForm.php @@ -16,6 +16,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Utils\ForeignKey; +use function __; use function htmlspecialchars; use function sprintf; use function strlen; diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php index f20f9d9a43..085fbe740f 100644 --- a/libraries/classes/StorageEngine.php +++ b/libraries/classes/StorageEngine.php @@ -22,6 +22,7 @@ use PhpMyAdmin\Engines\PerformanceSchema; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Utils\SessionCache; +use function __; use function array_key_exists; use function define; use function explode; diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index ad8cf094c3..973f3b5711 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -18,6 +18,7 @@ use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\SqlParser\Statements\DropStatement; use PhpMyAdmin\SqlParser\Utils\Table as TableUtils; +use function __; use function array_key_exists; use function array_map; use function count; diff --git a/libraries/classes/Table/Maintenance.php b/libraries/classes/Table/Maintenance.php index 3a85b8de0b..ae28ab82e1 100644 --- a/libraries/classes/Table/Maintenance.php +++ b/libraries/classes/Table/Maintenance.php @@ -8,6 +8,7 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Index; use PhpMyAdmin\Util; +use function __; use function implode; use function sprintf; diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php index cecf54e07f..3d469f18e2 100644 --- a/libraries/classes/Template.php +++ b/libraries/classes/Template.php @@ -29,6 +29,7 @@ use Twig\Loader\FilesystemLoader; use Twig\RuntimeLoader\ContainerRuntimeLoader; use Twig\TemplateWrapper; +use function __; use function is_array; use function sprintf; use function trigger_error; diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php index 3cabc64b95..128a9b9d78 100644 --- a/libraries/classes/Theme.php +++ b/libraries/classes/Theme.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function file_exists; use function file_get_contents; use function filemtime; diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index cadc6ba762..357f636e58 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; use function array_key_exists; use function closedir; use function htmlspecialchars; diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index 117774b01b..990243ec67 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Html\Generator; +use function __; use function array_key_exists; use function array_merge; use function array_multisort; diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php index d8f1fd1712..8e420717e8 100644 --- a/libraries/classes/Types.php +++ b/libraries/classes/Types.php @@ -7,6 +7,8 @@ declare(strict_types=1); namespace PhpMyAdmin; +use function __; +use function _pgettext; use function array_diff; use function array_merge; use function array_push; diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php index bc7e8f2cbc..74241b536c 100644 --- a/libraries/classes/UserPassword.php +++ b/libraries/classes/UserPassword.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Query\Compatibility; use PhpMyAdmin\Server\Privileges; +use function __; use function strlen; /** diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index c77fbed065..10848278ef 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\UserFormList; +use function __; use function array_flip; use function array_merge; use function basename; diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index d821b0a705..c46db357f0 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -13,6 +13,8 @@ use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\Utils\SessionCache; use phpseclib3\Crypt\Random; +use function __; +use function _pgettext; use function abs; use function array_key_exists; use function array_map; diff --git a/libraries/classes/ZipExtension.php b/libraries/classes/ZipExtension.php index cb5f7e2212..40a5b8bb7c 100644 --- a/libraries/classes/ZipExtension.php +++ b/libraries/classes/ZipExtension.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use ZipArchive; +use function __; use function array_combine; use function count; use function crc32; diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php index 8e1e89a778..1046e0b904 100644 --- a/test/classes/Controllers/Database/PrivilegesControllerTest.php +++ b/test/classes/Controllers/Database/PrivilegesControllerTest.php @@ -11,6 +11,9 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Url; +use function __; +use function _pgettext; + class PrivilegesControllerTest extends AbstractTestCase { /** diff --git a/test/classes/Controllers/JavaScriptMessagesControllerTest.php b/test/classes/Controllers/JavaScriptMessagesControllerTest.php index 72bbed9329..1122c425a5 100644 --- a/test/classes/Controllers/JavaScriptMessagesControllerTest.php +++ b/test/classes/Controllers/JavaScriptMessagesControllerTest.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Controllers\JavaScriptMessagesController; use PHPUnit\Framework\TestCase; +use function __; use function json_decode; use function ob_end_clean; use function ob_get_contents; diff --git a/test/classes/Controllers/Server/DatabasesControllerTest.php b/test/classes/Controllers/Server/DatabasesControllerTest.php index 5455a0d4bf..4d6432ccb4 100644 --- a/test/classes/Controllers/Server/DatabasesControllerTest.php +++ b/test/classes/Controllers/Server/DatabasesControllerTest.php @@ -14,6 +14,7 @@ use PhpMyAdmin\Tests\Stubs\Response; use PhpMyAdmin\Transformations; use stdClass; +use function __; use function sprintf; class DatabasesControllerTest extends AbstractTestCase diff --git a/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php index 3af3830c97..8ad812c783 100644 --- a/test/classes/Controllers/Server/EnginesControllerTest.php +++ b/test/classes/Controllers/Server/EnginesControllerTest.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response; +use function __; use function htmlspecialchars; class EnginesControllerTest extends AbstractTestCase diff --git a/test/classes/Controllers/Server/Status/MonitorControllerTest.php b/test/classes/Controllers/Server/Status/MonitorControllerTest.php index 66c49ba4a0..086ac0a90c 100644 --- a/test/classes/Controllers/Server/Status/MonitorControllerTest.php +++ b/test/classes/Controllers/Server/Status/MonitorControllerTest.php @@ -12,6 +12,8 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response; use PhpMyAdmin\Utils\SessionCache; +use function __; + class MonitorControllerTest extends AbstractTestCase { /** @var Data */ diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php index bc751c41b6..9a5d8f04c5 100644 --- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php +++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response; use PhpMyAdmin\Url; +use function __; use function htmlspecialchars; class ProcessesControllerTest extends AbstractTestCase diff --git a/test/classes/Controllers/Server/Status/QueriesControllerTest.php b/test/classes/Controllers/Server/Status/QueriesControllerTest.php index 3b5ff5b368..aba92d59dd 100644 --- a/test/classes/Controllers/Server/Status/QueriesControllerTest.php +++ b/test/classes/Controllers/Server/Status/QueriesControllerTest.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response; use PhpMyAdmin\Util; +use function __; use function array_sum; use function htmlspecialchars; diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php index c2c8128739..d1f7ee7c10 100644 --- a/test/classes/Controllers/Server/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/VariablesControllerTest.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response as ResponseStub; use ReflectionProperty; +use function __; use function htmlspecialchars; use function str_replace; diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php index 4e7f182c3c..1c24bc709a 100644 --- a/test/classes/Controllers/Table/IndexesControllerTest.php +++ b/test/classes/Controllers/Table/IndexesControllerTest.php @@ -17,6 +17,7 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response as ResponseStub; use PhpMyAdmin\Url; +use function __; use function sprintf; class IndexesControllerTest extends AbstractTestCase diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php index cba1373534..99242d1ff7 100644 --- a/test/classes/Controllers/Table/PrivilegesControllerTest.php +++ b/test/classes/Controllers/Table/PrivilegesControllerTest.php @@ -11,6 +11,9 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Url; +use function __; +use function _pgettext; + class PrivilegesControllerTest extends AbstractTestCase { /** diff --git a/test/classes/Controllers/TransformationOverviewControllerTest.php b/test/classes/Controllers/TransformationOverviewControllerTest.php index 80512d23a4..dc5ccdf439 100644 --- a/test/classes/Controllers/TransformationOverviewControllerTest.php +++ b/test/classes/Controllers/TransformationOverviewControllerTest.php @@ -10,6 +10,8 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\Response; use PhpMyAdmin\Transformations; +use function __; + class TransformationOverviewControllerTest extends AbstractTestCase { /** diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index bceacd3597..aeba1ce002 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -8,6 +8,8 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Sanitize; use stdClass; +use function __; +use function _pgettext; use function hash; use function htmlspecialchars; use function mb_strpos; diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index 9140152ea0..3c54f7ddab 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Encoding; +use function _setlocale; use function fclose; use function file_get_contents; use function fopen; diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php index 7b2b859e84..2594ba36b2 100644 --- a/test/classes/Engines/BdbTest.php +++ b/test/classes/Engines/BdbTest.php @@ -7,6 +7,8 @@ namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Bdb; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; + class BdbTest extends AbstractTestCase { /** @var Bdb */ diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php index 90de8823cc..c079bc98ed 100644 --- a/test/classes/Engines/InnodbTest.php +++ b/test/classes/Engines/InnodbTest.php @@ -10,6 +10,8 @@ namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Innodb; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; + class InnodbTest extends AbstractTestCase { /** @var Innodb */ diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php index 5c00062342..067efb8239 100644 --- a/test/classes/Engines/MyisamTest.php +++ b/test/classes/Engines/MyisamTest.php @@ -10,6 +10,8 @@ namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Myisam; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; + class MyisamTest extends AbstractTestCase { /** @var Myisam */ diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php index 96e76b32bc..e76c8b65a8 100644 --- a/test/classes/Engines/PbxtTest.php +++ b/test/classes/Engines/PbxtTest.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Engines\Pbxt; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; use function sprintf; class PbxtTest extends AbstractTestCase diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php index b46e8df465..2a11c0acbc 100644 --- a/test/classes/Html/GeneratorTest.php +++ b/test/classes/Html/GeneratorTest.php @@ -8,6 +8,8 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Util; +use function __; +use function _pgettext; use function call_user_func_array; use function htmlspecialchars; use function urlencode; diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index 904d6f390a..93aa7ef00c 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\LanguageManager; +use function _ngettext; use function count; use function is_readable; use function strtolower; diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index 92f68bf40d..08bcea194b 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Types; use PhpMyAdmin\Url; use stdClass; +use function __; +use function _pgettext; use function json_encode; class NormalizationTest extends AbstractTestCase diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php index 342c33fb0d..8e8bd656f0 100644 --- a/test/classes/Plugins/Export/ExportHtmlwordTest.php +++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php @@ -18,6 +18,7 @@ use PhpMyAdmin\Version; use ReflectionMethod; use ReflectionProperty; +use function __; use function array_shift; use function ob_get_clean; use function ob_start; diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php index 7ab91cdaec..d662d42ac4 100644 --- a/test/classes/Plugins/Export/ExportLatexTest.php +++ b/test/classes/Plugins/Export/ExportLatexTest.php @@ -18,6 +18,7 @@ use PhpMyAdmin\Version; use ReflectionMethod; use ReflectionProperty; +use function __; use function array_shift; use function ob_get_clean; use function ob_start; diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php index 86e884d1e6..c62fdeca75 100644 --- a/test/classes/Plugins/Export/ExportMediawikiTest.php +++ b/test/classes/Plugins/Export/ExportMediawikiTest.php @@ -16,6 +16,7 @@ use PhpMyAdmin\Tests\AbstractTestCase; use ReflectionMethod; use ReflectionProperty; +use function __; use function array_shift; use function ob_get_clean; use function ob_start; diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index 53d9101183..3b12f7c928 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -20,6 +20,7 @@ use ReflectionMethod; use ReflectionProperty; use stdClass; +use function __; use function array_shift; use const MYSQLI_BLOB_FLAG; diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php index 662ee62e3e..48efd635c2 100644 --- a/test/classes/Plugins/Export/ExportPdfTest.php +++ b/test/classes/Plugins/Export/ExportPdfTest.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Tests\AbstractTestCase; use ReflectionMethod; use ReflectionProperty; +use function __; use function array_shift; /** diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php index 78039c9cbd..97846b7d3d 100644 --- a/test/classes/Plugins/Import/ImportCsvTest.php +++ b/test/classes/Plugins/Import/ImportCsvTest.php @@ -9,6 +9,7 @@ use PhpMyAdmin\File; use PhpMyAdmin\Plugins\Import\ImportCsv; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; use function basename; class ImportCsvTest extends AbstractTestCase diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php index f44c619f9b..8ca752ae26 100644 --- a/test/classes/Plugins/Import/ImportLdiTest.php +++ b/test/classes/Plugins/Import/ImportLdiTest.php @@ -10,6 +10,8 @@ use PhpMyAdmin\Plugins\Import\ImportLdi; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\MockObject\MockObject; +use function __; + class ImportLdiTest extends AbstractTestCase { /** @var ImportLdi */ diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php index 1bb79f59d8..d113d8aaf2 100644 --- a/test/classes/Plugins/Import/ImportMediawikiTest.php +++ b/test/classes/Plugins/Import/ImportMediawikiTest.php @@ -9,6 +9,8 @@ use PhpMyAdmin\File; use PhpMyAdmin\Plugins\Import\ImportMediawiki; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; + class ImportMediawikiTest extends AbstractTestCase { /** @var ImportMediawiki */ diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php index dfb6c98096..c93d4a7b3c 100644 --- a/test/classes/Plugins/Import/ImportOdsTest.php +++ b/test/classes/Plugins/Import/ImportOdsTest.php @@ -8,6 +8,7 @@ use PhpMyAdmin\File; use PhpMyAdmin\Plugins\Import\ImportOds; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; use function str_repeat; /** diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php index e0f7fe1d31..ca086807ca 100644 --- a/test/classes/Plugins/Import/ImportShpTest.php +++ b/test/classes/Plugins/Import/ImportShpTest.php @@ -9,6 +9,7 @@ use PhpMyAdmin\File; use PhpMyAdmin\Plugins\Import\ImportShp; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; use function define; use function defined; use function extension_loaded; diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php index 20dc1b1a07..70fa8726ef 100644 --- a/test/classes/Plugins/Import/ImportXmlTest.php +++ b/test/classes/Plugins/Import/ImportXmlTest.php @@ -9,6 +9,8 @@ use PhpMyAdmin\File; use PhpMyAdmin\Plugins\Import\ImportXml; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; + /** * @requires extension xml * @requires extension xmlwriter diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 7d806034aa..877fb9ad50 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -7,6 +7,8 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Relation; +use function __; + /** * @group medium */ diff --git a/test/classes/Server/PluginsTest.php b/test/classes/Server/PluginsTest.php index 6f610d2a03..e7ddf84b00 100644 --- a/test/classes/Server/PluginsTest.php +++ b/test/classes/Server/PluginsTest.php @@ -8,6 +8,8 @@ use PhpMyAdmin\Server\Plugin; use PhpMyAdmin\Server\Plugins; use PhpMyAdmin\Tests\AbstractTestCase; +use function __; + class PluginsTest extends AbstractTestCase { /** @var Plugins */ diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index ed28ee8093..0f6b3bf5c9 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -20,6 +20,8 @@ use PhpMyAdmin\Util; use PhpMyAdmin\Version; use stdClass; +use function __; +use function _pgettext; use function htmlspecialchars; use function implode; diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php index 646d40b269..26c78d8f73 100644 --- a/test/classes/Server/SelectTest.php +++ b/test/classes/Server/SelectTest.php @@ -8,6 +8,8 @@ use PhpMyAdmin\Server\Select; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Util; +use function __; + /** * PhpMyAdmin\Tests\Server\SelectTest class * diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index bc3d718594..4a3e263806 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Version; +use function __; use function htmlspecialchars; /** diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index 323267f1be..7821d4a6ea 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -11,6 +11,8 @@ use PhpMyAdmin\Tracking; use PhpMyAdmin\Url; use PhpMyAdmin\Version; +use function __; +use function _pgettext; use function htmlspecialchars; use function sprintf; diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index cc993f3760..780bd2ad56 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Util; use PhpMyAdmin\Utils\SessionCache; use PhpMyAdmin\Version; +use function __; +use function _setlocale; use function count; use function date_default_timezone_get; use function date_default_timezone_set;