diff options
author | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-05-30 07:42:21 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-05-30 07:42:21 +0300 |
commit | b9c0463d960494cbfe0f04b3159c5ff4a467c446 (patch) | |
tree | 9fe17f2cc230558fbff7a76b9386600ac37d0e8e /libraries/config.values.php | |
parent | 93bf3d0d1739ec3b15d0e0317ee18b222c58c462 (diff) |
Use short array syntax instead of long array syntax
Replaces array() with [].
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'libraries/config.values.php')
-rw-r--r-- | libraries/config.values.php | 184 |
1 files changed, 92 insertions, 92 deletions
diff --git a/libraries/config.values.php b/libraries/config.values.php index 5e0bad93a8..39b99cd050 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -19,191 +19,191 @@ if (!defined('PHPMYADMIN')) { * * Use normal array, paths won't be expanded */ -$cfg_db = array(); +$cfg_db = []; -$cfg_db['Servers'] = array( - 1 => array( +$cfg_db['Servers'] = [ + 1 => [ 'port' => 'integer', - 'auth_type' => array('config', 'http', 'signon', 'cookie'), - 'AllowDeny' => array( - 'order' => array('', 'deny,allow', 'allow,deny', 'explicit') - ), + 'auth_type' => ['config', 'http', 'signon', 'cookie'], + 'AllowDeny' => [ + 'order' => ['', 'deny,allow', 'allow,deny', 'explicit'] + ], 'only_db' => 'array' - ) -); -$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode', 'mb', 'none'); -$cfg_db['OBGzip'] = array('auto', true, false); + ] +]; +$cfg_db['RecodingEngine'] = ['auto', 'iconv', 'recode', 'mb', 'none']; +$cfg_db['OBGzip'] = ['auto', true, false]; $cfg_db['MemoryLimit'] = 'short_string'; -$cfg_db['NavigationLogoLinkWindow'] = array('main', 'new'); -$cfg_db['NavigationTreeDefaultTabTable'] = array( +$cfg_db['NavigationLogoLinkWindow'] = ['main', 'new']; +$cfg_db['NavigationTreeDefaultTabTable'] = [ 'structure' => __('Structure'), // fields list 'sql' => __('SQL'), // SQL form 'search' => __('Search'), // search page 'insert' => __('Insert'), // insert row page 'browse' => __('Browse') // browse page -); -$cfg_db['NavigationTreeDefaultTabTable2'] = array( +]; +$cfg_db['NavigationTreeDefaultTabTable2'] = [ '' => '', //don't display 'structure' => __('Structure'), // fields list 'sql' => __('SQL'), // SQL form 'search' => __('Search'), // search page 'insert' => __('Insert'), // insert row page 'browse' => __('Browse') // browse page -); +]; $cfg_db['NavigationTreeDbSeparator'] = 'short_string'; $cfg_db['NavigationTreeTableSeparator'] = 'short_string'; $cfg_db['NavigationWidth'] = 'integer'; -$cfg_db['TableNavigationLinksMode'] = array( +$cfg_db['TableNavigationLinksMode'] = [ 'icons' => __('Icons'), 'text' => __('Text'), 'both' => __('Both') -); -$cfg_db['MaxRows'] = array(25, 50, 100, 250, 500); -$cfg_db['Order'] = array('ASC', 'DESC', 'SMART'); -$cfg_db['RowActionLinks'] = array( +]; +$cfg_db['MaxRows'] = [25, 50, 100, 250, 500]; +$cfg_db['Order'] = ['ASC', 'DESC', 'SMART']; +$cfg_db['RowActionLinks'] = [ 'none' => __('Nowhere'), 'left' => __('Left'), 'right' => __('Right'), 'both' => __('Both') -); -$cfg_db['TablePrimaryKeyOrder'] = array( +]; +$cfg_db['TablePrimaryKeyOrder'] = [ 'NONE' => __('None'), 'ASC' => __('Ascending'), 'DESC' => __('Descending') -); -$cfg_db['ProtectBinary'] = array(false, 'blob', 'noblob', 'all'); -$cfg_db['CharEditing'] = array('input', 'textarea'); -$cfg_db['TabsMode'] = array( +]; +$cfg_db['ProtectBinary'] = [false, 'blob', 'noblob', 'all']; +$cfg_db['CharEditing'] = ['input', 'textarea']; +$cfg_db['TabsMode'] = [ 'icons' => __('Icons'), 'text' => __('Text'), 'both' => __('Both') -); -$cfg_db['PDFDefaultPageSize'] = array( +]; +$cfg_db['PDFDefaultPageSize'] = [ 'A3' => 'A3', 'A4' => 'A4', 'A5' => 'A5', 'letter' => 'letter', 'legal' => 'legal' -); -$cfg_db['ActionLinksMode'] = array( +]; +$cfg_db['ActionLinksMode'] = [ 'icons' => __('Icons'), 'text' => __('Text'), 'both' => __('Both') -); -$cfg_db['GridEditing'] = array( +]; +$cfg_db['GridEditing'] = [ 'click' => __('Click'), 'double-click' => __('Double click'), 'disabled' => __('Disabled'), -); -$cfg_db['RelationalDisplay'] = array( +]; +$cfg_db['RelationalDisplay'] = [ 'K' => __('key'), 'D' => __('display column') -); -$cfg_db['DefaultTabServer'] = array( +]; +$cfg_db['DefaultTabServer'] = [ // the welcome page (recommended for multiuser setups) 'welcome' => __('Welcome'), 'databases' => __('Databases'), // list of databases 'status' => __('Status'), // runtime information 'variables' => __('Variables'), // MySQL server variables 'privileges' => __('Privileges') // user management -); -$cfg_db['DefaultTabDatabase'] = array( +]; +$cfg_db['DefaultTabDatabase'] = [ 'structure' => __('Structure'), // tables list 'sql' => __('SQL'), // SQL form 'search' => __('Search'), // search query 'operations' => __('Operations') // operations on database -); -$cfg_db['DefaultTabTable'] = array( +]; +$cfg_db['DefaultTabTable'] = [ 'structure' => __('Structure'), // fields list 'sql' => __('SQL'), // SQL form 'search' => __('Search'), // search page 'insert' => __('Insert'), // insert row page 'browse' => __('Browse') // browse page -); -$cfg_db['InitialSlidersState'] = array( +]; +$cfg_db['InitialSlidersState'] = [ 'open' => __('Open'), 'closed' => __('Closed'), 'disabled' => __('Disabled') -); -$cfg_db['SendErrorReports'] = array( +]; +$cfg_db['SendErrorReports'] = [ 'ask' => __('Ask before sending error reports'), 'always' => __('Always send error reports'), 'never' => __('Never send error reports') -); -$cfg_db['DefaultForeignKeyChecks'] = array( +]; +$cfg_db['DefaultForeignKeyChecks'] = [ 'default' => __('Server default'), 'enable' => __('Enable'), 'disable' => __('Disable') -); -$cfg_db['Import']['format'] = array( +]; +$cfg_db['Import']['format'] = [ 'csv', // CSV 'docsql', // DocSQL 'ldi', // CSV using LOAD DATA 'sql' // SQL -); +]; $cfg_db['Import']['charset'] = array_merge( - array(''), + [''], $GLOBALS['cfg']['AvailableCharsets'] ); $cfg_db['Import']['sql_compatibility'] - = $cfg_db['Export']['sql_compatibility'] = array( + = $cfg_db['Export']['sql_compatibility'] = [ 'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE', // removed; in MySQL 5.0.33, this produces exports that // can't be read by POSTGRESQL (see our bug #1596328) //'POSTGRESQL', 'TRADITIONAL' - ); + ]; $cfg_db['Import']['csv_terminated'] = 'short_string'; $cfg_db['Import']['csv_enclosed'] = 'short_string'; $cfg_db['Import']['csv_escaped'] = 'short_string'; $cfg_db['Import']['ldi_terminated'] = 'short_string'; $cfg_db['Import']['ldi_enclosed'] = 'short_string'; $cfg_db['Import']['ldi_escaped'] = 'short_string'; -$cfg_db['Import']['ldi_local_option'] = array('auto', true, false); -$cfg_db['Export']['_sod_select'] = array( +$cfg_db['Import']['ldi_local_option'] = ['auto', true, false]; +$cfg_db['Export']['_sod_select'] = [ 'structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data') -); -$cfg_db['Export']['method'] = array( +]; +$cfg_db['Export']['method'] = [ 'quick' => __('Quick - display only the minimal options to configure'), 'custom' => __('Custom - display all possible options to configure'), 'custom-no-form' => __( 'Custom - like above, but without the quick/custom choice' ), -); -$cfg_db['Export']['format'] = array( +]; +$cfg_db['Export']['format'] = [ 'codegen', 'csv', 'excel', 'htmlexcel','htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xml', 'yaml' -); -$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip'); +]; +$cfg_db['Export']['compression'] = ['none', 'zip', 'gzip']; $cfg_db['Export']['charset'] = array_merge( - array(''), + [''], $GLOBALS['cfg']['AvailableCharsets'] ); -$cfg_db['Export']['codegen_format'] = array( +$cfg_db['Export']['codegen_format'] = [ '#', 'NHibernate C# DO', 'NHibernate XML' -); +]; $cfg_db['Export']['csv_separator'] = 'short_string'; $cfg_db['Export']['csv_terminated'] = 'short_string'; $cfg_db['Export']['csv_enclosed'] = 'short_string'; $cfg_db['Export']['csv_escaped'] = 'short_string'; $cfg_db['Export']['csv_null'] = 'short_string'; $cfg_db['Export']['excel_null'] = 'short_string'; -$cfg_db['Export']['excel_edition'] = array( +$cfg_db['Export']['excel_edition'] = [ 'win' => 'Windows', 'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh' -); +]; $cfg_db['Export']['sql_structure_or_data'] = $cfg_db['Export']['_sod_select']; -$cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE'); -$cfg_db['Export']['sql_insert_syntax'] = array( +$cfg_db['Export']['sql_type'] = ['INSERT', 'UPDATE', 'REPLACE']; +$cfg_db['Export']['sql_insert_syntax'] = [ 'complete' => __('complete inserts'), 'extended' => __('extended inserts'), 'both' => __('both of the above'), 'none' => __('neither of the above') -); +]; $cfg_db['Export']['htmlword_structure_or_data'] = $cfg_db['Export']['_sod_select']; $cfg_db['Export']['htmlword_null'] = 'short_string'; $cfg_db['Export']['ods_null'] = 'short_string'; @@ -212,9 +212,9 @@ $cfg_db['Export']['odt_structure_or_data'] = $cfg_db['Export']['_sod_select']; $cfg_db['Export']['texytext_structure_or_data'] = $cfg_db['Export']['_sod_select']; $cfg_db['Export']['texytext_null'] = 'short_string'; -$cfg_db['Console']['Mode'] = array( +$cfg_db['Console']['Mode'] = [ 'info', 'show', 'collapse' -); +]; $cfg_db['Console']['Height'] = 'integer'; $cfg_db['Console']['OrderBy'] = ['exec', 'time', 'count']; $cfg_db['Console']['Order'] = ['asc', 'desc']; @@ -223,26 +223,26 @@ $cfg_db['Console']['Order'] = ['asc', 'desc']; * Default values overrides * Use only full paths */ -$cfg_db['_overrides'] = array(); +$cfg_db['_overrides'] = []; /** * Basic validator assignments (functions from libraries/config/Validator.php * and 'validators' object in js/config.js) * Use only full paths and form ids */ -$cfg_db['_validators'] = array( +$cfg_db['_validators'] = [ 'CharTextareaCols' => 'validatePositiveNumber', 'CharTextareaRows' => 'validatePositiveNumber', 'ExecTimeLimit' => 'validateNonNegativeNumber', 'Export/sql_max_query_size' => 'validatePositiveNumber', 'FirstLevelNavigationItems' => 'validatePositiveNumber', 'ForeignKeyMaxLimit' => 'validatePositiveNumber', - 'Import/csv_enclosed' => array(array('validateByRegex', '/^.?$/')), - 'Import/csv_escaped' => array(array('validateByRegex', '/^.$/')), - 'Import/csv_terminated' => array(array('validateByRegex', '/^.$/')), - 'Import/ldi_enclosed' => array(array('validateByRegex', '/^.?$/')), - 'Import/ldi_escaped' => array(array('validateByRegex', '/^.$/')), - 'Import/ldi_terminated' => array(array('validateByRegex', '/^.$/')), + 'Import/csv_enclosed' => [['validateByRegex', '/^.?$/']], + 'Import/csv_escaped' => [['validateByRegex', '/^.$/']], + 'Import/csv_terminated' => [['validateByRegex', '/^.$/']], + 'Import/ldi_enclosed' => [['validateByRegex', '/^.?$/']], + 'Import/ldi_escaped' => [['validateByRegex', '/^.$/']], + 'Import/ldi_terminated' => [['validateByRegex', '/^.$/']], 'Import/skip_queries' => 'validateNonNegativeNumber', 'InsertRows' => 'validatePositiveNumber', 'NumRecentTables' => 'validateNonNegativeNumber', @@ -255,7 +255,7 @@ $cfg_db['_validators'] = array( 'MaxCharactersInDisplayedSQL' => 'validatePositiveNumber', 'MaxRows' => 'validatePositiveNumber', 'MaxTableList' => 'validatePositiveNumber', - 'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')), + 'MemoryLimit' => [['validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i']], 'NavigationTreeTableLevel' => 'validatePositiveNumber', 'NavigationWidth' => 'validateNonNegativeNumber', 'QueryHistoryMax' => 'validatePositiveNumber', @@ -266,19 +266,19 @@ $cfg_db['_validators'] = array( 'Servers/1/hide_db' => 'validateRegex', 'TextareaCols' => 'validatePositiveNumber', 'TextareaRows' => 'validatePositiveNumber', - 'TrustedProxies' => 'validateTrustedProxies'); + 'TrustedProxies' => 'validateTrustedProxies']; /** * Additional validators used for user preferences */ -$cfg_db['_userValidators'] = array( - 'MaxDbList' => array( - array('validateUpperBound', 'value:MaxDbList') - ), - 'MaxTableList' => array( - array('validateUpperBound', 'value:MaxTableList') - ), - 'QueryHistoryMax' => array( - array('validateUpperBound', 'value:QueryHistoryMax') - ) -); +$cfg_db['_userValidators'] = [ + 'MaxDbList' => [ + ['validateUpperBound', 'value:MaxDbList'] + ], + 'MaxTableList' => [ + ['validateUpperBound', 'value:MaxTableList'] + ], + 'QueryHistoryMax' => [ + ['validateUpperBound', 'value:QueryHistoryMax'] + ] +]; |