gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Relation classes into the ConfigStorage namespace

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2021-12-13 12:01:56 -03:00
parent 1258178f68
commit c411121fd8
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
120 changed files with 596 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Bookmark.php
View File

@ -7,6 +7,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use function count;
use function is_array;
use function preg_match_all;

25
libraries/classes/Relation.php → libraries/classes/ConfigStorage/Relation.php
View File

@ -2,11 +2,18 @@
declare(strict_types=1);
namespace PhpMyAdmin;
namespace PhpMyAdmin\ConfigStorage;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\InternalRelations;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Statements\CreateStatement;
use PhpMyAdmin\SqlParser\Utils\Table as TableUtils;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
use PhpMyAdmin\Version;
use function __;
use function array_keys;
@ -948,11 +955,11 @@ class Relation
/**
* Outputs dropdown with values of foreign fields
*
* @param array[] $disp_row array of the displayed row
* @param string $foreign_field the foreign field
* @param string $foreign_display the foreign field to display
* @param string $data the current data of the dropdown (field in row)
* @param int $max maximum number of items in the dropdown
* @param array[] $disp_row array of the displayed row
* @param string $foreign_field the foreign field
* @param string $foreign_display the foreign field to display
* @param string $data the current data of the dropdown (field in row)
* @param int|null $max maximum number of items in the dropdown
*
* @return string the <option value=""><option>s
*
@ -1060,7 +1067,7 @@ class Relation
* foreign_link: bool,
* the_total: mixed,
* foreign_display: string,
* disp_row: ?list<non-empty-array>,
* disp_row: list<non-empty-array>|null,
* foreign_field: mixed
* }
*
@ -1572,7 +1579,7 @@ class Relation
/**
* Returns default PMA table names and their create queries.
*
* @return array<string,string> table name, create query
* @return array<string, string> table name, create query
*/
public function getDefaultPmaTableNames(array $tableNameReplacements): array
{
@ -1668,7 +1675,7 @@ class Relation
$existingTables = $this->dbi->getTables($db, DatabaseInterface::CONNECT_CONTROL);
/** @var array<string,string> $tableNameReplacements */
/** @var array<string, string> $tableNameReplacements */
$tableNameReplacements = [];
// Build a map of replacements between default table names and name built by the user

10
libraries/classes/RelationCleanup.php → libraries/classes/ConfigStorage/RelationCleanup.php
View File

@ -1,14 +1,14 @@
<?php
/**
* Set of functions used for cleaning up phpMyAdmin tables
*/
declare(strict_types=1);
namespace PhpMyAdmin;
namespace PhpMyAdmin\ConfigStorage;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Util;
/**
* PhpMyAdmin\RelationCleanup class
* Set of functions used for cleaning up phpMyAdmin tables
*/
class RelationCleanup
{

45
libraries/classes/RelationParameters.php → libraries/classes/ConfigStorage/RelationParameters.php
View File

@ -2,9 +2,10 @@
declare(strict_types=1);
namespace PhpMyAdmin;
namespace PhpMyAdmin\ConfigStorage;
use PhpMyAdmin\Dbal\DatabaseName;
use PhpMyAdmin\Version;
use Webmozart\Assert\Assert;
use Webmozart\Assert\InvalidArgumentException;
@ -472,27 +473,27 @@ final class RelationParameters
* designersettingswork: bool,
* exporttemplateswork: bool,
* allworks: bool,
* user: string|null,
* db: string|null,
* bookmark: string|null,
* central_columns: string|null,
* column_info: string|null,
* designer_settings: string|null,
* export_templates: string|null,
* favorite: string|null,
* history: string|null,
* navigationhiding: string|null,
* pdf_pages: string|null,
* recent: string|null,
* relation: string|null,
* savedsearches: string|null,
* table_coords: string|null,
* table_info: string|null,
* table_uiprefs: string|null,
* tracking: string|null,
* userconfig: string|null,
* usergroups: string|null,
* users: string|null
* user: (string|null),
* db: (string|null),
* bookmark: (string|null),
* central_columns: (string|null),
* column_info: (string|null),
* designer_settings: (string|null),
* export_templates: (string|null),
* favorite: (string|null),
* history: (string|null),
* navigationhiding: (string|null),
* pdf_pages: (string|null),
* recent: (string|null),
* relation: (string|null),
* savedsearches: (string|null),
* table_coords: (string|null),
* table_info: (string|null),
* table_uiprefs: (string|null),
* tracking: (string|null),
* userconfig: (string|null),
* usergroups: (string|null),
* users: (string|null)
* }
*/
public function toArray(): array

2
libraries/classes/Console.php
View File

@ -7,6 +7,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use function __;
use function _ngettext;
use function count;

2
libraries/classes/Controllers/BrowseForeignersController.php
View File

@ -5,8 +5,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\BrowseForeigners;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/CheckRelationsController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Database/DataDictionaryController.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Index;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;

4
libraries/classes/Controllers/Database/OperationsController.php
View File

@ -6,6 +6,8 @@ namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Message;
@ -13,8 +15,6 @@ use PhpMyAdmin\Operations;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\Plugins\Export\ExportSql;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;

4
libraries/classes/Controllers/Database/QueryByExampleController.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Database\Qbe;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\SavedSearches;
use PhpMyAdmin\Sql;

2
libraries/classes/Controllers/Database/Structure/DropTableController.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\Database\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;

4
libraries/classes/Controllers/Database/Structure/EmptyTableController.php
View File

@ -4,14 +4,14 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\Database\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FlashMessages;
use PhpMyAdmin\Message;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Database/Structure/FavoriteTableController.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Database\AbstractController;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;

4
libraries/classes/Controllers/Database/StructureController.php
View File

@ -7,13 +7,13 @@ namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FlashMessages;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Operations;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Replication;
use PhpMyAdmin\ReplicationInfo;
use PhpMyAdmin\ResponseRenderer;

2
libraries/classes/Controllers/Export/Template/CreateController.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Export/Template/DeleteController.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Export/Template/LoadController.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Export/Template/UpdateController.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/HomeController.php
View File

@ -7,13 +7,13 @@ namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Git;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\LanguageManager;
use PhpMyAdmin\Message;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Select;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/NavigationController.php
View File

@ -5,9 +5,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Message;
use PhpMyAdmin\Navigation\Navigation;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Utils\SessionCache;

2
libraries/classes/Controllers/Preferences/ExportController.php
View File

@ -7,8 +7,8 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\ExportForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Preferences/FeaturesController.php
View File

@ -7,8 +7,8 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\FeaturesForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Preferences/ImportController.php
View File

@ -7,8 +7,8 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\ImportForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Preferences/MainPanelController.php
View File

@ -7,8 +7,8 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\MainForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Preferences/ManageController.php
View File

@ -7,11 +7,11 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\UserFormList;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Core;
use PhpMyAdmin\File;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\ThemeManager;

2
libraries/classes/Controllers/Preferences/NavigationController.php
View File

@ -7,8 +7,8 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\NaviForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Preferences/SqlController.php
View File

@ -7,8 +7,8 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\SqlForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Preferences/TwoFactorController.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\TwoFactor;

2
libraries/classes/Controllers/Server/Databases/DestroyController.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Server\Databases;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;

2
libraries/classes/Controllers/Server/DatabasesController.php
View File

@ -6,10 +6,10 @@ namespace PhpMyAdmin\Controllers\Server;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ReplicationInfo;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;

4
libraries/classes/Controllers/Server/PrivilegesController.php
View File

@ -5,6 +5,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Server;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\PrivilegesController as DatabaseController;
use PhpMyAdmin\Controllers\Table\PrivilegesController as TableController;
@ -12,8 +14,6 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Plugins;
use PhpMyAdmin\Server\Privileges;

2
libraries/classes/Controllers/Server/UserGroupsController.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Server;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\UserGroups;
use PhpMyAdmin\Template;

4
libraries/classes/Controllers/Server/UserGroupsFormController.php
View File

@ -5,10 +5,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Server;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationParameters;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;

2
libraries/classes/Controllers/Table/AddFieldController.php
View File

@ -5,13 +5,13 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Core;
use PhpMyAdmin\CreateAddField;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\ColumnsDefinition;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Table/ChangeController.php
View File

@ -5,10 +5,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\InsertEdit;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;

2
libraries/classes/Controllers/Table/CreateController.php
View File

@ -5,11 +5,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Core;
use PhpMyAdmin\CreateAddField;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\ColumnsDefinition;
use PhpMyAdmin\Template;

4
libraries/classes/Controllers/Table/DeleteRowsController.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Table/DropColumnController.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FlashMessages;
use PhpMyAdmin\Message;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;

7
libraries/classes/Controllers/Table/OperationsController.php
View File

@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Html\Generator;
@ -15,7 +16,6 @@ use PhpMyAdmin\Operations;
use PhpMyAdmin\Partitioning\Partition;
use PhpMyAdmin\Query\Generator as QueryGenerator;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Template;
@ -97,8 +97,9 @@ class OperationsController extends AbstractController
$relationParameters = $this->relation->getRelationParameters();
// reselect current db (needed in some cases probably due to
// the calling of PhpMyAdmin\Relation)
/**
* Reselect current db (needed in some cases probably due to the calling of {@link Relation})
*/
$this->dbi->selectDb($db);
$reread_info = $pma_table->getStatusInfo(null, false);

4
libraries/classes/Controllers/Table/RelationController.php
View File

@ -4,12 +4,12 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Index;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationParameters;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Table/ReplaceController.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Database\SqlController as DatabaseSqlController;
use PhpMyAdmin\Controllers\Sql\SqlController;
use PhpMyAdmin\Controllers\Table\SqlController as TableSqlController;
@ -14,7 +15,6 @@ use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\InsertEdit;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins\IOTransformationsPlugin;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;

4
libraries/classes/Controllers/Table/SearchController.php
View File

@ -4,12 +4,12 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Table\Search;

2
libraries/classes/Controllers/Table/Structure/ChangeController.php
View File

@ -5,10 +5,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table\Structure;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Table\AbstractController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\ColumnsDefinition;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Table/Structure/SaveController.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table\Structure;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Table\AbstractController;
use PhpMyAdmin\Controllers\Table\StructureController;
use PhpMyAdmin\Core;
@ -11,7 +12,6 @@ use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Index;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;

6
libraries/classes/Controllers/Table/StructureController.php
View File

@ -7,6 +7,9 @@ namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\CreateAddField;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\DatabaseInterface;
@ -17,9 +20,6 @@ use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Index;
use PhpMyAdmin\Partitioning\Partition;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\RelationParameters;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Table;

2
libraries/classes/Controllers/Table/ZoomSearchController.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Table\Search;
use PhpMyAdmin\Template;

2
libraries/classes/Controllers/Transformation/WrapperController.php
View File

@ -4,12 +4,12 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Transformation;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Image\ImageWrapper;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;

2
libraries/classes/Database/CentralColumns.php
View File

@ -5,9 +5,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Database;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;

2
libraries/classes/Database/Designer.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Database\Designer\DesignerTable;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
use stdClass;

2
libraries/classes/Database/Designer/Common.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Database\Designer;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Index;
use PhpMyAdmin\Query\Generator as QueryGenerator;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Table;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;

4
libraries/classes/Database/MultiTableQuery.php
View File

@ -7,11 +7,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Operations;
use PhpMyAdmin\ParseAnalyze;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;

2
libraries/classes/Database/Qbe.php
View File

@ -7,10 +7,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Message;
use PhpMyAdmin\Relation;
use PhpMyAdmin\SavedSearches;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;

1
libraries/classes/DatabaseInterface.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Database\DatabaseList;
use PhpMyAdmin\Dbal\DatabaseName;
use PhpMyAdmin\Dbal\DbalInterface;

2
libraries/classes/Display/Results.php
View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Display;
use PhpMyAdmin\Config\SpecialSchemaLinks;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FieldMetadata;
@ -16,7 +17,6 @@ use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json;
use PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql;
use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link;
use PhpMyAdmin\Plugins\TransformationsPlugin;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Sql;

1
libraries/classes/ErrorReport.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Utils\HttpRequest;
use function count;

2
libraries/classes/Export/Options.php
View File

@ -4,12 +4,12 @@ declare(strict_types=1);
namespace PhpMyAdmin\Export;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Core;
use PhpMyAdmin\Encoding;
use PhpMyAdmin\Plugins;
use PhpMyAdmin\Plugins\ExportPlugin;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Table;
use PhpMyAdmin\Util;

1
libraries/classes/Footer.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use Traversable;
use function basename;

1
libraries/classes/Header.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Navigation\Navigation;

1
libraries/classes/InsertEdit.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Plugins\TransformationsPlugin;
use PhpMyAdmin\Utils\Gis;

1
libraries/classes/Menu.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Query\Utilities;
use PhpMyAdmin\Utils\SessionCache;

2
libraries/classes/Navigation/Navigation.php
View File

@ -9,8 +9,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Navigation;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Server\Select;

2
libraries/classes/Navigation/Nodes/Node.php
View File

@ -7,9 +7,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Navigation\Nodes;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Util;
use function __;

1
libraries/classes/Normalization.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Query\Compatibility;

1
libraries/classes/Operations.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Engines\Innodb;
use PhpMyAdmin\Partitioning\Partition;
use PhpMyAdmin\Plugins\Export\ExportSql;

2
libraries/classes/Plugins/Export/Helpers/Pdf.php
View File

@ -7,10 +7,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Plugins\Export\Helpers;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FieldMetadata;
use PhpMyAdmin\Pdf as PdfLib;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\Util;
use TCPDF_STATIC;

2
libraries/classes/Plugins/ExportPlugin.php
View File

@ -7,10 +7,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Plugins;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Export;
use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
use PhpMyAdmin\Properties\Plugins\PluginPropertyItem;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Transformations;
use function stripos;

2
libraries/classes/Plugins/Schema/ExportRelationSchema.php
View File

@ -8,7 +8,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Plugins\Schema;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;

2
libraries/classes/Plugins/Schema/Pdf/Pdf.php
View File

@ -7,8 +7,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Plugins\Schema\Pdf;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Pdf as PdfLib;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Util;
use function __;

2
libraries/classes/Plugins/Schema/TableStats.php
View File

@ -7,10 +7,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Plugins\Schema;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Font;
use PhpMyAdmin\Index;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Util;
use function array_flip;

2
libraries/classes/RecentFavoriteTable.php
View File

@ -7,6 +7,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use function __;
use function array_key_exists;
use function array_merge;

2
libraries/classes/SavedSearches.php
View File

@ -7,6 +7,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use function __;
use function count;
use function intval;

4
libraries/classes/Server/Privileges.php
View File

@ -8,13 +8,13 @@ declare(strict_types=1);
namespace PhpMyAdmin\Server;
use mysqli_stmt;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Html\MySQLDocumentation;
use PhpMyAdmin\Message;
use PhpMyAdmin\Query\Compatibility;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;

2
libraries/classes/Server/UserGroups.php
View File

@ -7,8 +7,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Server;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;

2
libraries/classes/Sql.php
View File

@ -4,6 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Display\Results as DisplayResults;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Html\MySQLDocumentation;

1
libraries/classes/SystemDatabase.php
View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use mysqli_result;
use PhpMyAdmin\ConfigStorage\Relation;
use function count;
use function sprintf;

2
libraries/classes/Table.php
View File

@ -4,6 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Html\MySQLDocumentation;
use PhpMyAdmin\Plugins\Export\ExportSql;

2
libraries/classes/Table/ColumnsDefinition.php
View File

@ -5,11 +5,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Table;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Partitioning\Partition;
use PhpMyAdmin\Partitioning\TablePartitionDefinition;
use PhpMyAdmin\Query\Compatibility;
use PhpMyAdmin\Relation;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Table;
use PhpMyAdmin\Transformations;

1
libraries/classes/Tracker.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Plugins\Export\ExportSql;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Statements\AlterStatement;

1
libraries/classes/Tracking.php
View File

@ -7,6 +7,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Html\Generator;
use function __;

1
libraries/classes/Transformations.php
View File

@ -17,6 +17,7 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Plugins\TransformationsInterface;
use function array_shift;

2
libraries/classes/Twig/RelationExtension.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use PhpMyAdmin\Relation;
use PhpMyAdmin\ConfigStorage\Relation;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;

1
libraries/classes/UserPreferences.php
View File

@ -6,6 +6,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\UserFormList;
use PhpMyAdmin\ConfigStorage\Relation;
use function __;
use function array_flip;

7
libraries/services.php
View File

@ -2,6 +2,9 @@
declare(strict_types=1);
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
return [
'services' => [
'advisor' => [
@ -126,14 +129,14 @@ return [
'arguments' => ['$dbi' => '@dbi'],
],
'relation' => [
'class' => PhpMyAdmin\Relation::class,
'class' => Relation::class,
'arguments' => [
'@dbi',
'@template',
],
],
'relation_cleanup' => [
'class' => PhpMyAdmin\RelationCleanup::class,
'class' => RelationCleanup::class,
'arguments' => [
'@dbi',
'@relation',

286
phpstan-baseline.neon
View File

@ -855,6 +855,131 @@ parameters:
count: 1
path: libraries/classes/Config/Validator.php
-
message: "#^Do\\-while loop condition is always false\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:buildForeignDropdown\\(\\) has parameter \\$foreign with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:checkChildForeignReferences\\(\\) has parameter \\$child_references_full with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:checkChildForeignReferences\\(\\) has parameter \\$foreigners_full with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:foreignDropdown\\(\\) has parameter \\$disp_row with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getChildReferences\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getComments\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getDbComments\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getDefaultPmaTableNames\\(\\) has parameter \\$tableNameReplacements with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getForeignData\\(\\) has parameter \\$foreigners with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getForeignData\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getForeigners\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getHistory\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getRelationsAndStatus\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:getTables\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:searchColumnInForeigners\\(\\) has parameter \\$foreigners with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:searchColumnInForeigners\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Offset 'comment' does not exist on array\\|null\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$foreigners of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:searchColumnInForeigners\\(\\) expects array, array\\|true given\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:fetchAssoc\\(\\) expects object, mixed given\\.$#"
count: 3
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:fetchRow\\(\\) expects object, mixed given\\.$#"
count: 2
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:freeResult\\(\\) expects object, mixed given\\.$#"
count: 4
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:numRows\\(\\) expects bool\\|object, mixed given\\.$#"
count: 4
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Property PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:\\$dbi \\(PhpMyAdmin\\\\DatabaseInterface\\) does not accept PhpMyAdmin\\\\DatabaseInterface\\|null\\.$#"
count: 1
path: libraries/classes/ConfigStorage/Relation.php
-
message: "#^Parameter \\#1 \\$params of static method PhpMyAdmin\\\\Url\\:\\:getCommonRaw\\(\\) expects array\\<int\\|string, bool\\|int\\|string\\>, array\\<string, mixed\\> given\\.$#"
count: 1
@ -5446,12 +5571,12 @@ parameters:
path: libraries/classes/InsertEdit.php
-
message: "#^Parameter \\#2 \\$foreign_field of method PhpMyAdmin\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#"
message: "#^Parameter \\#2 \\$foreign_field of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/InsertEdit.php
-
message: "#^Parameter \\#4 \\$data of method PhpMyAdmin\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#"
message: "#^Parameter \\#4 \\$data of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/InsertEdit.php
@ -7490,131 +7615,6 @@ parameters:
count: 1
path: libraries/classes/RecentFavoriteTable.php
-
message: "#^Do\\-while loop condition is always false\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:buildForeignDropdown\\(\\) has parameter \\$foreign with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:checkChildForeignReferences\\(\\) has parameter \\$child_references_full with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:checkChildForeignReferences\\(\\) has parameter \\$foreigners_full with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:foreignDropdown\\(\\) has parameter \\$disp_row with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getChildReferences\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getComments\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getDbComments\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getDefaultPmaTableNames\\(\\) has parameter \\$tableNameReplacements with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getForeignData\\(\\) has parameter \\$foreigners with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getForeignData\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getForeigners\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getHistory\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getRelationsAndStatus\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:getTables\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:searchColumnInForeigners\\(\\) has parameter \\$foreigners with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Relation\\:\\:searchColumnInForeigners\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Offset 'comment' does not exist on array\\|null\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Parameter \\#1 \\$foreigners of method PhpMyAdmin\\\\Relation\\:\\:searchColumnInForeigners\\(\\) expects array, array\\|true given\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:fetchAssoc\\(\\) expects object, mixed given\\.$#"
count: 3
path: libraries/classes/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:fetchRow\\(\\) expects object, mixed given\\.$#"
count: 2
path: libraries/classes/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:freeResult\\(\\) expects object, mixed given\\.$#"
count: 4
path: libraries/classes/Relation.php
-
message: "#^Parameter \\#1 \\$result of method PhpMyAdmin\\\\DatabaseInterface\\:\\:numRows\\(\\) expects bool\\|object, mixed given\\.$#"
count: 4
path: libraries/classes/Relation.php
-
message: "#^Property PhpMyAdmin\\\\Relation\\:\\:\\$dbi \\(PhpMyAdmin\\\\DatabaseInterface\\) does not accept PhpMyAdmin\\\\DatabaseInterface\\|null\\.$#"
count: 1
path: libraries/classes/Relation.php
-
message: "#^Method PhpMyAdmin\\\\Replication\\:\\:slaveChangeMaster\\(\\) has parameter \\$pos with no value type specified in iterable type array\\.$#"
count: 1
@ -8666,7 +8666,7 @@ parameters:
path: libraries/classes/Sql.php
-
message: "#^Parameter \\#2 \\$foreign_field of method PhpMyAdmin\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#"
message: "#^Parameter \\#2 \\$foreign_field of method PhpMyAdmin\\\\ConfigStorage\\\\Relation\\:\\:foreignDropdown\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Sql.php
@ -9915,6 +9915,21 @@ parameters:
count: 1
path: test/classes/Config/SettingsTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\ConfigStorage\\\\RelationParametersTest\\:\\:providerForTestRelationParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: test/classes/ConfigStorage/RelationParametersTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\ConfigStorage\\\\RelationParametersTest\\:\\:testRelationParameters\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
count: 1
path: test/classes/ConfigStorage/RelationParametersTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\ConfigStorage\\\\RelationParametersTest\\:\\:testRelationParameters\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: test/classes/ConfigStorage/RelationParametersTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\ConfigTest\\:\\:configPaths\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
@ -11430,21 +11445,6 @@ parameters:
count: 1
path: test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\RelationParametersTest\\:\\:providerForTestRelationParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: test/classes/RelationParametersTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\RelationParametersTest\\:\\:testRelationParameters\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#"
count: 1
path: test/classes/RelationParametersTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\RelationParametersTest\\:\\:testRelationParameters\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
count: 1
path: test/classes/RelationParametersTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\SanitizeTest\\:\\:dataProviderCheckLinks\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1

496
psalm-baseline.xml
View File

@ -861,6 +861,168 @@
<code>$uv[$i]</code>
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/ConfigStorage/Relation.php">
<MixedArgument occurrences="33">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['sql_history']</code>
<code>$_SESSION['sql_history']</code>
<code>$_SESSION['sql_history']</code>
<code>$child_references</code>
<code>$child_references</code>
<code>$column['DATA_TYPE']</code>
<code>$columns['table_name']</code>
<code>$columns['table_schema']</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$disp</code>
<code>$disp</code>
<code>$disp</code>
<code>$foreign[$field]</code>
<code>$foreign_db</code>
<code>$foreign_db</code>
<code>$foreign_field</code>
<code>$foreign_field</code>
<code>$foreign_table</code>
<code>$foreign_table</code>
<code>$one_key['index_list']</code>
<code>$result</code>
<code>$result</code>
<code>$row[1]</code>
<code>$show_create_table</code>
<code>$tableNameReplacements[$tableName]</code>
<code>$tableRes</code>
<code>$tableRes</code>
<code>$tablesRows</code>
</MixedArgument>
<MixedArgumentTypeCoercion occurrences="2">
<code>uksort($foreign, 'strnatcasecmp')</code>
<code>usort($tables, 'strnatcasecmp')</code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess occurrences="13">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$column['COLUMN_NAME']</code>
<code>$column['DATA_TYPE']</code>
<code>$columns['table_name']</code>
<code>$columns['table_schema']</code>
<code>$one_key['constraint']</code>
<code>$one_key['index_list']</code>
<code>$one_key['on_delete']</code>
<code>$one_key['on_update']</code>
<code>$one_key['ref_db_name']</code>
<code>$one_key['ref_index_list']</code>
<code>$one_key['ref_table_name']</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="6">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['sql_history'][]</code>
<code>$_SESSION['tmpval']['favoriteTables']</code>
<code>$_SESSION['tmpval']['recentTables']</code>
</MixedArrayAssignment>
<MixedArrayOffset occurrences="6">
<code>$comments[$column['Field']]</code>
<code>$comments[$row['db_name']]</code>
<code>$foreign[$field]</code>
<code>$foreign[$field]</code>
<code>$foreign[$key]</code>
<code>$one_key['ref_index_list'][$column_index]</code>
</MixedArrayOffset>
<MixedAssignment occurrences="39">
<code>$child_references</code>
<code>$column</code>
<code>$column_index</code>
<code>$columns</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$comments[$column['Field']]</code>
<code>$comments[$row['db_name']]</code>
<code>$disp</code>
<code>$field</code>
<code>$foreign[$field]</code>
<code>$foreign[$key]</code>
<code>$foreign_db</code>
<code>$foreign_field</code>
<code>$foreign_table</code>
<code>$foreigner['constraint']</code>
<code>$foreigner['foreign_db']</code>
<code>$foreigner['foreign_field']</code>
<code>$foreigner['foreign_table']</code>
<code>$foreigner['on_delete']</code>
<code>$foreigner['on_update']</code>
<code>$foreigners[$column]</code>
<code>$foreigners['foreign_keys_data']</code>
<code>$key</code>
<code>$max_time</code>
<code>$one_key</code>
<code>$relations</code>
<code>$result</code>
<code>$result</code>
<code>$result</code>
<code>$result</code>
<code>$show_create_table</code>
<code>$tableRes</code>
<code>$tablesRows</code>
<code>$tables[]</code>
<code>$the_total</code>
<code>$the_total</code>
<code>$value</code>
<code>$value</code>
</MixedAssignment>
<MixedInferredReturnType occurrences="2">
<code>array|false</code>
<code>string|false</code>
</MixedInferredReturnType>
<MixedOperand occurrences="1">
<code>$max_time</code>
</MixedOperand>
<MixedReturnStatement occurrences="3">
<code>$column['COLUMN_NAME']</code>
<code>$foreigners[$column]</code>
<code>$row['display_field']</code>
</MixedReturnStatement>
<PossiblyFalseArgument occurrences="5">
<code>$GLOBALS['cfg']['Server']['column_info']</code>
<code>$GLOBALS['cfg']['Server']['column_info']</code>
<code>$GLOBALS['cfg']['Server']['pmadb']</code>
<code>$GLOBALS['cfg']['Server']['pmadb']</code>
<code>$GLOBALS['cfg']['Server']['pmadb']</code>
</PossiblyFalseArgument>
<PossiblyInvalidArgument occurrences="4">
<code>$com_rs</code>
<code>$com_rs</code>
<code>$foreigners</code>
<code>$result</code>
</PossiblyInvalidArgument>
<PossiblyNullArrayAccess occurrences="1">
<code>$row['comment']</code>
</PossiblyNullArrayAccess>
<PossiblyNullPropertyAssignmentValue occurrences="1">
<code>$dbi</code>
</PossiblyNullPropertyAssignmentValue>
<RedundantCast occurrences="6">
<code>(int) $GLOBALS['cfg']['LimitChars']</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]</code>
<code>(string) $table[1]</code>
</RedundantCast>
<RedundantCastGivenDocblockType occurrences="3">
<code>(string) $data</code>
<code>(string) $db</code>
<code>(string) $table</code>
</RedundantCastGivenDocblockType>
<RedundantCondition occurrences="6">
<code>is_array($GLOBALS['cfg']['ForeignKeyDropdownOrder'])</code>
<code>is_scalar($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])</code>
<code>is_scalar($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])</code>
</RedundantCondition>
</file>
<file src="libraries/classes/Console.php">
<PropertyNotSetInConstructor occurrences="1">
<code>$isAjax</code>
@ -12304,168 +12466,6 @@
<code>$this-&gt;getPmaTable()</code>
</PossiblyNullOperand>
</file>
<file src="libraries/classes/Relation.php">
<MixedArgument occurrences="33">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['sql_history']</code>
<code>$_SESSION['sql_history']</code>
<code>$_SESSION['sql_history']</code>
<code>$child_references</code>
<code>$child_references</code>
<code>$column['DATA_TYPE']</code>
<code>$columns['table_name']</code>
<code>$columns['table_schema']</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$disp</code>
<code>$disp</code>
<code>$disp</code>
<code>$foreign[$field]</code>
<code>$foreign_db</code>
<code>$foreign_db</code>
<code>$foreign_field</code>
<code>$foreign_field</code>
<code>$foreign_table</code>
<code>$foreign_table</code>
<code>$one_key['index_list']</code>
<code>$result</code>
<code>$result</code>
<code>$row[1]</code>
<code>$show_create_table</code>
<code>$tableNameReplacements[$tableName]</code>
<code>$tableRes</code>
<code>$tableRes</code>
<code>$tablesRows</code>
</MixedArgument>
<MixedArgumentTypeCoercion occurrences="2">
<code>uksort($foreign, 'strnatcasecmp')</code>
<code>usort($tables, 'strnatcasecmp')</code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess occurrences="13">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$column['COLUMN_NAME']</code>
<code>$column['DATA_TYPE']</code>
<code>$columns['table_name']</code>
<code>$columns['table_schema']</code>
<code>$one_key['constraint']</code>
<code>$one_key['index_list']</code>
<code>$one_key['on_delete']</code>
<code>$one_key['on_update']</code>
<code>$one_key['ref_db_name']</code>
<code>$one_key['ref_index_list']</code>
<code>$one_key['ref_table_name']</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="6">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['sql_history'][]</code>
<code>$_SESSION['tmpval']['favoriteTables']</code>
<code>$_SESSION['tmpval']['recentTables']</code>
</MixedArrayAssignment>
<MixedArrayOffset occurrences="6">
<code>$comments[$column['Field']]</code>
<code>$comments[$row['db_name']]</code>
<code>$foreign[$field]</code>
<code>$foreign[$field]</code>
<code>$foreign[$key]</code>
<code>$one_key['ref_index_list'][$column_index]</code>
</MixedArrayOffset>
<MixedAssignment occurrences="39">
<code>$child_references</code>
<code>$column</code>
<code>$column_index</code>
<code>$columns</code>
<code>$com_rs</code>
<code>$com_rs</code>
<code>$comments[$column['Field']]</code>
<code>$comments[$row['db_name']]</code>
<code>$disp</code>
<code>$field</code>
<code>$foreign[$field]</code>
<code>$foreign[$key]</code>
<code>$foreign_db</code>
<code>$foreign_field</code>
<code>$foreign_table</code>
<code>$foreigner['constraint']</code>
<code>$foreigner['foreign_db']</code>
<code>$foreigner['foreign_field']</code>
<code>$foreigner['foreign_table']</code>
<code>$foreigner['on_delete']</code>
<code>$foreigner['on_update']</code>
<code>$foreigners[$column]</code>
<code>$foreigners['foreign_keys_data']</code>
<code>$key</code>
<code>$max_time</code>
<code>$one_key</code>
<code>$relations</code>
<code>$result</code>
<code>$result</code>
<code>$result</code>
<code>$result</code>
<code>$show_create_table</code>
<code>$tableRes</code>
<code>$tablesRows</code>
<code>$tables[]</code>
<code>$the_total</code>
<code>$the_total</code>
<code>$value</code>
<code>$value</code>
</MixedAssignment>
<MixedInferredReturnType occurrences="2">
<code>array|false</code>
<code>string|false</code>
</MixedInferredReturnType>
<MixedOperand occurrences="1">
<code>$max_time</code>
</MixedOperand>
<MixedReturnStatement occurrences="3">
<code>$column['COLUMN_NAME']</code>
<code>$foreigners[$column]</code>
<code>$row['display_field']</code>
</MixedReturnStatement>
<PossiblyFalseArgument occurrences="5">
<code>$GLOBALS['cfg']['Server']['column_info']</code>
<code>$GLOBALS['cfg']['Server']['column_info']</code>
<code>$GLOBALS['cfg']['Server']['pmadb']</code>
<code>$GLOBALS['cfg']['Server']['pmadb']</code>
<code>$GLOBALS['cfg']['Server']['pmadb']</code>
</PossiblyFalseArgument>
<PossiblyInvalidArgument occurrences="4">
<code>$com_rs</code>
<code>$com_rs</code>
<code>$foreigners</code>
<code>$result</code>
</PossiblyInvalidArgument>
<PossiblyNullArrayAccess occurrences="1">
<code>$row['comment']</code>
</PossiblyNullArrayAccess>
<PossiblyNullPropertyAssignmentValue occurrences="1">
<code>$dbi</code>
</PossiblyNullPropertyAssignmentValue>
<RedundantCast occurrences="6">
<code>(int) $GLOBALS['cfg']['LimitChars']</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]</code>
<code>(string) $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]</code>
<code>(string) $table[1]</code>
</RedundantCast>
<RedundantCastGivenDocblockType occurrences="3">
<code>(string) $data</code>
<code>(string) $db</code>
<code>(string) $table</code>
</RedundantCastGivenDocblockType>
<RedundantCondition occurrences="6">
<code>is_array($GLOBALS['cfg']['ForeignKeyDropdownOrder'])</code>
<code>is_scalar($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])</code>
<code>is_scalar($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])</code>
</RedundantCondition>
</file>
<file src="libraries/classes/Replication.php">
<LessSpecificReturnStatement occurrences="1">
<code>$output</code>
@ -15390,6 +15390,92 @@
<code>$this-&gt;sessionID</code>
</MixedAssignment>
</file>
<file src="test/classes/ConfigStorage/RelationCleanupTest.php">
<MixedArgument occurrences="4">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArgument>
<MixedArrayAccess occurrences="4">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="4">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArrayAssignment>
<MixedMethodCall occurrences="12">
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>withConsecutive</code>
<code>withConsecutive</code>
<code>withConsecutive</code>
<code>withConsecutive</code>
</MixedMethodCall>
<PossiblyUndefinedMethod occurrences="8">
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
</PossiblyUndefinedMethod>
</file>
<file src="test/classes/ConfigStorage/RelationTest.php">
<DocblockTypeContradiction occurrences="1">
<code>assertSame</code>
</DocblockTypeContradiction>
<EmptyArrayAccess occurrences="3">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</EmptyArrayAccess>
<InvalidScalarArgument occurrences="8">
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
</InvalidScalarArgument>
<MixedArrayAccess occurrences="3">
<code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
<code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
<code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="1">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArrayAssignment>
<RedundantCondition occurrences="3">
<code>assertSame</code>
<code>assertSame</code>
<code>assertSame</code>
</RedundantCondition>
<RedundantConditionGivenDocblockType occurrences="2">
<code>assertSame</code>
<code>assertSame</code>
</RedundantConditionGivenDocblockType>
<TypeDoesNotContainType occurrences="3">
<code>assertSame</code>
<code>assertSame</code>
<code>assertSame</code>
</TypeDoesNotContainType>
</file>
<file src="test/classes/ConfigTest.php">
<InvalidArgument occurrences="1">
<code>$v</code>
@ -16747,92 +16833,6 @@
<code>getGroup</code>
</PossiblyUndefinedMethod>
</file>
<file src="test/classes/RelationCleanupTest.php">
<MixedArgument occurrences="4">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArgument>
<MixedArrayAccess occurrences="4">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="4">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArrayAssignment>
<MixedMethodCall occurrences="12">
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>method</code>
<code>withConsecutive</code>
<code>withConsecutive</code>
<code>withConsecutive</code>
<code>withConsecutive</code>
</MixedMethodCall>
<PossiblyUndefinedMethod occurrences="8">
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
<code>expects</code>
</PossiblyUndefinedMethod>
</file>
<file src="test/classes/RelationTest.php">
<DocblockTypeContradiction occurrences="1">
<code>assertSame</code>
</DocblockTypeContradiction>
<EmptyArrayAccess occurrences="3">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</EmptyArrayAccess>
<InvalidScalarArgument occurrences="8">
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
<code>$_SESSION</code>
</InvalidScalarArgument>
<MixedArrayAccess occurrences="3">
<code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
<code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
<code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
</MixedArrayAccess>
<MixedArrayAssignment occurrences="1">
<code>$_SESSION['relation'][$GLOBALS['server']]</code>
</MixedArrayAssignment>
<RedundantCondition occurrences="3">
<code>assertSame</code>
<code>assertSame</code>
<code>assertSame</code>
</RedundantCondition>
<RedundantConditionGivenDocblockType occurrences="2">
<code>assertSame</code>
<code>assertSame</code>
</RedundantConditionGivenDocblockType>
<TypeDoesNotContainType occurrences="3">
<code>assertSame</code>
<code>assertSame</code>
<code>assertSame</code>
</TypeDoesNotContainType>
</file>
<file src="test/classes/SanitizeTest.php">
<MixedInferredReturnType occurrences="4">
<code>array</code>

9
test/classes/RelationCleanupTest.php → test/classes/ConfigStorage/RelationCleanupTest.php
View File

@ -2,17 +2,18 @@
declare(strict_types=1);
namespace PhpMyAdmin\Tests;
namespace PhpMyAdmin\Tests\ConfigStorage;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Version;
use PHPUnit\Framework\MockObject\MockObject;
use function array_merge;
/**
* @covers \PhpMyAdmin\RelationCleanup
* @covers \PhpMyAdmin\ConfigStorage\RelationCleanup
*/
class RelationCleanupTest extends AbstractTestCase
{

6
test/classes/RelationParametersTest.php → test/classes/ConfigStorage/RelationParametersTest.php
View File

@ -2,15 +2,15 @@
declare(strict_types=1);
namespace PhpMyAdmin\Tests;
namespace PhpMyAdmin\Tests\ConfigStorage;
use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\Dbal\DatabaseName;
use PhpMyAdmin\RelationParameters;
use PhpMyAdmin\Version;
use PHPUnit\Framework\TestCase;
/**
* @covers \PhpMyAdmin\RelationParameters
* @covers \PhpMyAdmin\ConfigStorage\RelationParameters
*/
class RelationParametersTest extends TestCase
{

7
test/classes/RelationTest.php → test/classes/ConfigStorage/RelationTest.php
View File

@ -2,15 +2,16 @@
declare(strict_types=1);
namespace PhpMyAdmin\Tests;
namespace PhpMyAdmin\Tests\ConfigStorage;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Tests\AbstractTestCase;
use function implode;
/**
* @covers \PhpMyAdmin\Relation
* @covers \PhpMyAdmin\ConfigStorage\Relation
* @group medium
*/
class RelationTest extends AbstractTestCase

2
test/classes/Controllers/CheckRelationsControllerTest.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\CheckRelationsController;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

2
test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Database\Structure;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Database\Structure\FavoriteTableController;
use PhpMyAdmin\RecentFavoriteTable;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub;

4
test/classes/Controllers/Database/StructureControllerTest.php
View File

@ -4,12 +4,12 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FlashMessages;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Replication;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;

2
test/classes/Controllers/Export/Template/CreateControllerTest.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Export\Template\CreateController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

2
test/classes/Controllers/Export/Template/DeleteControllerTest.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Export\Template\DeleteController;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

2
test/classes/Controllers/Export/Template/LoadControllerTest.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Export\Template\LoadController;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

2
test/classes/Controllers/Export/Template/UpdateControllerTest.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Export\Template;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Export\Template\UpdateController;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

4
test/classes/Controllers/Server/Databases/DestroyControllerTest.php
View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Server\Databases;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\Server\Databases\DestroyController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

4
test/classes/Controllers/Server/DatabasesControllerTest.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Server;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\Server\DatabasesController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\RelationCleanup;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;

2
test/classes/Controllers/Table/RelationControllerTest.php
View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Table\RelationController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;

2
test/classes/Controllers/Table/SearchControllerTest.php
View File

@ -4,11 +4,11 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Table;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Table\SearchController;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FieldMetadata;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Table\Search;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;

2
test/classes/Controllers/Table/Structure/ChangeControllerTest.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Table\Structure;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Table\Structure\ChangeController;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub;

Some files were not shown because too many files have changed in this diff Show More