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

Remove &$sameWideWidth param

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-03-07 12:14:08 +00:00
parent 98beb5b555
commit 17374ec4ee
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
View File

@ -158,11 +158,11 @@ class PdfRelationSchema extends ExportRelationSchema
$table,
null,
$this->pageNumber,
$this->tablewidth,
$this->showKeys,
$this->tableDimension,
$this->offline,
);
$this->tablewidth = max($this->tablewidth, $this->tables[$table]->width);
}
if ($this->sameWide) {
@ -340,10 +340,10 @@ class PdfRelationSchema extends ExportRelationSchema
$masterTable,
null,
$this->pageNumber,
$this->tablewidth,
$this->showKeys,
$this->tableDimension,
);
$this->tablewidth = max($this->tablewidth, $this->tables[$masterTable]->width);
$this->setMinMax($this->tables[$masterTable]);
}
@ -354,10 +354,10 @@ class PdfRelationSchema extends ExportRelationSchema
$foreignTable,
null,
$this->pageNumber,
$this->tablewidth,
$this->showKeys,
$this->tableDimension,
);
$this->tablewidth = max($this->tablewidth, $this->tables[$foreignTable]->width);
$this->setMinMax($this->tables[$foreignTable]);
}

26
libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
View File

@ -38,17 +38,15 @@ class TableStatsPdf extends TableStats
* @see TableStatsPdf::setWidthTable
* @see PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf::setHeightTable
*
* @param Pdf $diagram The PDF diagram
* @param string $db The database name
* @param string $tableName The table name
* @param int $fontSize The font size
* @param int $pageNumber The current page number (from the
* $cfg['Servers'][$i]['table_coords'] table)
* @param int|float $sameWideWidth The max. width among tables
* @param bool $showKeys Whether to display keys or not
* @param bool $tableDimension Whether to display table position or not
* @param bool $offline Whether the coordinates are sent
* from the browser
* @param Pdf $diagram The PDF diagram
* @param string $db The database name
* @param string $tableName The table name
* @param int $fontSize The font size
* @param int $pageNumber The current page number (from the
* $cfg['Servers'][$i]['table_coords'] table)
* @param bool $showKeys Whether to display keys or not
* @param bool $tableDimension Whether to display table position or not
* @param bool $offline Whether the coordinates are sent from the browser
*/
public function __construct(
$diagram,
@ -56,7 +54,6 @@ class TableStatsPdf extends TableStats
$tableName,
$fontSize,
$pageNumber,
&$sameWideWidth,
$showKeys = false,
$tableDimension = false,
$offline = false,
@ -67,11 +64,6 @@ class TableStatsPdf extends TableStats
$this->setHeight();
// setWidth must be after setHeight, because title can include table height which changes table width
$this->setWidth($fontSize);
if ($sameWideWidth >= $this->width) {
return;
}
$sameWideWidth = $this->width;
}
/**