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

Remove Controllers\AbstractController abstract class

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2024-04-07 16:34:11 -03:00
parent 036e8ce95f
commit c965d07f68
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
197 changed files with 1181 additions and 1127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Controllers/AbstractController.php
View File

@ -1,15 +0,0 @@
<?php
declare(strict_types=1);
namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
abstract class AbstractController implements InvocableController
{
public function __construct(protected ResponseRenderer $response, protected Template $template)
{
}
}

11
src/Controllers/BrowseForeignersController.php
View File

@ -14,15 +14,14 @@ use PhpMyAdmin\Template;
/**
* Display selection for relational field values
*/
class BrowseForeignersController extends AbstractController
final class BrowseForeignersController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private BrowseForeigners $browseForeigners,
private Relation $relation,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly BrowseForeigners $browseForeigners,
private readonly Relation $relation,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/ChangeLogController.php
View File

@ -25,11 +25,13 @@ use function printf;
use function readgzfile;
use function str_ends_with;
final class ChangeLogController extends AbstractController
final class ChangeLogController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private readonly Config $config)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Config $config,
) {
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/CheckRelationsController.php
View File

@ -18,11 +18,13 @@ use const SQL_DIR;
/**
* Displays status of phpMyAdmin configuration storage
*/
class CheckRelationsController extends AbstractController
final class CheckRelationsController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Relation $relation)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Relation $relation,
) {
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/CollationConnectionController.php
View File

@ -11,11 +11,13 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
final class CollationConnectionController extends AbstractController
final class CollationConnectionController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Config $config)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Config $config,
) {
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/ColumnController.php
View File

@ -11,11 +11,13 @@ use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class ColumnController extends AbstractController
final class ColumnController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

9
src/Controllers/Console/Bookmark/AddController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Console\Bookmark;
use PhpMyAdmin\Bookmarks\BookmarkRepository;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
@ -15,14 +15,13 @@ use PhpMyAdmin\Template;
use function __;
use function is_string;
final class AddController extends AbstractController
final class AddController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly BookmarkRepository $bookmarkRepository,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Console/Bookmark/RefreshController.php
View File

@ -5,20 +5,19 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Console\Bookmark;
use PhpMyAdmin\Console;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class RefreshController extends AbstractController
final class RefreshController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Console $console,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Console $console,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Console/UpdateConfigController.php
View File

@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Console;
use Fig\Http\Message\StatusCodeInterface;
use InvalidArgumentException;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
@ -17,11 +17,13 @@ use function __;
use function in_array;
use function is_numeric;
final class UpdateConfigController extends AbstractController
final class UpdateConfigController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Config $config)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Config $config,
) {
}
public function __invoke(ServerRequest $request): Response

11
src/Controllers/Database/CentralColumns/PopulateColumnsController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\CentralColumns;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\Http\Response;
@ -12,14 +12,13 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class PopulateColumnsController extends AbstractController
final class PopulateColumnsController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private CentralColumns $centralColumns,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly CentralColumns $centralColumns,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Database/CentralColumnsController.php
View File

@ -8,7 +8,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -25,14 +25,13 @@ use function is_numeric;
use function parse_str;
use function sprintf;
class CentralColumnsController extends AbstractController
final class CentralColumnsController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private CentralColumns $centralColumns,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly CentralColumns $centralColumns,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

15
src/Controllers/Database/DataDictionaryController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -19,16 +19,15 @@ use PhpMyAdmin\Util;
use function is_array;
use function str_replace;
class DataDictionaryController extends AbstractController
final class DataDictionaryController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Relation $relation,
private Transformations $transformations,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Relation $relation,
private readonly Transformations $transformations,
private readonly DatabaseInterface $dbi,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/DesignerController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Designer;
use PhpMyAdmin\Database\Designer\Common as DesignerCommon;
@ -26,16 +26,15 @@ use function in_array;
use function json_encode;
use function sprintf;
class DesignerController extends AbstractController
final class DesignerController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Designer $databaseDesigner,
private DesignerCommon $designerCommon,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Designer $databaseDesigner,
private readonly DesignerCommon $designerCommon,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/EventsController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Events;
use PhpMyAdmin\DatabaseInterface;
@ -27,16 +27,15 @@ use function mb_strtoupper;
use function sprintf;
use function trim;
final class EventsController extends AbstractController
final class EventsController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Events $events,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Events $events,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

15
src/Controllers/Database/ExportController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Export\Export;
@ -26,17 +26,16 @@ use function array_merge;
use function count;
use function is_array;
final class ExportController extends AbstractController
final class ExportController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Export $export,
private Options $exportOptions,
private PageSettings $pageSettings,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Export $export,
private readonly Options $exportOptions,
private readonly PageSettings $pageSettings,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/ImportController.php
View File

@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -29,16 +29,15 @@ use PhpMyAdmin\Utils\ForeignKey;
use function __;
use function is_numeric;
final class ImportController extends AbstractController
final class ImportController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private PageSettings $pageSettings,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly PageSettings $pageSettings,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/Database/MultiTableQuery/QueryController.php
View File

@ -4,13 +4,19 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\MultiTableQuery;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Database\MultiTableQuery;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class QueryController extends AbstractController
final class QueryController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
$this->response->addHTML(MultiTableQuery::displayResults(

12
src/Controllers/Database/MultiTableQuery/TablesController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\MultiTableQuery;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -15,11 +15,13 @@ use PhpMyAdmin\Template;
use function array_map;
use function implode;
final class TablesController extends AbstractController
final class TablesController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Database/MultiTableQueryController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\MultiTableQuery;
use PhpMyAdmin\DatabaseInterface;
@ -16,11 +16,13 @@ use PhpMyAdmin\Template;
/**
* Handles database multi-table querying
*/
class MultiTableQueryController extends AbstractController
final class MultiTableQueryController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/PrivilegesController.php
View File

@ -8,7 +8,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -27,15 +27,14 @@ use function mb_strtolower;
/**
* Controller for database privileges
*/
class PrivilegesController extends AbstractController
final class PrivilegesController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Privileges $privileges,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Privileges $privileges,
private readonly DatabaseInterface $dbi,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

15
src/Controllers/Database/RoutinesController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Routines;
use PhpMyAdmin\DatabaseInterface;
@ -35,17 +35,16 @@ use const ENT_QUOTES;
/**
* Routines management.
*/
class RoutinesController extends AbstractController
final class RoutinesController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPrivilegesFactory $userPrivilegesFactory,
private DatabaseInterface $dbi,
private Routines $routines,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
private readonly DatabaseInterface $dbi,
private readonly Routines $routines,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Database/SearchController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\Search;
use PhpMyAdmin\DatabaseInterface;
@ -22,15 +22,14 @@ use PhpMyAdmin\Util;
use function __;
class SearchController extends AbstractController
final class SearchController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

9
src/Controllers/Database/SqlAutoCompleteController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -18,15 +18,14 @@ use function sprintf;
/**
* Table/Column autocomplete in SQL editors.
*/
class SqlAutoCompleteController extends AbstractController
final class SqlAutoCompleteController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly Config $config,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/SqlController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Http\Response;
@ -25,16 +25,15 @@ use function htmlspecialchars;
/**
* Database SQL executor
*/
class SqlController extends AbstractController
class SqlController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private SqlQueryForm $sqlQueryForm,
private PageSettings $pageSettings,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly SqlQueryForm $sqlQueryForm,
private readonly PageSettings $pageSettings,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/Database/SqlFormatController.php
View File

@ -4,16 +4,22 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\SqlParser\Utils\Formatter;
use PhpMyAdmin\Template;
/**
* Format SQL for SQL editors.
*/
class SqlFormatController extends AbstractController
final class SqlFormatController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
/** @var string $query */

10
src/Controllers/Database/Structure/AddPrefixController.php
View File

@ -4,15 +4,21 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function __;
final class AddPrefixController extends AbstractController
final class AddPrefixController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
/** @var string[] $selected */

13
src/Controllers/Database/Structure/AddPrefixTableController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -15,15 +15,14 @@ use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
final class AddPrefixTableController extends AbstractController
final class AddPrefixTableController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/Structure/CentralColumns/AddController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure\CentralColumns;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -19,15 +19,14 @@ use Webmozart\Assert\Assert;
use function __;
use function is_array;
final class AddController extends AbstractController
final class AddController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure\CentralColumns;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\DatabaseInterface;
@ -19,15 +19,14 @@ use Webmozart\Assert\Assert;
use function __;
use function is_array;
final class MakeConsistentController extends AbstractController
final class MakeConsistentController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/Structure/CentralColumns/RemoveController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure\CentralColumns;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -18,15 +18,14 @@ use Webmozart\Assert\Assert;
use function __;
use function is_array;
final class RemoveController extends AbstractController
final class RemoveController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/Database/Structure/ChangePrefixFormController.php
View File

@ -4,15 +4,21 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function __;
final class ChangePrefixFormController extends AbstractController
final class ChangePrefixFormController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
/** @var string[] $selected */

10
src/Controllers/Database/Structure/CopyFormController.php
View File

@ -4,16 +4,22 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function __;
final class CopyFormController extends AbstractController
final class CopyFormController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
/** @var string[] $selected */

13
src/Controllers/Database/Structure/CopyTableController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -16,16 +16,15 @@ use PhpMyAdmin\Table\Table;
use PhpMyAdmin\Template;
use PhpMyAdmin\UserPrivilegesFactory;
final class CopyTableController extends AbstractController
final class CopyTableController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Operations $operations,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Operations $operations,
private readonly StructureController $structureController,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Database/Structure/CopyTableWithPrefixController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -17,14 +17,13 @@ use PhpMyAdmin\Template;
use function mb_strlen;
use function mb_substr;
final class CopyTableWithPrefixController extends AbstractController
final class CopyTableWithPrefixController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Database/Structure/DropFormController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -17,11 +17,13 @@ use PhpMyAdmin\Utils\ForeignKey;
use function __;
use function htmlspecialchars;
final class DropFormController extends AbstractController
final class DropFormController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

15
src/Controllers/Database/Structure/DropTableController.php
View File

@ -5,8 +5,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -19,16 +19,15 @@ use PhpMyAdmin\Utils\ForeignKey;
use function __;
final class DropTableController extends AbstractController
final class DropTableController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private RelationCleanup $relationCleanup,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly RelationCleanup $relationCleanup,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/Database/Structure/EmptyFormController.php
View File

@ -4,18 +4,24 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
use function __;
use function htmlspecialchars;
final class EmptyFormController extends AbstractController
final class EmptyFormController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
/** @var string[] $selected */

19
src/Controllers/Database/Structure/EmptyTableController.php
View File

@ -8,8 +8,8 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FlashMessages;
@ -26,18 +26,17 @@ use PhpMyAdmin\Utils\ForeignKey;
use function __;
final class EmptyTableController extends AbstractController
final class EmptyTableController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private Relation $relation,
private RelationCleanup $relationCleanup,
private FlashMessages $flash,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly Relation $relation,
private readonly RelationCleanup $relationCleanup,
private readonly FlashMessages $flash,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Database/Structure/FavoriteTableController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Favorites\RecentFavoriteTable;
@ -29,15 +29,14 @@ use function json_encode;
use function md5;
use function sha1;
final class FavoriteTableController extends AbstractController
final class FavoriteTableController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Relation $relation,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Relation $relation,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Database/Structure/RealRowCountController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -23,15 +23,14 @@ use function __;
/**
* Handles request for real row count on database level view page.
*/
final class RealRowCountController extends AbstractController
final class RealRowCountController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Database/Structure/ReplacePrefixController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\StructureController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
@ -18,15 +18,14 @@ use PhpMyAdmin\Util;
use function mb_strlen;
use function mb_substr;
final class ReplacePrefixController extends AbstractController
final class ReplacePrefixController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private StructureController $structureController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly StructureController $structureController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Database/Structure/ShowCreateController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database\Structure;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -15,11 +15,13 @@ use PhpMyAdmin\Template;
use function __;
final class ShowCreateController extends AbstractController
final class ShowCreateController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

20
src/Controllers/Database/StructureController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -56,7 +56,7 @@ use function urlencode;
/**
* Handles database structure logic
*/
final class StructureController extends AbstractController
final class StructureController implements InvocableController
{
/** @var int Number of tables */
private int $numTables = 0;
@ -79,17 +79,15 @@ final class StructureController extends AbstractController
private ReplicationInfo $replicationInfo;
public function __construct(
ResponseRenderer $response,
Template $template,
private Relation $relation,
private Replication $replication,
private DatabaseInterface $dbi,
private TrackingChecker $trackingChecker,
private PageSettings $pageSettings,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Relation $relation,
private readonly Replication $replication,
private readonly DatabaseInterface $dbi,
private readonly TrackingChecker $trackingChecker,
private readonly PageSettings $pageSettings,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
$this->replicationInfo = new ReplicationInfo($this->dbi);
}

13
src/Controllers/Database/TrackingController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -29,16 +29,15 @@ use function sprintf;
/**
* Tracking configuration for database.
*/
class TrackingController extends AbstractController
final class TrackingController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Tracking $tracking,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Tracking $tracking,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/DatabaseController.php
View File

@ -10,11 +10,13 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class DatabaseController extends AbstractController
final class DatabaseController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private readonly DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/ErrorReportController.php
View File

@ -28,16 +28,15 @@ use function time;
/**
* Handle error report submission
*/
class ErrorReportController extends AbstractController
final class ErrorReportController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private ErrorReport $errorReport,
private ErrorHandler $errorHandler,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly ErrorReport $errorReport,
private readonly ErrorHandler $errorHandler,
private readonly DatabaseInterface $dbi,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/Export/CheckTimeOutController.php
View File

@ -4,12 +4,18 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Export;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class CheckTimeOutController extends AbstractController
final class CheckTimeOutController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
if (! $request->isAjax()) {

12
src/Controllers/Export/ExportController.php
View File

@ -6,8 +6,8 @@ namespace PhpMyAdmin\Controllers\Export;
use PhpMyAdmin\Config;
use PhpMyAdmin\Container\ContainerBuilder;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\ExportController as DatabaseExportController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Current;
use PhpMyAdmin\Encoding;
@ -38,11 +38,13 @@ use function is_array;
use function register_shutdown_function;
use function time;
final class ExportController extends AbstractController
final class ExportController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Export $export)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Export $export,
) {
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Export/TablesController.php
View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Export;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\Database\ExportController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
@ -13,14 +13,13 @@ use PhpMyAdmin\Template;
use function __;
final class TablesController extends AbstractController
final class TablesController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private ExportController $exportController,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly ExportController $exportController,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Export/Template/CreateController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\Response;
@ -16,15 +16,14 @@ use PhpMyAdmin\Template;
use function is_array;
final class CreateController extends AbstractController
final class CreateController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private TemplateModel $model,
private Relation $relation,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly TemplateModel $model,
private readonly Relation $relation,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Export/Template/DeleteController.php
View File

@ -6,22 +6,21 @@ namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class DeleteController extends AbstractController
final class DeleteController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private TemplateModel $model,
private Relation $relation,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly TemplateModel $model,
private readonly Relation $relation,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Export/Template/LoadController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\Response;
@ -14,15 +14,14 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class LoadController extends AbstractController
final class LoadController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private TemplateModel $model,
private Relation $relation,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly TemplateModel $model,
private readonly Relation $relation,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Export/Template/UpdateController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Export\Template;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\Response;
@ -14,15 +14,14 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class UpdateController extends AbstractController
final class UpdateController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private TemplateModel $model,
private Relation $relation,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly TemplateModel $model,
private readonly Relation $relation,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

8
src/Controllers/GisDataEditorController.php
View File

@ -11,6 +11,8 @@ use PhpMyAdmin\Gis\GisFactory;
use PhpMyAdmin\Gis\GisVisualization;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function array_merge;
use function in_array;
@ -22,8 +24,12 @@ use function trim;
/**
* Editor for Geometry data types.
*/
class GisDataEditorController extends AbstractController
final class GisDataEditorController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
private const GIS_TYPES = [
'POINT',
'MULTIPOINT',

10
src/Controllers/GitInfoController.php
View File

@ -14,11 +14,13 @@ use PhpMyAdmin\Util;
use function strtotime;
final class GitInfoController extends AbstractController
final class GitInfoController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Config $config)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Config $config,
) {
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/HomeController.php
View File

@ -42,7 +42,7 @@ use function sprintf;
use const PHP_VERSION;
use const SODIUM_CRYPTO_SECRETBOX_KEYBYTES;
class HomeController extends AbstractController
final class HomeController implements InvocableController
{
/**
* @var array<int, array<string, string>>
@ -51,14 +51,13 @@ class HomeController extends AbstractController
private array $errors = [];
public function __construct(
ResponseRenderer $response,
Template $template,
private Config $config,
private ThemeManager $themeManager,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Config $config,
private readonly ThemeManager $themeManager,
private readonly DatabaseInterface $dbi,
private readonly ResponseFactory $responseFactory,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

15
src/Controllers/Import/ImportController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Bookmarks\Bookmark;
use PhpMyAdmin\Bookmarks\BookmarkRepository;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
@ -48,17 +48,16 @@ use function preg_quote;
use function preg_replace;
use function time;
final class ImportController extends AbstractController
final class ImportController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Import $import,
private Sql $sql,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Import $import,
private readonly Sql $sql,
private readonly DatabaseInterface $dbi,
private readonly BookmarkRepository $bookmarkRepository,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Import/SimulateDmlController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Import;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Import\SimulateDml;
@ -20,14 +20,13 @@ use function __;
use function count;
use function explode;
final class SimulateDmlController extends AbstractController
final class SimulateDmlController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private SimulateDml $simulateDml,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly SimulateDml $simulateDml,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

2
src/Controllers/Import/StatusController.php
View File

@ -26,7 +26,7 @@ use function usleep;
*/
class StatusController implements InvocableController
{
public function __construct(private Template $template)
public function __construct(private readonly Template $template)
{
}

8
src/Controllers/LicenseController.php
View File

@ -9,6 +9,8 @@ namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function __;
use function is_readable;
@ -18,8 +20,12 @@ use function readfile;
/**
* Simple script to set correct charset for the license
*/
class LicenseController extends AbstractController
final class LicenseController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
$this->response->disable();

8
src/Controllers/LintController.php
View File

@ -11,6 +11,8 @@ use PhpMyAdmin\Core;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Linter;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function header;
use function is_array;
@ -20,8 +22,12 @@ use function sprintf;
/**
* Represents the interface between the linter and the query editor.
*/
class LintController extends AbstractController
final class LintController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
if (! $request->isAjax()) {

4
src/Controllers/LogoutController.php
View File

@ -9,9 +9,9 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Plugins\AuthenticationPluginFactory;
use PhpMyAdmin\ResponseRenderer;
class LogoutController implements InvocableController
final class LogoutController implements InvocableController
{
public function __construct(private AuthenticationPluginFactory $authPluginFactory)
public function __construct(private readonly AuthenticationPluginFactory $authPluginFactory)
{
}

12
src/Controllers/Navigation/UpdateNavWidthConfigController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Navigation;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Message;
@ -15,11 +15,13 @@ use PhpMyAdmin\Template;
use function __;
use function is_numeric;
final class UpdateNavWidthConfigController extends AbstractController
final class UpdateNavWidthConfigController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private readonly Config $config)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Config $config,
) {
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/NavigationController.php
View File

@ -21,16 +21,15 @@ use function __;
*
* Displays server, database and table selection tree.
*/
class NavigationController extends AbstractController
final class NavigationController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Navigation $navigation,
private Relation $relation,
private PageSettings $pageSettings,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Navigation $navigation,
private readonly Relation $relation,
private readonly PageSettings $pageSettings,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Normalization/AddNewPrimaryController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -16,15 +16,14 @@ use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use PhpMyAdmin\UserPrivilegesFactory;
final class AddNewPrimaryController extends AbstractController
final class AddNewPrimaryController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Normalization $normalization,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Normalization/CreateNewColumnController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -16,15 +16,14 @@ use PhpMyAdmin\UserPrivilegesFactory;
use function min;
final class CreateNewColumnController extends AbstractController
final class CreateNewColumnController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Normalization $normalization,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/FirstNormalForm/FirstStepController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\FirstNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -14,11 +14,13 @@ use PhpMyAdmin\Template;
use function in_array;
final class FirstStepController extends AbstractController
final class FirstStepController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/FirstNormalForm/FourthStepController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\FirstNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class FourthStepController extends AbstractController
final class FourthStepController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/FirstNormalForm/SecondStepController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\FirstNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class SecondStepController extends AbstractController
final class SecondStepController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\FirstNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class ThirdStepController extends AbstractController
final class ThirdStepController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/GetColumnsController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -15,11 +15,13 @@ use PhpMyAdmin\Template;
use function __;
use function _pgettext;
final class GetColumnsController extends AbstractController
final class GetColumnsController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

10
src/Controllers/Normalization/MainController.php
View File

@ -4,16 +4,22 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
/**
* Normalization process (temporarily specific to 1NF).
*/
class MainController extends AbstractController
final class MainController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
$this->response->addScriptFiles(['normalization.js', 'vendor/jquery/jquery.uitablefilter.js']);

12
src/Controllers/Normalization/MoveRepeatingGroup.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class MoveRepeatingGroup extends AbstractController
final class MoveRepeatingGroup implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/PartialDependenciesController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class PartialDependenciesController extends AbstractController
final class PartialDependenciesController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\SecondNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -14,11 +14,13 @@ use PhpMyAdmin\Template;
use function json_decode;
final class CreateNewTablesController extends AbstractController
final class CreateNewTablesController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/SecondNormalForm/FirstStepController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\SecondNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class FirstStepController extends AbstractController
final class FirstStepController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/SecondNormalForm/NewTablesController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\SecondNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -14,11 +14,13 @@ use PhpMyAdmin\Template;
use function json_decode;
final class NewTablesController extends AbstractController
final class NewTablesController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\ThirdNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -14,11 +14,13 @@ use PhpMyAdmin\Template;
use function json_decode;
final class CreateNewTablesController extends AbstractController
final class CreateNewTablesController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/ThirdNormalForm/FirstStepController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\ThirdNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -12,11 +12,13 @@ use PhpMyAdmin\Normalization;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class FirstStepController extends AbstractController
final class FirstStepController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Normalization\ThirdNormalForm;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -14,11 +14,13 @@ use PhpMyAdmin\Template;
use function json_decode;
final class NewTablesController extends AbstractController
final class NewTablesController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Normalization $normalization)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Normalization $normalization,
) {
}
public function __invoke(ServerRequest $request): Response|null

13
src/Controllers/Operations/Database/CollationController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Operations\Database;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -21,16 +21,15 @@ use PhpMyAdmin\Util;
use function __;
final class CollationController extends AbstractController
final class CollationController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Operations $operations,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Operations $operations,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

19
src/Controllers/Operations/DatabaseController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -33,19 +33,18 @@ use function mb_strtolower;
/**
* Handles miscellaneous database operations.
*/
class DatabaseController extends AbstractController
final class DatabaseController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Operations $operations,
private UserPrivilegesFactory $userPrivilegesFactory,
private Relation $relation,
private RelationCleanup $relationCleanup,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Operations $operations,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
private readonly Relation $relation,
private readonly RelationCleanup $relationCleanup,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Operations/TableController.php
View File

@ -7,7 +7,7 @@ namespace PhpMyAdmin\Controllers\Operations;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -40,18 +40,17 @@ use function preg_replace;
use function str_contains;
use function urldecode;
class TableController extends AbstractController
final class TableController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private Operations $operations,
private UserPrivilegesFactory $userPrivilegesFactory,
private Relation $relation,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Operations $operations,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
private readonly Relation $relation,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Operations/ViewController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Operations;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\DbTableExists;
@ -28,15 +28,14 @@ use function strval;
/**
* View manipulations
*/
class ViewController extends AbstractController
final class ViewController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly DbTableExists $dbTableExists,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

8
src/Controllers/PhpInfoController.php
View File

@ -10,6 +10,8 @@ namespace PhpMyAdmin\Controllers;
use PhpMyAdmin\Config;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function phpinfo;
@ -20,8 +22,12 @@ use const INFO_MODULES;
/**
* phpinfo() wrapper to allow displaying only when configured to do so.
*/
class PhpInfoController extends AbstractController
final class PhpInfoController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
$this->response->disable();

17
src/Controllers/Preferences/ExportController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\ExportForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use PhpMyAdmin\UserPreferences;
use function define;
use function ltrim;
class ExportController extends AbstractController
final class ExportController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Preferences/FeaturesController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\FeaturesForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use PhpMyAdmin\UserPreferences;
use function define;
use function ltrim;
class FeaturesController extends AbstractController
final class FeaturesController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Preferences/ImportController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\ImportForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use PhpMyAdmin\UserPreferences;
use function define;
use function ltrim;
class ImportController extends AbstractController
final class ImportController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Preferences/MainPanelController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\MainForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use PhpMyAdmin\UserPreferences;
use function define;
use function ltrim;
class MainPanelController extends AbstractController
final class MainPanelController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Preferences/ManageController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\UserFormList;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Core;
use PhpMyAdmin\File;
use PhpMyAdmin\Http\Response;
@ -44,17 +44,16 @@ use const UPLOAD_ERR_OK;
/**
* User preferences management page.
*/
class ManageController extends AbstractController
final class ManageController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Preferences/NavigationController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\NaviForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use PhpMyAdmin\UserPreferences;
use function define;
use function ltrim;
class NavigationController extends AbstractController
final class NavigationController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

17
src/Controllers/Preferences/SqlController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Config\Forms\User\SqlForm;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use PhpMyAdmin\UserPreferences;
use function define;
use function ltrim;
class SqlController extends AbstractController
final class SqlController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private UserPreferences $userPreferences,
private Relation $relation,
private Config $config,
private ThemeManager $themeManager,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly UserPreferences $userPreferences,
private readonly Relation $relation,
private readonly Config $config,
private readonly ThemeManager $themeManager,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

12
src/Controllers/Preferences/TwoFactorController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Preferences;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Message;
@ -18,11 +18,13 @@ use function __;
use function count;
use function define;
class TwoFactorController extends AbstractController
final class TwoFactorController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private Relation $relation)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly Relation $relation,
) {
}
public function __invoke(ServerRequest $request): Response|null

8
src/Controllers/RecentTablesListController.php
View File

@ -8,9 +8,15 @@ use PhpMyAdmin\Favorites\RecentFavoriteTables;
use PhpMyAdmin\Favorites\TableType;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
final class RecentTablesListController extends AbstractController
final class RecentTablesListController implements InvocableController
{
public function __construct(private readonly ResponseRenderer $response, private readonly Template $template)
{
}
public function __invoke(ServerRequest $request): Response|null
{
if (! $request->isAjax()) {

4
src/Controllers/SchemaExportController.php
View File

@ -21,9 +21,9 @@ use function mb_strlen;
/**
* Schema export handler
*/
class SchemaExportController implements InvocableController
final class SchemaExportController implements InvocableController
{
public function __construct(private Export $export, private ResponseRenderer $response)
public function __construct(private readonly Export $export, private readonly ResponseRenderer $response)
{
}

13
src/Controllers/Server/BinlogController.php
View File

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Controllers\Server;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Http\Response;
@ -21,7 +21,7 @@ use function array_key_exists;
/**
* Handles viewing binary logs
*/
final class BinlogController extends AbstractController
final class BinlogController implements InvocableController
{
/**
* binary log files
@ -30,10 +30,11 @@ final class BinlogController extends AbstractController
*/
private array $binaryLogs;
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
$this->binaryLogs = $this->dbi->fetchResult('SHOW MASTER LOGS', 'Log_name');
}

12
src/Controllers/Server/CollationsController.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Charsets;
use PhpMyAdmin\Charsets\Charset;
use PhpMyAdmin\Charsets\Collation;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -19,7 +19,7 @@ use PhpMyAdmin\Url;
/**
* Handles viewing character sets and collations
*/
class CollationsController extends AbstractController
final class CollationsController implements InvocableController
{
/** @var array<string, Charset> */
private array $charsets;
@ -32,14 +32,12 @@ class CollationsController extends AbstractController
* @param array<string, array<string, Collation>>|null $collations
*/
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
array|null $charsets = null,
array|null $collations = null,
) {
parent::__construct($response, $template);
$config = Config::getInstance();
$this->charsets = $charsets ?? Charsets::getCharsets($this->dbi, $config->selectedServer['DisableIS']);
$this->collations = $collations ?? Charsets::getCollations($this->dbi, $config->selectedServer['DisableIS']);

12
src/Controllers/Server/Databases/CreateController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Databases;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Html\Generator;
@ -25,11 +25,13 @@ use function is_string;
use function mb_strtolower;
use function str_contains;
final class CreateController extends AbstractController
final class CreateController implements InvocableController
{
public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
{
parent::__construct($response, $template);
public function __construct(
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
) {
}
public function __invoke(ServerRequest $request): Response|null

15
src/Controllers/Server/Databases/DestroyController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server\Databases;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
@ -23,17 +23,16 @@ use function _ngettext;
use function count;
use function is_array;
final class DestroyController extends AbstractController
final class DestroyController implements InvocableController
{
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private Transformations $transformations,
private RelationCleanup $relationCleanup,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly Transformations $transformations,
private readonly RelationCleanup $relationCleanup,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

11
src/Controllers/Server/DatabasesController.php
View File

@ -6,7 +6,7 @@ namespace PhpMyAdmin\Controllers\Server;
use PhpMyAdmin\Charsets;
use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\AbstractController;
use PhpMyAdmin\Controllers\InvocableController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Dbal\ConnectionType;
@ -32,7 +32,7 @@ use function strtolower;
/**
* Handles viewing and creating and deleting databases
*/
class DatabasesController extends AbstractController
final class DatabasesController implements InvocableController
{
/** @var mixed[] array of database details */
private array $databases = [];
@ -61,12 +61,11 @@ class DatabasesController extends AbstractController
];
public function __construct(
ResponseRenderer $response,
Template $template,
private DatabaseInterface $dbi,
private readonly ResponseRenderer $response,
private readonly Template $template,
private readonly DatabaseInterface $dbi,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
) {
parent::__construct($response, $template);
}
public function __invoke(ServerRequest $request): Response|null

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