diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index bce3006e36..257a9e298e 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -303,7 +303,6 @@ class InsertEdit * Analyze the table column array * * @param ColumnFull $tableColumn description of column in given table - * @param string[] $commentsMap comments for every column that has a comment * @param int $columnLength length of the current column taken from field metadata * @param bool $insertMode whether insert mode * @@ -311,7 +310,6 @@ class InsertEdit */ private function analyzeTableColumnsArray( ColumnFull $tableColumn, - array $commentsMap, int $columnLength, bool $insertMode, ): array { @@ -336,7 +334,6 @@ class InsertEdit $column['len'] = 30; } - $column['Field_title'] = $this->getColumnTitle($tableColumn->field, $commentsMap); $column['is_binary'] = $this->isColumn( $tableColumn->type, ['binary', 'varbinary'], @@ -1735,7 +1732,7 @@ class InsertEdit array $columnMime, string $whereClause, ): string { - $column = $this->analyzeTableColumnsArray($tableColumn, $commentsMap, $columnLength, $insertMode); + $column = $this->analyzeTableColumnsArray($tableColumn, $columnLength, $insertMode); $asIs = false; /** @var string $fieldHashMd5 */ @@ -2008,6 +2005,7 @@ class InsertEdit 'select_option_for_upload' => $selectOptionForUpload, 'limit_chars' => $GLOBALS['cfg']['LimitChars'], 'input_field_html' => $inputFieldHtml, + 'field_title' => $this->getColumnTitle($column['Field'], $commentsMap), ]); } diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index ea4523a673..61e5488804 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -9180,11 +9180,6 @@ parameters: count: 1 path: test/classes/InsertEditTest.php - - - message: "#^Cannot access offset 'Field_title' on mixed\\.$#" - count: 1 - path: test/classes/InsertEditTest.php - - message: "#^Cannot access offset 'True_Type' on mixed\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 6287095788..e6966b2184 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -7611,6 +7611,7 @@ + @@ -14303,7 +14304,6 @@ - diff --git a/templates/table/insert/column_row.twig b/templates/table/insert/column_row.twig index 75e1351a0c..c9d59aa369 100644 --- a/templates/table/insert/column_row.twig +++ b/templates/table/insert/column_row.twig @@ -1,6 +1,6 @@ - {{ column.Field_title|raw }} + {{ field_title|raw }} diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 1b0a211b31..8ca9fdc7c7 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -429,8 +429,6 @@ class InsertEditTest extends AbstractTestCase $this->assertEquals($result['len'], 100); - $this->assertEquals($result['Field_title'], '1<2'); - $this->assertEquals($result['is_binary'], false); $this->assertEquals($result['is_blob'], false);