diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2020-05-26 04:42:37 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2020-05-26 04:42:37 +0300 |
| commit | 3baad2eb1c2fe57497b877f76c2708afb5da6438 (patch) | |
| tree | 782e699860ebccf0445c8e634e2bb038f69165c5 /libraries | |
| parent | 9269d75fb406935f73e18b7b015ed93f3c2e32af (diff) | |
Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'libraries')
451 files changed, 480 insertions, 53 deletions
diff --git a/libraries/classes/Advisor.php b/libraries/classes/Advisor.php index 66c8d308ca..0c22d2cadf 100644 --- a/libraries/classes/Advisor.php +++ b/libraries/classes/Advisor.php @@ -3,6 +3,7 @@ * A simple rules engine, that parses and executes the rules in advisory_rules.txt. * Adjusted to phpMyAdmin. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index 0c723bccdb..ea9b6a99cd 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -2,6 +2,7 @@ /** * Handles bookmarking SQL queries */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index 5fc05142b3..240fcdb5eb 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -2,6 +2,7 @@ /** * Contains functions used by browse foreigners */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php index 6194c14c29..25cf98e8fd 100644 --- a/libraries/classes/CentralColumns.php +++ b/libraries/classes/CentralColumns.php @@ -2,6 +2,7 @@ /** * Functions for displaying user preferences pages */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php index b8812fae99..a915cf83af 100644 --- a/libraries/classes/Charsets.php +++ b/libraries/classes/Charsets.php @@ -2,6 +2,7 @@ /** * MySQL charset metadata and manipulations */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Charsets/Charset.php b/libraries/classes/Charsets/Charset.php index fbf6c6d192..46d05927e6 100644 --- a/libraries/classes/Charsets/Charset.php +++ b/libraries/classes/Charsets/Charset.php @@ -2,6 +2,7 @@ /** * Value object class for a character set */ + declare(strict_types=1); namespace PhpMyAdmin\Charsets; diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index 0f44b3e676..21bce07dca 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -2,6 +2,7 @@ /** * Value object class for a collation */ + declare(strict_types=1); namespace PhpMyAdmin\Charsets; diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php index 7d912cfc95..2fc0beed6e 100644 --- a/libraries/classes/CheckUserPrivileges.php +++ b/libraries/classes/CheckUserPrivileges.php @@ -2,6 +2,7 @@ /** * Get user's global privileges and some db-specific privileges */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Command/AdvisoryRulesCommand.php b/libraries/classes/Command/AdvisoryRulesCommand.php index 926f17b9ba..f75069d570 100644 --- a/libraries/classes/Command/AdvisoryRulesCommand.php +++ b/libraries/classes/Command/AdvisoryRulesCommand.php @@ -2,6 +2,7 @@ /** * Translates advisory rules to Gettext format */ + declare(strict_types=1); namespace PhpMyAdmin\Command; diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php index f99397bcbf..9bb9ad0a6b 100644 --- a/libraries/classes/Common.php +++ b/libraries/classes/Common.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 072653ff9e..fc6904db77 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -2,6 +2,7 @@ /** * Configuration handling. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php index e459acf63f..55836360cf 100644 --- a/libraries/classes/Config/ConfigFile.php +++ b/libraries/classes/Config/ConfigFile.php @@ -2,6 +2,7 @@ /** * Config file management */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php index 9d54dfe7bd..65794a88c2 100644 --- a/libraries/classes/Config/Descriptions.php +++ b/libraries/classes/Config/Descriptions.php @@ -2,6 +2,7 @@ /** * Verbose descriptions for settings. */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/Form.php b/libraries/classes/Config/Form.php index 5bbe2f2a33..4850b4cd66 100644 --- a/libraries/classes/Config/Form.php +++ b/libraries/classes/Config/Form.php @@ -2,6 +2,7 @@ /** * Form handling code. */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index 8895356b56..6e1bf7fe4a 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -9,6 +9,7 @@ * o translated_path - work_path modified for HTML field name, a path with * slashes changed to hyphens, eg. Servers-4-verbose */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index 69f5961046..f3f8d0ddda 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -2,6 +2,7 @@ /** * Form templates */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/Forms/BaseForm.php b/libraries/classes/Config/Forms/BaseForm.php index 613cf2791d..eba9487fcf 100644 --- a/libraries/classes/Config/Forms/BaseForm.php +++ b/libraries/classes/Config/Forms/BaseForm.php @@ -2,6 +2,7 @@ /** * Base class for preferences. */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms; diff --git a/libraries/classes/Config/Forms/BaseFormList.php b/libraries/classes/Config/Forms/BaseFormList.php index 05ad952d9e..c2104b2a52 100644 --- a/libraries/classes/Config/Forms/BaseFormList.php +++ b/libraries/classes/Config/Forms/BaseFormList.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms; @@ -44,7 +45,7 @@ class BaseFormList /** * @param string $name Name * - * @return null|string + * @return string|null */ public static function get($name) { diff --git a/libraries/classes/Config/Forms/Page/BrowseForm.php b/libraries/classes/Config/Forms/Page/BrowseForm.php index a49b308a51..12f0edc4bd 100644 --- a/libraries/classes/Config/Forms/Page/BrowseForm.php +++ b/libraries/classes/Config/Forms/Page/BrowseForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/DbStructureForm.php b/libraries/classes/Config/Forms/Page/DbStructureForm.php index 5505bb11de..7dc085750d 100644 --- a/libraries/classes/Config/Forms/Page/DbStructureForm.php +++ b/libraries/classes/Config/Forms/Page/DbStructureForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/EditForm.php b/libraries/classes/Config/Forms/Page/EditForm.php index 93182c6f75..6312bde1d3 100644 --- a/libraries/classes/Config/Forms/Page/EditForm.php +++ b/libraries/classes/Config/Forms/Page/EditForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/ExportForm.php b/libraries/classes/Config/Forms/Page/ExportForm.php index 29358c012f..583191c8ed 100644 --- a/libraries/classes/Config/Forms/Page/ExportForm.php +++ b/libraries/classes/Config/Forms/Page/ExportForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/ImportForm.php b/libraries/classes/Config/Forms/Page/ImportForm.php index b7f92bc35c..bfc7389026 100644 --- a/libraries/classes/Config/Forms/Page/ImportForm.php +++ b/libraries/classes/Config/Forms/Page/ImportForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/NaviForm.php b/libraries/classes/Config/Forms/Page/NaviForm.php index f728a19cfd..6d63126b64 100644 --- a/libraries/classes/Config/Forms/Page/NaviForm.php +++ b/libraries/classes/Config/Forms/Page/NaviForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/PageFormList.php b/libraries/classes/Config/Forms/Page/PageFormList.php index 3c9ca25349..6158331ee2 100644 --- a/libraries/classes/Config/Forms/Page/PageFormList.php +++ b/libraries/classes/Config/Forms/Page/PageFormList.php @@ -2,6 +2,7 @@ /** * Page preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/SqlForm.php b/libraries/classes/Config/Forms/Page/SqlForm.php index 1702b13257..f6e78487c8 100644 --- a/libraries/classes/Config/Forms/Page/SqlForm.php +++ b/libraries/classes/Config/Forms/Page/SqlForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Page/TableStructureForm.php b/libraries/classes/Config/Forms/Page/TableStructureForm.php index 9240d5a002..485db5ee1a 100644 --- a/libraries/classes/Config/Forms/Page/TableStructureForm.php +++ b/libraries/classes/Config/Forms/Page/TableStructureForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; diff --git a/libraries/classes/Config/Forms/Setup/ConfigForm.php b/libraries/classes/Config/Forms/Setup/ConfigForm.php index 03d80ac205..cadf8c5cc5 100644 --- a/libraries/classes/Config/Forms/Setup/ConfigForm.php +++ b/libraries/classes/Config/Forms/Setup/ConfigForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/ExportForm.php b/libraries/classes/Config/Forms/Setup/ExportForm.php index 671c8a9570..0fd7294536 100644 --- a/libraries/classes/Config/Forms/Setup/ExportForm.php +++ b/libraries/classes/Config/Forms/Setup/ExportForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/FeaturesForm.php b/libraries/classes/Config/Forms/Setup/FeaturesForm.php index b824de2cb4..bfe84c671a 100644 --- a/libraries/classes/Config/Forms/Setup/FeaturesForm.php +++ b/libraries/classes/Config/Forms/Setup/FeaturesForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/ImportForm.php b/libraries/classes/Config/Forms/Setup/ImportForm.php index 17107ac036..c22c973f27 100644 --- a/libraries/classes/Config/Forms/Setup/ImportForm.php +++ b/libraries/classes/Config/Forms/Setup/ImportForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/MainForm.php b/libraries/classes/Config/Forms/Setup/MainForm.php index 5332fcdaea..3b7d0eef42 100644 --- a/libraries/classes/Config/Forms/Setup/MainForm.php +++ b/libraries/classes/Config/Forms/Setup/MainForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/NaviForm.php b/libraries/classes/Config/Forms/Setup/NaviForm.php index 48b1c4707f..f95f71236c 100644 --- a/libraries/classes/Config/Forms/Setup/NaviForm.php +++ b/libraries/classes/Config/Forms/Setup/NaviForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/ServersForm.php b/libraries/classes/Config/Forms/Setup/ServersForm.php index fada6e4aa6..57f0755e9b 100644 --- a/libraries/classes/Config/Forms/Setup/ServersForm.php +++ b/libraries/classes/Config/Forms/Setup/ServersForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/SetupFormList.php b/libraries/classes/Config/Forms/Setup/SetupFormList.php index e0a6ca3810..0a93f77df6 100644 --- a/libraries/classes/Config/Forms/Setup/SetupFormList.php +++ b/libraries/classes/Config/Forms/Setup/SetupFormList.php @@ -2,6 +2,7 @@ /** * Setup preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/Setup/SqlForm.php b/libraries/classes/Config/Forms/Setup/SqlForm.php index dcac512e44..2ac321fc17 100644 --- a/libraries/classes/Config/Forms/Setup/SqlForm.php +++ b/libraries/classes/Config/Forms/Setup/SqlForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; diff --git a/libraries/classes/Config/Forms/User/ExportForm.php b/libraries/classes/Config/Forms/User/ExportForm.php index 93c37f4ab4..2ae5eca337 100644 --- a/libraries/classes/Config/Forms/User/ExportForm.php +++ b/libraries/classes/Config/Forms/User/ExportForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php index daca4c16b4..4a803d77b8 100644 --- a/libraries/classes/Config/Forms/User/FeaturesForm.php +++ b/libraries/classes/Config/Forms/User/FeaturesForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/Forms/User/ImportForm.php b/libraries/classes/Config/Forms/User/ImportForm.php index 116cf4800d..37992c2aa4 100644 --- a/libraries/classes/Config/Forms/User/ImportForm.php +++ b/libraries/classes/Config/Forms/User/ImportForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php index 372028fc1f..831a2941a7 100644 --- a/libraries/classes/Config/Forms/User/MainForm.php +++ b/libraries/classes/Config/Forms/User/MainForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/Forms/User/NaviForm.php b/libraries/classes/Config/Forms/User/NaviForm.php index f397cf29e2..7fe62f1ee3 100644 --- a/libraries/classes/Config/Forms/User/NaviForm.php +++ b/libraries/classes/Config/Forms/User/NaviForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/Forms/User/SqlForm.php b/libraries/classes/Config/Forms/User/SqlForm.php index e7c9057fa9..1e4a7b64a0 100644 --- a/libraries/classes/Config/Forms/User/SqlForm.php +++ b/libraries/classes/Config/Forms/User/SqlForm.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/Forms/User/UserFormList.php b/libraries/classes/Config/Forms/User/UserFormList.php index 2c4a5e0750..6bcf94cbcf 100644 --- a/libraries/classes/Config/Forms/User/UserFormList.php +++ b/libraries/classes/Config/Forms/User/UserFormList.php @@ -2,6 +2,7 @@ /** * User preferences form */ + declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\User; diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php index 041144b6be..2a94eb02a2 100644 --- a/libraries/classes/Config/PageSettings.php +++ b/libraries/classes/Config/PageSettings.php @@ -2,6 +2,7 @@ /** * Page-related settings */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php index 6f8015f180..496790c4f1 100644 --- a/libraries/classes/Config/ServerConfigChecks.php +++ b/libraries/classes/Config/ServerConfigChecks.php @@ -2,6 +2,7 @@ /** * Server config checks management */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 4fb34520f9..bbbc91a49c 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -2,6 +2,7 @@ /** * Links configuration for MySQL system tables */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php index 1892498aad..2fb0f3f0a5 100644 --- a/libraries/classes/Config/Validator.php +++ b/libraries/classes/Config/Validator.php @@ -2,6 +2,7 @@ /** * Form validation for configuration editor */ + declare(strict_types=1); namespace PhpMyAdmin\Config; diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index d954b1b806..1af7ac01dc 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -2,6 +2,7 @@ /** * Used to render the console of PMA's pages */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index f5173aa9e1..203a823be3 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\AbstractController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/AjaxController.php b/libraries/classes/Controllers/AjaxController.php index d6e513b861..f084400b1e 100644 --- a/libraries/classes/Controllers/AjaxController.php +++ b/libraries/classes/Controllers/AjaxController.php @@ -2,6 +2,7 @@ /** * Generic AJAX endpoint for getting information about database */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/BrowseForeignersController.php b/libraries/classes/Controllers/BrowseForeignersController.php index e5da306160..9483be5972 100644 --- a/libraries/classes/Controllers/BrowseForeignersController.php +++ b/libraries/classes/Controllers/BrowseForeignersController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\BrowseForeignersController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/ChangeLogController.php b/libraries/classes/Controllers/ChangeLogController.php index 6ed30c2df0..c2fd847e5d 100644 --- a/libraries/classes/Controllers/ChangeLogController.php +++ b/libraries/classes/Controllers/ChangeLogController.php @@ -2,6 +2,7 @@ /** * Simple script to set correct charset for changelog */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index 074647fa4f..3eacc6cd39 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -2,6 +2,7 @@ /** * Displays status of phpMyAdmin configuration storage */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/Database/AbstractController.php b/libraries/classes/Controllers/Database/AbstractController.php index b80d61055e..1c66328f65 100644 --- a/libraries/classes/Controllers/Database/AbstractController.php +++ b/libraries/classes/Controllers/Database/AbstractController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Database\AbstractController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 9e3762184a..223dbbeb3b 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -2,6 +2,7 @@ /** * Central Columns view/edit */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index e49eca66cb..905c49d03b 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Database\DataDictionaryController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 36977a0499..a956c4864c 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 1e1681ec8e..3700a3d05a 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index d1c58ca5ed..8c05c376ee 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index a07a8dca2c..b5bf12398d 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Database\MultiTableQueryController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index da56053019..c7b63e72c7 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index a820f3ee7a..52bf2d8f13 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -2,6 +2,7 @@ /** * Controller for database privileges */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 8231103245..59ba8d55a1 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Database\RoutinesController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index b5ad96420c..b0ff250193 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php index fbf4aa8823..1d107044e9 100644 --- a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php +++ b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index a5a3a58092..9dfae418ef 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/SqlFormatController.php b/libraries/classes/Controllers/Database/SqlFormatController.php index 2332ae0876..845df3a0b5 100644 --- a/libraries/classes/Controllers/Database/SqlFormatController.php +++ b/libraries/classes/Controllers/Database/SqlFormatController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 23dce29f0e..f43ad09b19 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -1123,8 +1123,7 @@ class StructureController extends AbstractController $databaseCharset = $collation->getCharset(); } - // table form - $html .= $this->template->render('database/structure/table_header', [ + return $html . $this->template->render('database/structure/table_header', [ 'db' => $this->db, 'db_is_system_schema' => $this->dbIsSystemSchema, 'replication' => $GLOBALS['replication_info']['slave']['status'], @@ -1171,8 +1170,6 @@ class StructureController extends AbstractController 'central_columns_work' => $GLOBALS['cfgRelation']['centralcolumnswork'] ?? null, ], ]); - - return $html; } /** diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 03ef823e20..7ed2160e97 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 45ec30d0d6..5dffba6971 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Database\TriggersController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; diff --git a/libraries/classes/Controllers/ErrorReportController.php b/libraries/classes/Controllers/ErrorReportController.php index 683e787a1d..7b7a3a3004 100644 --- a/libraries/classes/Controllers/ErrorReportController.php +++ b/libraries/classes/Controllers/ErrorReportController.php @@ -2,6 +2,7 @@ /** * Handle error report submission */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/ExportController.php b/libraries/classes/Controllers/ExportController.php index a8b5af8879..09abe5175b 100644 --- a/libraries/classes/Controllers/ExportController.php +++ b/libraries/classes/Controllers/ExportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/GisDataEditorController.php b/libraries/classes/Controllers/GisDataEditorController.php index 043ffb0614..92434c5749 100644 --- a/libraries/classes/Controllers/GisDataEditorController.php +++ b/libraries/classes/Controllers/GisDataEditorController.php @@ -2,6 +2,7 @@ /** * Editor for Geometry data types. */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 43321721ea..90a9a2f61b 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\HomeController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/ImportController.php b/libraries/classes/Controllers/ImportController.php index 0bb4a28bbf..8045565347 100644 --- a/libraries/classes/Controllers/ImportController.php +++ b/libraries/classes/Controllers/ImportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/ImportStatusController.php b/libraries/classes/Controllers/ImportStatusController.php index accfe4fdde..ab039818b0 100644 --- a/libraries/classes/Controllers/ImportStatusController.php +++ b/libraries/classes/Controllers/ImportStatusController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/LicenseController.php b/libraries/classes/Controllers/LicenseController.php index 34c63870d2..1f5c7d4f2f 100644 --- a/libraries/classes/Controllers/LicenseController.php +++ b/libraries/classes/Controllers/LicenseController.php @@ -2,6 +2,7 @@ /** * Simple script to set correct charset for the license */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/LintController.php b/libraries/classes/Controllers/LintController.php index 5d7d5a924f..e417f32f38 100644 --- a/libraries/classes/Controllers/LintController.php +++ b/libraries/classes/Controllers/LintController.php @@ -2,6 +2,7 @@ /** * Represents the interface between the linter and the query editor. */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/LogoutController.php b/libraries/classes/Controllers/LogoutController.php index e0c34e6add..7794b1d9d9 100644 --- a/libraries/classes/Controllers/LogoutController.php +++ b/libraries/classes/Controllers/LogoutController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index 350a09b34f..dea755b179 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index 444e1b7826..87fc182a41 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/PhpInfoController.php b/libraries/classes/Controllers/PhpInfoController.php index 4abe204cdb..553339afd9 100644 --- a/libraries/classes/Controllers/PhpInfoController.php +++ b/libraries/classes/Controllers/PhpInfoController.php @@ -2,6 +2,7 @@ /** * phpinfo() wrapper to allow displaying only when configured to do so. */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index 61b64fcf54..5d1b17f934 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Preferences; diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index ad118584b3..6ca0b8ba66 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Preferences; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index dd6fa7fad0..82c5241c22 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index 9c95141050..1bb1cc068d 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\BinlogController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/CollationsController.php b/libraries/classes/Controllers/Server/CollationsController.php index a46863b864..be56fec53c 100644 --- a/libraries/classes/Controllers/Server/CollationsController.php +++ b/libraries/classes/Controllers/Server/CollationsController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\CollationsController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index 9a90564219..316c2aeb14 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\DatabasesController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/EnginesController.php b/libraries/classes/Controllers/Server/EnginesController.php index 4985688cb1..a29c0bb7f4 100644 --- a/libraries/classes/Controllers/Server/EnginesController.php +++ b/libraries/classes/Controllers/Server/EnginesController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\EnginesController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 31b2db9d3f..97ea84f630 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index ec14b59b07..6d73727d87 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index 067638d1c7..e2c8c27263 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -3,6 +3,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\PluginsController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index e7b5753f59..d89fb57549 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index 0e907e6f09..72bf70c48d 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -2,6 +2,7 @@ /** * Server replications */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php index e1c44c60af..c3637ed4cf 100644 --- a/libraries/classes/Controllers/Server/SqlController.php +++ b/libraries/classes/Controllers/Server/SqlController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\SqlController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/Status/AbstractController.php b/libraries/classes/Controllers/Server/Status/AbstractController.php index 27ba4df6b9..7cb169ca8e 100644 --- a/libraries/classes/Controllers/Server/Status/AbstractController.php +++ b/libraries/classes/Controllers/Server/Status/AbstractController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\Status\AbstractController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; diff --git a/libraries/classes/Controllers/Server/Status/MonitorController.php b/libraries/classes/Controllers/Server/Status/MonitorController.php index 316ddabc8c..8d3d79618f 100644 --- a/libraries/classes/Controllers/Server/Status/MonitorController.php +++ b/libraries/classes/Controllers/Server/Status/MonitorController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\Status\MonitorController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; diff --git a/libraries/classes/Controllers/Server/Status/ProcessesController.php b/libraries/classes/Controllers/Server/Status/ProcessesController.php index c382995015..fc20c642fc 100644 --- a/libraries/classes/Controllers/Server/Status/ProcessesController.php +++ b/libraries/classes/Controllers/Server/Status/ProcessesController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\Status\ProcessesController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; diff --git a/libraries/classes/Controllers/Server/Status/QueriesController.php b/libraries/classes/Controllers/Server/Status/QueriesController.php index 96e060cdf5..c04f9b3488 100644 --- a/libraries/classes/Controllers/Server/Status/QueriesController.php +++ b/libraries/classes/Controllers/Server/Status/QueriesController.php @@ -2,6 +2,7 @@ /** * Displays query statistics for the server */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index d98a3b85fb..3053f9ec9a 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\Status\StatusController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index 0d509055fa..9dc0a8f5f7 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -2,6 +2,7 @@ /** * Displays a list of server status variables */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php index 618e6b787b..4edee5b673 100644 --- a/libraries/classes/Controllers/Server/UserGroupsController.php +++ b/libraries/classes/Controllers/Server/UserGroupsController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index 35472047a2..89b3fc2761 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Server\VariablesController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server; diff --git a/libraries/classes/Controllers/Setup/AbstractController.php b/libraries/classes/Controllers/Setup/AbstractController.php index cfe74d9c92..c5f0c22bde 100644 --- a/libraries/classes/Controllers/Setup/AbstractController.php +++ b/libraries/classes/Controllers/Setup/AbstractController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Setup\AbstractController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Setup; diff --git a/libraries/classes/Controllers/Setup/ConfigController.php b/libraries/classes/Controllers/Setup/ConfigController.php index 87cf292db3..27cd8fdd39 100644 --- a/libraries/classes/Controllers/Setup/ConfigController.php +++ b/libraries/classes/Controllers/Setup/ConfigController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Setup\ConfigController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Setup; diff --git a/libraries/classes/Controllers/Setup/FormController.php b/libraries/classes/Controllers/Setup/FormController.php index 4e05f0580d..28084d043d 100644 --- a/libraries/classes/Controllers/Setup/FormController.php +++ b/libraries/classes/Controllers/Setup/FormController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Setup\FormController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Setup; diff --git a/libraries/classes/Controllers/Setup/HomeController.php b/libraries/classes/Controllers/Setup/HomeController.php index e551c0fa24..00f6af1336 100644 --- a/libraries/classes/Controllers/Setup/HomeController.php +++ b/libraries/classes/Controllers/Setup/HomeController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Setup\HomeController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Setup; diff --git a/libraries/classes/Controllers/Setup/ServersController.php b/libraries/classes/Controllers/Setup/ServersController.php index 1851dc7f18..3988934ff6 100644 --- a/libraries/classes/Controllers/Setup/ServersController.php +++ b/libraries/classes/Controllers/Setup/ServersController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Setup\ServersController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Setup; diff --git a/libraries/classes/Controllers/SqlController.php b/libraries/classes/Controllers/SqlController.php index b586a74fc3..5b93b8ce8a 100644 --- a/libraries/classes/Controllers/SqlController.php +++ b/libraries/classes/Controllers/SqlController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/Table/AbstractController.php b/libraries/classes/Controllers/Table/AbstractController.php index 78270a0ba3..336ffeacd3 100644 --- a/libraries/classes/Controllers/Table/AbstractController.php +++ b/libraries/classes/Controllers/Table/AbstractController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\Table\AbstractController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 166894dd13..7c2fdd6502 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index db89d5c4f4..826db4be66 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index 9d6cf78659..9bdcf85f3c 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 6753ba2cab..1c5a04b6bf 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index adf012dce3..0c38f9ded0 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 35a27b5d6b..9b5c12a980 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index 5884c763b0..83e0d3555f 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index eb86de4f19..2997a3618d 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index 27e0ad777e..6bf6337ce3 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index afaa0b5c6e..4743496cfb 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index 67cae8e443..3730b5145e 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 17252a7a78..0e86428b77 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -2,6 +2,7 @@ /** * Controller for table privileges */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/RecentFavoriteController.php b/libraries/classes/Controllers/Table/RecentFavoriteController.php index 17dfacfa55..10c32ac941 100644 --- a/libraries/classes/Controllers/Table/RecentFavoriteController.php +++ b/libraries/classes/Controllers/Table/RecentFavoriteController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index 17511809c2..fb45f48f32 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index c693f18a9d..6c792d1237 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index af86e4a501..1a444bbcc7 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index a037a536d5..755de0d989 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index a83e69f12d..4e6de58169 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index 325fa86855..81b81c3fb4 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index dd34783e66..c236bb9a91 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index 5c6367f023..c87f299d10 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; diff --git a/libraries/classes/Controllers/ThemesController.php b/libraries/classes/Controllers/ThemesController.php index 45107b0dce..47b7e45ef8 100644 --- a/libraries/classes/Controllers/ThemesController.php +++ b/libraries/classes/Controllers/ThemesController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/TransformationOverviewController.php b/libraries/classes/Controllers/TransformationOverviewController.php index 8f5c8f2510..4d826e8aed 100644 --- a/libraries/classes/Controllers/TransformationOverviewController.php +++ b/libraries/classes/Controllers/TransformationOverviewController.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Controllers\TransformationOverviewController */ + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index df467c25c7..7c905affbd 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index 01b42fd6c2..f1db934516 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php index d58531336d..6da2c948a5 100644 --- a/libraries/classes/Controllers/VersionCheckController.php +++ b/libraries/classes/Controllers/VersionCheckController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/ViewCreateController.php b/libraries/classes/Controllers/ViewCreateController.php index 746e551143..3f9a4ee57b 100644 --- a/libraries/classes/Controllers/ViewCreateController.php +++ b/libraries/classes/Controllers/ViewCreateController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Controllers/ViewOperationsController.php b/libraries/classes/Controllers/ViewOperationsController.php index d5dc7d0c08..b93732a3d1 100644 --- a/libraries/classes/Controllers/ViewOperationsController.php +++ b/libraries/classes/Controllers/ViewOperationsController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Controllers; diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 22889e9291..d8c7ac666b 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -4,6 +4,7 @@ * This script is distinct from libraries/common.inc.php because this * script is called from /test. */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -647,7 +648,7 @@ class Core * @param array $array the array * @param mixed $default default value * - * @return array|null|mixed array element or $default + * @return array|mixed|null array element or $default */ public static function arrayRead(string $path, array $array, $default = null) { diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index fffdf6fe3f..aff7449729 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\CreateAddField class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Database/DatabaseList.php b/libraries/classes/Database/DatabaseList.php index ab19ef8449..5f2ebe5a1e 100644 --- a/libraries/classes/Database/DatabaseList.php +++ b/libraries/classes/Database/DatabaseList.php @@ -2,6 +2,7 @@ /** * holds the PhpMyAdmin\Database\DatabaseList class */ + declare(strict_types=1); namespace PhpMyAdmin\Database; diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index 32f7bcf8fb..a417c696cb 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Database\Designer class */ + declare(strict_types=1); namespace PhpMyAdmin\Database; diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index b129271683..6adadf7f9e 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Database\Designer\Common class */ + declare(strict_types=1); namespace PhpMyAdmin\Database\Designer; @@ -51,7 +52,7 @@ class Common * * @return DesignerTable[] with table info */ - public function getTablesInfo(string $db = null, string $table = null): array + public function getTablesInfo(?string $db = null, ?string $table = null): array { $designerTables = []; $db = $db ?? $GLOBALS['db']; @@ -556,7 +557,7 @@ class Common * @param string $table table name * @param string $field display field name * - * @return array<int,string|null|bool> + * @return array<int, (string|bool|null)> */ public function saveDisplayField($db, $table, $field): array { diff --git a/libraries/classes/Database/Designer/DesignerTable.php b/libraries/classes/Database/Designer/DesignerTable.php index 705ec8527b..cb47389140 100644 --- a/libraries/classes/Database/Designer/DesignerTable.php +++ b/libraries/classes/Database/Designer/DesignerTable.php @@ -1,7 +1,6 @@ <?php -/** - * Holds the PhpMyAdmin\Database\Designer\DesignerTable class - */ + +declare(strict_types=1); namespace PhpMyAdmin\Database\Designer; diff --git a/libraries/classes/Database/MultiTableQuery.php b/libraries/classes/Database/MultiTableQuery.php index 4624915d14..6282d9fe12 100644 --- a/libraries/classes/Database/MultiTableQuery.php +++ b/libraries/classes/Database/MultiTableQuery.php @@ -2,6 +2,7 @@ /** * Handles DB Multi-table query */ + declare(strict_types=1); namespace PhpMyAdmin\Database; diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index 825f85b847..f82092ecdf 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -2,6 +2,7 @@ /** * Handles DB QBE search */ + declare(strict_types=1); namespace PhpMyAdmin\Database; diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index a7c57ce71c..a6981c96f9 100644 --- a/libraries/classes/Database/Routines.php +++ b/libraries/classes/Database/Routines.php @@ -1239,9 +1239,8 @@ class Routines . mb_strtoupper($_POST['item_returnopts_num']); } } - $query .= ' '; - return $query; + return $query . ' '; } /** @@ -1633,7 +1632,7 @@ class Routines * * @param array $row Columns * - * @return null|string + * @return string|null */ private function browseRow(array $row): ?string { diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php index e6e283bbc9..c0ed31ae7f 100644 --- a/libraries/classes/Database/Search.php +++ b/libraries/classes/Database/Search.php @@ -2,6 +2,7 @@ /** * Handles Database Search */ + declare(strict_types=1); namespace PhpMyAdmin\Database; diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 83642a741c..b922086128 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -2,6 +2,7 @@ /** * Main interface for database interactions */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -113,7 +114,7 @@ class DatabaseInterface implements DbalInterface /** @var array Current user and host cache */ private $_current_user; - /** @var null|string lower_case_table_names value cache */ + /** @var string|null lower_case_table_names value cache */ private $_lower_case_table_names = null; /** @var bool Whether connection is MariaDB */ @@ -1373,7 +1374,7 @@ class DatabaseInterface implements DbalInterface * @param string $table name of table to retrieve columns from * @param mixed $link mysql link resource * - * @return null|array + * @return array|null */ public function getColumnNames( string $database, @@ -1793,7 +1794,7 @@ class DatabaseInterface implements DbalInterface * Returns row or element of a row * * @param array $row Row to process - * @param string|null|int $value Which column to return + * @param string|int|null $value Which column to return * * @return mixed */ diff --git a/libraries/classes/Dbal/DbalInterface.php b/libraries/classes/Dbal/DbalInterface.php index 3f5f57fe06..fa58c255bf 100644 --- a/libraries/classes/Dbal/DbalInterface.php +++ b/libraries/classes/Dbal/DbalInterface.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Dbal; @@ -256,7 +257,7 @@ interface DbalInterface * @param string $table name of table to retrieve columns from * @param mixed $link mysql link resource * - * @return null|array + * @return array|null */ public function getColumnNames( string $database, diff --git a/libraries/classes/Dbal/DbiExtension.php b/libraries/classes/Dbal/DbiExtension.php index cd50c811d4..408b4365aa 100644 --- a/libraries/classes/Dbal/DbiExtension.php +++ b/libraries/classes/Dbal/DbiExtension.php @@ -2,6 +2,7 @@ /** * Contract for every database extension supported by phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Dbal; diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index d82ebabe38..6dfcaf9303 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -2,6 +2,7 @@ /** * Interface to the MySQL Improved extension (MySQLi) */ + declare(strict_types=1); namespace PhpMyAdmin\Dbal; diff --git a/libraries/classes/Di/Migration.php b/libraries/classes/Di/Migration.php index 5f98aa3f78..d4b49674fe 100644 --- a/libraries/classes/Di/Migration.php +++ b/libraries/classes/Di/Migration.php @@ -2,6 +2,7 @@ /** * Migration from home-made DI to Symfony DI */ + declare(strict_types=1); namespace PhpMyAdmin\Di; diff --git a/libraries/classes/Display/ChangePassword.php b/libraries/classes/Display/ChangePassword.php index 6746ea7c77..ad5556799c 100644 --- a/libraries/classes/Display/ChangePassword.php +++ b/libraries/classes/Display/ChangePassword.php @@ -2,6 +2,7 @@ /** * Displays form for password change */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/CreateTable.php b/libraries/classes/Display/CreateTable.php index b56c98ea94..04b701218b 100644 --- a/libraries/classes/Display/CreateTable.php +++ b/libraries/classes/Display/CreateTable.php @@ -21,6 +21,7 @@ * warnings about the lack of privileges for CREATE TABLE. Tested * on MySQL 5.0.18. */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/Error.php b/libraries/classes/Display/Error.php index 28b2296980..c3063945ea 100644 --- a/libraries/classes/Display/Error.php +++ b/libraries/classes/Display/Error.php @@ -2,6 +2,7 @@ /** * Displays Error */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php index c459f77fef..9ae1ad5e09 100644 --- a/libraries/classes/Display/Export.php +++ b/libraries/classes/Display/Export.php @@ -2,6 +2,7 @@ /** * functions for displaying server, database and table export */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/GitRevision.php b/libraries/classes/Display/GitRevision.php index 20504be20c..a309ee6901 100644 --- a/libraries/classes/Display/GitRevision.php +++ b/libraries/classes/Display/GitRevision.php @@ -2,6 +2,7 @@ /** * Displays git revision */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/Import.php b/libraries/classes/Display/Import.php index 0c48e00e8a..c9ac064692 100644 --- a/libraries/classes/Display/Import.php +++ b/libraries/classes/Display/Import.php @@ -2,6 +2,7 @@ /** * functions for displaying import for: server, database and table */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/ImportAjax.php b/libraries/classes/Display/ImportAjax.php index 26941d06f8..30c19d554f 100644 --- a/libraries/classes/Display/ImportAjax.php +++ b/libraries/classes/Display/ImportAjax.php @@ -2,6 +2,7 @@ /** * Handles plugins that show the upload progress */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index e1f1bf4c0a..859be817d1 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -2,6 +2,7 @@ /** * Hold the PhpMyAdmin\Display\Results class */ + declare(strict_types=1); namespace PhpMyAdmin\Display; diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php index 277e5c4c22..c1ea1044ee 100644 --- a/libraries/classes/Encoding.php +++ b/libraries/classes/Encoding.php @@ -2,6 +2,7 @@ /** * Hold the PhpMyAdmin\Encoding class */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -30,29 +31,21 @@ class Encoding { /** * None encoding conversion engine - * - * @var int */ public const ENGINE_NONE = 0; /** * iconv encoding conversion engine - * - * @var int */ public const ENGINE_ICONV = 1; /** * recode encoding conversion engine - * - * @var int */ public const ENGINE_RECODE = 2; /** * mbstring encoding conversion engine - * - * @var int */ public const ENGINE_MB = 3; diff --git a/libraries/classes/Engines/Bdb.php b/libraries/classes/Engines/Bdb.php index 586bb3f570..3e74492534 100644 --- a/libraries/classes/Engines/Bdb.php +++ b/libraries/classes/Engines/Bdb.php @@ -2,6 +2,7 @@ /** * The BDB storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Berkeleydb.php b/libraries/classes/Engines/Berkeleydb.php index 275cad4c88..2e953fb96b 100644 --- a/libraries/classes/Engines/Berkeleydb.php +++ b/libraries/classes/Engines/Berkeleydb.php @@ -2,6 +2,7 @@ /** * The BerkeleyDB storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Binlog.php b/libraries/classes/Engines/Binlog.php index 3869f67bea..06c55320b7 100644 --- a/libraries/classes/Engines/Binlog.php +++ b/libraries/classes/Engines/Binlog.php @@ -2,6 +2,7 @@ /** * The binary log storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Innobase.php b/libraries/classes/Engines/Innobase.php index 91b2eacce8..5597d86f62 100644 --- a/libraries/classes/Engines/Innobase.php +++ b/libraries/classes/Engines/Innobase.php @@ -2,6 +2,7 @@ /** * The Innobase storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php index 4993580ac2..7c0426bf9f 100644 --- a/libraries/classes/Engines/Innodb.php +++ b/libraries/classes/Engines/Innodb.php @@ -2,6 +2,7 @@ /** * The InnoDB storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Memory.php b/libraries/classes/Engines/Memory.php index 5566f32eeb..ba2985088c 100644 --- a/libraries/classes/Engines/Memory.php +++ b/libraries/classes/Engines/Memory.php @@ -2,6 +2,7 @@ /** * The MEMORY (HEAP) storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Merge.php b/libraries/classes/Engines/Merge.php index 0bef2f4aff..33c68e8a72 100644 --- a/libraries/classes/Engines/Merge.php +++ b/libraries/classes/Engines/Merge.php @@ -2,6 +2,7 @@ /** * The MERGE storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/MrgMyisam.php b/libraries/classes/Engines/MrgMyisam.php index 7a605dc897..2aed8cc3a8 100644 --- a/libraries/classes/Engines/MrgMyisam.php +++ b/libraries/classes/Engines/MrgMyisam.php @@ -2,6 +2,7 @@ /** * The MERGE storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Myisam.php b/libraries/classes/Engines/Myisam.php index 1ddc0867ed..f8bb1cf909 100644 --- a/libraries/classes/Engines/Myisam.php +++ b/libraries/classes/Engines/Myisam.php @@ -2,6 +2,7 @@ /** * The MyISAM storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Ndbcluster.php b/libraries/classes/Engines/Ndbcluster.php index 10631f6f5a..0a70bb99a6 100644 --- a/libraries/classes/Engines/Ndbcluster.php +++ b/libraries/classes/Engines/Ndbcluster.php @@ -2,6 +2,7 @@ /** * The NDBCLUSTER storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/Pbxt.php b/libraries/classes/Engines/Pbxt.php index 4796398e84..41d4a2db8e 100644 --- a/libraries/classes/Engines/Pbxt.php +++ b/libraries/classes/Engines/Pbxt.php @@ -2,6 +2,7 @@ /** * The PBXT storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Engines/PerformanceSchema.php b/libraries/classes/Engines/PerformanceSchema.php index f0bf1e2ba7..33b1198d95 100644 --- a/libraries/classes/Engines/PerformanceSchema.php +++ b/libraries/classes/Engines/PerformanceSchema.php @@ -2,6 +2,7 @@ /** * The performance schema storage engine */ + declare(strict_types=1); namespace PhpMyAdmin\Engines; diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php index cd2189376c..eb311e521f 100644 --- a/libraries/classes/Error.php +++ b/libraries/classes/Error.php @@ -2,6 +2,7 @@ /** * Holds class PhpMyAdmin\Error */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index 9def7e99b0..e36d9f40e5 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -2,6 +2,7 @@ /** * Holds class PhpMyAdmin\ErrorHandler */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php index 5fd6a193c6..871f3a727d 100644 --- a/libraries/classes/ErrorReport.php +++ b/libraries/classes/ErrorReport.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\ErrorReport class */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -227,7 +228,7 @@ class ErrorReport * * @param array $report the report info to be sent * - * @return string|null|bool the reply of the server + * @return string|bool|null the reply of the server */ public function send(array $report) { diff --git a/libraries/classes/Exceptions/ExportException.php b/libraries/classes/Exceptions/ExportException.php index ea66032317..c40557703c 100644 --- a/libraries/classes/Exceptions/ExportException.php +++ b/libraries/classes/Exceptions/ExportException.php @@ -2,6 +2,7 @@ /** * Export exception */ + declare(strict_types=1); namespace PhpMyAdmin\Exceptions; diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index 4e955430f8..37e5500e93 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -2,6 +2,7 @@ /** * function for the main export logic */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -793,7 +794,7 @@ class Export $size = $this->dbi->fetchValue($query); //Converting the size to MB - $size = $size / 1024 / 1024; + $size /= 1024 / 1024; if ($size > $table_size) { continue; } diff --git a/libraries/classes/File.php b/libraries/classes/File.php index 655679861a..89a8626294 100644 --- a/libraries/classes/File.php +++ b/libraries/classes/File.php @@ -186,8 +186,7 @@ class File /** * Gets file content * - * @return string|null|false the binary file content, - * or false if no content + * @return string|false|null the binary file content, or false if no content * * @access public */ diff --git a/libraries/classes/FileListing.php b/libraries/classes/FileListing.php index a8615f1c69..9fb2500f32 100644 --- a/libraries/classes/FileListing.php +++ b/libraries/classes/FileListing.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\FileListing class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Font.php b/libraries/classes/Font.php index 301416d968..d042a30d5b 100644 --- a/libraries/classes/Font.php +++ b/libraries/classes/Font.php @@ -2,6 +2,7 @@ /** * Class with Font related methods. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index eb8f10a8dd..5ebdf17b9a 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -2,6 +2,7 @@ /** * Used to render the footer of PMA's pages */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Gis/GisFactory.php b/libraries/classes/Gis/GisFactory.php index 7b79b137fb..20e390de44 100644 --- a/libraries/classes/Gis/GisFactory.php +++ b/libraries/classes/Gis/GisFactory.php @@ -2,6 +2,7 @@ /** * Contains the factory class that handles the creation of geometric objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php index 8457ca3270..6109707aca 100644 --- a/libraries/classes/Gis/GisGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -2,6 +2,7 @@ /** * Base class for all GIS data type classes */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php index b2187960ee..74783c8dee 100644 --- a/libraries/classes/Gis/GisGeometryCollection.php +++ b/libraries/classes/Gis/GisGeometryCollection.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS GEOMETRYCOLLECTION objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php index 2c8387e66f..58b698d15c 100644 --- a/libraries/classes/Gis/GisLineString.php +++ b/libraries/classes/Gis/GisLineString.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS LINESTRING objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php index 9955d3eb7a..c85bfc690a 100644 --- a/libraries/classes/Gis/GisMultiLineString.php +++ b/libraries/classes/Gis/GisMultiLineString.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS MULTILINESTRING objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php index 88d84ea127..6e3b86d330 100644 --- a/libraries/classes/Gis/GisMultiPoint.php +++ b/libraries/classes/Gis/GisMultiPoint.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS MULTIPOINT objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php index 14e7cdd4d6..fb8f9b7633 100644 --- a/libraries/classes/Gis/GisMultiPolygon.php +++ b/libraries/classes/Gis/GisMultiPolygon.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS MULTIPOLYGON objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php index 0aa249743a..53f50eea39 100644 --- a/libraries/classes/Gis/GisPoint.php +++ b/libraries/classes/Gis/GisPoint.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS POINT objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php index 9c7fc6b9ac..6cb6e956de 100644 --- a/libraries/classes/Gis/GisPolygon.php +++ b/libraries/classes/Gis/GisPolygon.php @@ -2,6 +2,7 @@ /** * Handles actions related to GIS POLYGON objects */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php index 5308cb7bea..efe13d0a0b 100644 --- a/libraries/classes/Gis/GisVisualization.php +++ b/libraries/classes/Gis/GisVisualization.php @@ -2,6 +2,7 @@ /** * Handles visualization of GIS data */ + declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php index ae595d0447..db38a85d9d 100644 --- a/libraries/classes/Git.php +++ b/libraries/classes/Git.php @@ -2,6 +2,7 @@ /** * Git inspection */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -383,9 +384,9 @@ class Git /** * Is the commit remote * - * @param mixed $commit The commit - * @param boolean $isRemoteCommit Is the commit remote ?, will be modified by reference - * @param string $hash The commit hash + * @param mixed $commit The commit + * @param bool $isRemoteCommit Is the commit remote ?, will be modified by reference + * @param string $hash The commit hash * * @return stdClass|null The commit body from the GitHub API */ diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index cc22a97c6e..da99842b08 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -2,6 +2,7 @@ /** * Used to render the header of PMA's pages */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php b/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php index 2051f13c45..ee3061feac 100644 --- a/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php +++ b/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php @@ -2,6 +2,7 @@ /** * Interface for links (image, text, …) */ + declare(strict_types=1); namespace PhpMyAdmin\Html\ActionLinksModes; diff --git a/libraries/classes/Html/ActionLinksModes/Factory.php b/libraries/classes/Html/ActionLinksModes/Factory.php index 0206321c32..717cb8fbe3 100644 --- a/libraries/classes/Html/ActionLinksModes/Factory.php +++ b/libraries/classes/Html/ActionLinksModes/Factory.php @@ -2,6 +2,7 @@ /** * ActionLinksModesInterface builder */ + declare(strict_types=1); namespace PhpMyAdmin\Html\ActionLinksModes; diff --git a/libraries/classes/Html/ActionLinksModes/Image.php b/libraries/classes/Html/ActionLinksModes/Image.php index dd6546628d..40826dbdd0 100644 --- a/libraries/classes/Html/ActionLinksModes/Image.php +++ b/libraries/classes/Html/ActionLinksModes/Image.php @@ -2,6 +2,7 @@ /** * Image link generator */ + declare(strict_types=1); namespace PhpMyAdmin\Html\ActionLinksModes; diff --git a/libraries/classes/Html/ActionLinksModes/Text.php b/libraries/classes/Html/ActionLinksModes/Text.php index 3a2d383204..f5b49ececb 100644 --- a/libraries/classes/Html/ActionLinksModes/Text.php +++ b/libraries/classes/Html/ActionLinksModes/Text.php @@ -2,6 +2,7 @@ /** * Text link generator */ + declare(strict_types=1); namespace PhpMyAdmin\Html\ActionLinksModes; diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php index b515963907..dba4f69506 100644 --- a/libraries/classes/Html/Generator.php +++ b/libraries/classes/Html/Generator.php @@ -2,6 +2,7 @@ /** * HTML Generator */ + declare(strict_types=1); namespace PhpMyAdmin\Html; @@ -82,7 +83,7 @@ class Generator public static function linkToVarDocumentation( string $name, bool $useMariaDB = false, - string $text = null + ?string $text = null ): string { $html = ''; try { diff --git a/libraries/classes/Html/MySQLDocumentation.php b/libraries/classes/Html/MySQLDocumentation.php index 2e5ee1ee80..fb45c8a806 100644 --- a/libraries/classes/Html/MySQLDocumentation.php +++ b/libraries/classes/Html/MySQLDocumentation.php @@ -2,6 +2,7 @@ /** * Generate HTML for MySQL Documentation */ + declare(strict_types=1); namespace PhpMyAdmin\Html; diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index 7d555e9d5d..7341eac5ca 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Import class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index f23329c715..7ce92852c2 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -2,6 +2,7 @@ /** * holds the database index class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/IndexColumn.php b/libraries/classes/IndexColumn.php index 0408892325..cc74687ced 100644 --- a/libraries/classes/IndexColumn.php +++ b/libraries/classes/IndexColumn.php @@ -2,6 +2,7 @@ /** * holds the database index columns class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 68edad768b..7a4aae49b3 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -2,6 +2,7 @@ /** * set of functions with the insert/edit features in pma */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/InternalRelations.php b/libraries/classes/InternalRelations.php index b64469321a..3dee67ea75 100644 --- a/libraries/classes/InternalRelations.php +++ b/libraries/classes/InternalRelations.php @@ -2,6 +2,7 @@ /** * Internal relations for information schema and mysql databases. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/IpAllowDeny.php b/libraries/classes/IpAllowDeny.php index f50bbb95a4..65457ba37d 100644 --- a/libraries/classes/IpAllowDeny.php +++ b/libraries/classes/IpAllowDeny.php @@ -3,6 +3,7 @@ * This library is used with the server IP allow/deny host authentication * feature */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Language.php b/libraries/classes/Language.php index d336c03ee5..b543d67450 100644 --- a/libraries/classes/Language.php +++ b/libraries/classes/Language.php @@ -2,6 +2,7 @@ /** * Hold the PhpMyAdmin\Language class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index 27352f29cb..88554fd7f9 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -2,6 +2,7 @@ /** * Hold the PhpMyAdmin\LanguageManager class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Linter.php b/libraries/classes/Linter.php index bbc37649c7..c31d9f90b8 100644 --- a/libraries/classes/Linter.php +++ b/libraries/classes/Linter.php @@ -2,6 +2,7 @@ /** * Analyzes a query and gives user feedback. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ListAbstract.php b/libraries/classes/ListAbstract.php index bbaffce325..225b875f7c 100644 --- a/libraries/classes/ListAbstract.php +++ b/libraries/classes/ListAbstract.php @@ -2,6 +2,7 @@ /** * hold the ListAbstract base class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ListDatabase.php b/libraries/classes/ListDatabase.php index c93b7736fe..88ea3309cc 100644 --- a/libraries/classes/ListDatabase.php +++ b/libraries/classes/ListDatabase.php @@ -2,6 +2,7 @@ /** * holds the ListDatabase class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Logging.php b/libraries/classes/Logging.php index 6f92db50c9..c32482648f 100644 --- a/libraries/classes/Logging.php +++ b/libraries/classes/Logging.php @@ -4,6 +4,7 @@ * * This includes web server specific code to log some information. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index f4e9cee5d9..91d095441e 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -2,6 +2,7 @@ /** * Generates and renders the top menu */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php index 608457ae44..9b8c18d4ea 100644 --- a/libraries/classes/Message.php +++ b/libraries/classes/Message.php @@ -2,6 +2,7 @@ /** * Holds class Message */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Mime.php b/libraries/classes/Mime.php index 06f208db4d..70b4711da3 100644 --- a/libraries/classes/Mime.php +++ b/libraries/classes/Mime.php @@ -4,6 +4,7 @@ * * @todo Maybe we could try to use fileinfo module if loaded */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index b1a86023e4..0f8a96fc49 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -3,6 +3,7 @@ * This class is responsible for instantiating * the various components of the navigation panel */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation; diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index 7dabcbc4e5..c7415582a3 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation; diff --git a/libraries/classes/Navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php index 0b18aabd62..1221a69e2c 100644 --- a/libraries/classes/Navigation/NodeFactory.php +++ b/libraries/classes/Navigation/NodeFactory.php @@ -2,6 +2,7 @@ /** * This class is responsible for creating Node objects */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation; diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index fbf29dc8e1..9762dd8158 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree in the left frame */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; @@ -29,13 +30,7 @@ use function strstr; */ class Node { - /** - * @var int Defines a possible node type - */ public const CONTAINER = 0; - /** - * @var int Defines a possible node type - */ public const OBJECT = 1; /** * @var string A non-unique identifier for the node diff --git a/libraries/classes/Navigation/Nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php index 0b8f28eacb..ed910e3fbe 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php index 55d50f120c..104cd448bb 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php index c2cf448176..ce3f6350c1 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index 515a5dfc5f..dde0e1bfa5 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php index 8c24ae4b21..a343a94974 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php @@ -2,6 +2,7 @@ /** * Represents container node that carries children of a database */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php index 02531804fe..fedc504fca 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php index f2b529eee4..f5802077fd 100644 --- a/libraries/classes/Navigation/Nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php index ace58aafc2..ce2bf6a03a 100644 --- a/libraries/classes/Navigation/Nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php index e8e7adfe85..44c4af3486 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index 933021b3af..6db44babaa 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php index 1bde5fd1a0..7866d8f8ac 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 2ad6906577..2818be416b 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php index e47a791133..507b81480f 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index 6932b79436..9d2a40e254 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php index 7bf9c70203..20303e7a11 100644 --- a/libraries/classes/Navigation/Nodes/NodeTable.php +++ b/libraries/classes/Navigation/Nodes/NodeTable.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php index 857f777e26..cc175207c2 100644 --- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php index 165e3cb51b..24962511ab 100644 --- a/libraries/classes/Navigation/Nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index 15a695b69f..21dbc990e2 100644 --- a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php index 59b62b27b8..6dcea469b9 100644 --- a/libraries/classes/Navigation/Nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Navigation/Nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php index faf7acbe59..3216c203ce 100644 --- a/libraries/classes/Navigation/Nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -2,6 +2,7 @@ /** * Functionality for the navigation tree */ + declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index 0633838459..508fed209f 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Normalization class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/OpenDocument.php b/libraries/classes/OpenDocument.php index a21681324b..2551883805 100644 --- a/libraries/classes/OpenDocument.php +++ b/libraries/classes/OpenDocument.php @@ -2,6 +2,7 @@ /** * Simple interface for creating OASIS OpenDocument files. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index 185f016049..7243d56670 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Operations class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/OutputBuffering.php b/libraries/classes/OutputBuffering.php index b2203a696c..e151b02ac3 100644 --- a/libraries/classes/OutputBuffering.php +++ b/libraries/classes/OutputBuffering.php @@ -2,6 +2,7 @@ /** * Output buffering wrapper */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ParseAnalyze.php b/libraries/classes/ParseAnalyze.php index 615493947f..953433ebc1 100644 --- a/libraries/classes/ParseAnalyze.php +++ b/libraries/classes/ParseAnalyze.php @@ -2,6 +2,7 @@ /** * Parse and analyse a SQL query */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Partition.php b/libraries/classes/Partition.php index 35df30f899..ef102191e3 100644 --- a/libraries/classes/Partition.php +++ b/libraries/classes/Partition.php @@ -2,6 +2,7 @@ /** * Library for extracting information about the partitions */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php index aef20a35e0..2edb82c0f8 100644 --- a/libraries/classes/Pdf.php +++ b/libraries/classes/Pdf.php @@ -2,6 +2,7 @@ /** * TCPDF wrapper class. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php index 5841146874..f6d0221575 100644 --- a/libraries/classes/Plugins.php +++ b/libraries/classes/Plugins.php @@ -2,6 +2,7 @@ /** * Generic plugin interface. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Plugins/Auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php index 2e5e3578aa..b1e5b595da 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -2,6 +2,7 @@ /** * Config Authentication plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Auth; diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index 1d60f40a5e..8f0ada3f68 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -2,6 +2,7 @@ /** * Cookie Authentication plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Auth; diff --git a/libraries/classes/Plugins/Auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php index b002190b3b..9f06677bda 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationHttp.php +++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php @@ -3,6 +3,7 @@ * HTTP Authentication plugin for phpMyAdmin. * NOTE: Requires PHP loaded as a Apache module. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Auth; diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php index 69fc4256d1..936ec8bf41 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationSignon.php +++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php @@ -2,6 +2,7 @@ /** * SignOn Authentication plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Auth; @@ -53,7 +54,7 @@ class AuthenticationSignon extends AuthenticationPlugin * * @param array $sessionCookieParams The cookie params */ - public function setCookieParams(array $sessionCookieParams = null): void + public function setCookieParams(?array $sessionCookieParams = null): void { /* Session cookie params from config */ if ($sessionCookieParams === null) { diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index d48429c959..e8e3a586ee 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the authentication plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php index 9f279cd0c4..624ebeb1e9 100644 --- a/libraries/classes/Plugins/Export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -2,6 +2,7 @@ /** * Set of functions used to build NHibernate dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php index 317fa1a641..43f7cb8b48 100644 --- a/libraries/classes/Plugins/Export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -2,6 +2,7 @@ /** * CSV export code */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php index 04ce9aa997..d0d04a1232 100644 --- a/libraries/classes/Plugins/Export/ExportExcel.php +++ b/libraries/classes/Plugins/Export/ExportExcel.php @@ -2,6 +2,7 @@ /** * Class for exporting CSV dumps of tables for excel */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index 46e02b54c5..8c015d4a86 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -2,6 +2,7 @@ /** * HTML-Word export code */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index 1ab6a1ed0b..3746d502fe 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -2,6 +2,7 @@ /** * Set of methods used to build dumps of tables as JSON */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php index d26b2e0eae..dd839e4fa4 100644 --- a/libraries/classes/Plugins/Export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -2,6 +2,7 @@ /** * Set of methods used to build dumps of tables as Latex */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php index ddd88844c7..ee4872a2ef 100644 --- a/libraries/classes/Plugins/Export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -2,6 +2,7 @@ /** * Set of functions used to build MediaWiki dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php index 91f04afe1f..426faa8e62 100644 --- a/libraries/classes/Plugins/Export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -2,6 +2,7 @@ /** * Set of functions used to build OpenDocument Spreadsheet dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index b01584549f..980f0ac4a5 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -2,6 +2,7 @@ /** * Set of functions used to build OpenDocument Text dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index d41056e92b..ea71f47aa6 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -2,6 +2,7 @@ /** * Produce a PDF report (export) from a query */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php index 9a436fd457..fb7e5b39a2 100644 --- a/libraries/classes/Plugins/Export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -2,6 +2,7 @@ /** * Set of functions used to build dumps of tables as PHP Arrays */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index 6c25377f37..4f3ef314ff 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -2,6 +2,7 @@ /** * Set of functions used to build SQL dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index 3fc369c573..439af82ce3 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -2,6 +2,7 @@ /** * Export to Texy! text. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index 942a2e115a..b35e8f200b 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -2,6 +2,7 @@ /** * Set of functions used to build XML dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php index 2e6b126f81..a906b52721 100644 --- a/libraries/classes/Plugins/Export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -2,6 +2,7 @@ /** * Set of functions used to build YAML dumps of tables */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index 6fe85de362..f4c34ba0ab 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -2,6 +2,7 @@ /** * PhpMyAdmin\Plugins\Export\Helpers\Pdf class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export\Helpers; diff --git a/libraries/classes/Plugins/Export/Helpers/TableProperty.php b/libraries/classes/Plugins/Export/Helpers/TableProperty.php index b17943b9c1..716d6a7618 100644 --- a/libraries/classes/Plugins/Export/Helpers/TableProperty.php +++ b/libraries/classes/Plugins/Export/Helpers/TableProperty.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Plugins\Export\Helpers\TableProperty class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export\Helpers; diff --git a/libraries/classes/Plugins/Export/README.md b/libraries/classes/Plugins/Export/README.md index c9e479d4c3..f1420fb614 100644 --- a/libraries/classes/Plugins/Export/README.md +++ b/libraries/classes/Plugins/Export/README.md @@ -13,6 +13,7 @@ some plugins for your use, you can directly use texts in plugin. * @package PhpMyAdmin-Export * @subpackage [Name] */ + declare(strict_types=1); /** diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php index 1d82a4282e..87424a683d 100644 --- a/libraries/classes/Plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the export plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php index d1cb292b7d..53b9f081ba 100644 --- a/libraries/classes/Plugins/IOTransformationsPlugin.php +++ b/libraries/classes/Plugins/IOTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the I/O transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/Import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php index 9018ed4844..73bffd89aa 100644 --- a/libraries/classes/Plugins/Import/AbstractImportCsv.php +++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php @@ -2,6 +2,7 @@ /** * Super class of CSV import plugins for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index 460948d33c..ce07fd3c24 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -4,6 +4,7 @@ * * @todo add an option for handling NULL values */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php index ab9ee748f4..50885e92c6 100644 --- a/libraries/classes/Plugins/Import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -2,6 +2,7 @@ /** * CSV import plugin for phpMyAdmin using LOAD DATA */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php index 705eaaf5be..c4ea4b6df4 100644 --- a/libraries/classes/Plugins/Import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -2,6 +2,7 @@ /** * MediaWiki import plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index ba2e239636..0319e05260 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -5,6 +5,7 @@ * @todo Pretty much everything * @todo Importing of accented characters seems to fail */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php index 094fc2d066..5111c76105 100644 --- a/libraries/classes/Plugins/Import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -2,6 +2,7 @@ /** * ESRI Shape file import plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php index 4fae572c61..546c6fc699 100644 --- a/libraries/classes/Plugins/Import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -2,6 +2,7 @@ /** * SQL import plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index b6299b4be2..5a142567cd 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -4,6 +4,7 @@ * * @todo Improve efficiency */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/README.md b/libraries/classes/Plugins/Import/README.md index 41d27ec07e..fec3a3c242 100644 --- a/libraries/classes/Plugins/Import/README.md +++ b/libraries/classes/Plugins/Import/README.md @@ -12,6 +12,7 @@ gettext mechanism, see https://wiki.phpmyadmin.net/pma/Gettext_for_developers. * @package PhpMyAdmin-Import * @subpackage [Name] */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/ShapeFileImport.php b/libraries/classes/Plugins/Import/ShapeFileImport.php index 47bdf5d12c..3528bc1888 100644 --- a/libraries/classes/Plugins/Import/ShapeFileImport.php +++ b/libraries/classes/Plugins/Import/ShapeFileImport.php @@ -3,6 +3,7 @@ * This class extends ShapeFile class to cater the following phpMyAdmin * specific requirements. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; diff --git a/libraries/classes/Plugins/Import/Upload/UploadApc.php b/libraries/classes/Plugins/Import/Upload/UploadApc.php index 12fe8952aa..842583d2f0 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadApc.php +++ b/libraries/classes/Plugins/Import/Upload/UploadApc.php @@ -2,6 +2,7 @@ /** * Provides upload functionalities for the import plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import\Upload; diff --git a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php index cd80678dd3..bab2e07772 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php +++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php @@ -2,6 +2,7 @@ /** * Provides upload functionalities for the import plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import\Upload; diff --git a/libraries/classes/Plugins/Import/Upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php index d4db84bf8c..ce5df15049 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadProgress.php +++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php @@ -2,6 +2,7 @@ /** * Provides upload functionalities for the import plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import\Upload; diff --git a/libraries/classes/Plugins/Import/Upload/UploadSession.php b/libraries/classes/Plugins/Import/Upload/UploadSession.php index f3b3e320e2..caf24c0a80 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadSession.php +++ b/libraries/classes/Plugins/Import/Upload/UploadSession.php @@ -2,6 +2,7 @@ /** * Provides upload functionalities for the import plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import\Upload; diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php index de74e97237..d75c9fe313 100644 --- a/libraries/classes/Plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the import plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/Schema/Dia/Dia.php b/libraries/classes/Plugins/Schema/Dia/Dia.php index d91fe076f9..8a08eeb6f3 100644 --- a/libraries/classes/Plugins/Schema/Dia/Dia.php +++ b/libraries/classes/Plugins/Schema/Dia/Dia.php @@ -2,6 +2,7 @@ /** * Classes to create relation schema in Dia format. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Dia; diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php index 3c8fa53cb3..ba96040c01 100644 --- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php @@ -2,6 +2,7 @@ /** * Classes to create relation schema in Dia format. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Dia; diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php index 58f944e8eb..2552f6bda9 100644 --- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php +++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Dia; diff --git a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php index cb28d258c1..6f57d5e7e8 100644 --- a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php +++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Dia; diff --git a/libraries/classes/Plugins/Schema/Eps/Eps.php b/libraries/classes/Plugins/Schema/Eps/Eps.php index 9239786b60..a8ac650a1d 100644 --- a/libraries/classes/Plugins/Schema/Eps/Eps.php +++ b/libraries/classes/Plugins/Schema/Eps/Eps.php @@ -2,6 +2,7 @@ /** * Classes to create relation schema in EPS format. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index 0c424a8266..ab6d585fb9 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -2,6 +2,7 @@ /** * Classes to create relation schema in EPS format. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; diff --git a/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php b/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php index 2bce646270..afdc8f078a 100644 --- a/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Eps\RelationStatsEps class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; diff --git a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php index 60ea67e6cb..376f244475 100644 --- a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index 60b53dda83..71d49676d0 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -3,6 +3,7 @@ * Contains PhpMyAdmin\Plugins\Schema\ExportRelationSchema class which is * inherited by all schema classes. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php index 9d19e3e7a8..95da84af12 100644 --- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php @@ -2,6 +2,7 @@ /** * PDF schema handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Pdf; diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index 4ad9734c67..48953c5aa4 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -2,6 +2,7 @@ /** * PDF schema handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Pdf; diff --git a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php index adb2024848..f0bbdb8530 100644 --- a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Pdf\RelationStatsPdf class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Pdf; diff --git a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php index 8e70e16877..b45457fa02 100644 --- a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Pdf; diff --git a/libraries/classes/Plugins/Schema/RelationStats.php b/libraries/classes/Plugins/Schema/RelationStats.php index 547863a7dc..67b999f848 100644 --- a/libraries/classes/Plugins/Schema/RelationStats.php +++ b/libraries/classes/Plugins/Schema/RelationStats.php @@ -2,6 +2,7 @@ /** * Contains abstract class to hold relation preferences/statistics */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/Schema/SchemaDia.php b/libraries/classes/Plugins/Schema/SchemaDia.php index 8edfef660b..033aab7946 100644 --- a/libraries/classes/Plugins/Schema/SchemaDia.php +++ b/libraries/classes/Plugins/Schema/SchemaDia.php @@ -2,6 +2,7 @@ /** * Dia schema export code */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php index c9f2ae9b22..a43ec257db 100644 --- a/libraries/classes/Plugins/Schema/SchemaEps.php +++ b/libraries/classes/Plugins/Schema/SchemaEps.php @@ -2,6 +2,7 @@ /** * PDF schema export code */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php index 33cc659224..2fd92e2f48 100644 --- a/libraries/classes/Plugins/Schema/SchemaPdf.php +++ b/libraries/classes/Plugins/Schema/SchemaPdf.php @@ -2,6 +2,7 @@ /** * PDF schema export code */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/Schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php index b9e8d48be9..f85aab1d7f 100644 --- a/libraries/classes/Plugins/Schema/SchemaSvg.php +++ b/libraries/classes/Plugins/Schema/SchemaSvg.php @@ -2,6 +2,7 @@ /** * PDF schema export code */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php index 6b70bbdae5..aa42f9b359 100644 --- a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; diff --git a/libraries/classes/Plugins/Schema/Svg/Svg.php b/libraries/classes/Plugins/Schema/Svg/Svg.php index 2756db6aa4..23829f76d4 100644 --- a/libraries/classes/Plugins/Schema/Svg/Svg.php +++ b/libraries/classes/Plugins/Schema/Svg/Svg.php @@ -2,6 +2,7 @@ /** * Classes to create relation schema in SVG format. */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index 613173e84b..c4392a9e1e 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; diff --git a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php index a3923c6225..53fb63a2ac 100644 --- a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php @@ -2,6 +2,7 @@ /** * Contains PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg class */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; diff --git a/libraries/classes/Plugins/Schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php index c360808cbb..4b12af0cb8 100644 --- a/libraries/classes/Plugins/Schema/TableStats.php +++ b/libraries/classes/Plugins/Schema/TableStats.php @@ -2,6 +2,7 @@ /** * Contains abstract class to hold table preferences/statistics */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php index 4daf61539c..0d4cb603bd 100644 --- a/libraries/classes/Plugins/SchemaPlugin.php +++ b/libraries/classes/Plugins/SchemaPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the schema export plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php index d86d52c141..8eb0386aaa 100644 --- a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the Bool2Text transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php index b0334c6197..3c7212b27a 100644 --- a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for syntax highlighted editors using CodeMirror */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php index 80c6988f39..9d24f100e1 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the date format transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php index aaf55698f7..7ce4ffb6b6 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the download transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php index 96b1dbf9ab..ea97b61545 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the external transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php index db173f7015..65aaecbaf5 100644 --- a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the formatted transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php index feb3401697..7773fd499f 100644 --- a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the hex transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php index 6334e8581f..4dff74d107 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the link transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php index 4c3b9e6d1e..39c9a42707 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the image upload input transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php index 0d32e1c901..2b72e48916 100644 --- a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the inline transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php index 5ae37999de..c118e51a16 100644 --- a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the long to IPv4 transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php index bbd650c968..c9ea220eb9 100644 --- a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the prepend/append transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php index 741297e7a6..d190ed176d 100644 --- a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the regex validation input transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php index 55a0d69142..382c69a25f 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the SQL transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php index ec0e679319..9b4b62ac81 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the substring transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php index c0964bf3e2..a818c48556 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the text file upload input transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php index b52aff9be5..b78295a154 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the image link transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php index d3f8ee8eab..b7011a7ded 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the link transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php index e8a538d4b7..71b242041c 100644 --- a/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php +++ b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php @@ -2,6 +2,7 @@ /** * Image JPEG Upload Input Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php index 20d125f936..e227c339cb 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php @@ -2,6 +2,7 @@ /** * Text Plain File Upload Input Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php index 1c2aa4eb6f..426ab23cf7 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php @@ -2,6 +2,7 @@ /** * Handles the IPv4/IPv6 to binary transformation for text plain */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php index 3d9e74386c..07cc7adcd1 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php @@ -2,6 +2,7 @@ /** * Handles the IPv4/IPv6 to long transformation for text plain */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php index 8f5834b4ab..50eda014d9 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php @@ -2,6 +2,7 @@ /** * JSON editing with syntax highlighted CodeMirror editor */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php index 3dce37a115..8f2db20a88 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php @@ -2,6 +2,7 @@ /** * Text Plain Regex Validation Input Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php index 941772f0a0..4a2565af71 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php @@ -2,6 +2,7 @@ /** * SQL editing with syntax highlighted CodeMirror editor */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php index 560235599f..7f16e8a14a 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php @@ -2,6 +2,7 @@ /** * XML (and HTML) editing with syntax highlighted CodeMirror editor */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Input; diff --git a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php index df73e7bf61..176097865b 100644 --- a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php +++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php @@ -2,6 +2,7 @@ /** * Application OctetStream Download Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php index 68614073b6..f80cf7577d 100644 --- a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php +++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php @@ -2,6 +2,7 @@ /** * Application OctetStream Hex Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php index 613680d3b7..c55ef8dca0 100644 --- a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php +++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php @@ -2,6 +2,7 @@ /** * Image JPEG Inline Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php index ff8b6a6d03..7651d945ed 100644 --- a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php +++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php @@ -2,6 +2,7 @@ /** * Image JPEG Link Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php index 1d9b3049b5..629baa4eac 100644 --- a/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php +++ b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php @@ -2,6 +2,7 @@ /** * Image PNG Inline Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php index 71b403ce9a..08aefa014c 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php @@ -2,6 +2,7 @@ /** * Blob SQL Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php index 25924da90e..49fd28aca5 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php @@ -2,6 +2,7 @@ /** * Handles the binary to IPv4/IPv6 transformation for text plain */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php index 70bb9020aa..f666bef4d4 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php @@ -2,6 +2,7 @@ /** * Text Plain Bool2Text Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php index 6b79c83b01..5fe40806d5 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php @@ -2,6 +2,7 @@ /** * Text Plain Date Format Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php index 759e581093..c539285089 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php @@ -2,6 +2,7 @@ /** * Text Plain External Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php index b91b4d0c04..e36734d8bc 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php @@ -2,6 +2,7 @@ /** * Text Plain Formatted Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php index 7481d8ac1a..24cabba3fe 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php @@ -2,6 +2,7 @@ /** * Text Plain Image Link Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php index 221b31f2fe..d2579ea359 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php @@ -2,6 +2,7 @@ /** * Text Plain JSON Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php index 974eeb91ab..984c196d77 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php @@ -2,6 +2,7 @@ /** * Text Plain SQL Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php index 7633ad1d99..18f33a818b 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php @@ -2,6 +2,7 @@ /** * Text Plain XML Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Output; diff --git a/libraries/classes/Plugins/Transformations/TEMPLATE b/libraries/classes/Plugins/Transformations/TEMPLATE index 9a83715d55..c428fe0557 100644 --- a/libraries/classes/Plugins/Transformations/TEMPLATE +++ b/libraries/classes/Plugins/Transformations/TEMPLATE @@ -7,6 +7,7 @@ * @package PhpMyAdmin-Transformations * @subpackage [TransformationName] */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations; diff --git a/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT b/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT index 261356a4c7..d8f637e5c8 100644 --- a/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT +++ b/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT @@ -7,6 +7,7 @@ * @package PhpMyAdmin-Transformations * @subpackage [TransformationName] */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations\Abs; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Link.php b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php index d89f76d3d6..32043bc76d 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_Link.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php @@ -2,6 +2,7 @@ /** * Text Plain Link Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php index 9c9a71f3a2..774ede7f35 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php @@ -2,6 +2,7 @@ /** * Text Plain Long To IPv4 Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php index b105da70f2..57366fb5a6 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php @@ -2,6 +2,7 @@ /** * Text Plain Prepend/Append Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php index 7eacbeced8..1b3ff64a0f 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php @@ -2,6 +2,7 @@ /** * Text Plain Substring Transformations plugin for phpMyAdmin */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\Transformations; diff --git a/libraries/classes/Plugins/TransformationsInterface.php b/libraries/classes/Plugins/TransformationsInterface.php index fda95f1014..ff9069cf92 100644 --- a/libraries/classes/Plugins/TransformationsInterface.php +++ b/libraries/classes/Plugins/TransformationsInterface.php @@ -2,6 +2,7 @@ /** * Interface for the transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/TransformationsPlugin.php b/libraries/classes/Plugins/TransformationsPlugin.php index b446d5e030..77fc2cac95 100644 --- a/libraries/classes/Plugins/TransformationsPlugin.php +++ b/libraries/classes/Plugins/TransformationsPlugin.php @@ -2,6 +2,7 @@ /** * Abstract class for the transformations plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index 012b229f86..1fcb264256 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -2,6 +2,7 @@ /** * Second authentication factor handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\TwoFactor; diff --git a/libraries/classes/Plugins/TwoFactor/Invalid.php b/libraries/classes/Plugins/TwoFactor/Invalid.php index ffd6acef0b..18a19241d8 100644 --- a/libraries/classes/Plugins/TwoFactor/Invalid.php +++ b/libraries/classes/Plugins/TwoFactor/Invalid.php @@ -2,6 +2,7 @@ /** * Second authentication factor handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\TwoFactor; diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php index b1f9857ac1..fb793736bc 100644 --- a/libraries/classes/Plugins/TwoFactor/Key.php +++ b/libraries/classes/Plugins/TwoFactor/Key.php @@ -2,6 +2,7 @@ /** * Second authentication factor handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\TwoFactor; diff --git a/libraries/classes/Plugins/TwoFactor/Simple.php b/libraries/classes/Plugins/TwoFactor/Simple.php index b099206066..5c366a1e69 100644 --- a/libraries/classes/Plugins/TwoFactor/Simple.php +++ b/libraries/classes/Plugins/TwoFactor/Simple.php @@ -2,6 +2,7 @@ /** * Second authentication factor handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins\TwoFactor; diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index d72213c338..b6f9a29228 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -2,6 +2,7 @@ /** * Two authentication factor handling */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/UploadInterface.php b/libraries/classes/Plugins/UploadInterface.php index 5dba561331..7db15a039e 100644 --- a/libraries/classes/Plugins/UploadInterface.php +++ b/libraries/classes/Plugins/UploadInterface.php @@ -2,6 +2,7 @@ /** * Interface for the import->upload plugins */ + declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php index 901e7c5502..91fe43e03a 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Groups; diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php index 8227994b24..88a8e00c09 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Groups; diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php index 3515f08fa3..aeaabcbfb9 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Groups; diff --git a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php index da881c250f..762683fc61 100644 --- a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\BoolPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/DocPropertyItem.php b/libraries/classes/Properties/Options/Items/DocPropertyItem.php index 81b6d401e7..6a796388d0 100644 --- a/libraries/classes/Properties/Options/Items/DocPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/DocPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\DocPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php index afa378756a..4a2f81877b 100644 --- a/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php index 6959fa5fcf..b4d9e42c2e 100644 --- a/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/NumberPropertyItem.php b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php index f0ba19eb73..d8bf8a621c 100644 --- a/libraries/classes/Properties/Options/Items/NumberPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\TextPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php index d915f427a9..39c0935b89 100644 --- a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\RadioPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/SelectPropertyItem.php b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php index 06708660c5..4557f21b54 100644 --- a/libraries/classes/Properties/Options/Items/SelectPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\SelectPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/Items/TextPropertyItem.php b/libraries/classes/Properties/Options/Items/TextPropertyItem.php index 2e5cd86807..eb4e40da12 100644 --- a/libraries/classes/Properties/Options/Items/TextPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/TextPropertyItem.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\Properties\Options\Items\TextPropertyItem class */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options\Items; diff --git a/libraries/classes/Properties/Options/OptionsPropertyGroup.php b/libraries/classes/Properties/Options/OptionsPropertyGroup.php index 0df179b3ee..41449164b5 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyGroup.php +++ b/libraries/classes/Properties/Options/OptionsPropertyGroup.php @@ -2,6 +2,7 @@ /** * Superclass for the Property Group classes. */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options; diff --git a/libraries/classes/Properties/Options/OptionsPropertyItem.php b/libraries/classes/Properties/Options/OptionsPropertyItem.php index 492d0055b5..fa3bbe27f2 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyItem.php +++ b/libraries/classes/Properties/Options/OptionsPropertyItem.php @@ -3,6 +3,7 @@ * The top-level class of the "Options" subtree of the object-oriented * properties system (the other subtree is "Plugin"). */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options; diff --git a/libraries/classes/Properties/Options/OptionsPropertyOneItem.php b/libraries/classes/Properties/Options/OptionsPropertyOneItem.php index 38935d74cf..881e3dd2fd 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyOneItem.php +++ b/libraries/classes/Properties/Options/OptionsPropertyOneItem.php @@ -2,6 +2,7 @@ /** * Superclass for the single Property Item classes. */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Options; diff --git a/libraries/classes/Properties/Plugins/ExportPluginProperties.php b/libraries/classes/Properties/Plugins/ExportPluginProperties.php index ca40b82ac9..1adfabb8ae 100644 --- a/libraries/classes/Properties/Plugins/ExportPluginProperties.php +++ b/libraries/classes/Properties/Plugins/ExportPluginProperties.php @@ -2,6 +2,7 @@ /** * Properties class for the export plug-in */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Plugins; diff --git a/libraries/classes/Properties/Plugins/ImportPluginProperties.php b/libraries/classes/Properties/Plugins/ImportPluginProperties.php index c5d35031ff..6f0c052261 100644 --- a/libraries/classes/Properties/Plugins/ImportPluginProperties.php +++ b/libraries/classes/Properties/Plugins/ImportPluginProperties.php @@ -2,6 +2,7 @@ /** * Properties class for the import plug-in */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Plugins; diff --git a/libraries/classes/Properties/Plugins/PluginPropertyItem.php b/libraries/classes/Properties/Plugins/PluginPropertyItem.php index c4740d141c..f3c98f53e2 100644 --- a/libraries/classes/Properties/Plugins/PluginPropertyItem.php +++ b/libraries/classes/Properties/Plugins/PluginPropertyItem.php @@ -3,6 +3,7 @@ * The top-level class of the "Plugin" subtree of the object-oriented * properties system (the other subtree is "Options"). */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Plugins; diff --git a/libraries/classes/Properties/Plugins/SchemaPluginProperties.php b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php index 8198d68620..92b57bf32a 100644 --- a/libraries/classes/Properties/Plugins/SchemaPluginProperties.php +++ b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php @@ -2,6 +2,7 @@ /** * Properties class for the schema export plug-in */ + declare(strict_types=1); namespace PhpMyAdmin\Properties\Plugins; diff --git a/libraries/classes/Properties/PropertyItem.php b/libraries/classes/Properties/PropertyItem.php index 96c394f9fa..eebbb8ddad 100644 --- a/libraries/classes/Properties/PropertyItem.php +++ b/libraries/classes/Properties/PropertyItem.php @@ -2,6 +2,7 @@ /** * The top-level class of the object-oriented properties system. */ + declare(strict_types=1); namespace PhpMyAdmin\Properties; @@ -34,7 +35,7 @@ abstract class PropertyItem * the addProperty() or removeProperty() methods, which are not available * for simple PhpMyAdmin\Properties\Options\OptionsPropertyOneItem subclasses. * - * @return null|object + * @return object|null */ public function getGroup() { diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index d8b798c055..9db9b5de7f 100644 --- a/libraries/classes/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -2,6 +2,7 @@ /** * Recent and Favorite table list handling */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index 26c8f93d80..14ff00f70c 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -2,6 +2,7 @@ /** * Set of functions used with the relation and PDF feature */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/RelationCleanup.php b/libraries/classes/RelationCleanup.php index 1745dd15cc..409e20f5a0 100644 --- a/libraries/classes/RelationCleanup.php +++ b/libraries/classes/RelationCleanup.php @@ -2,6 +2,7 @@ /** * Set of functions used for cleaning up phpMyAdmin tables */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Replication.php b/libraries/classes/Replication.php index bfa14b28fc..94c3808de0 100644 --- a/libraries/classes/Replication.php +++ b/libraries/classes/Replication.php @@ -2,6 +2,7 @@ /** * Replication helpers */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ReplicationGui.php b/libraries/classes/ReplicationGui.php index 7c413121d3..46b2720298 100644 --- a/libraries/classes/ReplicationGui.php +++ b/libraries/classes/ReplicationGui.php @@ -2,6 +2,7 @@ /** * Functions for the replication GUI */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ReplicationInfo.php b/libraries/classes/ReplicationInfo.php index c17acf58ca..c12a31f4fa 100644 --- a/libraries/classes/ReplicationInfo.php +++ b/libraries/classes/ReplicationInfo.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php index 1a40669278..09e9c9a2b8 100644 --- a/libraries/classes/Response.php +++ b/libraries/classes/Response.php @@ -2,6 +2,7 @@ /** * Manages the rendering of pages in PMA */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php index bc4cc56f62..a11edbada5 100644 --- a/libraries/classes/Sanitize.php +++ b/libraries/classes/Sanitize.php @@ -2,6 +2,7 @@ /** * This class includes various sanitization methods that can be called statically */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php index dd1e372ad9..7b017107d7 100644 --- a/libraries/classes/SavedSearches.php +++ b/libraries/classes/SavedSearches.php @@ -2,6 +2,7 @@ /** * Saved searches managing */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php index dd0f049a2c..4969c27b2a 100644 --- a/libraries/classes/Scripts.php +++ b/libraries/classes/Scripts.php @@ -2,6 +2,7 @@ /** * JavaScript management */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Server/Plugin.php b/libraries/classes/Server/Plugin.php index 9caf75f5af..de96413a76 100644 --- a/libraries/classes/Server/Plugin.php +++ b/libraries/classes/Server/Plugin.php @@ -2,6 +2,7 @@ /** * Server Plugin value object */ + declare(strict_types=1); namespace PhpMyAdmin\Server; diff --git a/libraries/classes/Server/Plugins.php b/libraries/classes/Server/Plugins.php index ed28a85c46..15d6a2eeb6 100644 --- a/libraries/classes/Server/Plugins.php +++ b/libraries/classes/Server/Plugins.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Server; diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index c8722ef043..943f143b1a 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -2,6 +2,7 @@ /** * set of functions with the Privileges section in pma */ + declare(strict_types=1); namespace PhpMyAdmin\Server; diff --git a/libraries/classes/Server/Select.php b/libraries/classes/Server/Select.php index 83fbc94325..7650ec1350 100644 --- a/libraries/classes/Server/Select.php +++ b/libraries/classes/Server/Select.php @@ -2,6 +2,7 @@ /** * Code for displaying server selection */ + declare(strict_types=1); namespace PhpMyAdmin\Server; diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php index 705cb4a25d..0e76c70834 100644 --- a/libraries/classes/Server/Status/Data.php +++ b/libraries/classes/Server/Status/Data.php @@ -3,6 +3,7 @@ * PhpMyAdmin\Server\Status\Data class * Used by server_status_*.php pages */ + declare(strict_types=1); namespace PhpMyAdmin\Server\Status; diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php index 0ad7587c86..e210f0a7ce 100644 --- a/libraries/classes/Server/Status/Monitor.php +++ b/libraries/classes/Server/Status/Monitor.php @@ -2,6 +2,7 @@ /** * functions for displaying server status sub item: monitor */ + declare(strict_types=1); namespace PhpMyAdmin\Server\Status; diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php index 09522e7fa5..2c54814f5b 100644 --- a/libraries/classes/Server/UserGroups.php +++ b/libraries/classes/Server/UserGroups.php @@ -2,6 +2,7 @@ /** * set of functions for user group handling */ + declare(strict_types=1); namespace PhpMyAdmin\Server; diff --git a/libraries/classes/Session.php b/libraries/classes/Session.php index 39c370f6fd..0406032e2b 100644 --- a/libraries/classes/Session.php +++ b/libraries/classes/Session.php @@ -4,6 +4,7 @@ * * @see https://www.php.net/manual/en/features.sessions.php */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Setup/ConfigGenerator.php b/libraries/classes/Setup/ConfigGenerator.php index f97f37b2a7..9b16441af2 100644 --- a/libraries/classes/Setup/ConfigGenerator.php +++ b/libraries/classes/Setup/ConfigGenerator.php @@ -2,6 +2,7 @@ /** * Config file generator */ + declare(strict_types=1); namespace PhpMyAdmin\Setup; diff --git a/libraries/classes/Setup/FormProcessing.php b/libraries/classes/Setup/FormProcessing.php index 40d4deecb7..06740fbc78 100644 --- a/libraries/classes/Setup/FormProcessing.php +++ b/libraries/classes/Setup/FormProcessing.php @@ -2,6 +2,7 @@ /** * Formset processing library */ + declare(strict_types=1); namespace PhpMyAdmin\Setup; diff --git a/libraries/classes/Setup/Index.php b/libraries/classes/Setup/Index.php index 2e06671164..c48b3f41ac 100644 --- a/libraries/classes/Setup/Index.php +++ b/libraries/classes/Setup/Index.php @@ -2,6 +2,7 @@ /** * Various checks and message functions used on index page. */ + declare(strict_types=1); namespace PhpMyAdmin\Setup; diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 75910ca053..cb580b7e60 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -2,6 +2,7 @@ /** * Set of functions for the SQL executor */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -1433,7 +1434,7 @@ class Sql * @param int $unlim_num_rows unlimited number of rows * @param int $num_rows number of rows * @param bool $showtable whether to show table or not - * @param object|null|bool $result result of the executed query + * @param object|bool|null $result result of the executed query * @param array $analyzed_sql_results analyzed sql results * @param bool $is_limited_display Show only limited operations or not * diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php index e96f05ae26..0d79e0ba5f 100644 --- a/libraries/classes/SqlQueryForm.php +++ b/libraries/classes/SqlQueryForm.php @@ -8,6 +8,7 @@ * @usedby /table/structure * @usedby /table/tracking */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php index 77e711ebb0..b8f24f591e 100644 --- a/libraries/classes/StorageEngine.php +++ b/libraries/classes/StorageEngine.php @@ -2,6 +2,7 @@ /** * Library for extracting information about the available storage engines */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/SubPartition.php b/libraries/classes/SubPartition.php index 469cbdf38d..847d45f02a 100644 --- a/libraries/classes/SubPartition.php +++ b/libraries/classes/SubPartition.php @@ -2,6 +2,7 @@ /** * Library for extracting information about the sub-partitions */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/SystemDatabase.php b/libraries/classes/SystemDatabase.php index d23b0566ef..39711f1f76 100644 --- a/libraries/classes/SystemDatabase.php +++ b/libraries/classes/SystemDatabase.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\SystemDatabase class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 4876d11c53..4c6ef5e0c1 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -2,6 +2,7 @@ /** * Holds the Table class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Table/Search.php b/libraries/classes/Table/Search.php index c005f10afb..72f16d3bea 100644 --- a/libraries/classes/Table/Search.php +++ b/libraries/classes/Table/Search.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); namespace PhpMyAdmin\Table; diff --git a/libraries/classes/TablePartitionDefinition.php b/libraries/classes/TablePartitionDefinition.php index b59c4d6722..dc318e50f4 100644 --- a/libraries/classes/TablePartitionDefinition.php +++ b/libraries/classes/TablePartitionDefinition.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\TablePartitionDefinition class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php index dd327bbb27..164b0c27c0 100644 --- a/libraries/classes/Template.php +++ b/libraries/classes/Template.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Template class */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -45,9 +46,6 @@ class Template */ protected static $twig; - /** - * @var string - */ public const BASE_PATH = 'templates/'; public function __construct() diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php index 27f3337620..0c234f8f14 100644 --- a/libraries/classes/Theme.php +++ b/libraries/classes/Theme.php @@ -2,6 +2,7 @@ /** * hold Theme class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index b65b12104d..191fd49a6c 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -2,6 +2,7 @@ /** * phpMyAdmin theme manager */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index 258d9f3435..1b65118c05 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -2,6 +2,7 @@ /** * Tracking changes on databases, tables and views */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index 92648b1404..24266843f9 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -2,6 +2,7 @@ /** * Functions used for database and table tracking */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php index 128c84a7c9..d96f7fea74 100644 --- a/libraries/classes/Transformations.php +++ b/libraries/classes/Transformations.php @@ -12,6 +12,7 @@ * Please provide a comment for your function, * what it does and what parameters are available. */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Twig/CoreExtension.php b/libraries/classes/Twig/CoreExtension.php index 262917e90f..b17f2bfdf8 100644 --- a/libraries/classes/Twig/CoreExtension.php +++ b/libraries/classes/Twig/CoreExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\CoreExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/I18n/NodeTrans.php b/libraries/classes/Twig/I18n/NodeTrans.php index 84c087e3dc..8a187ef3a3 100644 --- a/libraries/classes/Twig/I18n/NodeTrans.php +++ b/libraries/classes/Twig/I18n/NodeTrans.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\I18n\NodeTrans class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig\I18n; diff --git a/libraries/classes/Twig/I18n/TokenParserTrans.php b/libraries/classes/Twig/I18n/TokenParserTrans.php index 754572982d..3db7ad398c 100644 --- a/libraries/classes/Twig/I18n/TokenParserTrans.php +++ b/libraries/classes/Twig/I18n/TokenParserTrans.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\I18n\TokenParserTrans class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig\I18n; diff --git a/libraries/classes/Twig/I18nExtension.php b/libraries/classes/Twig/I18nExtension.php index 9ae57de821..8648a0f7c5 100644 --- a/libraries/classes/Twig/I18nExtension.php +++ b/libraries/classes/Twig/I18nExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\I18nExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/MessageExtension.php b/libraries/classes/Twig/MessageExtension.php index 298697785d..b8720b6cff 100644 --- a/libraries/classes/Twig/MessageExtension.php +++ b/libraries/classes/Twig/MessageExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\MessageExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/PluginsExtension.php b/libraries/classes/Twig/PluginsExtension.php index 69f9aa0a92..8724a4c761 100644 --- a/libraries/classes/Twig/PluginsExtension.php +++ b/libraries/classes/Twig/PluginsExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\PluginsExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/RelationExtension.php b/libraries/classes/Twig/RelationExtension.php index e5550b86a3..fa244744bc 100644 --- a/libraries/classes/Twig/RelationExtension.php +++ b/libraries/classes/Twig/RelationExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\RelationExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/SanitizeExtension.php b/libraries/classes/Twig/SanitizeExtension.php index b93339959c..24f8a48b78 100644 --- a/libraries/classes/Twig/SanitizeExtension.php +++ b/libraries/classes/Twig/SanitizeExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\SanitizeExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/TableExtension.php b/libraries/classes/Twig/TableExtension.php index b21bd88d27..c3d522700d 100644 --- a/libraries/classes/Twig/TableExtension.php +++ b/libraries/classes/Twig/TableExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\TableExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/TrackerExtension.php b/libraries/classes/Twig/TrackerExtension.php index da33477f28..2f6b9c7851 100644 --- a/libraries/classes/Twig/TrackerExtension.php +++ b/libraries/classes/Twig/TrackerExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\TrackerExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/TransformationsExtension.php b/libraries/classes/Twig/TransformationsExtension.php index eda9953afb..7bfc51b629 100644 --- a/libraries/classes/Twig/TransformationsExtension.php +++ b/libraries/classes/Twig/TransformationsExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\TransformationsExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/UrlExtension.php b/libraries/classes/Twig/UrlExtension.php index df1005b1ca..9db8e7b23d 100644 --- a/libraries/classes/Twig/UrlExtension.php +++ b/libraries/classes/Twig/UrlExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\UrlExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php index 0e7adb58f5..4f6009a1a2 100644 --- a/libraries/classes/Twig/UtilExtension.php +++ b/libraries/classes/Twig/UtilExtension.php @@ -2,6 +2,7 @@ /** * hold PhpMyAdmin\Twig\UtilExtension class */ + declare(strict_types=1); namespace PhpMyAdmin\Twig; diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php index 4a12fdccb4..c6797bf3bf 100644 --- a/libraries/classes/TwoFactor.php +++ b/libraries/classes/TwoFactor.php @@ -2,6 +2,7 @@ /** * Two authentication factor handling */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php index 149f96a2ef..73974b07af 100644 --- a/libraries/classes/Types.php +++ b/libraries/classes/Types.php @@ -2,6 +2,7 @@ /** * SQL data types definition */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php index 18e0852468..d4be3ab984 100644 --- a/libraries/classes/Url.php +++ b/libraries/classes/Url.php @@ -2,6 +2,7 @@ /** * Static methods for URL/hidden inputs generating */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php index eefc7465eb..8422103ace 100644 --- a/libraries/classes/UserPassword.php +++ b/libraries/classes/UserPassword.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\UserPassword class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index ecb502357b..f5ff847671 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -2,6 +2,7 @@ /** * Holds the PhpMyAdmin\UserPreferences class */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 339b48b183..eb9cd364d0 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2,6 +2,7 @@ /** * Hold the PhpMyAdmin\Util class */ + declare(strict_types=1); namespace PhpMyAdmin; @@ -176,7 +177,7 @@ class Util * * @return string unqoted string */ - public static function unQuote(string $quoted_string, string $quote = null): string + public static function unQuote(string $quoted_string, ?string $quote = null): string { $quotes = []; diff --git a/libraries/classes/Utils/FormatConverter.php b/libraries/classes/Utils/FormatConverter.php index 59055d5d77..ca626db8a4 100644 --- a/libraries/classes/Utils/FormatConverter.php +++ b/libraries/classes/Utils/FormatConverter.php @@ -2,6 +2,7 @@ /** * Format converter */ + declare(strict_types=1); namespace PhpMyAdmin\Utils; @@ -30,14 +31,14 @@ class FormatConverter */ public static function binaryToIp($buffer) { - if (0 !== strpos($buffer, '0x')) { + if (strpos($buffer, '0x') !== 0) { return $buffer; } $ipHex = substr($buffer, 2); $ipBin = hex2bin($ipHex); - if (false === $ipBin) { + if ($ipBin === false) { return $buffer; } diff --git a/libraries/classes/Utils/HttpRequest.php b/libraries/classes/Utils/HttpRequest.php index 494564ff4b..07ab665362 100644 --- a/libraries/classes/Utils/HttpRequest.php +++ b/libraries/classes/Utils/HttpRequest.php @@ -2,6 +2,7 @@ /** * Hold the PhpMyAdmin\Utils\HttpRequest class */ + declare(strict_types=1); namespace PhpMyAdmin\Utils; @@ -89,7 +90,7 @@ class HttpRequest * @param int $httpStatus HTTP response status code * @param bool $returnOnlyStatus If set to true, the method would only return response status * - * @return string|null|bool + * @return string|bool|null */ private function response( $response, @@ -119,7 +120,7 @@ class HttpRequest * @param string $header Header to be set for the HTTP request * @param int $ssl SSL mode to use * - * @return string|null|bool + * @return string|bool|null */ private function curl( $url, @@ -221,7 +222,7 @@ class HttpRequest * @param mixed $content Content to be sent with HTTP request * @param string $header Header to be set for the HTTP request * - * @return string|null|bool + * @return string|bool|null */ private function fopen( $url, @@ -270,7 +271,7 @@ class HttpRequest * @param mixed $content Content to be sent with HTTP request * @param string $header Header to be set for the HTTP request * - * @return string|null|bool + * @return string|bool|null */ public function create( $url, diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php index f038b68489..59809dd917 100644 --- a/libraries/classes/VersionInformation.php +++ b/libraries/classes/VersionInformation.php @@ -2,6 +2,7 @@ /** * Responsible for retrieving version information and notifiying about latest version */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/classes/ZipExtension.php b/libraries/classes/ZipExtension.php index 4436a78701..956655cc42 100644 --- a/libraries/classes/ZipExtension.php +++ b/libraries/classes/ZipExtension.php @@ -2,6 +2,7 @@ /** * Interface for the zip extension */ + declare(strict_types=1); namespace PhpMyAdmin; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 31d1ea137c..cb7f33e244 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -27,6 +27,7 @@ * - db connection * - authentication work */ + declare(strict_types=1); use PhpMyAdmin\Config; diff --git a/libraries/config.default.php b/libraries/config.default.php index a509f4ca95..519aa89c03 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -15,6 +15,7 @@ * * All directives are explained in the documentation */ + declare(strict_types=1); /** diff --git a/libraries/config.values.php b/libraries/config.values.php index a0fc6a5454..6b7a4307cc 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -3,6 +3,7 @@ * Database with allowed values for configuration stored in the $cfg array, * used by setup script and user preferences to generate forms. */ + declare(strict_types=1); if (! defined('PHPMYADMIN')) { diff --git a/libraries/services.php b/libraries/services.php index 91d16eedc2..e1e1462dc1 100644 --- a/libraries/services.php +++ b/libraries/services.php @@ -1,5 +1,7 @@ <?php +declare(strict_types=1); + return [ 'services' => [ diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php index 8a5a6c875b..5aa5cc9f00 100644 --- a/libraries/services_controllers.php +++ b/libraries/services_controllers.php @@ -1,5 +1,7 @@ <?php +declare(strict_types=1); + return [ 'services' => [ diff --git a/libraries/services_loader.php b/libraries/services_loader.php index c1baf76d8b..c2cee52f4a 100644 --- a/libraries/services_loader.php +++ b/libraries/services_loader.php @@ -1,5 +1,7 @@ <?php +declare(strict_types=1); + namespace Symfony\Component\DependencyInjection\Loader\Configurator; use Symfony\Component\DependencyInjection\Reference; diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 9cae9f1ebe..85676bed8b 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -6,6 +6,7 @@ * For changing this file you should know what you are doing. For this reason * options here are not part of normal configuration. */ + declare(strict_types=1); // phpcs:disable PSR1.Files.SideEffects |