From c028d421d77ad8595f384f454e939cfd1ebb332a Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 22:19:17 +0100
Subject: [PATCH 01/11] Extract common code

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 src/Database/Designer.php | 104 ++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 60 deletions(-)

diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index 78446b8f25..5e8fb929dc 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -234,36 +234,7 @@ class Designer
     ): string {
         $GLOBALS['text_dir'] ??= null;
 
-        $columnsType = [];
-        foreach ($tableColumnsInfo as $tableName => $columnsInfo) {
-            foreach ($columnsInfo as $columnInfo) {
-                $tableColumnName = $tableName . '.' . $columnInfo->name;
-                if (isset($tablesPkOrUniqueKeys[$tableColumnName])) {
-                    $columnsType[$tableColumnName] = 'designer/FieldKey_small';
-                } else {
-                    $columnsType[$tableColumnName] = 'designer/Field_small';
-                    if (
-                        str_contains($columnInfo->type, 'char')
-                        || str_contains($columnInfo->type, 'text')
-                    ) {
-                        $columnsType[$tableColumnName] .= '_char';
-                    } elseif (
-                        str_contains($columnInfo->type, 'int')
-                        || str_contains($columnInfo->type, 'float')
-                        || str_contains($columnInfo->type, 'double')
-                        || str_contains($columnInfo->type, 'decimal')
-                    ) {
-                        $columnsType[$tableColumnName] .= '_int';
-                    } elseif (
-                        str_contains($columnInfo->type, 'date')
-                        || str_contains($columnInfo->type, 'time')
-                        || str_contains($columnInfo->type, 'year')
-                    ) {
-                        $columnsType[$tableColumnName] .= '_date';
-                    }
-                }
-            }
-        }
+        $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesPkOrUniqueKeys);
 
         return $this->template->render('database/designer/database_tables', [
             'db' => Current::$database,
@@ -319,36 +290,7 @@ class Designer
         $GLOBALS['text_dir'] ??= null;
 
         $relationParameters = $this->relation->getRelationParameters();
-        $columnsType = [];
-        foreach ($tableColumnsInfo as $tableName => $columnsInfo) {
-            foreach ($columnsInfo as $columnInfo) {
-                $tableColumnName = $tableName . '.' . $columnInfo->name;
-                if (isset($tablesPkOrUniqueKeys[$tableColumnName])) {
-                    $columnsType[$tableColumnName] = 'designer/FieldKey_small';
-                } else {
-                    $columnsType[$tableColumnName] = 'designer/Field_small';
-                    if (
-                        str_contains($columnInfo->type, 'char')
-                        || str_contains($columnInfo->type, 'text')
-                    ) {
-                        $columnsType[$tableColumnName] .= '_char';
-                    } elseif (
-                        str_contains($columnInfo->type, 'int')
-                        || str_contains($columnInfo->type, 'float')
-                        || str_contains($columnInfo->type, 'double')
-                        || str_contains($columnInfo->type, 'decimal')
-                    ) {
-                        $columnsType[$tableColumnName] .= '_int';
-                    } elseif (
-                        str_contains($columnInfo->type, 'date')
-                        || str_contains($columnInfo->type, 'time')
-                        || str_contains($columnInfo->type, 'year')
-                    ) {
-                        $columnsType[$tableColumnName] .= '_date';
-                    }
-                }
-            }
-        }
+        $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesPkOrUniqueKeys);
 
         $displayedFields = [];
         foreach ($scriptDisplayField as $designerTable) {
@@ -386,4 +328,46 @@ class Designer
             'columns_type' => $columnsType,
         ]);
     }
+
+    /**
+     * @param list<ColumnInfo>[] $tableColumnsInfo     table column info
+     * @param mixed[]            $tablesPkOrUniqueKeys unique or primary indices
+     *
+     * @return array<string, string>
+     */
+    private function getColumnTypes(array $tableColumnsInfo, array $tablesPkOrUniqueKeys): array
+    {
+        $columnsType = [];
+        foreach ($tableColumnsInfo as $tableName => $columnsInfo) {
+            foreach ($columnsInfo as $columnInfo) {
+                $tableColumnName = $tableName . '.' . $columnInfo->name;
+                if (isset($tablesPkOrUniqueKeys[$tableColumnName])) {
+                    $columnsType[$tableColumnName] = 'designer/FieldKey_small';
+                } else {
+                    $columnsType[$tableColumnName] = 'designer/Field_small';
+                    if (
+                        str_contains($columnInfo->type, 'char')
+                        || str_contains($columnInfo->type, 'text')
+                    ) {
+                        $columnsType[$tableColumnName] .= '_char';
+                    } elseif (
+                        str_contains($columnInfo->type, 'int')
+                        || str_contains($columnInfo->type, 'float')
+                        || str_contains($columnInfo->type, 'double')
+                        || str_contains($columnInfo->type, 'decimal')
+                    ) {
+                        $columnsType[$tableColumnName] .= '_int';
+                    } elseif (
+                        str_contains($columnInfo->type, 'date')
+                        || str_contains($columnInfo->type, 'time')
+                        || str_contains($columnInfo->type, 'year')
+                    ) {
+                        $columnsType[$tableColumnName] .= '_date';
+                    }
+                }
+            }
+        }
+
+        return $columnsType;
+    }
 }

From 0b6e5fd1a0ce7fed0748cce6cd7381ad81712434 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 22:50:52 +0100
Subject: [PATCH 02/11] Inline controller method

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon                         |  5 ---
 .../Database/DesignerController.php           | 26 +++++++----
 src/Database/Designer.php                     | 44 +------------------
 3 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 94fa0bbfe6..c8d17a48d3 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1610,11 +1610,6 @@ parameters:
 			count: 2
 			path: src/Controllers/Database/DesignerController.php
 
-		-
-			message: "#^Parameter \\#1 \\$db of method PhpMyAdmin\\\\Database\\\\Designer\\:\\:getDatabaseTables\\(\\) expects string, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Database/DesignerController.php
-
 		-
 			message: "#^Parameter \\#1 \\$db of method PhpMyAdmin\\\\Database\\\\Designer\\:\\:getHtmlForEditOrDeletePages\\(\\) expects string, mixed given\\.$#"
 			count: 2
diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php
index f0d60fa2ed..fc416fc220 100644
--- a/src/Controllers/Database/DesignerController.php
+++ b/src/Controllers/Database/DesignerController.php
@@ -64,15 +64,23 @@ class DesignerController extends AbstractController
                 $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
                 $tablesPkOrUniqueKeys = $this->designerCommon->getPkOrUniqueKeys($scriptDisplayField);
 
-                $html = $this->databaseDesigner->getDatabaseTables(
-                    $db,
-                    $scriptDisplayField,
-                    [],
-                    -1,
-                    $tableColumn,
-                    $tablesAllKeys,
-                    $tablesPkOrUniqueKeys,
-                );
+                $GLOBALS['text_dir'] ??= null;
+
+                $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesPkOrUniqueKeys);
+
+                $html =  $this->template->render('database/designer/database_tables', [
+                    'db' => Current::$database,
+                    'text_dir' => $GLOBALS['text_dir'],
+                    'get_db' => $db,
+                    'has_query' => isset($_REQUEST['query']),
+                    'tab_pos' => [],
+                    'display_page' => -1,
+                    'tab_column' => $tableColumn,
+                    'tables_all_keys' => $tablesAllKeys,
+                    'tables_pk_or_unique_keys' => $tablesPkOrUniqueKeys,
+                    'tables' => $scriptDisplayField,
+                    'columns_type' => $columnsType,
+                ]);
             }
 
             if ($html !== '') {
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index 5e8fb929dc..1131ff1956 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -6,7 +6,6 @@ namespace PhpMyAdmin\Database;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\ConfigStorage\Relation;
-use PhpMyAdmin\Current;
 use PhpMyAdmin\Database\Designer\ColumnInfo;
 use PhpMyAdmin\Database\Designer\DesignerTable;
 use PhpMyAdmin\DatabaseInterface;
@@ -210,47 +209,6 @@ class Designer
         return $classesArray;
     }
 
-    /**
-     * Get HTML to display tables on designer page
-     *
-     * @param string             $db                   The database name from the request
-     * @param DesignerTable[]    $designerTables       The designer tables
-     * @param mixed[]            $tabPos               tables positions
-     * @param int                $displayPage          page number of the selected page
-     * @param list<ColumnInfo>[] $tableColumnsInfo     table column info
-     * @param mixed[]            $tablesAllKeys        all indices
-     * @param mixed[]            $tablesPkOrUniqueKeys unique or primary indices
-     *
-     * @return string html
-     */
-    public function getDatabaseTables(
-        string $db,
-        array $designerTables,
-        array $tabPos,
-        int $displayPage,
-        array $tableColumnsInfo,
-        array $tablesAllKeys,
-        array $tablesPkOrUniqueKeys,
-    ): string {
-        $GLOBALS['text_dir'] ??= null;
-
-        $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesPkOrUniqueKeys);
-
-        return $this->template->render('database/designer/database_tables', [
-            'db' => Current::$database,
-            'text_dir' => $GLOBALS['text_dir'],
-            'get_db' => $db,
-            'has_query' => isset($_REQUEST['query']),
-            'tab_pos' => $tabPos,
-            'display_page' => $displayPage,
-            'tab_column' => $tableColumnsInfo,
-            'tables_all_keys' => $tablesAllKeys,
-            'tables_pk_or_unique_keys' => $tablesPkOrUniqueKeys,
-            'tables' => $designerTables,
-            'columns_type' => $columnsType,
-        ]);
-    }
-
     /**
      * Returns HTML for Designer page
      *
@@ -335,7 +293,7 @@ class Designer
      *
      * @return array<string, string>
      */
-    private function getColumnTypes(array $tableColumnsInfo, array $tablesPkOrUniqueKeys): array
+    public function getColumnTypes(array $tableColumnsInfo, array $tablesPkOrUniqueKeys): array
     {
         $columnsType = [];
         foreach ($tableColumnsInfo as $tableName => $columnsInfo) {

From 522792227864ed26a63e6d0ad86e10f30e0021aa Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 22:58:50 +0100
Subject: [PATCH 03/11] Remove useless param

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 src/Controllers/Database/DesignerController.php | 1 -
 src/Database/Designer.php                       | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php
index fc416fc220..efa896b4c4 100644
--- a/src/Controllers/Database/DesignerController.php
+++ b/src/Controllers/Database/DesignerController.php
@@ -239,7 +239,6 @@ class DesignerController extends AbstractController
                 $scriptDisplayField,
                 $scriptTables,
                 $scriptContr,
-                $scriptDisplayField,
                 $displayPage,
                 $visualBuilderMode,
                 $selectedPage,
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index 1131ff1956..9a5b5c021c 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -217,7 +217,6 @@ class Designer
      * @param DesignerTable[]    $designerTables       The designer tables
      * @param mixed[]            $scriptTables         array on foreign key support for each table
      * @param mixed[]            $scriptContr          initialization data array
-     * @param DesignerTable[]    $scriptDisplayField   displayed tables in designer with their display fields
      * @param int                $displayPage          page number of the selected page
      * @param bool               $visualBuilderMode    whether this is visual query builder
      * @param string|null        $selectedPage         name of the selected page
@@ -235,7 +234,6 @@ class Designer
         array $designerTables,
         array $scriptTables,
         array $scriptContr,
-        array $scriptDisplayField,
         int $displayPage,
         bool $visualBuilderMode,
         string|null $selectedPage,
@@ -251,7 +249,7 @@ class Designer
         $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesPkOrUniqueKeys);
 
         $displayedFields = [];
-        foreach ($scriptDisplayField as $designerTable) {
+        foreach ($designerTables as $designerTable) {
             if ($designerTable->getDisplayField() === null) {
                 continue;
             }

From 58a65847408126950374328f8fa46ed17bfbf61e Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 23:08:25 +0100
Subject: [PATCH 04/11] Remove unused param

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 resources/templates/database/designer/main.twig | 1 -
 src/Controllers/Database/DesignerController.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/resources/templates/database/designer/main.twig b/resources/templates/database/designer/main.twig
index bac8cb1142..384c41fb99 100644
--- a/resources/templates/database/designer/main.twig
+++ b/resources/templates/database/designer/main.twig
@@ -233,7 +233,6 @@ window.designerConfig = {{ designer_config|raw }};
         {% include 'database/designer/database_tables.twig' with {
             'db': db,
             'text_dir': text_dir,
-            'get_db': get_db,
             'has_query': has_query,
             'tab_pos': tab_pos,
             'display_page': display_page,
diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php
index efa896b4c4..563b2b7662 100644
--- a/src/Controllers/Database/DesignerController.php
+++ b/src/Controllers/Database/DesignerController.php
@@ -71,7 +71,6 @@ class DesignerController extends AbstractController
                 $html =  $this->template->render('database/designer/database_tables', [
                     'db' => Current::$database,
                     'text_dir' => $GLOBALS['text_dir'],
-                    'get_db' => $db,
                     'has_query' => isset($_REQUEST['query']),
                     'tab_pos' => [],
                     'display_page' => -1,

From 479f7d77ce9dbb7ee7cd0af1476c058239a2fdfe Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 23:09:59 +0100
Subject: [PATCH 05/11] Inline Twig file

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 .../templates/database/designer/main.twig     | 22 ++++++++++++++++++-
 resources/templates/modals/build_query.twig   | 21 ------------------
 2 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 resources/templates/modals/build_query.twig

diff --git a/resources/templates/database/designer/main.twig b/resources/templates/database/designer/main.twig
index 384c41fb99..7d09712c44 100644
--- a/resources/templates/database/designer/main.twig
+++ b/resources/templates/database/designer/main.twig
@@ -1121,5 +1121,25 @@ window.designerConfig = {{ designer_config|raw }};
   </div>
 </div>
 {% if visual_builder %}
-  {{ include('modals/build_query.twig', {'get_db': get_db}) }}
+<div class="modal fade" id="buildQueryModal" tabindex="-1" aria-labelledby="buildQueryModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="buildQueryModalLabel">{% trans 'Loading' %}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+      </div>
+      <div id="box" class="modal-body">
+        <form method="post" action="{{ url('/database/qbe') }}" id="vqb_form">
+          <textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea>
+          <input type="hidden" name="submit_sql" value="true">
+          {{ get_hidden_inputs(get_db) }}
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Close' %}</button>
+        <button type="button" class="btn btn-secondary" id="buildQuerySubmitButton">{% trans 'Submit' %}</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endif %}
diff --git a/resources/templates/modals/build_query.twig b/resources/templates/modals/build_query.twig
deleted file mode 100644
index b32fe296b3..0000000000
--- a/resources/templates/modals/build_query.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="modal fade" id="buildQueryModal" tabindex="-1" aria-labelledby="buildQueryModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="buildQueryModalLabel">{% trans 'Loading' %}</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
-      </div>
-      <div id="box" class="modal-body">
-        <form method="post" action="{{ url('/database/qbe') }}" id="vqb_form">
-          <textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea>
-          <input type="hidden" name="submit_sql" value="true">
-          {{ get_hidden_inputs(get_db) }}
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Close' %}</button>
-        <button type="button" class="btn btn-secondary" id="buildQuerySubmitButton">{% trans 'Submit' %}</button>
-      </div>
-    </div>
-  </div>
-</div>

From 4f93d3d15d509a6b310e00ce7e6785e8b5c6cbd0 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 23:12:37 +0100
Subject: [PATCH 06/11] Remove Twig function call

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 resources/templates/database/designer/main.twig | 2 +-
 src/Database/Designer.php                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/templates/database/designer/main.twig b/resources/templates/database/designer/main.twig
index 7d09712c44..c8a9c028e3 100644
--- a/resources/templates/database/designer/main.twig
+++ b/resources/templates/database/designer/main.twig
@@ -1132,7 +1132,7 @@ window.designerConfig = {{ designer_config|raw }};
         <form method="post" action="{{ url('/database/qbe') }}" id="vqb_form">
           <textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea>
           <input type="hidden" name="submit_sql" value="true">
-          {{ get_hidden_inputs(get_db) }}
+          {{ hidden_input_fields|raw }}
         </form>
       </div>
       <div class="modal-footer">
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index 9a5b5c021c..ac9e0d019f 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -12,6 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins;
 use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
 use stdClass;
 
@@ -269,7 +270,7 @@ class Designer
         return $this->template->render('database/designer/main', [
             'db' => $db,
             'text_dir' => $GLOBALS['text_dir'],
-            'get_db' => $getDb,
+            'hidden_input_fields' => Url::getHiddenInputs($getDb),
             'designer_config' => json_encode($designerConfig),
             'display_page' => $displayPage,
             'has_query' => $visualBuilderMode,

From d6076edfa7a060ae72b59aa42ac1aa789ff14cf2 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 23:17:26 +0100
Subject: [PATCH 07/11] Merge the arrays together

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon                         |  5 ---
 .../database/designer/database_tables.twig    | 14 ++++---
 .../templates/database/designer/main.twig     |  1 -
 .../Database/DesignerController.php           |  8 +---
 src/Database/Designer.php                     | 37 +++++++++----------
 src/Database/Designer/Common.php              | 23 ++----------
 6 files changed, 30 insertions(+), 58 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c8d17a48d3..2c8dd278a2 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -6960,11 +6960,6 @@ parameters:
 			count: 1
 			path: src/Database/Designer/Common.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, bool\\|string given\\.$#"
-			count: 1
-			path: src/Database/Designer/Common.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given\\.$#"
 			count: 2
diff --git a/resources/templates/database/designer/database_tables.twig b/resources/templates/database/designer/database_tables.twig
index 8521ce1ab7..a5ff03a078 100644
--- a/resources/templates/database/designer/database_tables.twig
+++ b/resources/templates/database/designer/database_tables.twig
@@ -70,12 +70,14 @@
                     designerTable.getTableName()|escape('url'),
                     tab_column[t_n][j].name|url_encode
                 ] %}
-                {% if not designerTable.supportsForeignkeys() %}
-                    {% set click_field_param = click_field_param|merge([tables_pk_or_unique_keys[tmp_column] is defined ? 1 : 0]) %}
-                {% else %}
-                    {# if foreign keys are supported, it's not necessary that the
-                    index is a primary key #}
-                    {% set click_field_param = click_field_param|merge([tables_all_keys[tmp_column] is defined ? 1 : 0]) %}
+                {% if tables_all_keys[tmp_column] is defined %}
+                    {% if not designerTable.supportsForeignkeys() %}
+                        {% set click_field_param = click_field_param|merge([tables_all_keys[tmp_column] ? 1 : 0]) %}
+                    {% else %}
+                        {# if foreign keys are supported, it's not necessary that the
+                        index is a primary key #}
+                        {% set click_field_param = click_field_param|merge([1]) %}
+                    {% endif %}
                 {% endif %}
                 {% set click_field_param = click_field_param|merge([db]) %}
                 <tr id="id_tr_{{ designerTable.getTableName()|escape('url') }}.{{ tab_column[t_n][j].name }}" class="tab_field
diff --git a/resources/templates/database/designer/main.twig b/resources/templates/database/designer/main.twig
index c8a9c028e3..fc016f83f1 100644
--- a/resources/templates/database/designer/main.twig
+++ b/resources/templates/database/designer/main.twig
@@ -238,7 +238,6 @@ window.designerConfig = {{ designer_config|raw }};
             'display_page': display_page,
             'tab_column': tab_column,
             'tables_all_keys': tables_all_keys,
-            'tables_pk_or_unique_keys': tables_pk_or_unique_keys,
             'columns_type': columns_type,
             'tables': designerTables,
         } only %}
diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php
index 563b2b7662..854e1ddf61 100644
--- a/src/Controllers/Database/DesignerController.php
+++ b/src/Controllers/Database/DesignerController.php
@@ -62,13 +62,12 @@ class DesignerController extends AbstractController
                 $scriptDisplayField = $this->designerCommon->getTablesInfo($db, $table);
                 $tableColumn = $this->designerCommon->getColumnsInfo($scriptDisplayField);
                 $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
-                $tablesPkOrUniqueKeys = $this->designerCommon->getPkOrUniqueKeys($scriptDisplayField);
 
                 $GLOBALS['text_dir'] ??= null;
 
-                $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesPkOrUniqueKeys);
+                $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesAllKeys);
 
-                $html =  $this->template->render('database/designer/database_tables', [
+                $html = $this->template->render('database/designer/database_tables', [
                     'db' => Current::$database,
                     'text_dir' => $GLOBALS['text_dir'],
                     'has_query' => isset($_REQUEST['query']),
@@ -76,7 +75,6 @@ class DesignerController extends AbstractController
                     'display_page' => -1,
                     'tab_column' => $tableColumn,
                     'tables_all_keys' => $tablesAllKeys,
-                    'tables_pk_or_unique_keys' => $tablesPkOrUniqueKeys,
                     'tables' => $scriptDisplayField,
                     'columns_type' => $columnsType,
                 ]);
@@ -217,7 +215,6 @@ class DesignerController extends AbstractController
 
         $tableColumn = $this->designerCommon->getColumnsInfo($scriptDisplayField);
         $scriptTables = $this->designerCommon->getScriptTabs($scriptDisplayField);
-        $tablesPkOrUniqueKeys = $this->designerCommon->getPkOrUniqueKeys($scriptDisplayField);
         $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
         $classesSideMenu = $this->databaseDesigner->returnClassNamesFromMenuButtons();
 
@@ -245,7 +242,6 @@ class DesignerController extends AbstractController
                 $tablePositions,
                 $tableColumn,
                 $tablesAllKeys,
-                $tablesPkOrUniqueKeys,
             ),
         );
 
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index ac9e0d019f..5c94bf5931 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -213,19 +213,18 @@ class Designer
     /**
      * Returns HTML for Designer page
      *
-     * @param string             $db                   database in use
-     * @param string             $getDb                database in url
-     * @param DesignerTable[]    $designerTables       The designer tables
-     * @param mixed[]            $scriptTables         array on foreign key support for each table
-     * @param mixed[]            $scriptContr          initialization data array
-     * @param int                $displayPage          page number of the selected page
-     * @param bool               $visualBuilderMode    whether this is visual query builder
-     * @param string|null        $selectedPage         name of the selected page
-     * @param mixed[]            $paramsArray          array with class name for various buttons on side menu
-     * @param mixed[]            $tablePositions       table positions
-     * @param list<ColumnInfo>[] $tableColumnsInfo     table column info
-     * @param mixed[]            $tablesAllKeys        all indices
-     * @param mixed[]            $tablesPkOrUniqueKeys unique or primary indices
+     * @param string              $db                database in use
+     * @param string              $getDb             database in url
+     * @param DesignerTable[]     $designerTables    The designer tables
+     * @param mixed[]             $scriptTables      array on foreign key support for each table
+     * @param mixed[]             $scriptContr       initialization data array
+     * @param int                 $displayPage       page number of the selected page
+     * @param bool                $visualBuilderMode whether this is visual query builder
+     * @param string|null         $selectedPage      name of the selected page
+     * @param mixed[]             $paramsArray       array with class name for various buttons on side menu
+     * @param mixed[]             $tablePositions    table positions
+     * @param list<ColumnInfo>[]  $tableColumnsInfo  table column info
+     * @param array<string, bool> $tablesAllKeys     all indices
      *
      * @return string html
      */
@@ -242,12 +241,11 @@ class Designer
         array $tablePositions,
         array $tableColumnsInfo,
         array $tablesAllKeys,
-        array $tablesPkOrUniqueKeys,
     ): string {
         $GLOBALS['text_dir'] ??= null;
 
         $relationParameters = $this->relation->getRelationParameters();
-        $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesPkOrUniqueKeys);
+        $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesAllKeys);
 
         $displayedFields = [];
         foreach ($designerTables as $designerTable) {
@@ -280,25 +278,24 @@ class Designer
             'tab_pos' => $tablePositions,
             'tab_column' => $tableColumnsInfo,
             'tables_all_keys' => $tablesAllKeys,
-            'tables_pk_or_unique_keys' => $tablesPkOrUniqueKeys,
             'designerTables' => $designerTables,
             'columns_type' => $columnsType,
         ]);
     }
 
     /**
-     * @param list<ColumnInfo>[] $tableColumnsInfo     table column info
-     * @param mixed[]            $tablesPkOrUniqueKeys unique or primary indices
+     * @param list<ColumnInfo>[]  $tableColumnsInfo table column info
+     * @param array<string, bool> $tablesAllKeys    unique or primary indices
      *
      * @return array<string, string>
      */
-    public function getColumnTypes(array $tableColumnsInfo, array $tablesPkOrUniqueKeys): array
+    public function getColumnTypes(array $tableColumnsInfo, array $tablesAllKeys): array
     {
         $columnsType = [];
         foreach ($tableColumnsInfo as $tableName => $columnsInfo) {
             foreach ($columnsInfo as $columnInfo) {
                 $tableColumnName = $tableName . '.' . $columnInfo->name;
-                if (isset($tablesPkOrUniqueKeys[$tableColumnName])) {
+                if (isset($tablesAllKeys[$tableColumnName]) && $tablesAllKeys[$tableColumnName]) {
                     $columnsType[$tableColumnName] = 'designer/FieldKey_small';
                 } else {
                     $columnsType[$tableColumnName] = 'designer/Field_small';
diff --git a/src/Database/Designer/Common.php b/src/Database/Designer/Common.php
index 89dedd1819..b663cba687 100644
--- a/src/Database/Designer/Common.php
+++ b/src/Database/Designer/Common.php
@@ -175,27 +175,14 @@ class Common
         return $retval;
     }
 
-    /**
-     * Returns UNIQUE and PRIMARY indices
-     *
-     * @param DesignerTable[] $designerTables The designer tables
-     *
-     * @return mixed[] unique or primary indices
-     */
-    public function getPkOrUniqueKeys(array $designerTables): array
-    {
-        return $this->getAllKeys($designerTables, true);
-    }
-
     /**
      * Returns all indices
      *
      * @param DesignerTable[] $designerTables The designer tables
-     * @param bool            $uniqueOnly     whether to include only unique ones
      *
-     * @return mixed[] indices
+     * @return array<string, bool>
      */
-    public function getAllKeys(array $designerTables, bool $uniqueOnly = false): array
+    public function getAllKeys(array $designerTables): array
     {
         $keys = [];
 
@@ -203,13 +190,9 @@ class Common
             $schema = $designerTable->getDatabaseName();
             // for now, take into account only the first index segment
             foreach (Index::getFromTable($this->dbi, $designerTable->getTableName(), $schema) as $index) {
-                if ($uniqueOnly && ! $index->isUnique()) {
-                    continue;
-                }
-
                 $columns = $index->getColumns();
                 foreach (array_keys($columns) as $columnName) {
-                    $keys[$schema . '.' . $designerTable->getTableName() . '.' . $columnName] = 1;
+                    $keys[$schema . '.' . $designerTable->getTableName() . '.' . $columnName] = ! $index->getNonUnique();
                 }
             }
         }

From 5f222ec29da1c100e6f5f7d85eafdf7d1fbe46c1 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Mon, 18 Dec 2023 23:50:44 +0100
Subject: [PATCH 08/11] Extract getDesignerConfig method

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 src/Database/Designer.php | 54 ++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index 5c94bf5931..a1362e4bfc 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -244,26 +244,9 @@ class Designer
     ): string {
         $GLOBALS['text_dir'] ??= null;
 
-        $relationParameters = $this->relation->getRelationParameters();
         $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesAllKeys);
 
-        $displayedFields = [];
-        foreach ($designerTables as $designerTable) {
-            if ($designerTable->getDisplayField() === null) {
-                continue;
-            }
-
-            $displayedFields[$designerTable->getTableName()] = $designerTable->getDisplayField();
-        }
-
-        $designerConfig = new stdClass();
-        $designerConfig->db = $db;
-        $designerConfig->scriptTables = $scriptTables;
-        $designerConfig->scriptContr = $scriptContr;
-        $designerConfig->server = $GLOBALS['server'];
-        $designerConfig->scriptDisplayField = $displayedFields;
-        $designerConfig->displayPage = $displayPage;
-        $designerConfig->tablesEnabled = $relationParameters->pdfFeature !== null;
+        $designerConfig = $this->getDesignerConfig($db, $designerTables, $scriptTables, $scriptContr, $displayPage);
 
         return $this->template->render('database/designer/main', [
             'db' => $db,
@@ -324,4 +307,39 @@ class Designer
 
         return $columnsType;
     }
+
+    /**
+     * @param DesignerTable[] $designerTables The designer tables
+     * @param mixed[]         $scriptTables   array on foreign key support for each table
+     * @param mixed[]         $scriptContr    initialization data array
+     */
+    private function getDesignerConfig(
+        string $db,
+        array $designerTables,
+        array $scriptTables,
+        array $scriptContr,
+        int $displayPage,
+    ): stdClass {
+        $relationParameters = $this->relation->getRelationParameters();
+
+        $displayedFields = [];
+        foreach ($designerTables as $designerTable) {
+            if ($designerTable->getDisplayField() === null) {
+                continue;
+            }
+
+            $displayedFields[$designerTable->getTableName()] = $designerTable->getDisplayField();
+        }
+
+        $designerConfig = new stdClass();
+        $designerConfig->db = $db;
+        $designerConfig->scriptTables = $scriptTables;
+        $designerConfig->scriptContr = $scriptContr;
+        $designerConfig->server = $GLOBALS['server'];
+        $designerConfig->scriptDisplayField = $displayedFields;
+        $designerConfig->displayPage = $displayPage;
+        $designerConfig->tablesEnabled = $relationParameters->pdfFeature !== null;
+
+        return $designerConfig;
+    }
 }

From 2709d1c6f862ee6bb58546beeff2f63b0925221c Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 19 Dec 2023 00:03:43 +0100
Subject: [PATCH 09/11] Inline controller method

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon                         | 10 ++--
 .../Database/DesignerController.php           | 48 +++++++++------
 src/Database/Designer.php                     | 60 +------------------
 3 files changed, 36 insertions(+), 82 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 2c8dd278a2..45627f2554 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1645,6 +1645,11 @@ parameters:
 			count: 1
 			path: src/Controllers/Database/DesignerController.php
 
+		-
+			message: "#^Parameter \\#1 \\$db of static method PhpMyAdmin\\\\Url\\:\\:getHiddenInputs\\(\\) expects array\\|string, mixed given\\.$#"
+			count: 1
+			path: src/Controllers/Database/DesignerController.php
+
 		-
 			message: "#^Parameter \\#1 \\$index of method PhpMyAdmin\\\\Database\\\\Designer\\\\Common\\:\\:saveSetting\\(\\) expects string, mixed given\\.$#"
 			count: 1
@@ -1705,11 +1710,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Database/DesignerController.php
 
-		-
-			message: "#^Parameter \\#2 \\$getDb of method PhpMyAdmin\\\\Database\\\\Designer\\:\\:getHtmlForMain\\(\\) expects string, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Database/DesignerController.php
-
 		-
 			message: "#^Parameter \\#2 \\$table of method PhpMyAdmin\\\\Database\\\\Designer\\\\Common\\:\\:getTablesInfo\\(\\) expects string\\|null, mixed given\\.$#"
 			count: 2
diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php
index 854e1ddf61..639420304e 100644
--- a/src/Controllers/Database/DesignerController.php
+++ b/src/Controllers/Database/DesignerController.php
@@ -21,6 +21,7 @@ use PhpMyAdmin\Util;
 use function __;
 use function htmlspecialchars;
 use function in_array;
+use function json_encode;
 use function sprintf;
 
 class DesignerController extends AbstractController
@@ -39,6 +40,7 @@ class DesignerController extends AbstractController
     {
         $GLOBALS['message'] ??= null;
         $GLOBALS['errorUrl'] ??= null;
+        $GLOBALS['text_dir'] ??= null;
 
         $db = $request->getParsedBodyParam('db');
         $table = $request->getParsedBodyParam('table');
@@ -63,8 +65,6 @@ class DesignerController extends AbstractController
                 $tableColumn = $this->designerCommon->getColumnsInfo($scriptDisplayField);
                 $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
 
-                $GLOBALS['text_dir'] ??= null;
-
                 $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesAllKeys);
 
                 $html = $this->template->render('database/designer/database_tables', [
@@ -226,24 +226,36 @@ class DesignerController extends AbstractController
 
         $this->addScriptFiles(['designer/init.js']);
 
+        $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesAllKeys);
+
+        $designerConfig = $this->databaseDesigner->getDesignerConfig(
+            Current::$database,
+            $scriptDisplayField,
+            $scriptTables,
+            $scriptContr,
+            $displayPage,
+        );
+
+        $mainHtml = $this->template->render('database/designer/main', [
+            'db' => Current::$database,
+            'text_dir' => $GLOBALS['text_dir'],
+            'hidden_input_fields' => Url::getHiddenInputs($request->getQueryParam('db')),
+            'designer_config' => json_encode($designerConfig),
+            'display_page' => $displayPage,
+            'has_query' => $visualBuilderMode,
+            'visual_builder' => $visualBuilderMode,
+            'selected_page' => $selectedPage,
+            'params_array' => $classesSideMenu,
+            'tab_pos' => $tablePositions,
+            'tab_column' => $tableColumn,
+            'tables_all_keys' => $tablesAllKeys,
+            'designerTables' => $scriptDisplayField,
+            'columns_type' => $columnsType,
+        ]);
+
         // Embed some data into HTML, later it will be read
         // by designer/init.js and converted to JS variables.
-        $this->response->addHTML(
-            $this->databaseDesigner->getHtmlForMain(
-                Current::$database,
-                $request->getQueryParam('db'),
-                $scriptDisplayField,
-                $scriptTables,
-                $scriptContr,
-                $displayPage,
-                $visualBuilderMode,
-                $selectedPage,
-                $classesSideMenu,
-                $tablePositions,
-                $tableColumn,
-                $tablesAllKeys,
-            ),
-        );
+        $this->response->addHTML($mainHtml);
 
         $this->response->addHTML('<div id="PMA_disable_floating_menubar"></div>');
     }
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index a1362e4bfc..a5d2bd19ff 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins;
 use PhpMyAdmin\Template;
-use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
 use stdClass;
 
@@ -20,7 +19,6 @@ use function __;
 use function intval;
 use function is_array;
 use function json_decode;
-use function json_encode;
 use function str_contains;
 
 /**
@@ -210,62 +208,6 @@ class Designer
         return $classesArray;
     }
 
-    /**
-     * Returns HTML for Designer page
-     *
-     * @param string              $db                database in use
-     * @param string              $getDb             database in url
-     * @param DesignerTable[]     $designerTables    The designer tables
-     * @param mixed[]             $scriptTables      array on foreign key support for each table
-     * @param mixed[]             $scriptContr       initialization data array
-     * @param int                 $displayPage       page number of the selected page
-     * @param bool                $visualBuilderMode whether this is visual query builder
-     * @param string|null         $selectedPage      name of the selected page
-     * @param mixed[]             $paramsArray       array with class name for various buttons on side menu
-     * @param mixed[]             $tablePositions    table positions
-     * @param list<ColumnInfo>[]  $tableColumnsInfo  table column info
-     * @param array<string, bool> $tablesAllKeys     all indices
-     *
-     * @return string html
-     */
-    public function getHtmlForMain(
-        string $db,
-        string $getDb,
-        array $designerTables,
-        array $scriptTables,
-        array $scriptContr,
-        int $displayPage,
-        bool $visualBuilderMode,
-        string|null $selectedPage,
-        array $paramsArray,
-        array $tablePositions,
-        array $tableColumnsInfo,
-        array $tablesAllKeys,
-    ): string {
-        $GLOBALS['text_dir'] ??= null;
-
-        $columnsType = $this->getColumnTypes($tableColumnsInfo, $tablesAllKeys);
-
-        $designerConfig = $this->getDesignerConfig($db, $designerTables, $scriptTables, $scriptContr, $displayPage);
-
-        return $this->template->render('database/designer/main', [
-            'db' => $db,
-            'text_dir' => $GLOBALS['text_dir'],
-            'hidden_input_fields' => Url::getHiddenInputs($getDb),
-            'designer_config' => json_encode($designerConfig),
-            'display_page' => $displayPage,
-            'has_query' => $visualBuilderMode,
-            'visual_builder' => $visualBuilderMode,
-            'selected_page' => $selectedPage,
-            'params_array' => $paramsArray,
-            'tab_pos' => $tablePositions,
-            'tab_column' => $tableColumnsInfo,
-            'tables_all_keys' => $tablesAllKeys,
-            'designerTables' => $designerTables,
-            'columns_type' => $columnsType,
-        ]);
-    }
-
     /**
      * @param list<ColumnInfo>[]  $tableColumnsInfo table column info
      * @param array<string, bool> $tablesAllKeys    unique or primary indices
@@ -313,7 +255,7 @@ class Designer
      * @param mixed[]         $scriptTables   array on foreign key support for each table
      * @param mixed[]         $scriptContr    initialization data array
      */
-    private function getDesignerConfig(
+    public function getDesignerConfig(
         string $db,
         array $designerTables,
         array $scriptTables,

From a1726bc6d7d0fdde1377977ed4651ac1ef9d61d7 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 19 Dec 2023 00:19:18 +0100
Subject: [PATCH 10/11] Shorten code

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 .../Database/DesignerController.php           |  2 -
 src/Database/Designer.php                     | 48 ++++---------------
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/Controllers/Database/DesignerController.php b/src/Controllers/Database/DesignerController.php
index 639420304e..541430f35c 100644
--- a/src/Controllers/Database/DesignerController.php
+++ b/src/Controllers/Database/DesignerController.php
@@ -64,7 +64,6 @@ class DesignerController extends AbstractController
                 $scriptDisplayField = $this->designerCommon->getTablesInfo($db, $table);
                 $tableColumn = $this->designerCommon->getColumnsInfo($scriptDisplayField);
                 $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
-
                 $columnsType = $this->databaseDesigner->getColumnTypes($tableColumn, $tablesAllKeys);
 
                 $html = $this->template->render('database/designer/database_tables', [
@@ -217,7 +216,6 @@ class DesignerController extends AbstractController
         $scriptTables = $this->designerCommon->getScriptTabs($scriptDisplayField);
         $tablesAllKeys = $this->designerCommon->getAllKeys($scriptDisplayField);
         $classesSideMenu = $this->databaseDesigner->returnClassNamesFromMenuButtons();
-
         $scriptContr = $this->designerCommon->getScriptContr($scriptDisplayField);
 
         $this->response->setMinimalFooter();
diff --git a/src/Database/Designer.php b/src/Database/Designer.php
index a5d2bd19ff..0caf3cbd3a 100644
--- a/src/Database/Designer.php
+++ b/src/Database/Designer.php
@@ -166,46 +166,18 @@ class Designer
      */
     public function returnClassNamesFromMenuButtons(): array
     {
-        $classesArray = [];
         $paramsArray = $this->getSideMenuParamsArray();
+        $selectedButton = 'M_butt_Selected_down';
+        $normalButton = 'M_butt';
 
-        if (isset($paramsArray['angular_direct']) && $paramsArray['angular_direct'] === 'angular') {
-            $classesArray['angular_direct'] = 'M_butt_Selected_down';
-        } else {
-            $classesArray['angular_direct'] = 'M_butt';
-        }
-
-        if (isset($paramsArray['snap_to_grid']) && $paramsArray['snap_to_grid'] === 'on') {
-            $classesArray['snap_to_grid'] = 'M_butt_Selected_down';
-        } else {
-            $classesArray['snap_to_grid'] = 'M_butt';
-        }
-
-        if (isset($paramsArray['pin_text']) && $paramsArray['pin_text'] === 'true') {
-            $classesArray['pin_text'] = 'M_butt_Selected_down';
-        } else {
-            $classesArray['pin_text'] = 'M_butt';
-        }
-
-        if (isset($paramsArray['relation_lines']) && $paramsArray['relation_lines'] === 'false') {
-            $classesArray['relation_lines'] = 'M_butt_Selected_down';
-        } else {
-            $classesArray['relation_lines'] = 'M_butt';
-        }
-
-        if (isset($paramsArray['small_big_all']) && $paramsArray['small_big_all'] === 'v') {
-            $classesArray['small_big_all'] = 'M_butt_Selected_down';
-        } else {
-            $classesArray['small_big_all'] = 'M_butt';
-        }
-
-        if (isset($paramsArray['side_menu']) && $paramsArray['side_menu'] === 'true') {
-            $classesArray['side_menu'] = 'M_butt_Selected_down';
-        } else {
-            $classesArray['side_menu'] = 'M_butt';
-        }
-
-        return $classesArray;
+        return [
+            'angular_direct' => ($paramsArray['angular_direct'] ?? '') === 'angular' ? $selectedButton : $normalButton,
+            'snap_to_grid' => ($paramsArray['snap_to_grid'] ?? '') === 'on' ? $selectedButton : $normalButton,
+            'pin_text' => ($paramsArray['pin_text'] ?? '') === 'true' ? $selectedButton : $normalButton,
+            'relation_lines' => ($paramsArray['relation_lines'] ?? '') === 'false' ? $selectedButton : $normalButton,
+            'small_big_all' => ($paramsArray['small_big_all'] ?? '') === 'v' ? $selectedButton : $normalButton,
+            'side_menu' => ($paramsArray['side_menu'] ?? '') === 'true' ? $selectedButton : $normalButton,
+        ];
     }
 
     /**

From f6cc11693372363638edbd90c1e8f437c6910433 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 19 Dec 2023 00:34:09 +0100
Subject: [PATCH 11/11] Shorten line

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 src/Database/Designer/Common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Database/Designer/Common.php b/src/Database/Designer/Common.php
index b663cba687..cddebc72ab 100644
--- a/src/Database/Designer/Common.php
+++ b/src/Database/Designer/Common.php
@@ -192,7 +192,8 @@ class Common
             foreach (Index::getFromTable($this->dbi, $designerTable->getTableName(), $schema) as $index) {
                 $columns = $index->getColumns();
                 foreach (array_keys($columns) as $columnName) {
-                    $keys[$schema . '.' . $designerTable->getTableName() . '.' . $columnName] = ! $index->getNonUnique();
+                    $key = $schema . '.' . $designerTable->getTableName() . '.' . $columnName;
+                    $keys[$key] = ! $index->getNonUnique();
                 }
             }
         }