diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index 2f4b66f0a6..4a2f76bb35 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -233,13 +233,11 @@ class EpsRelationSchema extends ExportRelationSchema /** * Draws tables - * - * @see TableStatsEps::Table_Stats_tableDraw() */ private function drawTables(): void { foreach ($this->tables as $table) { - $table->tableDraw($this->showColor); + $table->tableDraw(); } } } diff --git a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php index c377e6bdf2..b9c99bd69f 100644 --- a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php @@ -120,10 +120,8 @@ class TableStatsEps extends TableStats * @see Eps * @see Eps::line * @see Eps::rect - * - * @param bool $showColor Whether to display color */ - public function tableDraw(bool $showColor): void + public function tableDraw(): void { $this->diagram->rect($this->x, $this->y + 12, $this->width, $this->heightCell, 1); $this->diagram->showXY($this->getTitle(), $this->x + 5, $this->y + 14); diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index 9145bddf2e..207c00b7dd 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -8,10 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia; -use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; -use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf; use PhpMyAdmin\Version; use function __; @@ -36,7 +33,7 @@ use function sprintf; */ class SvgRelationSchema extends ExportRelationSchema { - /** @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] */ + /** @var TableStatsSvg[] */ private array $tables = []; /** @var RelationStatsSvg[] Relations */ @@ -266,8 +263,6 @@ class SvgRelationSchema extends ExportRelationSchema /** * Draws tables - * - * @see TableStatsSvg::Table_Stats_tableDraw() */ private function drawTables(): void { diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 952e2fbb97..00f815c37c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -6770,11 +6770,6 @@ parameters: count: 1 path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - - message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:setMinMax\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:addRelation\\(\\) expects string, \\(int\\|string\\) given\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4943712649..88e64377c1 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -10908,9 +10908,6 @@ y + 14]]> y + 14 + $this->currentCell]]> - - $showColor - $height @@ -11290,9 +11287,6 @@ - - showColor]]> - $oneField @@ -11322,13 +11316,6 @@ $oneKey $rel - - tables[$table]]]> - - - tableDraw - tableDraw -