diff --git a/ChangeLog b/ChangeLog index 3703f07625..ba0fbb0883 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - issue #13919 Remove font size feature - issue #12373 Add Metro theme - issue #14155 Add move columns preview SQL button +- issue #14296 Enable strict mode in PHP files 4.8.1 (not yet released) - issue #12772 Fix case where the central columns attributes don't get filled in diff --git a/ajax.php b/ajax.php index 5f4fc8c22f..1e098f4b0e 100644 --- a/ajax.php +++ b/ajax.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Response; use PhpMyAdmin\Util; diff --git a/browse_foreigners.php b/browse_foreigners.php index 0ae36334d1..3abedb401a 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\BrowseForeigners; use PhpMyAdmin\Relation; diff --git a/changelog.php b/changelog.php index b0f8b0124b..502ce4f114 100644 --- a/changelog.php +++ b/changelog.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Response; /** diff --git a/chk_rel.php b/chk_rel.php index f34e8300d5..d4724ef2f9 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Relation; use PhpMyAdmin\Response; diff --git a/config.sample.inc.php b/config.sample.inc.php index 5eede6dd90..c4f4df6f80 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -9,6 +9,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); /** * This is needed for cookie based authentication to encrypt password in diff --git a/db_central_columns.php b/db_central_columns.php index 9c175e9fb0..78c29c574e 100644 --- a/db_central_columns.php +++ b/db_central_columns.php @@ -6,6 +6,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\CentralColumns; use PhpMyAdmin\Core; diff --git a/db_datadict.php b/db_datadict.php index 7bd93eae4c..0edf628eeb 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Relation; use PhpMyAdmin\Response; use PhpMyAdmin\Transformations; diff --git a/db_designer.php b/db_designer.php index da9ea0a6d0..caa8e3a68b 100644 --- a/db_designer.php +++ b/db_designer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Designer */ +declare(strict_types=1); + use PhpMyAdmin\Database\Designer; use PhpMyAdmin\Database\Designer\Common; use PhpMyAdmin\Response; diff --git a/db_events.php b/db_events.php index e13935fc68..39ee2e414f 100644 --- a/db_events.php +++ b/db_events.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); /** * Include required files diff --git a/db_export.php b/db_export.php index 05df8d9767..cfad2ce5d0 100644 --- a/db_export.php +++ b/db_export.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Display\Export as DisplayExport; use PhpMyAdmin\Export; diff --git a/db_import.php b/db_import.php index e61bae6131..99bcdaafb8 100644 --- a/db_import.php +++ b/db_import.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Display\Import; diff --git a/db_multi_table_query.php b/db_multi_table_query.php index 1ae4944db0..0add6ad0c7 100644 --- a/db_multi_table_query.php +++ b/db_multi_table_query.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Database\MultiTableQuery; use PhpMyAdmin\Response; diff --git a/db_operations.php b/db_operations.php index 70c0d53877..3ef7546a73 100644 --- a/db_operations.php +++ b/db_operations.php @@ -11,6 +11,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Display\CreateTable; use PhpMyAdmin\Message; diff --git a/db_qbe.php b/db_qbe.php index 3860d68b13..94ea207133 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Database\Qbe; use PhpMyAdmin\Message; use PhpMyAdmin\Relation; diff --git a/db_routines.php b/db_routines.php index 5740c35aee..4248093958 100644 --- a/db_routines.php +++ b/db_routines.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); /** * Include required files diff --git a/db_search.php b/db_search.php index 4f8a6648e2..5c611a50d4 100644 --- a/db_search.php +++ b/db_search.php @@ -7,6 +7,7 @@ * @todo display executed query, optional? * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Database\Search; use PhpMyAdmin\Response; diff --git a/db_sql.php b/db_sql.php index d7f038ad8a..1afeb0e6f0 100644 --- a/db_sql.php +++ b/db_sql.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Response; use PhpMyAdmin\SqlQueryForm; diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php index 0fe4ae6fbd..dae9fa3fa1 100644 --- a/db_sql_autocomplete.php +++ b/db_sql_autocomplete.php @@ -5,8 +5,10 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Response; + require_once 'libraries/common.inc.php'; if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) { diff --git a/db_sql_format.php b/db_sql_format.php index dd3c2b86d9..bb7df923de 100644 --- a/db_sql_format.php +++ b/db_sql_format.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Response; /** diff --git a/db_structure.php b/db_structure.php index 09c4aee4e2..42413134cd 100644 --- a/db_structure.php +++ b/db_structure.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Controllers\Database\DatabaseStructureController; use PhpMyAdmin\Di\Container; diff --git a/db_tracking.php b/db_tracking.php index fb64c6f2b4..d4157cdcdb 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Display\CreateTable; use PhpMyAdmin\Message; use PhpMyAdmin\Relation; diff --git a/db_triggers.php b/db_triggers.php index cdd0ebe81c..885f1457c8 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); /** * Include required files diff --git a/error_report.php b/error_report.php index 408a4eb201..eca909e61a 100644 --- a/error_report.php +++ b/error_report.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\ErrorReport; use PhpMyAdmin\Message; use PhpMyAdmin\Response; diff --git a/examples/config.manyhosts.inc.php b/examples/config.manyhosts.inc.php index b6a6a12761..49877db689 100644 --- a/examples/config.manyhosts.inc.php +++ b/examples/config.manyhosts.inc.php @@ -8,6 +8,7 @@ * @package PhpMyAdmin * @subpackage Example */ +declare(strict_types=1); $i=0; $hosts = array ( diff --git a/examples/openid.php b/examples/openid.php index e44baef620..3347c3d799 100644 --- a/examples/openid.php +++ b/examples/openid.php @@ -15,6 +15,7 @@ * @package PhpMyAdmin * @subpackage Example */ +declare(strict_types=1); if (false === @include_once 'OpenID/RelyingParty.php') { exit; diff --git a/examples/signon-script.php b/examples/signon-script.php index 7a2b8aa2f6..6eea629bee 100644 --- a/examples/signon-script.php +++ b/examples/signon-script.php @@ -10,7 +10,7 @@ * @package PhpMyAdmin * @subpackage Example */ - +declare(strict_types=1); /** * This function returns username and password. diff --git a/examples/signon.php b/examples/signon.php index 9b64326f5c..c925722352 100644 --- a/examples/signon.php +++ b/examples/signon.php @@ -10,6 +10,7 @@ * @package PhpMyAdmin * @subpackage Example */ +declare(strict_types=1); /* Use cookies for session */ ini_set('session.use_cookies', 'true'); diff --git a/export.php b/export.php index e1255ae631..bcac58936f 100644 --- a/export.php +++ b/export.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; diff --git a/gis_data_editor.php b/gis_data_editor.php index 6f438658c7..190a802c10 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Gis\GisFactory; diff --git a/import.php b/import.php index d53de967fb..f5b963a558 100644 --- a/import.php +++ b/import.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Bookmark; use PhpMyAdmin\Core; @@ -437,15 +438,15 @@ if ($memory_limit == -1) { } // Calculate value of the limit -$memoryUnit = mb_strtolower(substr($memory_limit, -1)); +$memoryUnit = mb_strtolower(substr((string) $memory_limit, -1)); if ('m' == $memoryUnit) { - $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024; + $memory_limit = (int) substr((string) $memory_limit, 0, -1) * 1024 * 1024; } elseif ('k' == $memoryUnit) { - $memory_limit = (int)substr($memory_limit, 0, -1) * 1024; + $memory_limit = (int) substr((string) $memory_limit, 0, -1) * 1024; } elseif ('g' == $memoryUnit) { - $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024 * 1024; + $memory_limit = (int) substr((string) $memory_limit, 0, -1) * 1024 * 1024 * 1024; } else { - $memory_limit = (int)$memory_limit; + $memory_limit = (int) $memory_limit; } // Just to be sure, there might be lot of memory needed for uncompression diff --git a/import_status.php b/import_status.php index 02e39d45ca..efc861b80b 100644 --- a/import_status.php +++ b/import_status.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Display\ImportAjax; diff --git a/index.php b/index.php index fef1e057b6..25e30cdd9f 100644 --- a/index.php +++ b/index.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Core; diff --git a/js/messages.php b/js/messages.php index 5c1df8df2f..bc7d17e4d2 100644 --- a/js/messages.php +++ b/js/messages.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); if (!defined('TESTSUITE')) { chdir('..'); diff --git a/js/whitelist.php b/js/whitelist.php index 366a948477..3f6ff055f5 100644 --- a/js/whitelist.php +++ b/js/whitelist.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); if (!defined('TESTSUITE')) { chdir('..'); diff --git a/libraries/check_user_privileges.inc.php b/libraries/check_user_privileges.inc.php index 168a992062..589c3863d6 100644 --- a/libraries/check_user_privileges.inc.php +++ b/libraries/check_user_privileges.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + if (! defined('PHPMYADMIN')) { exit; } diff --git a/libraries/classes/Di/AliasItem.php b/libraries/classes/Di/AliasItem.php index 3f461dd2fd..6d98929bec 100644 --- a/libraries/classes/Di/AliasItem.php +++ b/libraries/classes/Di/AliasItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; /** diff --git a/libraries/classes/Di/Container.php b/libraries/classes/Di/Container.php index 06fab997fc..1a7435b158 100644 --- a/libraries/classes/Di/Container.php +++ b/libraries/classes/Di/Container.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; use Psr\Container\ContainerInterface; diff --git a/libraries/classes/Di/ContainerException.php b/libraries/classes/Di/ContainerException.php index a5a2da0ee3..ff8a97e0fb 100644 --- a/libraries/classes/Di/ContainerException.php +++ b/libraries/classes/Di/ContainerException.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; use Exception; diff --git a/libraries/classes/Di/FactoryItem.php b/libraries/classes/Di/FactoryItem.php index 16a096cd49..cdced6aa50 100644 --- a/libraries/classes/Di/FactoryItem.php +++ b/libraries/classes/Di/FactoryItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; /** diff --git a/libraries/classes/Di/Item.php b/libraries/classes/Di/Item.php index 9ddd6a8f21..2632a3f56e 100644 --- a/libraries/classes/Di/Item.php +++ b/libraries/classes/Di/Item.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; /** diff --git a/libraries/classes/Di/NotFoundException.php b/libraries/classes/Di/NotFoundException.php index f861ff8e85..8404543897 100644 --- a/libraries/classes/Di/NotFoundException.php +++ b/libraries/classes/Di/NotFoundException.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; use Psr\Container\NotFoundExceptionInterface; diff --git a/libraries/classes/Di/ReflectorItem.php b/libraries/classes/Di/ReflectorItem.php index 228a1f7fe4..0ddb09a204 100644 --- a/libraries/classes/Di/ReflectorItem.php +++ b/libraries/classes/Di/ReflectorItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; /** diff --git a/libraries/classes/Di/ServiceItem.php b/libraries/classes/Di/ServiceItem.php index 25a4576f11..908c64906a 100644 --- a/libraries/classes/Di/ServiceItem.php +++ b/libraries/classes/Di/ServiceItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; /** diff --git a/libraries/classes/Di/ValueItem.php b/libraries/classes/Di/ValueItem.php index 2997a374de..419b9468d0 100644 --- a/libraries/classes/Di/ValueItem.php +++ b/libraries/classes/Di/ValueItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Di */ +declare(strict_types=1); + namespace PhpMyAdmin\Di; /** diff --git a/libraries/classes/Display/ChangePassword.php b/libraries/classes/Display/ChangePassword.php index de41082792..e92ece26e7 100644 --- a/libraries/classes/Display/ChangePassword.php +++ b/libraries/classes/Display/ChangePassword.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Message; diff --git a/libraries/classes/Display/CreateTable.php b/libraries/classes/Display/CreateTable.php index 5114d6292c..73db9239bb 100644 --- a/libraries/classes/Display/CreateTable.php +++ b/libraries/classes/Display/CreateTable.php @@ -24,6 +24,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Template; diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php index c4b9479fb7..cfc58cbe36 100644 --- a/libraries/classes/Display/Export.php +++ b/libraries/classes/Display/Export.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Core; diff --git a/libraries/classes/Display/GitRevision.php b/libraries/classes/Display/GitRevision.php index 3de8c4e1f9..b975a1bc5b 100644 --- a/libraries/classes/Display/GitRevision.php +++ b/libraries/classes/Display/GitRevision.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Core; diff --git a/libraries/classes/Display/Import.php b/libraries/classes/Display/Import.php index f3cbb6b638..c1040b1539 100644 --- a/libraries/classes/Display/Import.php +++ b/libraries/classes/Display/Import.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Core; diff --git a/libraries/classes/Display/ImportAjax.php b/libraries/classes/Display/ImportAjax.php index abb5e714c3..b6f209410e 100644 --- a/libraries/classes/Display/ImportAjax.php +++ b/libraries/classes/Display/ImportAjax.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Core; diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index e38a54a930..8ec6103024 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Display; use PhpMyAdmin\Core; diff --git a/libraries/classes/Engines/Bdb.php b/libraries/classes/Engines/Bdb.php index cde9480c7b..2bbf2914d5 100644 --- a/libraries/classes/Engines/Bdb.php +++ b/libraries/classes/Engines/Bdb.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Engines/Berkeleydb.php b/libraries/classes/Engines/Berkeleydb.php index ad4f46059a..6f41e78f0e 100644 --- a/libraries/classes/Engines/Berkeleydb.php +++ b/libraries/classes/Engines/Berkeleydb.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; /** diff --git a/libraries/classes/Engines/Binlog.php b/libraries/classes/Engines/Binlog.php index 4c4211fe81..f9498a5934 100644 --- a/libraries/classes/Engines/Binlog.php +++ b/libraries/classes/Engines/Binlog.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Engines/Innobase.php b/libraries/classes/Engines/Innobase.php index 9aeb8b305b..f806359017 100644 --- a/libraries/classes/Engines/Innobase.php +++ b/libraries/classes/Engines/Innobase.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; /** diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php index 72cc8f4aa0..e9b3c1a4b7 100644 --- a/libraries/classes/Engines/Innodb.php +++ b/libraries/classes/Engines/Innodb.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; @@ -331,10 +333,11 @@ class Innodb extends StorageEngine public function getPageStatus() { return '
' . "\n"
-        . htmlspecialchars(
-            $GLOBALS['dbi']->fetchValue('SHOW ENGINE INNODB STATUS;', 0, 'Status')
-        ) . "\n"
-        . '
' . "\n"; + . htmlspecialchars((string) $GLOBALS['dbi']->fetchValue( + 'SHOW ENGINE INNODB STATUS;', + 0, + 'Status' + )) . "\n" . '' . "\n"; } /** diff --git a/libraries/classes/Engines/Memory.php b/libraries/classes/Engines/Memory.php index b2a8b9fc88..55b7b2f4dc 100644 --- a/libraries/classes/Engines/Memory.php +++ b/libraries/classes/Engines/Memory.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Engines/Merge.php b/libraries/classes/Engines/Merge.php index e610c8b63a..62eef53f70 100644 --- a/libraries/classes/Engines/Merge.php +++ b/libraries/classes/Engines/Merge.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Engines/MrgMyisam.php b/libraries/classes/Engines/MrgMyisam.php index 24465b88aa..cebc40f2a9 100644 --- a/libraries/classes/Engines/MrgMyisam.php +++ b/libraries/classes/Engines/MrgMyisam.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; /** diff --git a/libraries/classes/Engines/Myisam.php b/libraries/classes/Engines/Myisam.php index b0341fda7a..06a5384f40 100644 --- a/libraries/classes/Engines/Myisam.php +++ b/libraries/classes/Engines/Myisam.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Engines/Ndbcluster.php b/libraries/classes/Engines/Ndbcluster.php index 49e87ae2c8..812832c23c 100644 --- a/libraries/classes/Engines/Ndbcluster.php +++ b/libraries/classes/Engines/Ndbcluster.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Engines/Pbxt.php b/libraries/classes/Engines/Pbxt.php index 9be40e7d30..d7eddbac42 100644 --- a/libraries/classes/Engines/Pbxt.php +++ b/libraries/classes/Engines/Pbxt.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\Core; diff --git a/libraries/classes/Engines/PerformanceSchema.php b/libraries/classes/Engines/PerformanceSchema.php index 9c62704831..01669b438c 100644 --- a/libraries/classes/Engines/PerformanceSchema.php +++ b/libraries/classes/Engines/PerformanceSchema.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Engines */ +declare(strict_types=1); + namespace PhpMyAdmin\Engines; use PhpMyAdmin\StorageEngine; diff --git a/libraries/classes/Gis/GisFactory.php b/libraries/classes/Gis/GisFactory.php index 560f89d828..f33c7254ef 100644 --- a/libraries/classes/Gis/GisFactory.php +++ b/libraries/classes/Gis/GisFactory.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); + namespace PhpMyAdmin\Gis; /** diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php index 0e320dfe34..cb521ba42d 100644 --- a/libraries/classes/Gis/GisGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php index 561c80a9bb..54ef8769d6 100644 --- a/libraries/classes/Gis/GisGeometryCollection.php +++ b/libraries/classes/Gis/GisGeometryCollection.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php index fa29eeb12c..3086a48452 100644 --- a/libraries/classes/Gis/GisLineString.php +++ b/libraries/classes/Gis/GisLineString.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; @@ -223,7 +224,7 @@ class GisLineString extends GisGeometry } $row .= '"'; foreach ($line_options as $option => $val) { - $row .= ' ' . $option . '="' . trim($val) . '"'; + $row .= ' ' . $option . '="' . trim((string) $val) . '"'; } $row .= '/>'; @@ -292,10 +293,10 @@ class GisLineString extends GisGeometry $wkt = 'LINESTRING('; for ($i = 0; $i < $no_of_points; $i++) { $wkt .= ((isset($gis_data[$index]['LINESTRING'][$i]['x']) - && trim($gis_data[$index]['LINESTRING'][$i]['x']) != '') + && trim((string) $gis_data[$index]['LINESTRING'][$i]['x']) != '') ? $gis_data[$index]['LINESTRING'][$i]['x'] : $empty) . ' ' . ((isset($gis_data[$index]['LINESTRING'][$i]['y']) - && trim($gis_data[$index]['LINESTRING'][$i]['y']) != '') + && trim((string) $gis_data[$index]['LINESTRING'][$i]['y']) != '') ? $gis_data[$index]['LINESTRING'][$i]['y'] : $empty) . ','; } diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php index 1c397ce263..1e08194abc 100644 --- a/libraries/classes/Gis/GisMultiLineString.php +++ b/libraries/classes/Gis/GisMultiLineString.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; @@ -250,7 +251,7 @@ class GisMultiLineString extends GisGeometry $row .= '"'; $line_options['id'] = $label . rand(); foreach ($line_options as $option => $val) { - $row .= ' ' . $option . '="' . trim($val) . '"'; + $row .= ' ' . $option . '="' . trim((string) $val) . '"'; } $row .= '/>'; } diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php index de9a78f571..96126bdc2d 100644 --- a/libraries/classes/Gis/GisMultiPoint.php +++ b/libraries/classes/Gis/GisMultiPoint.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; @@ -213,7 +214,7 @@ class GisMultiPoint extends GisGeometry . $point[1] . '" r="3"'; $point_options['id'] = $label . rand(); foreach ($point_options as $option => $val) { - $row .= ' ' . $option . '="' . trim($val) . '"'; + $row .= ' ' . $option . '="' . trim((string) $val) . '"'; } $row .= '/>'; } diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php index a454f76f36..193a4756ce 100644 --- a/libraries/classes/Gis/GisMultiPolygon.php +++ b/libraries/classes/Gis/GisMultiPolygon.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; @@ -286,7 +287,7 @@ class GisMultiPolygon extends GisGeometry $polygon_options['id'] = $label . rand(); $row .= '"'; foreach ($polygon_options as $option => $val) { - $row .= ' ' . $option . '="' . trim($val) . '"'; + $row .= ' ' . $option . '="' . trim((string) $val) . '"'; } $row .= '/>'; } diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php index 371e200662..55461e0fea 100644 --- a/libraries/classes/Gis/GisPoint.php +++ b/libraries/classes/Gis/GisPoint.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; @@ -221,7 +222,7 @@ class GisPoint extends GisGeometry $row .= ' $val) { - $row .= ' ' . $option . '="' . trim($val) . '"'; + $row .= ' ' . $option . '="' . trim((string) $val) . '"'; } $row .= '/>'; } diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php index becd8bfcc3..8cafe70167 100644 --- a/libraries/classes/Gis/GisPolygon.php +++ b/libraries/classes/Gis/GisPolygon.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); + namespace PhpMyAdmin\Gis; use TCPDF; @@ -253,7 +255,7 @@ class GisPolygon extends GisGeometry $row .= '"'; foreach ($polygon_options as $option => $val) { - $row .= ' ' . $option . '="' . trim($val) . '"'; + $row .= ' ' . $option . '="' . trim((string) $val) . '"'; } $row .= '/>'; diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php index be58859458..c11b55573b 100644 --- a/libraries/classes/Gis/GisVisualization.php +++ b/libraries/classes/Gis/GisVisualization.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-GIS */ +declare(strict_types=1); namespace PhpMyAdmin\Gis; diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index c4a297bee6..2e1fa416e4 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -6,6 +6,8 @@ * * @package PhpMyAdmin-navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Config\PageSettings; diff --git a/libraries/classes/Navigation/NavigationHeader.php b/libraries/classes/Navigation/NavigationHeader.php index 5b6408ec67..8774e0c374 100644 --- a/libraries/classes/Navigation/NavigationHeader.php +++ b/libraries/classes/Navigation/NavigationHeader.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Sanitize; diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index dbbdf3fad7..6cf4391245 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Navigation\Nodes\Node; @@ -979,7 +981,7 @@ class NavigationTree $retval .= $paths['aPath_clean'][2]; $retval .= ""; $retval .= ""; - $retval .= htmlspecialchars($node->pos2); + $retval .= htmlspecialchars((string) $node->pos2); $retval .= ""; } if (isset($paths['aPath_clean'][4])) { @@ -987,7 +989,7 @@ class NavigationTree $retval .= $paths['aPath_clean'][4]; $retval .= ""; $retval .= ""; - $retval .= htmlspecialchars($node->pos3); + $retval .= htmlspecialchars((string) $node->pos3); $retval .= ""; } diff --git a/libraries/classes/Navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php index 5c0f4dc9ba..5b6dc08bf0 100644 --- a/libraries/classes/Navigation/NodeFactory.php +++ b/libraries/classes/Navigation/NodeFactory.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Navigation\Nodes\Node; diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index a299206317..3af31ae884 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Navigation/Nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php index 876cb22151..50f041cce0 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php index eaa7c9c0a5..009f33fc67 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php index e36ab0b6b9..ae97ba308e 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Relation; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index 5fdbbef0ff..3ce3851347 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Relation; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php index e11ff6970c..729df5b0bd 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChildContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +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 33a9913d21..ec7996127f 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php index 0737fcce35..936018b783 100644 --- a/libraries/classes/Navigation/Nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php index 0231c94d6b..6b33c8eb40 100644 --- a/libraries/classes/Navigation/Nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php index 2f5cd38187..c685d11cce 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index bf092edcae..27de00003f 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php index 332cc2ce6f..e50100b6a9 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 39ba9ee70a..acd825f5fe 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php index e9a74eb044..5b2d0abfa8 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index e4eb0fa8c4..22ed502f48 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php index cafe3065e6..69bdddfa1f 100644 --- a/libraries/classes/Navigation/Nodes/NodeTable.php +++ b/libraries/classes/Navigation/Nodes/NodeTable.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php index e0a30cf730..7e23ebc95b 100644 --- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php index af88444f64..8ac1610c42 100644 --- a/libraries/classes/Navigation/Nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index 77cfc73117..e92fb4799b 100644 --- a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Navigation/Nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php index e7dd5185b7..94c70da7dd 100644 --- a/libraries/classes/Navigation/Nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php index dfb97c49a3..4047ddfa20 100644 --- a/libraries/classes/Navigation/Nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); + namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/libraries/classes/Plugins/Auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php index c83fe4bce2..06926815cf 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Authentication * @subpackage Config */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Plugins\AuthenticationPlugin; diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index c0306002b5..43a5459c54 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Authentication * @subpackage Cookie */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Config; @@ -125,7 +127,7 @@ class AuthenticationCookie extends AuthenticationPlugin // Show error message if (! empty($conn_error)) { - Message::rawError($conn_error)->display(); + Message::rawError((string) $conn_error)->display(); } elseif (isset($_GET['session_expired']) && intval($_GET['session_expired']) == 1 ) { @@ -564,7 +566,7 @@ class AuthenticationCookie extends AuthenticationPlugin $this->_getSessionEncryptionSecret() ), null, - $GLOBALS['cfg']['LoginCookieStore'] + (int) $GLOBALS['cfg']['LoginCookieStore'] ); } diff --git a/libraries/classes/Plugins/Auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php index 6d4c90d0ad..93e9127947 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationHttp.php +++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php @@ -7,6 +7,8 @@ * @package PhpMyAdmin-Authentication * @subpackage HTTP */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Plugins\AuthenticationPlugin; diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php index 9e0cae81b5..f94c6f42c2 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationSignon.php +++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Authentication * @subpackage SignOn */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Auth; use PhpMyAdmin\Core; diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index 420a12284c..49847e3464 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins; use PhpMyAdmin\Config; diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php index e00f22462b..b8f0ec8b1a 100644 --- a/libraries/classes/Plugins/Export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage CodeGen */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Export; diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php index 2dc8914b7b..c05b181ed3 100644 --- a/libraries/classes/Plugins/Export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-Export * @subpackage CSV */ +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 fa4622ad0b..3cb39e81f2 100644 --- a/libraries/classes/Plugins/Export/ExportExcel.php +++ b/libraries/classes/Plugins/Export/ExportExcel.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage CSV-Excel */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index e6fd3901d9..a42999a256 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage HTML-Word */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; @@ -260,7 +262,7 @@ class ExportHtmlword extends ExportPlugin $value = ''; } $schema_insert .= '' - . htmlspecialchars($value) + . htmlspecialchars((string) $value) . ''; } // end for $schema_insert .= ''; diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index 70ebcc8bd6..5096691a19 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage JSON */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php index 2c8ca9b926..77cde09b5f 100644 --- a/libraries/classes/Plugins/Export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage Latex */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php index efe09f4f33..974b62b891 100644 --- a/libraries/classes/Plugins/Export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage MediaWiki */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php index 5a444140a5..57577bdbe0 100644 --- a/libraries/classes/Plugins/Export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage ODS */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index ce3d2283d0..103f139bf6 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage ODT */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index 8441a907f8..f5ba93e230 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage PDF */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Export; diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php index 3199ec588b..2836f60460 100644 --- a/libraries/classes/Plugins/Export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-Export * @subpackage PHP */ +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 ca0d807600..51a509405a 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Charsets; diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index 703132b373..c58e9156e5 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage Texy!text */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index a216537ff7..e1524b578a 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage XML */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php index ea3ab279b5..19b17832eb 100644 --- a/libraries/classes/Plugins/Export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-Export * @subpackage YAML */ +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 22e1a63dcc..673a852a0d 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage PDF */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export\Helpers; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/Export/Helpers/TableProperty.php b/libraries/classes/Plugins/Export/Helpers/TableProperty.php index de8bff2047..1a1a8e1635 100644 --- a/libraries/classes/Plugins/Export/Helpers/TableProperty.php +++ b/libraries/classes/Plugins/Export/Helpers/TableProperty.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Export * @subpackage CodeGen */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Export\Helpers; use PhpMyAdmin\Plugins\Export\ExportCodegen; @@ -67,12 +69,12 @@ class TableProperty */ public function __construct(array $row) { - $this->name = trim($row[0]); - $this->type = trim($row[1]); - $this->nullable = trim($row[2]); - $this->key = trim($row[3]); - $this->defaultValue = trim($row[4]); - $this->ext = trim($row[5]); + $this->name = trim((string) $row[0]); + $this->type = trim((string) $row[1]); + $this->nullable = trim((string) $row[2]); + $this->key = trim((string) $row[3]); + $this->defaultValue = trim((string) $row[4]); + $this->ext = trim((string) $row[5]); } /** diff --git a/libraries/classes/Plugins/Export/README b/libraries/classes/Plugins/Export/README index a05dc8a47c..5ada85bcc6 100644 --- a/libraries/classes/Plugins/Export/README +++ b/libraries/classes/Plugins/Export/README @@ -11,9 +11,7 @@ some plugins for your use, you can directly use texts in plugin. * @package PhpMyAdmin-Export * @subpackage [Name] */ -if (! defined('PHPMYADMIN')) { - exit; -} +declare(strict_types=1); /** * Handles the export for the [Name] format diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php index a6eee2d93f..719109305b 100644 --- a/libraries/classes/Plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); namespace PhpMyAdmin\Plugins; diff --git a/libraries/classes/Plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php index 084923ddfc..32a2d7b99d 100644 --- a/libraries/classes/Plugins/IOTransformationsPlugin.php +++ b/libraries/classes/Plugins/IOTransformationsPlugin.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Import/AbstractImportCsv.php b/libraries/classes/Plugins/Import/AbstractImportCsv.php index 14ed2358e8..320607c513 100644 --- a/libraries/classes/Plugins/Import/AbstractImportCsv.php +++ b/libraries/classes/Plugins/Import/AbstractImportCsv.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Import * @subpackage CSV */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index f5a8feeb45..58383e9a01 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -7,6 +7,8 @@ * @package PhpMyAdmin-Import * @subpackage CSV */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Import; @@ -616,7 +618,7 @@ class ImportCsv extends AbstractImportCsv } } - if (mb_strlen($db)) { + if (mb_strlen((string) $db)) { $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES'); $tbl_name = 'TABLE ' . (count($result) + 1); } else { diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php index 59a27b9e62..b583716a58 100644 --- a/libraries/classes/Plugins/Import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Import * @subpackage LDI */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Import; @@ -15,10 +17,6 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Util; -if (!defined('PHPMYADMIN')) { - exit; -} - // We need relations enabled and we work only on database if ($GLOBALS['plugin_param'] !== 'table') { $GLOBALS['skip_import'] = true; @@ -131,18 +129,18 @@ class ImportLdi extends AbstractImportCsv } $sql .= ' INTO TABLE ' . Util::backquote($table); - if (strlen($ldi_terminated) > 0) { + if (strlen((string) $ldi_terminated) > 0) { $sql .= ' FIELDS TERMINATED BY \'' . $ldi_terminated . '\''; } - if (strlen($ldi_enclosed) > 0) { + if (strlen((string) $ldi_enclosed) > 0) { $sql .= ' ENCLOSED BY \'' . $GLOBALS['dbi']->escapeString($ldi_enclosed) . '\''; } - if (strlen($ldi_escaped) > 0) { + if (strlen((string) $ldi_escaped) > 0) { $sql .= ' ESCAPED BY \'' . $GLOBALS['dbi']->escapeString($ldi_escaped) . '\''; } - if (strlen($ldi_new_line) > 0) { + if (strlen((string) $ldi_new_line) > 0) { if ($ldi_new_line == 'auto') { $ldi_new_line = (PHP_EOL == "\n") @@ -155,7 +153,7 @@ class ImportLdi extends AbstractImportCsv $sql .= ' IGNORE ' . $skip_queries . ' LINES'; $skip_queries = 0; } - if (strlen($ldi_columns) > 0) { + if (strlen((string) $ldi_columns) > 0) { $sql .= ' ('; $tmp = preg_split('/,( ?)/', $ldi_columns); $cnt_tmp = count($tmp); diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php index f0dc0ea60e..165f31438f 100644 --- a/libraries/classes/Plugins/Import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Import * @subpackage MediaWiki */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Import; diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index 1c4ae8f40a..42c156302e 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -8,6 +8,8 @@ * @package PhpMyAdmin-Import * @subpackage ODS */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Import; @@ -397,16 +399,16 @@ class ImportOds extends ImportPlugin if ($_REQUEST['ods_recognize_percentages'] && !strcmp( 'percentage', - $cell_attrs['value-type'] + (string) $cell_attrs['value-type'] ) ) { - $value = (double)$cell_attrs['value']; + $value = (double) $cell_attrs['value']; return $value; } elseif ($_REQUEST['ods_recognize_currency'] - && !strcmp('currency', $cell_attrs['value-type']) + && !strcmp('currency', (string) $cell_attrs['value-type']) ) { - $value = (double)$cell_attrs['value']; + $value = (double) $cell_attrs['value']; return $value; } @@ -414,7 +416,7 @@ class ImportOds extends ImportPlugin /* We need to concatenate all paragraphs */ $values = array(); foreach ($text as $paragraph) { - $values[] = (string)$paragraph; + $values[] = (string) $paragraph; } $value = implode("\n", $values); diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php index ec2477d79d..e6155f9e81 100644 --- a/libraries/classes/Plugins/Import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Import * @subpackage ESRI_Shape */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Gis\GisFactory; @@ -250,7 +252,7 @@ class ImportShp extends ImportPlugin } // Set table name based on the number of tables - if (strlen($db) > 0) { + if (strlen((string) $db) > 0) { $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES'); $table_name = 'TABLE ' . (count($result) + 1); } else { @@ -268,7 +270,7 @@ class ImportShp extends ImportPlugin $analyses[$table_no][Import::FORMATTEDSQL][$spatial_col] = true; // Set database name to the currently selected one, if applicable - if (strlen($db) > 0) { + if (strlen((string) $db) > 0) { $db_name = $db; $options = array('create_db' => false); } else { @@ -306,7 +308,7 @@ class ImportShp extends ImportPlugin $import = new Import(); - if (strlen($buffer) < $length) { + if (strlen((string) $buffer) < $length) { if ($GLOBALS['finished']) { $eof = true; } else { diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php index d8a48e9dcc..32b8dc499f 100644 --- a/libraries/classes/Plugins/Import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Import * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Import; diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index 0b84484ce0..0be85fc0e3 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -7,6 +7,7 @@ * @package PhpMyAdmin-Import * @subpackage XML */ +declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; @@ -343,7 +344,7 @@ class ImportXml extends ImportPlugin */ /* Set database name to the currently selected one, if applicable */ - if (strlen($db)) { + if (strlen((string) $db)) { /* Override the database name in the XML file, if one is selected */ $db_name = $db; $options = array('create_db' => false); diff --git a/libraries/classes/Plugins/Import/README b/libraries/classes/Plugins/Import/README index 0bc6c415cf..e240556e98 100644 --- a/libraries/classes/Plugins/Import/README +++ b/libraries/classes/Plugins/Import/README @@ -10,6 +10,8 @@ gettext mechanism, see https://wiki.phpmyadmin.net/pma/Gettext_for_developers. * @package PhpMyAdmin-Import * @subpackage [Name] */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Import; diff --git a/libraries/classes/Plugins/Import/ShapeFileImport.php b/libraries/classes/Plugins/Import/ShapeFileImport.php index eadb52e168..8af3f90735 100644 --- a/libraries/classes/Plugins/Import/ShapeFileImport.php +++ b/libraries/classes/Plugins/Import/ShapeFileImport.php @@ -7,6 +7,8 @@ * @package PhpMyAdmin-Import * @subpackage ESRI_Shape */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\ShapeFile\ShapeFile; diff --git a/libraries/classes/Plugins/Import/Upload/UploadApc.php b/libraries/classes/Plugins/Import/Upload/UploadApc.php index 3eb135416e..13e23d3021 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadApc.php +++ b/libraries/classes/Plugins/Import/Upload/UploadApc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import\Upload; use PhpMyAdmin\Display\ImportAjax; diff --git a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php index b2539fe96a..d947b2acc4 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php +++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import\Upload; use PhpMyAdmin\Plugins\UploadInterface; diff --git a/libraries/classes/Plugins/Import/Upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php index bc68c73da5..aef07da273 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadProgress.php +++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import\Upload; use PhpMyAdmin\Display\ImportAjax; diff --git a/libraries/classes/Plugins/Import/Upload/UploadSession.php b/libraries/classes/Plugins/Import/Upload/UploadSession.php index 5c2ded03ff..315788f80f 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadSession.php +++ b/libraries/classes/Plugins/Import/Upload/UploadSession.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Import\Upload; use PhpMyAdmin\Display\ImportAjax; diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php index 924fe9a6b4..93d18130c7 100644 --- a/libraries/classes/Plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); namespace PhpMyAdmin\Plugins; @@ -77,7 +78,7 @@ abstract class ImportPlugin */ protected function getDbnameAndOptions($currentDb, $defaultDb) { - if (strlen($currentDb) > 0) { + if (strlen((string) $currentDb) > 0) { $db_name = $currentDb; $options = array('create_db' => false); } else { diff --git a/libraries/classes/Plugins/Schema/Dia/Dia.php b/libraries/classes/Plugins/Schema/Dia/Dia.php index b1fe5027c0..dd22c59797 100644 --- a/libraries/classes/Plugins/Schema/Dia/Dia.php +++ b/libraries/classes/Plugins/Schema/Dia/Dia.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Dia; use PhpMyAdmin\Core; diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php index 8797961c7b..696c56a61c 100644 --- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Dia; use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps; diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php index d645f66759..666084c624 100644 --- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php +++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +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 470f762c56..293fdaadb5 100644 --- a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php +++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Dia; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; diff --git a/libraries/classes/Plugins/Schema/Eps/Eps.php b/libraries/classes/Plugins/Schema/Eps/Eps.php index e71b1357da..e85e74a499 100644 --- a/libraries/classes/Plugins/Schema/Eps/Eps.php +++ b/libraries/classes/Plugins/Schema/Eps/Eps.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Eps; use PhpMyAdmin\Core; diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index 6056b1570a..01ad51f5f6 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Eps; use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia; diff --git a/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php b/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php index 61b7f6c260..dd8c4b439d 100644 --- a/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/RelationStatsEps.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Eps; use PhpMyAdmin\Plugins\Schema\RelationStats; diff --git a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php index cf02ed6ee4..3036986502 100644 --- a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Eps; use PhpMyAdmin\Font; @@ -108,13 +110,13 @@ class TableStatsEps extends TableStats foreach ($this->fields as $field) { $this->width = max( $this->width, - $this->font->getStringWidth($field, $font, $fontSize) + $this->font->getStringWidth($field, $font, (int) $fontSize) ); } $this->width += $this->font->getStringWidth( ' ', $font, - $fontSize + (int) $fontSize ); /* * it is unknown what value must be added, because @@ -124,7 +126,7 @@ class TableStatsEps extends TableStats < $this->font->getStringWidth( $this->getTitle(), $font, - $fontSize + (int) $fontSize )) { $this->width += 7; } diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index dc0b36d910..d0f1ee2b99 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -6,6 +6,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\Relation; diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php index 138c56c8ac..da7edce30d 100644 --- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Pdf; use PhpMyAdmin\Pdf as PdfLib; diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index 8bed42a01f..b21e1a5de3 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Pdf; use PhpMyAdmin\Pdf as PdfLib; diff --git a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php index 66a46b5552..a8eb2bbf18 100644 --- a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Pdf; use PhpMyAdmin\Plugins\Schema\RelationStats; diff --git a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php index 9f930ca514..09af78f09c 100644 --- a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Pdf; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; diff --git a/libraries/classes/Plugins/Schema/RelationStats.php b/libraries/classes/Plugins/Schema/RelationStats.php index 8fe9f30e1d..84bffe7dbf 100644 --- a/libraries/classes/Plugins/Schema/RelationStats.php +++ b/libraries/classes/Plugins/Schema/RelationStats.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +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 02dd75af1e..d98817846e 100644 --- a/libraries/classes/Plugins/Schema/SchemaDia.php +++ b/libraries/classes/Plugins/Schema/SchemaDia.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Schema * @subpackage Dia */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php index 1df342f043..b12f3c9da3 100644 --- a/libraries/classes/Plugins/Schema/SchemaEps.php +++ b/libraries/classes/Plugins/Schema/SchemaEps.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Schema * @subpackage EPS */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php index 0c12fb4573..e0ec627ef8 100644 --- a/libraries/classes/Plugins/Schema/SchemaPdf.php +++ b/libraries/classes/Plugins/Schema/SchemaPdf.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Schema * @subpackage PDF */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; diff --git a/libraries/classes/Plugins/Schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php index fce8104269..04697a158b 100644 --- a/libraries/classes/Plugins/Schema/SchemaSvg.php +++ b/libraries/classes/Plugins/Schema/SchemaSvg.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Schema * @subpackage SVG */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; diff --git a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php index b0f44d4ec3..865d0994fa 100644 --- a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Svg; use PhpMyAdmin\Plugins\Schema\RelationStats; diff --git a/libraries/classes/Plugins/Schema/Svg/Svg.php b/libraries/classes/Plugins/Schema/Svg/Svg.php index 624bf10632..899c6b758c 100644 --- a/libraries/classes/Plugins/Schema/Svg/Svg.php +++ b/libraries/classes/Plugins/Schema/Svg/Svg.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Svg; use PhpMyAdmin\Core; @@ -233,13 +235,13 @@ class Svg extends XMLWriter $styles = '' ) { $this->startElement($name); - $this->writeAttribute('width', $width); - $this->writeAttribute('height', $height); - $this->writeAttribute('x', $x); - $this->writeAttribute('y', $y); - $this->writeAttribute('style', $styles); + $this->writeAttribute('width', (string) $width); + $this->writeAttribute('height', (string) $height); + $this->writeAttribute('x', (string) $x); + $this->writeAttribute('y', (string) $y); + $this->writeAttribute('style', (string) $styles); if (isset($text)) { - $this->writeAttribute('font-family', $this->font); + $this->writeAttribute('font-family', (string) $this->font); $this->writeAttribute('font-size', $this->fontSize . 'px'); $this->text($text); } diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index 846b8fa153..3f8c1edb4e 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Svg; use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia; diff --git a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php index 258ebcaf6c..5998ae57c5 100644 --- a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema\Svg; use PhpMyAdmin\Font; diff --git a/libraries/classes/Plugins/Schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php index 1d102eb856..d3110b8cc7 100644 --- a/libraries/classes/Plugins/Schema/TableStats.php +++ b/libraries/classes/Plugins/Schema/TableStats.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\DatabaseInterface; diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php index 7be1959e01..2660efe480 100644 --- a/libraries/classes/Plugins/SchemaPlugin.php +++ b/libraries/classes/Plugins/SchemaPlugin.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +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 49a1c099ca..7df770fb04 100644 --- a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Bool2Text */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php index 129da8ea23..e32d2662f7 100644 --- a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-Transformations */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\IOTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php index 595872cc0e..f21e654754 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage DateFormat */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; @@ -50,6 +52,7 @@ abstract class DateFormatTransformationsPlugin extends TransformationsPlugin */ public function applyTransformation($buffer, array $options = array(), $meta = '') { + $buffer = (string) $buffer; // possibly use a global transform and feed it with special options $cfg = $GLOBALS['cfg']; $options = $this->getOptions($options, $cfg['DefaultTransformations']['DateFormat']); @@ -141,10 +144,10 @@ abstract class DateFormatTransformationsPlugin extends TransformationsPlugin $text = 'INVALID DATE TYPE'; } return '' . htmlspecialchars($text) . ''; + . htmlspecialchars((string) $source) . '">' . htmlspecialchars((string) $text) . ''; } - return htmlspecialchars($buffer); + return htmlspecialchars((string) $buffer); } /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php index d205b9f0f7..8c708489f6 100644 --- a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Download */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php index d3286aa563..9924b8a5d8 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage External */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php index c97f1268f2..22fe9e9a93 100644 --- a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Formatted */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php index 627de1f8d2..64f9ab0208 100644 --- a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Hex */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php index 6dca346a1f..2615a42c08 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php @@ -6,14 +6,12 @@ * @package PhpMyAdmin-Transformations * @subpackage Link */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; -if (!defined('PHPMYADMIN')) { - exit; -} - /** * Provides common methods for all of the link transformations plugins. * diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php index 3909149d94..5cf51dceb8 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage ImageUpload */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\IOTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php index a56fd80d1b..9c0fb5ce62 100644 --- a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php @@ -6,14 +6,12 @@ * @package PhpMyAdmin-Transformations * @subpackage Inline */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; -if (!defined('PHPMYADMIN')) { - exit; -} - /** * Provides common methods for all of the inline transformations plugins. * diff --git a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php index 8498d1b7b4..9b7f618741 100644 --- a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage LongToIPv4 */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php index 401e34ba59..0a1f9665ec 100644 --- a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage PreApPend */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php index 158cad71e7..8cb44269df 100644 --- a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage RegexValidation */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\IOTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php index bd1ad742a8..e16c182e19 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php index a3fdabe1a2..1770f203c3 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Substring */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php index ff90bf9f27..e435020e13 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage TextFileUpload */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\IOTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php index 1229f84a82..bb45af288f 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php @@ -6,15 +6,13 @@ * @package PhpMyAdmin-Transformations * @subpackage ImageLink */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Sanitize; -if (!defined('PHPMYADMIN')) { - exit; -} - /** * Provides common methods for all of the image link transformations plugins. * diff --git a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php index 29a4d74cde..5be2e769d0 100644 --- a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php @@ -6,15 +6,13 @@ * @package PhpMyAdmin-Transformations * @subpackage Link */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Sanitize; -if (!defined('PHPMYADMIN')) { - exit; -} - /** * Provides common methods for all of the link transformations plugins. * diff --git a/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php index 2478658ec2..903bfd22c7 100644 --- a/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php +++ b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage ImageUpload */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\ImageUploadTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php index c75d4ee6b4..b7a2ae36b4 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage TextFileUpload */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\TextFileUploadTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php index e96f583f5b..bbf3e0ecc1 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage IPToBinary */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\IOTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php index 75ae8a5ef9..50ff400bf4 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage JSON */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php index 6bd677f34f..136fe62122 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage RegexValidation */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\RegexValidationTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php index 719ffacdbd..f8617774e7 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin; diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php index 7dd2b0df71..a2e4e5e712 100644 --- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php +++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage XML */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Input; use PhpMyAdmin\Plugins\Transformations\Abs\CodeMirrorEditorTransformationPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php index 2255c8bb1f..2c0795fc66 100644 --- a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php +++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Download */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\DownloadTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php index 989e7a9836..4ab62eb0bb 100644 --- a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php +++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Hex */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\HexTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php index 6c86fe9d45..7c69405692 100644 --- a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php +++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Inline */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\InlineTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php index 39673c8a7f..f338d57e9f 100644 --- a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php +++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Link */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\ImageLinkTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php index 2e9e4c77f2..5c8e5e58ca 100644 --- a/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php +++ b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Inline */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\InlineTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php index b593351ed5..e6132f0044 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\SQLTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php index 80e7348840..097c5b0889 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage BinaryToIP */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php index 47e1b285e3..fcb65a676d 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Bool2Text */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\Bool2TextTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php index 84dba2b1e7..1d0ae7830c 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage DateFormat */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\DateFormatTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php index 5d18e44bfd..8e5a36d4d7 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage External */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\ExternalTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php index 82fa7ed863..6eeffba973 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Formatted */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\FormattedTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php index 2659dffa78..fcad39b290 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage ImageLink */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\Transformations\Abs\TextImageLinkTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php index e2a994024a..fe854010d5 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php index 8c76feea76..f0425a2713 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Response; diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php index 44bf6c0d41..5c87b06a05 100644 --- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php +++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage SQL */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Output; use PhpMyAdmin\Plugins\TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/TEMPLATE b/libraries/classes/Plugins/Transformations/TEMPLATE index 0f9c48d31b..7d2b2ff728 100644 --- a/libraries/classes/Plugins/Transformations/TEMPLATE +++ b/libraries/classes/Plugins/Transformations/TEMPLATE @@ -8,14 +8,12 @@ * @package PhpMyAdmin-Transformations * @subpackage [TransformationName] */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations; use PhpMyAdmin\Plugins\Transformations\Abs\[TransformationName]TransformationsPlugin; -if (! defined('PHPMYADMIN')) { - exit; -} - /** * Handles the [TransformationName] transformation for [MIMEType] - [MIMESubtype] * diff --git a/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT b/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT index 54ef4901e3..94a4b227ba 100644 --- a/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT +++ b/libraries/classes/Plugins/Transformations/TEMPLATE_ABSTRACT @@ -8,14 +8,12 @@ * @package PhpMyAdmin-Transformations * @subpackage [TransformationName] */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Plugins\IOTransformationsPlugin; -if (! defined('PHPMYADMIN')) { - exit; -} - /** * Provides common methods for all of the [TransformationName] transformations plugins. * diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Link.php b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php index 90c4bd3b64..298919b42f 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_Link.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Link */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations; use PhpMyAdmin\Plugins\Transformations\Abs\TextLinkTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php index 35b57b5b9e..5f288a8673 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage LongToIPv4 */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations; use PhpMyAdmin\Plugins\Transformations\Abs\LongToIPv4TransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php index 60b3d55e18..4c285fa7e6 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage PreApPend */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations; use PhpMyAdmin\Plugins\Transformations\Abs\PreApPendTransformationsPlugin; diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php index 6202643894..1f21fe1f1a 100644 --- a/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php +++ b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-Transformations * @subpackage Substring */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\Transformations; use PhpMyAdmin\Plugins\Transformations\Abs\SubstringTransformationsPlugin; diff --git a/libraries/classes/Plugins/TransformationsInterface.php b/libraries/classes/Plugins/TransformationsInterface.php index 8d048014b9..f87e4a8257 100644 --- a/libraries/classes/Plugins/TransformationsInterface.php +++ b/libraries/classes/Plugins/TransformationsInterface.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins; /** diff --git a/libraries/classes/Plugins/TransformationsPlugin.php b/libraries/classes/Plugins/TransformationsPlugin.php index 31f2877a5b..f7e9696a80 100644 --- a/libraries/classes/Plugins/TransformationsPlugin.php +++ b/libraries/classes/Plugins/TransformationsPlugin.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins; /** diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index 3056af3e46..18a7b1bb5e 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\TwoFactor; diff --git a/libraries/classes/Plugins/TwoFactor/Invalid.php b/libraries/classes/Plugins/TwoFactor/Invalid.php index b4fbfd5a55..8c3d96ca4f 100644 --- a/libraries/classes/Plugins/TwoFactor/Invalid.php +++ b/libraries/classes/Plugins/TwoFactor/Invalid.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Plugins\TwoFactorPlugin; diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php index 3ce4b236cb..ef07728b05 100644 --- a/libraries/classes/Plugins/TwoFactor/Key.php +++ b/libraries/classes/Plugins/TwoFactor/Key.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Response; diff --git a/libraries/classes/Plugins/TwoFactor/Simple.php b/libraries/classes/Plugins/TwoFactor/Simple.php index 70d3a614eb..a6d73a98cb 100644 --- a/libraries/classes/Plugins/TwoFactor/Simple.php +++ b/libraries/classes/Plugins/TwoFactor/Simple.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Plugins\TwoFactorPlugin; diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index 8e91b786af..20087917b1 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Plugins; use PhpMyAdmin\Core; diff --git a/libraries/classes/Plugins/UploadInterface.php b/libraries/classes/Plugins/UploadInterface.php index 28bf9d0aef..3839aab4e0 100644 --- a/libraries/classes/Plugins/UploadInterface.php +++ b/libraries/classes/Plugins/UploadInterface.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +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 d976da5aa0..99d3546995 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\OptionsPropertyGroup; diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php index 87a5fb4a8e..298f566984 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyRootGroup.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\OptionsPropertyGroup; diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php index 2532da9d8d..1475e4dc84 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\OptionsPropertyGroup; diff --git a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php index 2a45cf0b8a..7441243351 100644 --- a/libraries/classes/Properties/Options/Items/BoolPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/BoolPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/DocPropertyItem.php b/libraries/classes/Properties/Options/Items/DocPropertyItem.php index bfda142ef9..51a05f4fa0 100644 --- a/libraries/classes/Properties/Options/Items/DocPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/DocPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php index 46389ce42a..116666fbff 100644 --- a/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/HiddenPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php index 9ff762bb73..ab8e1b2b2f 100644 --- a/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/MessageOnlyPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/NumberPropertyItem.php b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php index e1892afe6d..9c81deb901 100644 --- a/libraries/classes/Properties/Options/Items/NumberPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/NumberPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php index 6424a1c0be..98f93a9ff3 100644 --- a/libraries/classes/Properties/Options/Items/RadioPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/RadioPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/SelectPropertyItem.php b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php index 4960cfaa95..ea7abcdc69 100644 --- a/libraries/classes/Properties/Options/Items/SelectPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/SelectPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/Items/TextPropertyItem.php b/libraries/classes/Properties/Options/Items/TextPropertyItem.php index 9a07b22c3e..5c10a54f60 100644 --- a/libraries/classes/Properties/Options/Items/TextPropertyItem.php +++ b/libraries/classes/Properties/Options/Items/TextPropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options\Items; use PhpMyAdmin\Properties\Options\OptionsPropertyOneItem; diff --git a/libraries/classes/Properties/Options/OptionsPropertyGroup.php b/libraries/classes/Properties/Options/OptionsPropertyGroup.php index 603ef0f271..5ad22d9470 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyGroup.php +++ b/libraries/classes/Properties/Options/OptionsPropertyGroup.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +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 2e4d6ac0f6..829f6d9d6c 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyItem.php +++ b/libraries/classes/Properties/Options/OptionsPropertyItem.php @@ -6,6 +6,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Options; use PhpMyAdmin\Properties\PropertyItem; diff --git a/libraries/classes/Properties/Options/OptionsPropertyOneItem.php b/libraries/classes/Properties/Options/OptionsPropertyOneItem.php index d44a7fe63a..9030e1ac58 100644 --- a/libraries/classes/Properties/Options/OptionsPropertyOneItem.php +++ b/libraries/classes/Properties/Options/OptionsPropertyOneItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +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 a5a19da926..4ae4e03ec1 100644 --- a/libraries/classes/Properties/Plugins/ExportPluginProperties.php +++ b/libraries/classes/Properties/Plugins/ExportPluginProperties.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +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 bbcdd59eaa..b270951491 100644 --- a/libraries/classes/Properties/Plugins/ImportPluginProperties.php +++ b/libraries/classes/Properties/Plugins/ImportPluginProperties.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Plugins; /** @@ -28,4 +30,4 @@ class ImportPluginProperties extends PluginPropertyItem { return "import"; } -} \ No newline at end of file +} diff --git a/libraries/classes/Properties/Plugins/PluginPropertyItem.php b/libraries/classes/Properties/Plugins/PluginPropertyItem.php index 8b041d4454..4d45ab1c37 100644 --- a/libraries/classes/Properties/Plugins/PluginPropertyItem.php +++ b/libraries/classes/Properties/Plugins/PluginPropertyItem.php @@ -6,6 +6,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Plugins; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Properties/Plugins/SchemaPluginProperties.php b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php index e3635337d7..28d187eb44 100644 --- a/libraries/classes/Properties/Plugins/SchemaPluginProperties.php +++ b/libraries/classes/Properties/Plugins/SchemaPluginProperties.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties\Plugins; /** diff --git a/libraries/classes/Properties/PropertyItem.php b/libraries/classes/Properties/PropertyItem.php index a01b103fa7..2556e1fc76 100644 --- a/libraries/classes/Properties/PropertyItem.php +++ b/libraries/classes/Properties/PropertyItem.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Properties; /** diff --git a/libraries/classes/Rte/Events.php b/libraries/classes/Rte/Events.php index e0212e5f02..337e593a7d 100644 --- a/libraries/classes/Rte/Events.php +++ b/libraries/classes/Rte/Events.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Message; @@ -413,7 +415,7 @@ class Events 'item_comment' ); foreach ($need_escape as $index) { - $item[$index] = htmlentities($item[$index], ENT_QUOTES); + $item[$index] = htmlentities((string) $item[$index], ENT_QUOTES); } $original_data = ''; if ($mode == 'edit') { diff --git a/libraries/classes/Rte/Export.php b/libraries/classes/Rte/Export.php index a5ab3132e1..616b9d1765 100644 --- a/libraries/classes/Rte/Export.php +++ b/libraries/classes/Rte/Export.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Message; diff --git a/libraries/classes/Rte/Footer.php b/libraries/classes/Rte/Footer.php index 9099f45a7f..619a495f73 100644 --- a/libraries/classes/Rte/Footer.php +++ b/libraries/classes/Rte/Footer.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Rte\Words; diff --git a/libraries/classes/Rte/General.php b/libraries/classes/Rte/General.php index 3eed69d4f2..b7028b0c36 100644 --- a/libraries/classes/Rte/General.php +++ b/libraries/classes/Rte/General.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Message; diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php index 00a5783f83..a114acc0da 100644 --- a/libraries/classes/Rte/Routines.php +++ b/libraries/classes/Rte/Routines.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Charsets; diff --git a/libraries/classes/Rte/RteList.php b/libraries/classes/Rte/RteList.php index 948e645ef1..86ca51e89c 100644 --- a/libraries/classes/Rte/RteList.php +++ b/libraries/classes/Rte/RteList.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Response; diff --git a/libraries/classes/Rte/Triggers.php b/libraries/classes/Rte/Triggers.php index e81be4d5b0..9e9976f549 100644 --- a/libraries/classes/Rte/Triggers.php +++ b/libraries/classes/Rte/Triggers.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; use PhpMyAdmin\Message; diff --git a/libraries/classes/Rte/Words.php b/libraries/classes/Rte/Words.php index b4bafbf6b4..2b8a6e9911 100644 --- a/libraries/classes/Rte/Words.php +++ b/libraries/classes/Rte/Words.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Rte; /** diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index d90c87c170..dcb3b0892d 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server; use PhpMyAdmin\Core; diff --git a/libraries/classes/Server/Select.php b/libraries/classes/Server/Select.php index b5b434de83..4976ea4598 100644 --- a/libraries/classes/Server/Select.php +++ b/libraries/classes/Server/Select.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server; use PhpMyAdmin\Url; diff --git a/libraries/classes/Server/Status.php b/libraries/classes/Server/Status.php index 93f953b3d5..d3b9cb1894 100644 --- a/libraries/classes/Server/Status.php +++ b/libraries/classes/Server/Status.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server; use PhpMyAdmin\ReplicationGui; diff --git a/libraries/classes/Server/Status/Advisor.php b/libraries/classes/Server/Status/Advisor.php index 2356c710f2..8fe3e2eab7 100644 --- a/libraries/classes/Server/Status/Advisor.php +++ b/libraries/classes/Server/Status/Advisor.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Advisor as PmaAdvisor; diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php index ceee76e771..b0b45c7397 100644 --- a/libraries/classes/Server/Status/Data.php +++ b/libraries/classes/Server/Status/Data.php @@ -6,6 +6,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Url; diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php index de30e6ee1c..ffeaaacd46 100644 --- a/libraries/classes/Server/Status/Monitor.php +++ b/libraries/classes/Server/Status/Monitor.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Sanitize; diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php index 463a1caae4..0ce9cb7940 100644 --- a/libraries/classes/Server/Status/Processes.php +++ b/libraries/classes/Server/Status/Processes.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Message; diff --git a/libraries/classes/Server/Status/Queries.php b/libraries/classes/Server/Status/Queries.php index 948aca47f0..27043da5ab 100644 --- a/libraries/classes/Server/Status/Queries.php +++ b/libraries/classes/Server/Status/Queries.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Server\Status\Data; diff --git a/libraries/classes/Server/Status/Variables.php b/libraries/classes/Server/Status/Variables.php index 75847bf698..6642d00e01 100644 --- a/libraries/classes/Server/Status/Variables.php +++ b/libraries/classes/Server/Status/Variables.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server\Status; use PhpMyAdmin\Server\Status\Data; @@ -292,7 +294,7 @@ class Variables $retval .= ''; } } - $retval .= htmlspecialchars($value); + $retval .= htmlspecialchars((string) $value); if (isset($alerts[$name])) { $retval .= ''; } diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php index b098b07329..fd3ccf6735 100644 --- a/libraries/classes/Server/UserGroups.php +++ b/libraries/classes/Server/UserGroups.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server; use PhpMyAdmin\Relation; diff --git a/libraries/classes/Server/Users.php b/libraries/classes/Server/Users.php index bd5058982c..ab4654f235 100644 --- a/libraries/classes/Server/Users.php +++ b/libraries/classes/Server/Users.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Server; use PhpMyAdmin\Url; diff --git a/libraries/classes/Twig/CharsetsExtension.php b/libraries/classes/Twig/CharsetsExtension.php index 0bdd2c7585..b191ba7be5 100644 --- a/libraries/classes/Twig/CharsetsExtension.php +++ b/libraries/classes/Twig/CharsetsExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/CoreExtension.php b/libraries/classes/Twig/CoreExtension.php index 138fdcdfeb..69f1f676ec 100644 --- a/libraries/classes/Twig/CoreExtension.php +++ b/libraries/classes/Twig/CoreExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/I18n/NodeTrans.php b/libraries/classes/Twig/I18n/NodeTrans.php index a24fe58ac0..dca285a41d 100644 --- a/libraries/classes/Twig/I18n/NodeTrans.php +++ b/libraries/classes/Twig/I18n/NodeTrans.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig\I18n */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig\I18n; use Twig\Compiler; diff --git a/libraries/classes/Twig/I18n/TokenParserTrans.php b/libraries/classes/Twig/I18n/TokenParserTrans.php index 44743e99d8..01834a924b 100644 --- a/libraries/classes/Twig/I18n/TokenParserTrans.php +++ b/libraries/classes/Twig/I18n/TokenParserTrans.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig\I18n */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig\I18n; use Twig\Extensions\TokenParser\TransTokenParser; diff --git a/libraries/classes/Twig/I18nExtension.php b/libraries/classes/Twig/I18nExtension.php index dc668304cf..1f63b236c3 100644 --- a/libraries/classes/Twig/I18nExtension.php +++ b/libraries/classes/Twig/I18nExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use PhpMyAdmin\Twig\I18n\TokenParserTrans; diff --git a/libraries/classes/Twig/IndexExtension.php b/libraries/classes/Twig/IndexExtension.php index 4fcea6ce0d..0e1fde6c05 100644 --- a/libraries/classes/Twig/IndexExtension.php +++ b/libraries/classes/Twig/IndexExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/MessageExtension.php b/libraries/classes/Twig/MessageExtension.php index c2d0796d15..2cec75ab02 100644 --- a/libraries/classes/Twig/MessageExtension.php +++ b/libraries/classes/Twig/MessageExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use PhpMyAdmin\Message; diff --git a/libraries/classes/Twig/PartitionExtension.php b/libraries/classes/Twig/PartitionExtension.php index d4d49cd71d..3c442f12a2 100644 --- a/libraries/classes/Twig/PartitionExtension.php +++ b/libraries/classes/Twig/PartitionExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/PhpFunctionsExtension.php b/libraries/classes/Twig/PhpFunctionsExtension.php index 4cf7fc2689..08f823270e 100644 --- a/libraries/classes/Twig/PhpFunctionsExtension.php +++ b/libraries/classes/Twig/PhpFunctionsExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/PluginsExtension.php b/libraries/classes/Twig/PluginsExtension.php index cf6d2219b8..4b88229047 100644 --- a/libraries/classes/Twig/PluginsExtension.php +++ b/libraries/classes/Twig/PluginsExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/RelationExtension.php b/libraries/classes/Twig/RelationExtension.php index ce69ffd041..221f350cd8 100644 --- a/libraries/classes/Twig/RelationExtension.php +++ b/libraries/classes/Twig/RelationExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use PhpMyAdmin\Relation; diff --git a/libraries/classes/Twig/SanitizeExtension.php b/libraries/classes/Twig/SanitizeExtension.php index 668e2aeb9f..4a1390532e 100644 --- a/libraries/classes/Twig/SanitizeExtension.php +++ b/libraries/classes/Twig/SanitizeExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/ServerPrivilegesExtension.php b/libraries/classes/Twig/ServerPrivilegesExtension.php index afc96b00ea..078470248e 100644 --- a/libraries/classes/Twig/ServerPrivilegesExtension.php +++ b/libraries/classes/Twig/ServerPrivilegesExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use PhpMyAdmin\Server\Privileges; diff --git a/libraries/classes/Twig/StorageEngineExtension.php b/libraries/classes/Twig/StorageEngineExtension.php index 9ce01f9567..cd94771c26 100644 --- a/libraries/classes/Twig/StorageEngineExtension.php +++ b/libraries/classes/Twig/StorageEngineExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/TableExtension.php b/libraries/classes/Twig/TableExtension.php index c736e40a45..0e257df840 100644 --- a/libraries/classes/Twig/TableExtension.php +++ b/libraries/classes/Twig/TableExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/TrackerExtension.php b/libraries/classes/Twig/TrackerExtension.php index 324f1ece6a..da6843990b 100644 --- a/libraries/classes/Twig/TrackerExtension.php +++ b/libraries/classes/Twig/TrackerExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/TransformationsExtension.php b/libraries/classes/Twig/TransformationsExtension.php index 984f539ce3..6636b8d79e 100644 --- a/libraries/classes/Twig/TransformationsExtension.php +++ b/libraries/classes/Twig/TransformationsExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use PhpMyAdmin\Transformations; diff --git a/libraries/classes/Twig/UrlExtension.php b/libraries/classes/Twig/UrlExtension.php index 7aff39e175..7cbd1f7cec 100644 --- a/libraries/classes/Twig/UrlExtension.php +++ b/libraries/classes/Twig/UrlExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php index 3a483d0795..622e8f97ac 100644 --- a/libraries/classes/Twig/UtilExtension.php +++ b/libraries/classes/Twig/UtilExtension.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin\Twig */ +declare(strict_types=1); + namespace PhpMyAdmin\Twig; use Twig\Extension\AbstractExtension; diff --git a/libraries/classes/Utils/HttpRequest.php b/libraries/classes/Utils/HttpRequest.php index d0727a3a40..1ae0bada4f 100644 --- a/libraries/classes/Utils/HttpRequest.php +++ b/libraries/classes/Utils/HttpRequest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Utils; /** diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 1805466bbe..bb56915782 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -30,6 +30,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Config; use PhpMyAdmin\Core; diff --git a/libraries/config.default.php b/libraries/config.default.php index c9eba9177d..a2acd4756d 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -18,6 +18,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); /** * Your phpMyAdmin URL. @@ -92,7 +93,7 @@ $cfg['TranslationWarningThreshold'] = 80; /** * Allows phpMyAdmin to be included from a other document in a frame; * setting this to true is a potential security hole. Setting this to - * 'sameorigin' prevents phpMyAdmin to be included from another document + * 'sameorigin' prevents phpMyAdmin to be included from another document * in a frame, unless that document belongs to the same domain. * * @global boolean|string $cfg['AllowThirdPartyFraming'] diff --git a/libraries/config.values.php b/libraries/config.values.php index 06e81a4410..5e0bad93a8 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -6,6 +6,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); if (!defined('PHPMYADMIN')) { exit; diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index bca8f2d07d..771949d031 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Message; diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php index 4a05f5f71d..6297e57abe 100644 --- a/libraries/db_table_exists.inc.php +++ b/libraries/db_table_exists.inc.php @@ -6,6 +6,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Message; diff --git a/libraries/dbi/dbi_dummy.inc.php b/libraries/dbi/dbi_dummy.inc.php index 75434e7439..0abbe309f3 100644 --- a/libraries/dbi/dbi_dummy.inc.php +++ b/libraries/dbi/dbi_dummy.inc.php @@ -10,6 +10,7 @@ * @package PhpMyAdmin-DBI * @subpackage Dummy */ +declare(strict_types=1); if (!defined('PHPMYADMIN')) { exit; diff --git a/libraries/error.inc.php b/libraries/error.inc.php index cbec5a3725..8e2234c26f 100644 --- a/libraries/error.inc.php +++ b/libraries/error.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Sanitize; if (! defined('PHPMYADMIN')) { diff --git a/libraries/information_schema_relations.inc.php b/libraries/information_schema_relations.inc.php index 3c1b618d3b..65122edc6b 100644 --- a/libraries/information_schema_relations.inc.php +++ b/libraries/information_schema_relations.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + if (! defined('PHPMYADMIN')) { exit; } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 60fd7082bd..1ffcc201d7 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\CentralColumns; use PhpMyAdmin\Message; diff --git a/libraries/mysql_relations.inc.php b/libraries/mysql_relations.inc.php index a6bc43a522..8a8b6a870a 100644 --- a/libraries/mysql_relations.inc.php +++ b/libraries/mysql_relations.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + if (! defined('PHPMYADMIN')) { exit; } diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 6b29eea2f9..289f8c53e9 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + if (! defined('PHPMYADMIN')) { exit; } diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index 6f6738162c..330851b3de 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Response; use PhpMyAdmin\Rte\Events; use PhpMyAdmin\Rte\Routines; diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 6eb7672af8..cb0e2aece7 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Url; if (! defined('PHPMYADMIN')) { diff --git a/libraries/special_schema_links.inc.php b/libraries/special_schema_links.inc.php index bab8b5be88..77109c69b6 100644 --- a/libraries/special_schema_links.inc.php +++ b/libraries/special_schema_links.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + if (! defined('PHPMYADMIN')) { exit; } diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 2ab3572967..02845a979b 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -6,6 +6,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Di\Container; use PhpMyAdmin\Partition; diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php index 650b23da27..025f3b5d90 100644 --- a/libraries/tbl_common.inc.php +++ b/libraries/tbl_common.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Url; if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_partition_definition.inc.php b/libraries/tbl_partition_definition.inc.php index 1ef4a9db6c..2c6c9b5c6e 100644 --- a/libraries/tbl_partition_definition.inc.php +++ b/libraries/tbl_partition_definition.inc.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 8b3bc32b63..a3d901e35a 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\Message; use PhpMyAdmin\Relation; diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 17b4305a56..57c7b05faf 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -9,6 +9,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + if (! defined('PHPMYADMIN')) { exit; } diff --git a/license.php b/license.php index c3d30e09eb..0837a42bee 100644 --- a/license.php +++ b/license.php @@ -8,6 +8,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Response; /** diff --git a/lint.php b/lint.php index 4bd478dea2..5c948892ac 100644 --- a/lint.php +++ b/lint.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Linter; diff --git a/logout.php b/logout.php index e715ed16e3..e41d7ee497 100644 --- a/logout.php +++ b/logout.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; diff --git a/navigation.php b/navigation.php index 69e4ee12d2..560f3ab218 100644 --- a/navigation.php +++ b/navigation.php @@ -5,8 +5,8 @@ * * @package PhpMyAdmin-Navigation */ +declare(strict_types=1); -// Include common functionalities use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\Relation; diff --git a/normalization.php b/normalization.php index 8f3c55c2a4..d7961ec500 100644 --- a/normalization.php +++ b/normalization.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Normalization; diff --git a/phpinfo.php b/phpinfo.php index 2a3a98587d..3c2c1f71f8 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); /** * Gets core libraries and defines some variables diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index a4cae4037d..5193cccfe6 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\OutputBuffering; use PhpMyAdmin\ThemeManager; diff --git a/prefs_forms.php b/prefs_forms.php index 70c90c18d4..08e0082293 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\Core; diff --git a/prefs_manage.php b/prefs_manage.php index 94d0870f7c..05dcd0c7e2 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\Core; diff --git a/prefs_twofactor.php b/prefs_twofactor.php index abda45ed6e..8b86326175 100644 --- a/prefs_twofactor.php +++ b/prefs_twofactor.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Message; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Template; diff --git a/schema_export.php b/schema_export.php index 2a5d4c62d1..18c8cfe111 100644 --- a/schema_export.php +++ b/schema_export.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Export; use PhpMyAdmin\Relation; diff --git a/scripts/advisor2po b/scripts/advisor2po index 128a5ecf50..4d88cad820 100644 --- a/scripts/advisor2po +++ b/scripts/advisor2po @@ -4,6 +4,7 @@ * Script to parse advisor rules and output them as Gettext POT formatted * strings for translation. */ +declare(strict_types=1); $messages = array(); $locations = array(); diff --git a/scripts/fix-po-twig b/scripts/fix-po-twig index 14753fdbf1..606ba20010 100644 --- a/scripts/fix-po-twig +++ b/scripts/fix-po-twig @@ -1,5 +1,6 @@ $where_clause) { // available in $multi_edit_columns_name[$key] $file_to_insert = new File(); - $file_to_insert->checkTblChangeForm($key, $rownumber); + $file_to_insert->checkTblChangeForm((string) $key, (string) $rownumber); $possibly_uploaded_val = $file_to_insert->getContent(); if ($possibly_uploaded_val !== false) { diff --git a/tbl_row_action.php b/tbl_row_action.php index d1930444af..c6fd61e948 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Response; use PhpMyAdmin\Sql; diff --git a/tbl_select.php b/tbl_select.php index 2a1f6e7754..c4be2746ec 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -8,6 +8,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Controllers\Table\TableSearchController; use PhpMyAdmin\Di\Container; diff --git a/tbl_sql.php b/tbl_sql.php index abaace59b1..d8a3b484ba 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Response; use PhpMyAdmin\SqlQueryForm; diff --git a/tbl_structure.php b/tbl_structure.php index 0134b13821..3a992a5b4a 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -6,6 +6,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Controllers\Table\TableStructureController; use PhpMyAdmin\Di\Container; diff --git a/tbl_tracking.php b/tbl_tracking.php index 078e6dfc02..308bde5fe8 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Message; use PhpMyAdmin\Tracker; use PhpMyAdmin\Tracking; diff --git a/tbl_triggers.php b/tbl_triggers.php index d96c922b15..2cfeb4820e 100644 --- a/tbl_triggers.php +++ b/tbl_triggers.php @@ -5,5 +5,6 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); require_once './db_triggers.php'; diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 5d73a6460e..d54e3ac5cd 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -7,6 +7,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Di\Container; use PhpMyAdmin\Response; diff --git a/test/Environment_test.php b/test/Environment_test.php index 662d773b4b..f36b0f9813 100644 --- a/test/Environment_test.php +++ b/test/Environment_test.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); /** * diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index cbe3289c3e..b22ddaf5eb 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -5,13 +5,14 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); /** * Set precision to sane value, with higher values * things behave slightly unexpectedly, for example * round(1.2, 2) returns 1.199999999999999956. */ -ini_set('precision', 14); +ini_set('precision', '14'); // Let PHP complain about all errors error_reporting(E_ALL); @@ -21,7 +22,7 @@ date_default_timezone_set('UTC'); // Adding phpMyAdmin sources to include path set_include_path( - get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php")) + get_include_path() . PATH_SEPARATOR . dirname((string) realpath("../index.php")) ); // Setting constants for testing diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index 219428dc4b..3ef931d840 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Advisor; diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index f2fe9b9ac9..ac4a11ff8f 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Bookmark; diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php index 9dcb7eee5e..231546b5bc 100644 --- a/test/classes/BrowseForeignersTest.php +++ b/test/classes/BrowseForeignersTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\BrowseForeigners; diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php index 196fe12a2f..eeb0286600 100644 --- a/test/classes/CentralColumnsTest.php +++ b/test/classes/CentralColumnsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\CentralColumns; diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index 626a99a276..823e4e4353 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Charsets; diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php index 981b090fee..4638a040d6 100644 --- a/test/classes/CheckUserPrivilegesTest.php +++ b/test/classes/CheckUserPrivilegesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\CheckUserPrivileges; diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php index da6d84e142..52cfd8de05 100644 --- a/test/classes/Config/ConfigFileTest.php +++ b/test/classes/Config/ConfigFileTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config\ConfigFile; diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php index 8745161eb3..e25205f394 100644 --- a/test/classes/Config/DescriptionTest.php +++ b/test/classes/Config/DescriptionTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php index 74e61fbeca..7b10969792 100644 --- a/test/classes/Config/FormDisplayTemplateTest.php +++ b/test/classes/Config/FormDisplayTemplateTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php index 80baff36e6..37e5cb03a8 100644 --- a/test/classes/Config/FormDisplayTest.php +++ b/test/classes/Config/FormDisplayTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php index e1e6353294..89760a9874 100644 --- a/test/classes/Config/FormTest.php +++ b/test/classes/Config/FormTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php index f2f39194ce..855a2ed44d 100644 --- a/test/classes/Config/Forms/FormListTest.php +++ b/test/classes/Config/Forms/FormListTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config\Forms; use PhpMyAdmin\Config; diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php index 677336d323..da847f16c7 100644 --- a/test/classes/Config/PageSettingsTest.php +++ b/test/classes/Config/PageSettingsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php index e84c9fe343..f32d3a39af 100644 --- a/test/classes/Config/ServerConfigChecksTest.php +++ b/test/classes/Config/ServerConfigChecksTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 63d16d5c96..681ed5f65a 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -6,6 +6,8 @@ * @package PhpMyAdmin-test * @group current */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/Controllers/Database/DatabaseStructureControllerTest.php b/test/classes/Controllers/Database/DatabaseStructureControllerTest.php index 7168e71550..41a6b17177 100644 --- a/test/classes/Controllers/Database/DatabaseStructureControllerTest.php +++ b/test/classes/Controllers/Database/DatabaseStructureControllerTest.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Database; use PhpMyAdmin\Controllers\Database\DatabaseStructureController; diff --git a/test/classes/Controllers/Server/ServerBinlogControllerTest.php b/test/classes/Controllers/Server/ServerBinlogControllerTest.php index 4593ddf82a..e0aa025a8c 100644 --- a/test/classes/Controllers/Server/ServerBinlogControllerTest.php +++ b/test/classes/Controllers/Server/ServerBinlogControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Controllers\Server\ServerBinlogController; diff --git a/test/classes/Controllers/Server/ServerCollationsControllerTest.php b/test/classes/Controllers/Server/ServerCollationsControllerTest.php index 6550543158..8621c8b370 100644 --- a/test/classes/Controllers/Server/ServerCollationsControllerTest.php +++ b/test/classes/Controllers/Server/ServerCollationsControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Controllers\Server\ServerCollationsController; diff --git a/test/classes/Controllers/Server/ServerDatabasesControllerTest.php b/test/classes/Controllers/Server/ServerDatabasesControllerTest.php index 8ff219ba60..18bd6fb25b 100644 --- a/test/classes/Controllers/Server/ServerDatabasesControllerTest.php +++ b/test/classes/Controllers/Server/ServerDatabasesControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Charsets; diff --git a/test/classes/Controllers/Server/ServerEnginesControllerTest.php b/test/classes/Controllers/Server/ServerEnginesControllerTest.php index 80c27177a7..fd0e48a0da 100644 --- a/test/classes/Controllers/Server/ServerEnginesControllerTest.php +++ b/test/classes/Controllers/Server/ServerEnginesControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Controllers\Server\ServerEnginesController; diff --git a/test/classes/Controllers/Server/ServerPluginsControllerTest.php b/test/classes/Controllers/Server/ServerPluginsControllerTest.php index 1592b98e6a..8c4869ad85 100644 --- a/test/classes/Controllers/Server/ServerPluginsControllerTest.php +++ b/test/classes/Controllers/Server/ServerPluginsControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Controllers\Server\ServerPluginsController; diff --git a/test/classes/Controllers/Server/ServerVariablesControllerTest.php b/test/classes/Controllers/Server/ServerVariablesControllerTest.php index 776b2a81f4..9c280a22ba 100644 --- a/test/classes/Controllers/Server/ServerVariablesControllerTest.php +++ b/test/classes/Controllers/Server/ServerVariablesControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Server; use PhpMyAdmin\Core; diff --git a/test/classes/Controllers/Table/TableIndexesControllerTest.php b/test/classes/Controllers/Table/TableIndexesControllerTest.php index 5a22baf45a..e098710c75 100644 --- a/test/classes/Controllers/Table/TableIndexesControllerTest.php +++ b/test/classes/Controllers/Table/TableIndexesControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\TableIndexesController; diff --git a/test/classes/Controllers/Table/TableRelationControllerTest.php b/test/classes/Controllers/Table/TableRelationControllerTest.php index bea6c91deb..368690ba1c 100644 --- a/test/classes/Controllers/Table/TableRelationControllerTest.php +++ b/test/classes/Controllers/Table/TableRelationControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Di\Container; diff --git a/test/classes/Controllers/Table/TableSearchControllerTest.php b/test/classes/Controllers/Table/TableSearchControllerTest.php index d52c896976..f9db5ee44e 100644 --- a/test/classes/Controllers/Table/TableSearchControllerTest.php +++ b/test/classes/Controllers/Table/TableSearchControllerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\TableSearchController; diff --git a/test/classes/Controllers/Table/TableStructureControllerTest.php b/test/classes/Controllers/Table/TableStructureControllerTest.php index db9cf52faf..658d6363c4 100644 --- a/test/classes/Controllers/Table/TableStructureControllerTest.php +++ b/test/classes/Controllers/Table/TableStructureControllerTest.php @@ -7,6 +7,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Di\Container; diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index 7f38a8cb8c..5826cfb5d8 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php index a2916debd2..bcb7c718ab 100644 --- a/test/classes/CreateAddFieldTest.php +++ b/test/classes/CreateAddFieldTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\CreateAddField; diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php index abbcaa5f05..75c919ea23 100644 --- a/test/classes/Database/Designer/CommonTest.php +++ b/test/classes/Database/Designer/CommonTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Database\Designer; use PhpMyAdmin\Database\Designer\Common; diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index 51d705740a..a2476faf6e 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Database\Designer; diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php index 7cde83b448..b99dbcd5b5 100644 --- a/test/classes/Database/QbeTest.php +++ b/test/classes/Database/QbeTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Database\Qbe; diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index 93dfd3c5a0..202399d82f 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Database\Search; diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index d0648a2c4e..cf5615dcb3 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Dbi/DbiMysqliTest.php b/test/classes/Dbi/DbiMysqliTest.php index 10c85ea93a..1a0ad5c769 100644 --- a/test/classes/Dbi/DbiMysqliTest.php +++ b/test/classes/Dbi/DbiMysqliTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Dbi; use PhpMyAdmin\Dbi\DbiMysqli; diff --git a/test/classes/Di/ContainerExceptionTest.php b/test/classes/Di/ContainerExceptionTest.php index 5700869ea3..2245d6648f 100644 --- a/test/classes/Di/ContainerExceptionTest.php +++ b/test/classes/Di/ContainerExceptionTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Di; use PhpMyAdmin\Di\ContainerException; diff --git a/test/classes/Di/ContainerTest.php b/test/classes/Di/ContainerTest.php index 4500ffc3bf..96f8ad2307 100644 --- a/test/classes/Di/ContainerTest.php +++ b/test/classes/Di/ContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Di; use PhpMyAdmin\Di\Container; diff --git a/test/classes/Di/NotFoundExceptionTest.php b/test/classes/Di/NotFoundExceptionTest.php index 4849d6c8f9..21fd9b0337 100644 --- a/test/classes/Di/NotFoundExceptionTest.php +++ b/test/classes/Di/NotFoundExceptionTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Di; use PhpMyAdmin\Di\NotFoundException; diff --git a/test/classes/Display/ChangePasswordTest.php b/test/classes/Display/ChangePasswordTest.php index a39c3877f8..51b3c4c282 100644 --- a/test/classes/Display/ChangePasswordTest.php +++ b/test/classes/Display/ChangePasswordTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Display; use PhpMyAdmin\Config; diff --git a/test/classes/Display/CreateTableTest.php b/test/classes/Display/CreateTableTest.php index 3646f5915d..ba054c56c0 100644 --- a/test/classes/Display/CreateTableTest.php +++ b/test/classes/Display/CreateTableTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Display; use PhpMyAdmin\Display\CreateTable; diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php index 6021518503..817b461680 100644 --- a/test/classes/Display/ExportTest.php +++ b/test/classes/Display/ExportTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Display; use PhpMyAdmin\Core; diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php index 1326168f2e..ce490fabf8 100644 --- a/test/classes/Display/ResultsTest.php +++ b/test/classes/Display/ResultsTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Display; use PhpMyAdmin\Config; diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index 991b1168ee..418b69d4aa 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Encoding; diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php index 723242e7bb..f3e19bfb24 100644 --- a/test/classes/Engines/BdbTest.php +++ b/test/classes/Engines/BdbTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Bdb; diff --git a/test/classes/Engines/BinlogTest.php b/test/classes/Engines/BinlogTest.php index 714d464006..9d8caa436f 100644 --- a/test/classes/Engines/BinlogTest.php +++ b/test/classes/Engines/BinlogTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Binlog; diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php index a14d7b1391..5eb9ad5399 100644 --- a/test/classes/Engines/InnodbTest.php +++ b/test/classes/Engines/InnodbTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Innodb; diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php index e8eb3a2292..f87dee0fea 100644 --- a/test/classes/Engines/MemoryTest.php +++ b/test/classes/Engines/MemoryTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Memory; diff --git a/test/classes/Engines/MrgMyisamTest.php b/test/classes/Engines/MrgMyisamTest.php index 16453be860..88ce5b6e91 100644 --- a/test/classes/Engines/MrgMyisamTest.php +++ b/test/classes/Engines/MrgMyisamTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\MrgMyisam; diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php index 11a00ad2ac..06a6105b5e 100644 --- a/test/classes/Engines/MyisamTest.php +++ b/test/classes/Engines/MyisamTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Myisam; diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php index 178c6e952e..22ea71f805 100644 --- a/test/classes/Engines/NdbclusterTest.php +++ b/test/classes/Engines/NdbclusterTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Engines\Ndbcluster; diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php index 9f29123c6c..8532266103 100644 --- a/test/classes/Engines/PbxtTest.php +++ b/test/classes/Engines/PbxtTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Engines; use PhpMyAdmin\Core; diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php index 56cdc579ae..e369113002 100644 --- a/test/classes/ErrorHandlerTest.php +++ b/test/classes/ErrorHandlerTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\ErrorHandler; diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index ee588eed12..cefb8fbea1 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Error; @@ -32,7 +34,7 @@ class ErrorTest extends PmaTestCase */ protected function setUp() { - $this->object = new Error('2', 'Compile Error', 'error.txt', 15); + $this->object = new Error(2, 'Compile Error', 'error.txt', 15); } /** diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php index 0f27626bc6..4e9131229f 100644 --- a/test/classes/ExportTest.php +++ b/test/classes/ExportTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Export; diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php index 8aa92154c7..bd57e0b2d6 100644 --- a/test/classes/FileTest.php +++ b/test/classes/FileTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\File; diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php index fb33a4b79e..13d27971ed 100644 --- a/test/classes/FontTest.php +++ b/test/classes/FontTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Font; @@ -39,115 +41,115 @@ class FontTest extends PmaTestCase // empty string $this->assertEquals( 0, - $this->font->getStringWidth("", "arial", "10") + $this->font->getStringWidth("", "arial", 10) ); // empty string $this->assertEquals( 3, - $this->font->getStringWidth(" ", "arial", "10") + $this->font->getStringWidth(" ", "arial", 10) ); // string "a" $this->assertEquals( 6, - $this->font->getStringWidth("a", "arial", "10") + $this->font->getStringWidth("a", "arial", 10) ); // string "aa" $this->assertEquals( 12, - $this->font->getStringWidth("aa", "arial", "10") + $this->font->getStringWidth("aa", "arial", 10) ); // string "i" $this->assertEquals( 3, - $this->font->getStringWidth("i", "arial", "10") + $this->font->getStringWidth("i", "arial", 10) ); // string "f" $this->assertEquals( 3, - $this->font->getStringWidth("f", "arial", "10") + $this->font->getStringWidth("f", "arial", 10) ); // string "t" $this->assertEquals( 3, - $this->font->getStringWidth("t", "arial", "10") + $this->font->getStringWidth("t", "arial", 10) ); // string "if" $this->assertEquals( 5, - $this->font->getStringWidth("if", "arial", "10") + $this->font->getStringWidth("if", "arial", 10) ); // string "it" $this->assertEquals( 6, - $this->font->getStringWidth("it", "arial", "10") + $this->font->getStringWidth("it", "arial", 10) ); // string "r" $this->assertEquals( 4, - $this->font->getStringWidth("r", "arial", "10") + $this->font->getStringWidth("r", "arial", 10) ); // string "1" $this->assertEquals( 5, - $this->font->getStringWidth("1", "arial", "10") + $this->font->getStringWidth("1", "arial", 10) ); // string "c" $this->assertEquals( 5, - $this->font->getStringWidth("c", "arial", "10") + $this->font->getStringWidth("c", "arial", 10) ); // string "F" $this->assertEquals( 7, - $this->font->getStringWidth("F", "arial", "10") + $this->font->getStringWidth("F", "arial", 10) ); // string "A" $this->assertEquals( 7, - $this->font->getStringWidth("A", "arial", "10") + $this->font->getStringWidth("A", "arial", 10) ); // string "w" $this->assertEquals( 8, - $this->font->getStringWidth("w", "arial", "10") + $this->font->getStringWidth("w", "arial", 10) ); // string "G" $this->assertEquals( 8, - $this->font->getStringWidth("G", "arial", "10") + $this->font->getStringWidth("G", "arial", 10) ); // string "m" $this->assertEquals( 9, - $this->font->getStringWidth("m", "arial", "10") + $this->font->getStringWidth("m", "arial", 10) ); // string "W" $this->assertEquals( 10, - $this->font->getStringWidth("W", "arial", "10") + $this->font->getStringWidth("W", "arial", 10) ); // string "$" $this->assertEquals( 3, - $this->font->getStringWidth("$", "arial", "10") + $this->font->getStringWidth("$", "arial", 10) ); } @@ -161,25 +163,25 @@ class FontTest extends PmaTestCase // string "phpMyAdmin", with Arial 10 $this->assertEquals( 59, - $this->font->getStringWidth("phpMyAdmin", "arial", "10") + $this->font->getStringWidth("phpMyAdmin", "arial", 10) ); // string "phpMyAdmin", with No font $this->assertEquals( 59, - $this->font->getStringWidth("phpMyAdmin", "", "10") + $this->font->getStringWidth("phpMyAdmin", "", 10) ); // string "phpMyAdmin", with Times 10 $this->assertEquals( 55, - $this->font->getStringWidth("phpMyAdmin", "times", "10") + $this->font->getStringWidth("phpMyAdmin", "times", 10) ); // string "phpMyAdmin", with Broadway 10 $this->assertEquals( 73, - $this->font->getStringWidth("phpMyAdmin", "broadway", "10") + $this->font->getStringWidth("phpMyAdmin", "broadway", 10) ); } @@ -194,25 +196,25 @@ class FontTest extends PmaTestCase // string "phpMyAdmin", with font size 0 $this->assertEquals( 0, - $this->font->getStringWidth("phpMyAdmin", "arial", "0") + $this->font->getStringWidth("phpMyAdmin", "arial", 0) ); // string "phpMyAdmin", with Arial 10 $this->assertEquals( 59, - $this->font->getStringWidth("phpMyAdmin", "arial", "10") + $this->font->getStringWidth("phpMyAdmin", "arial", 10) ); // string "phpMyAdmin", with Arial 11 $this->assertEquals( 65, - $this->font->getStringWidth("phpMyAdmin", "arial", "11") + $this->font->getStringWidth("phpMyAdmin", "arial", 11) ); // string "phpMyAdmin", with Arial 20 $this->assertEquals( 118, - $this->font->getStringWidth("phpMyAdmin", "arial", "20") + $this->font->getStringWidth("phpMyAdmin", "arial", 20) ); } @@ -226,7 +228,7 @@ class FontTest extends PmaTestCase // string "a", with invalid charlist (= array without proper structure) $this->assertEquals( 6, - $this->font->getStringWidth("a", "arial", "10", array("list")) + $this->font->getStringWidth("a", "arial", 10, array("list")) ); // string "a", with invalid charlist (= array without proper structure : @@ -234,7 +236,7 @@ class FontTest extends PmaTestCase $this->assertEquals( 6, $this->font->getStringWidth( - "a", "arial", "10", + "a", "arial", 10, array(array("chars" => "a")) ) ); @@ -244,7 +246,7 @@ class FontTest extends PmaTestCase $this->assertEquals( 6, $this->font->getStringWidth( - "a", "arial", "10", + "a", "arial", 10, array(array("modifier" => 0.61)) ) ); @@ -254,7 +256,7 @@ class FontTest extends PmaTestCase $this->assertEquals( 6, $this->font->getStringWidth( - "a", "arial", "10", + "a", "arial", 10, array(array("chars" => "a", "modifier" => 0.61)) ) ); @@ -263,7 +265,7 @@ class FontTest extends PmaTestCase $this->assertEquals( 7, $this->font->getStringWidth( - "a", "arial", "10", + "a", "arial", 10, array(array("chars" => array("a"), "modifier" => 0.61)) ) ); diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index 76704d9e36..2e4f0ad51a 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/Gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php index 4899b32a97..9d6bf7bf6e 100644 --- a/test/classes/Gis/GisFactoryTest.php +++ b/test/classes/Gis/GisFactoryTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisFactory; diff --git a/test/classes/Gis/GisGeomTestCase.php b/test/classes/Gis/GisGeomTestCase.php index 2addb4e1f3..df7c307d2e 100644 --- a/test/classes/Gis/GisGeomTestCase.php +++ b/test/classes/Gis/GisGeomTestCase.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php index f150d5f54a..824cc9f750 100644 --- a/test/classes/Gis/GisGeometryCollectionTest.php +++ b/test/classes/Gis/GisGeometryCollectionTest.php @@ -1,11 +1,12 @@ 2, 'height' => 150 ), - imagecreatetruecolor('120', '150') + imagecreatetruecolor(120, 150) ) ); } diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php index 969090caa3..11e487646a 100644 --- a/test/classes/Gis/GisGeometryTest.php +++ b/test/classes/Gis/GisGeometryTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php index d438248d4e..a97a2ccc5a 100644 --- a/test/classes/Gis/GisLineStringTest.php +++ b/test/classes/Gis/GisLineStringTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisLineString; @@ -206,7 +208,7 @@ class GisLineStringTest extends GisGeomTestCase 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150') + imagecreatetruecolor(120, 150) ) ); } diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php index 9120b6bc0e..ce63dea1a6 100644 --- a/test/classes/Gis/GisMultiLineStringTest.php +++ b/test/classes/Gis/GisMultiLineStringTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisMultiLineString; @@ -267,7 +269,7 @@ class GisMultiLineStringTest extends GisGeomTestCase 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150') + imagecreatetruecolor(120, 150) ) ); } diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php index 6fd86ebab8..582107b99a 100644 --- a/test/classes/Gis/GisMultiPointTest.php +++ b/test/classes/Gis/GisMultiPointTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisMultiPoint; @@ -210,7 +212,7 @@ class GisMultiPointTest extends GisGeomTestCase 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150'), + imagecreatetruecolor(120, 150), ) ); } diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php index cf50ad8581..9de3defe33 100644 --- a/test/classes/Gis/GisMultiPolygonTest.php +++ b/test/classes/Gis/GisMultiPolygonTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisMultiPolygon; @@ -311,7 +313,7 @@ class GisMultiPolygonTest extends GisGeomTestCase 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150'), + imagecreatetruecolor(120, 150), ) ); diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php index c2f71cb8ad..17155aac39 100644 --- a/test/classes/Gis/GisPointTest.php +++ b/test/classes/Gis/GisPointTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisPoint; @@ -211,7 +213,7 @@ class GisPointTest extends GisGeomTestCase 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150') + imagecreatetruecolor(120, 150) ) ); } diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php index 5dc0921f0c..4645f75bd1 100644 --- a/test/classes/Gis/GisPolygonTest.php +++ b/test/classes/Gis/GisPolygonTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Gis; use PhpMyAdmin\Gis\GisPolygon; @@ -398,7 +400,7 @@ class GisPolygonTest extends GisGeomTestCase 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150') + imagecreatetruecolor(120, 150) ) ); } diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index 98f8e97299..229e48ed83 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index d006a6d001..10d3090e89 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Import; diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php index 3d6dd19094..139455dc80 100644 --- a/test/classes/IndexTest.php +++ b/test/classes/IndexTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Index; diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 0b30a49652..2f40cbd79e 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php index d7d0e6d2a1..f7c89b66cd 100644 --- a/test/classes/IpAllowDenyTest.php +++ b/test/classes/IpAllowDenyTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Core; diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index edf952ec66..efe73e378c 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\LanguageManager; diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php index 0dd70e8ff6..e8a4fcf5ef 100644 --- a/test/classes/LinterTest.php +++ b/test/classes/LinterTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Linter; diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php index 51920b595c..42c7cfc964 100644 --- a/test/classes/ListDatabaseTest.php +++ b/test/classes/ListDatabaseTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\ListDatabase; diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php index 6cdee18208..87d7254c30 100644 --- a/test/classes/MenuTest.php +++ b/test/classes/MenuTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Core; diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php index 519bbf26fc..b557cdb3bb 100644 --- a/test/classes/MessageTest.php +++ b/test/classes/MessageTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Message; diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php index f26d72657b..861203615e 100644 --- a/test/classes/MimeTest.php +++ b/test/classes/MimeTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Mime; diff --git a/test/classes/MultSubmitsTest.php b/test/classes/MultSubmitsTest.php index 16636c1428..9dcf19d4c3 100644 --- a/test/classes/MultSubmitsTest.php +++ b/test/classes/MultSubmitsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\MultSubmits; diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php index e83bfb09dd..a0ac1f028d 100644 --- a/test/classes/Navigation/NavigationTest.php +++ b/test/classes/Navigation/NavigationTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation; use PhpMyAdmin\Navigation\Navigation; diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php index 0149332035..f5e31c3a29 100644 --- a/test/classes/Navigation/NavigationTreeTest.php +++ b/test/classes/Navigation/NavigationTreeTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation; use PhpMyAdmin\Config; diff --git a/test/classes/Navigation/NodeFactoryTest.php b/test/classes/Navigation/NodeFactoryTest.php index 5129ea00b8..6ec8c0a4ae 100644 --- a/test/classes/Navigation/NodeFactoryTest.php +++ b/test/classes/Navigation/NodeFactoryTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php index 94ea54988b..164c6f864f 100644 --- a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php index 96eec958ed..63090e9a7d 100644 --- a/test/classes/Navigation/Nodes/NodeColumnTest.php +++ b/test/classes/Navigation/Nodes/NodeColumnTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php index 667ba9e527..5123bf9264 100644 --- a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php +++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php index 6bd2c945c7..da3c158808 100644 --- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php +++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php index 7651954bba..70b487da39 100644 --- a/test/classes/Navigation/Nodes/NodeEventContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php index c88962268a..2207bd7d6b 100644 --- a/test/classes/Navigation/Nodes/NodeEventTest.php +++ b/test/classes/Navigation/Nodes/NodeEventTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php index 703902b341..64815094e6 100644 --- a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php index 8b8ea4a1f6..a43933d87a 100644 --- a/test/classes/Navigation/Nodes/NodeFunctionTest.php +++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php index c83d131cea..c92a28fbb9 100644 --- a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php index 38ee6f6b63..c152b42800 100644 --- a/test/classes/Navigation/Nodes/NodeIndexTest.php +++ b/test/classes/Navigation/Nodes/NodeIndexTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php index 8420053f0e..eaf465911a 100644 --- a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php index a964ace9c4..e798a1e67b 100644 --- a/test/classes/Navigation/Nodes/NodeProcedureTest.php +++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php index 41e9edf2d9..e8bd5ee922 100644 --- a/test/classes/Navigation/Nodes/NodeTableContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php index 6e2fd21ceb..c695797679 100644 --- a/test/classes/Navigation/Nodes/NodeTableTest.php +++ b/test/classes/Navigation/Nodes/NodeTableTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php index 4ee258b134..d1abfdbc89 100644 --- a/test/classes/Navigation/Nodes/NodeTest.php +++ b/test/classes/Navigation/Nodes/NodeTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php index 1ef6784e54..dabd8fdd60 100644 --- a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php index 68f7f7106e..7a8d5acf5b 100644 --- a/test/classes/Navigation/Nodes/NodeTriggerTest.php +++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php index f9dbf28754..d42a973307 100644 --- a/test/classes/Navigation/Nodes/NodeViewContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/Navigation/Nodes/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php index f1c50e8452..598b81f6f3 100644 --- a/test/classes/Navigation/Nodes/NodeViewTest.php +++ b/test/classes/Navigation/Nodes/NodeViewTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index f9bf1996c3..17c3b862e7 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php index cd425f37cd..7ed729c83e 100644 --- a/test/classes/OperationsTest.php +++ b/test/classes/OperationsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Operations; diff --git a/test/classes/PdfTest.php b/test/classes/PdfTest.php index 0f8942d220..17e8d6139a 100644 --- a/test/classes/PdfTest.php +++ b/test/classes/PdfTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php index 7ac788c782..95dd00525a 100644 --- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php +++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index 48f18966ed..2a60dbca19 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php index ac72bd292e..aaa1d5f499 100644 --- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php index 262dd2301e..3ff893d201 100644 --- a/test/classes/Plugins/Auth/AuthenticationSignonTest.php +++ b/test/classes/Plugins/Auth/AuthenticationSignonTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Auth; use PhpMyAdmin\Config; diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php index 58e05153ed..b807ca2902 100644 --- a/test/classes/Plugins/Export/ExportCodegenTest.php +++ b/test/classes/Plugins/Export/ExportCodegenTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Plugins\Export\ExportCodegen; diff --git a/test/classes/Plugins/Export/ExportCsvTest.php b/test/classes/Plugins/Export/ExportCsvTest.php index 0e17f1280c..8304e89021 100644 --- a/test/classes/Plugins/Export/ExportCsvTest.php +++ b/test/classes/Plugins/Export/ExportCsvTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportExcelTest.php b/test/classes/Plugins/Export/ExportExcelTest.php index 3f771bb177..2257b28a71 100644 --- a/test/classes/Plugins/Export/ExportExcelTest.php +++ b/test/classes/Plugins/Export/ExportExcelTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Plugins\Export\ExportExcel; diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php index afdd40c043..8ef0c81eed 100644 --- a/test/classes/Plugins/Export/ExportHtmlwordTest.php +++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportJsonTest.php b/test/classes/Plugins/Export/ExportJsonTest.php index 50ead4d27b..460cf75a1c 100644 --- a/test/classes/Plugins/Export/ExportJsonTest.php +++ b/test/classes/Plugins/Export/ExportJsonTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Plugins\Export\ExportJson; diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php index ba6649fa84..5ef6ddf8e8 100644 --- a/test/classes/Plugins/Export/ExportLatexTest.php +++ b/test/classes/Plugins/Export/ExportLatexTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Plugins\Export\ExportLatex; diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php index 31f1747acf..11a0f24200 100644 --- a/test/classes/Plugins/Export/ExportMediawikiTest.php +++ b/test/classes/Plugins/Export/ExportMediawikiTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php index fcd27d5738..6885180d81 100644 --- a/test/classes/Plugins/Export/ExportOdsTest.php +++ b/test/classes/Plugins/Export/ExportOdsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index fbe1f3dfc8..6fd5c0cae9 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php index 0a2e13baeb..b9ba1de3fe 100644 --- a/test/classes/Plugins/Export/ExportPdfTest.php +++ b/test/classes/Plugins/Export/ExportPdfTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\Plugins\Export\ExportPdf; diff --git a/test/classes/Plugins/Export/ExportPhparrayTest.php b/test/classes/Plugins/Export/ExportPhparrayTest.php index d326d71fee..9bbb963a3d 100644 --- a/test/classes/Plugins/Export/ExportPhparrayTest.php +++ b/test/classes/Plugins/Export/ExportPhparrayTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index 2a6ee2d6fc..bda8104de0 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php index d6a9bb7d67..4b6e1c3c80 100644 --- a/test/classes/Plugins/Export/ExportTexytextTest.php +++ b/test/classes/Plugins/Export/ExportTexytextTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php index 45f783eb64..1e409a3d4b 100644 --- a/test/classes/Plugins/Export/ExportXmlTest.php +++ b/test/classes/Plugins/Export/ExportXmlTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/ExportYamlTest.php b/test/classes/Plugins/Export/ExportYamlTest.php index 3c70d2189c..fd6cf28f99 100644 --- a/test/classes/Plugins/Export/ExportYamlTest.php +++ b/test/classes/Plugins/Export/ExportYamlTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php index c8c53e51e5..5aa0f8bea9 100644 --- a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php +++ b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Export\Helpers; use PhpMyAdmin\Plugins\Export\Helpers\TableProperty; diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php index f74f4ae513..45c7a7ee67 100644 --- a/test/classes/Plugins/Import/ImportCsvTest.php +++ b/test/classes/Plugins/Import/ImportCsvTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php index cbd8721505..a4075c8cfc 100644 --- a/test/classes/Plugins/Import/ImportLdiTest.php +++ b/test/classes/Plugins/Import/ImportLdiTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php index 265a149672..490a525532 100644 --- a/test/classes/Plugins/Import/ImportMediawikiTest.php +++ b/test/classes/Plugins/Import/ImportMediawikiTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php index 40cabebbfb..a2969182b0 100644 --- a/test/classes/Plugins/Import/ImportOdsTest.php +++ b/test/classes/Plugins/Import/ImportOdsTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php index 02be7e7291..6bd6c9dd49 100644 --- a/test/classes/Plugins/Import/ImportShpTest.php +++ b/test/classes/Plugins/Import/ImportShpTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Import/ImportSqlTest.php b/test/classes/Plugins/Import/ImportSqlTest.php index 57228eb492..5a2672a1e7 100644 --- a/test/classes/Plugins/Import/ImportSqlTest.php +++ b/test/classes/Plugins/Import/ImportSqlTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php index 8abdfbdc07..4c01d33428 100644 --- a/test/classes/Plugins/Import/ImportXmlTest.php +++ b/test/classes/Plugins/Import/ImportXmlTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php index 5c08609280..3909e44b35 100644 --- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema; diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php index b9aea56d85..0dc56cb2d5 100644 --- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema; diff --git a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php index f1509e9191..afdb2bef59 100644 --- a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php index 65bcf901d2..e9238d7c07 100644 --- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema; diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php index 11dc2256e9..b83897241f 100644 --- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Schema; use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema; diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php index 609c908d20..db74f226dd 100644 --- a/test/classes/Plugins/Transformations/TransformationPluginsTest.php +++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Plugins\Transformations; use PhpMyAdmin\Config; diff --git a/test/classes/PmaTestCase.php b/test/classes/PmaTestCase.php index 3a645ef44b..d226027a2a 100644 --- a/test/classes/PmaTestCase.php +++ b/test/classes/PmaTestCase.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Response; diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php index e1f6e01433..1bf33b3c62 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php index b6f85e2b79..963aefa35a 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php index 7e86a63c2b..93de24e06a 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options\Groups; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup; diff --git a/test/classes/Properties/Options/Items/PropertyItemsTest.php b/test/classes/Properties/Options/Items/PropertyItemsTest.php index 64da38d374..78fc728025 100644 --- a/test/classes/Properties/Options/Items/PropertyItemsTest.php +++ b/test/classes/Properties/Options/Items/PropertyItemsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options\Items; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; diff --git a/test/classes/Properties/Options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php index 2f7adb1c68..e76d995ef5 100644 --- a/test/classes/Properties/Options/OptionsPropertyGroupTest.php +++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Properties/Options/OptionsPropertyItemTest.php b/test/classes/Properties/Options/OptionsPropertyItemTest.php index 265a2308fa..26349d0f03 100644 --- a/test/classes/Properties/Options/OptionsPropertyItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyItemTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php index 1dc8d000e5..fc83262eb7 100644 --- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Options; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php index d3a1610b61..5039ce3005 100644 --- a/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php +++ b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Plugins; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; diff --git a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php index 934721880f..b21a4fd1fc 100644 --- a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php +++ b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Plugins; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; diff --git a/test/classes/Properties/Plugins/PluginPropertyItemTest.php b/test/classes/Properties/Plugins/PluginPropertyItemTest.php index 8a27540024..959f826bd7 100644 --- a/test/classes/Properties/Plugins/PluginPropertyItemTest.php +++ b/test/classes/Properties/Plugins/PluginPropertyItemTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties\Plugins; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Properties/PropertyItemTest.php b/test/classes/Properties/PropertyItemTest.php index 564506f41e..4660955176 100644 --- a/test/classes/Properties/PropertyItemTest.php +++ b/test/classes/Properties/PropertyItemTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Properties; use PHPUnit\Framework\TestCase; diff --git a/test/classes/RelationCleanupDbiMock.php b/test/classes/RelationCleanupDbiMock.php index 164e43b5b9..ddeaa16ba3 100644 --- a/test/classes/RelationCleanupDbiMock.php +++ b/test/classes/RelationCleanupDbiMock.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php index 1e2160a497..c744ef0919 100644 --- a/test/classes/RelationCleanupTest.php +++ b/test/classes/RelationCleanupTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 946dac3fa0..f59fbebc1e 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Relation; diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php index 1761509b51..bacac3ca93 100644 --- a/test/classes/ReplicationGuiTest.php +++ b/test/classes/ReplicationGuiTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php index 60e6819c26..831dd417b1 100644 --- a/test/classes/Rte/EventsTest.php +++ b/test/classes/Rte/EventsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Rte; use PhpMyAdmin\Response; diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index 441f196c77..6ffacde19b 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Rte; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php index 07d82fd038..a2119dd584 100644 --- a/test/classes/Rte/TriggersTest.php +++ b/test/classes/Rte/TriggersTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Rte; use PhpMyAdmin\Response; diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php index 98aeb90c2f..acd53a5c7a 100644 --- a/test/classes/SanitizeTest.php +++ b/test/classes/SanitizeTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Sanitize; diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php index d793c236af..a7cca57b80 100644 --- a/test/classes/ScriptsTest.php +++ b/test/classes/ScriptsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Scripts; diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index 8deaae72bf..0bd603fbb2 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Core; diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php index 24f793f2b3..fe45a42160 100644 --- a/test/classes/Server/SelectTest.php +++ b/test/classes/Server/SelectTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\Select; diff --git a/test/classes/Server/Status/AdvisorTest.php b/test/classes/Server/Status/AdvisorTest.php index 6b27d715a9..0f22acda3d 100644 --- a/test/classes/Server/Status/AdvisorTest.php +++ b/test/classes/Server/Status/AdvisorTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server\Status; use PhpMyAdmin\Core; diff --git a/test/classes/Server/Status/DataTest.php b/test/classes/Server/Status/DataTest.php index 2ecb9291ae..c005b7ec27 100644 --- a/test/classes/Server/Status/DataTest.php +++ b/test/classes/Server/Status/DataTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server\Status; use PhpMyAdmin\Core; diff --git a/test/classes/Server/Status/MonitorTest.php b/test/classes/Server/Status/MonitorTest.php index 529c2b9552..6ca0444ee4 100644 --- a/test/classes/Server/Status/MonitorTest.php +++ b/test/classes/Server/Status/MonitorTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server\Status; use PhpMyAdmin\Core; diff --git a/test/classes/Server/Status/ProcessesTest.php b/test/classes/Server/Status/ProcessesTest.php index a0bb4f97ab..065bf9b806 100644 --- a/test/classes/Server/Status/ProcessesTest.php +++ b/test/classes/Server/Status/ProcessesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server\Status; use PhpMyAdmin\Core; diff --git a/test/classes/Server/Status/QueriesTest.php b/test/classes/Server/Status/QueriesTest.php index 9ee99a4590..41f47117ed 100644 --- a/test/classes/Server/Status/QueriesTest.php +++ b/test/classes/Server/Status/QueriesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server\Status; use PhpMyAdmin\Core; diff --git a/test/classes/Server/Status/VariablesTest.php b/test/classes/Server/Status/VariablesTest.php index 34d80b5842..29080f0793 100644 --- a/test/classes/Server/Status/VariablesTest.php +++ b/test/classes/Server/Status/VariablesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server\Status; use PhpMyAdmin\Core; diff --git a/test/classes/Server/StatusTest.php b/test/classes/Server/StatusTest.php index 1177d3bb57..743dbc6186 100644 --- a/test/classes/Server/StatusTest.php +++ b/test/classes/Server/StatusTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Core; diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php index c03bb60e16..9e2501b720 100644 --- a/test/classes/Server/UserGroupsTest.php +++ b/test/classes/Server/UserGroupsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\UserGroups; diff --git a/test/classes/Server/UsersTest.php b/test/classes/Server/UsersTest.php index af7b741b18..7b5909afc2 100644 --- a/test/classes/Server/UsersTest.php +++ b/test/classes/Server/UsersTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\Users; diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php index 8ba7af9a6d..89f146ffa1 100644 --- a/test/classes/Setup/ConfigGeneratorTest.php +++ b/test/classes/Setup/ConfigGeneratorTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Setup; use PhpMyAdmin\Config; diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php index 9ba6f8af5e..f174571c40 100644 --- a/test/classes/Setup/FormProcessingTest.php +++ b/test/classes/Setup/FormProcessingTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Setup; use PhpMyAdmin\Setup\FormProcessing; diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php index bca6a1028f..44f2182a59 100644 --- a/test/classes/Setup/IndexTest.php +++ b/test/classes/Setup/IndexTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Setup; use PhpMyAdmin\Setup\Index as SetupIndex; diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index 2efaf16a53..27d57c20fa 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Core; diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 90e69f95d9..72c3865603 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Sql; diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php index 7e333ee9cf..21420a2310 100644 --- a/test/classes/StorageEngineTest.php +++ b/test/classes/StorageEngineTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\StorageEngine; diff --git a/test/classes/Stubs/Response.php b/test/classes/Stubs/Response.php index 20e60e80f9..82eff4906c 100644 --- a/test/classes/Stubs/Response.php +++ b/test/classes/Stubs/Response.php @@ -10,6 +10,8 @@ * @package PhpMyAdmin * @subpackage Stubs */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests\Stubs; use PhpMyAdmin\Header; diff --git a/test/classes/SysInfoTest.php b/test/classes/SysInfoTest.php index b7cc317c57..7a60931a38 100644 --- a/test/classes/SysInfoTest.php +++ b/test/classes/SysInfoTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\SysInfo; diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php index 74f95cd879..082a9ee8fd 100644 --- a/test/classes/SystemDatabaseTest.php +++ b/test/classes/SystemDatabaseTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\SystemDatabase; diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 99e7352c6d..729e1f9df8 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php index 9fa13ee216..3543eb211e 100644 --- a/test/classes/TemplateTest.php +++ b/test/classes/TemplateTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Template; diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php index 33fd46756f..44091ec2cf 100644 --- a/test/classes/ThemeManagerTest.php +++ b/test/classes/ThemeManagerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 6325a74e77..f0019f248f 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index c94c848231..30a7064a1f 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index a92082ea85..4741318bd7 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Tracking; diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 2f48461a60..3981c9d853 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Theme; diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php index 89d7d01c05..260ab5513b 100644 --- a/test/classes/TwoFactorTest.php +++ b/test/classes/TwoFactorTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\TwoFactor; diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php index a9b7fd64c2..66ab31c571 100644 --- a/test/classes/TypesTest.php +++ b/test/classes/TypesTest.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Tests\PmaTestCase; diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php index 2bce450315..92ec62c21f 100644 --- a/test/classes/UrlTest.php +++ b/test/classes/UrlTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Url; diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php index af0379af93..e9ffa8f921 100644 --- a/test/classes/UserPreferencesTest.php +++ b/test/classes/UserPreferencesTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config\ConfigFile; diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index eaf2039b68..939eb2f2c6 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; @@ -864,15 +866,15 @@ class UtilTest extends PmaTestCase // Test with various precisions $old_precision = ini_get('precision'); try { - ini_set('precision', 20); + ini_set('precision', '20'); $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', 14); + ini_set('precision', '14'); $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', 10); + ini_set('precision', '10'); $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', 5); + ini_set('precision', '5'); $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', -1); + ini_set('precision', '-1'); $this->assertFormatNumber($a, $b, $c, $d); } finally { ini_set('precision', $old_precision); diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php index c80f674127..3f2870ce1c 100644 --- a/test/classes/Utils/HttpRequestTest.php +++ b/test/classes/Utils/HttpRequestTest.php @@ -1,4 +1,5 @@ database_name = $GLOBALS['TESTSUITE_DATABASE'] - . mb_substr(md5(rand()), 0, 7); + . mb_substr(md5((string) rand()), 0, 7); $this->dbQuery( 'CREATE DATABASE IF NOT EXISTS ' . $this->database_name ); diff --git a/test/selenium/TrackingTest.php b/test/selenium/TrackingTest.php index 70dbcff916..6221a70f58 100644 --- a/test/selenium/TrackingTest.php +++ b/test/selenium/TrackingTest.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-test * @subpackage Selenium */ +declare(strict_types=1); namespace PhpMyAdmin\Tests\Selenium; diff --git a/test/selenium/XssTest.php b/test/selenium/XssTest.php index 3641047595..016ba7ccb2 100644 --- a/test/selenium/XssTest.php +++ b/test/selenium/XssTest.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-test * @subpackage Selenium */ +declare(strict_types=1); namespace PhpMyAdmin\Tests\Selenium; diff --git a/test/test_data/config.inc.php b/test/test_data/config.inc.php index acd0eb11bc..df94c3c594 100644 --- a/test/test_data/config.inc.php +++ b/test/test_data/config.inc.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-test */ +declare(strict_types=1); + $i = 0; /* Server: localhost [1] */ diff --git a/themes.php b/themes.php index 760015b140..272007a0be 100644 --- a/themes.php +++ b/themes.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\ThemeManager; diff --git a/themes/metro/css/codemirror.css.php b/themes/metro/css/codemirror.css.php index 2b855a314f..0d17c71b29 100644 --- a/themes/metro/css/codemirror.css.php +++ b/themes/metro/css/codemirror.css.php @@ -1,4 +1,5 @@ getImgPath('designer/left_panel_butt.png'); +$theme->getImgPath('designer/left_panel_butt.png'); // unplanned execution path if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) { diff --git a/themes/pmahomme/css/jqplot.css.php b/themes/pmahomme/css/jqplot.css.php index 1c5c5ac9e6..37458e8c14 100644 --- a/themes/pmahomme/css/jqplot.css.php +++ b/themes/pmahomme/css/jqplot.css.php @@ -7,6 +7,7 @@ * @package PhpMyAdmin-theme * @subpackage PMAHomme */ +declare(strict_types=1); // unplanned execution path if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) { diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php index e93c0a1271..5d5b985934 100644 --- a/themes/pmahomme/css/navigation.css.php +++ b/themes/pmahomme/css/navigation.css.php @@ -6,6 +6,7 @@ * @package PhpMyAdmin-theme * @subpackage PMAHomme */ +declare(strict_types=1); // unplanned execution path if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) { diff --git a/themes/pmahomme/css/resizable-menu.css.php b/themes/pmahomme/css/resizable-menu.css.php index 6cebc896ac..28f207f6d9 100644 --- a/themes/pmahomme/css/resizable-menu.css.php +++ b/themes/pmahomme/css/resizable-menu.css.php @@ -8,6 +8,7 @@ * @package PhpMyAdmin-theme * @subpackage PMAHomme */ +declare(strict_types=1); // unplanned execution path if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) { diff --git a/themes/pmahomme/css/rte.css.php b/themes/pmahomme/css/rte.css.php index 04e4f38161..6db626c6ea 100644 --- a/themes/pmahomme/css/rte.css.php +++ b/themes/pmahomme/css/rte.css.php @@ -7,6 +7,7 @@ * @package PhpMyAdmin-theme * @subpackage PMAHomme */ +declare(strict_types=1); // unplanned execution path if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) { diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php index 6ac5ddce5b..5cdaed866d 100644 --- a/themes/pmahomme/layout.inc.php +++ b/themes/pmahomme/layout.inc.php @@ -7,6 +7,7 @@ * @package PhpMyAdmin-theme * @subpackage PMAHomme */ +declare(strict_types=1); /** * navi frame diff --git a/themes/svg_gradient.php b/themes/svg_gradient.php index bebb691f8d..7541b35216 100644 --- a/themes/svg_gradient.php +++ b/themes/svg_gradient.php @@ -4,6 +4,8 @@ * * @package PhpMyAdmin-theme */ +declare(strict_types=1); + header('Content-Type: image/svg+xml'); header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); diff --git a/transformation_overview.php b/transformation_overview.php index 21d175f260..708bb628c9 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Response; use PhpMyAdmin\Transformations; diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 8dac25d910..7939c633a0 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Relation; diff --git a/url.php b/url.php index c56ed1f655..77056f83eb 100644 --- a/url.php +++ b/url.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Sanitize; diff --git a/user_password.php b/user_password.php index 945fc092f8..6097ccf552 100644 --- a/user_password.php +++ b/user_password.php @@ -6,6 +6,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Display\ChangePassword; use PhpMyAdmin\Message; diff --git a/version_check.php b/version_check.php index 4805e5735c..d62d1b143d 100644 --- a/version_check.php +++ b/version_check.php @@ -5,6 +5,7 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\VersionInformation; diff --git a/view_create.php b/view_create.php index a8f8277575..841bec6c9b 100644 --- a/view_create.php +++ b/view_create.php @@ -7,6 +7,7 @@ * @todo (also validate if js is disabled, after form submission?) * @package PhpMyAdmin */ +declare(strict_types=1); use PhpMyAdmin\Core; use PhpMyAdmin\Url; diff --git a/view_operations.php b/view_operations.php index 6454155205..d6bae3caa9 100644 --- a/view_operations.php +++ b/view_operations.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\Response;