From 17374ec4eef7be3a541249c020aea31e8cb1dbfc Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 7 Mar 2023 12:14:08 +0000
Subject: [PATCH] Remove &$sameWideWidth param

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 .../Plugins/Schema/Pdf/PdfRelationSchema.php  |  6 ++---
 .../Plugins/Schema/Pdf/TableStatsPdf.php      | 26 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
index 0aad3f784b..3f2e9c0ac4 100644
--- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
@@ -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]);
         }
 
diff --git a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
index c0ea985afe..d33f142e55 100644
--- a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
@@ -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;
     }
 
     /**