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

Move getColumnTitle() out of $column

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-05-15 13:12:38 +01:00
parent 719bc91797
commit 919bf36460
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/InsertEdit.php
View File

@ -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),
]);
}

5
phpstan-baseline.neon
View File

@ -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

2
psalm-baseline.xml
View File

@ -7611,6 +7611,7 @@
<code><![CDATA[$column['Extra']]]></code>
<code><![CDATA[$column['Field']]]></code>
<code><![CDATA[$column['Field']]]></code>
<code><![CDATA[$column['Field']]]></code>
<code><![CDATA[$column['True_Type']]]></code>
<code><![CDATA[$column['True_Type']]]></code>
<code><![CDATA[$column['True_Type']]]></code>
@ -14303,7 +14304,6 @@
<MixedArrayAccess>
<code><![CDATA[$result['Field']]]></code>
<code><![CDATA[$result['Field_md5']]]></code>
<code><![CDATA[$result['Field_title']]]></code>
<code><![CDATA[$result['True_Type']]]></code>
<code><![CDATA[$result['is_binary']]]></code>
<code><![CDATA[$result['is_blob']]]></code>

2
templates/table/insert/column_row.twig
View File

@ -1,6 +1,6 @@
<tr class="noclick">
<td class="text-center">
{{ column.Field_title|raw }}
{{ field_title|raw }}
<input type="hidden" name="fields_name[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="{{ column.Field }}">
</td>

2
test/classes/InsertEditTest.php
View File

@ -429,8 +429,6 @@ class InsertEditTest extends AbstractTestCase
$this->assertEquals($result['len'], 100);
$this->assertEquals($result['Field_title'], '1&lt;2');
$this->assertEquals($result['is_binary'], false);
$this->assertEquals($result['is_blob'], false);