Skip to content

Commit ff9df30

Browse files
committed
Merge #19894 - Add missing export format options (json, mediawiki, phparray)
Closes #19894 Fixes #19892 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents ec4c083 + a909bd2 commit ff9df30

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/Config/Settings/Export.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ final class Export
136136
*
137137
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Export_format
138138
*
139-
* @psalm-var 'codegen'|'csv'|'excel'|'htmlword'|'latex'|'ods'|'odt'|'pdf'|'sql'|'texytext'|'xml'|'yaml'
139+
* @psalm-var 'codegen'|'csv'|'excel'|'htmlword'|'json'|'latex'|'mediawiki'|'ods'|'odt'|'pdf'|'phparray'|'sql'|'texytext'|'xml'|'yaml'
140140
*/
141141
public string $format;
142142

@@ -1222,7 +1222,7 @@ public function asArray(): array
12221222
/**
12231223
* @param array<int|string, mixed> $export
12241224
*
1225-
* @psalm-return 'codegen'|'csv'|'excel'|'htmlword'|'latex'|'ods'|'odt'|'pdf'|'sql'|'texytext'|'xml'|'yaml'
1225+
* @psalm-return 'codegen'|'csv'|'excel'|'htmlword'|'json'|'latex'|'mediawiki'|'ods'|'odt'|'pdf'|'phparray'|'sql'|'texytext'|'xml'|'yaml'
12261226
*/
12271227
private function setFormat(array $export): string
12281228
{
@@ -1232,10 +1232,14 @@ private function setFormat(array $export): string
12321232
'csv',
12331233
'excel',
12341234
'htmlword',
1235+
'json',
12351236
'latex',
1237+
'mediawiki',
12361238
'ods',
12371239
'odt',
12381240
'pdf',
1241+
'phparray',
1242+
'sql',
12391243
'texytext',
12401244
'xml',
12411245
'yaml',

0 commit comments

Comments
 (0)