diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index 3ffef00251..7d2c749d6e 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -6,7 +6,6 @@ namespace PhpMyAdmin\Controllers\Server; use PhpMyAdmin\Charsets; use PhpMyAdmin\CheckUserPrivileges; -use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; @@ -14,7 +13,6 @@ use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; -use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -50,25 +48,15 @@ class DatabasesController extends AbstractController /** @var int position in list navigation */ private $position; - /** @var Transformations */ - private $transformations; - - /** @var RelationCleanup */ - private $relationCleanup; - /** @var DatabaseInterface */ private $dbi; public function __construct( ResponseRenderer $response, Template $template, - Transformations $transformations, - RelationCleanup $relationCleanup, DatabaseInterface $dbi ) { parent::__construct($response, $template); - $this->transformations = $transformations; - $this->relationCleanup = $relationCleanup; $this->dbi = $dbi; $checkUserPrivileges = new CheckUserPrivileges($dbi); diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php index 9786e74a03..486c18fcda 100644 --- a/libraries/services_controllers.php +++ b/libraries/services_controllers.php @@ -853,8 +853,6 @@ return [ 'arguments' => [ '$response' => '@response', '$template' => '@template', - '$transformations' => '@transformations', - '$relationCleanup' => '@relation_cleanup', '$dbi' => '@dbi', ], ], diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index b26032aa5c..ca865f0934 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1600,16 +1600,6 @@ parameters: count: 1 path: libraries/classes/Controllers/Server/DatabasesController.php - - - message: "#^Property PhpMyAdmin\\\\Controllers\\\\Server\\\\DatabasesController\\:\\:\\$relationCleanup is never read, only written\\.$#" - count: 1 - path: libraries/classes/Controllers/Server/DatabasesController.php - - - - message: "#^Property PhpMyAdmin\\\\Controllers\\\\Server\\\\DatabasesController\\:\\:\\$transformations is never read, only written\\.$#" - count: 1 - path: libraries/classes/Controllers/Server/DatabasesController.php - - message: "#^Cannot cast mixed to int\\.$#" count: 1 diff --git a/test/classes/Controllers/Server/DatabasesControllerTest.php b/test/classes/Controllers/Server/DatabasesControllerTest.php index df99b7515e..79d13646b2 100644 --- a/test/classes/Controllers/Server/DatabasesControllerTest.php +++ b/test/classes/Controllers/Server/DatabasesControllerTest.php @@ -4,8 +4,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Server; -use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Server\DatabasesController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; @@ -13,7 +11,6 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; -use PhpMyAdmin\Transformations; use function __; @@ -49,19 +46,12 @@ class DatabasesControllerTest extends AbstractTestCase { $GLOBALS['cfg']['Server']['only_db'] = ''; $template = new Template(); - $transformations = new Transformations(); - $relationCleanup = new RelationCleanup( - $GLOBALS['dbi'], - new Relation($GLOBALS['dbi']) - ); $response = new ResponseRenderer(); $controller = new DatabasesController( $response, $template, - $transformations, - $relationCleanup, $GLOBALS['dbi'] ); @@ -96,8 +86,6 @@ class DatabasesControllerTest extends AbstractTestCase $controller = new DatabasesController( $response, $template, - $transformations, - $relationCleanup, $GLOBALS['dbi'] );