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

Rename Config\Settings\Server properties to use camel case

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-05-02 15:50:59 -03:00
parent 2f4dab8880
commit 1921a8bb1d
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 259 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Common.php
View File

@ -561,7 +561,7 @@ final class Common
* user but the true user link must be open after this one, so it would be default one for all the scripts).
*/
$controlConnection = null;
if ($currentServer->controluser !== '') {
if ($currentServer->controlUser !== '') {
$controlConnection = $dbi->connect(Connection::TYPE_CONTROL);
}

362
libraries/classes/Config/Settings/Server.php
View File

@ -8,8 +8,6 @@ use function count;
use function in_array;
use function is_array;
// phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
/** @psalm-immutable */
final class Server
{
@ -66,7 +64,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_ssl_key
*/
public string|null $ssl_key = null;
public string|null $sslKey = null;
/**
* Path to the cert file when using SSL for connecting to the MySQL server
@ -77,7 +75,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_ssl_cert
*/
public string|null $ssl_cert = null;
public string|null $sslCert = null;
/**
* Path to the CA file when using SSL for connecting to the MySQL server
@ -88,7 +86,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_ssl_ca
*/
public string|null $ssl_ca = null;
public string|null $sslCa = null;
/**
* Directory containing trusted SSL CA certificates in PEM format
@ -99,7 +97,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_ssl_ca_path
*/
public string|null $ssl_ca_path = null;
public string|null $sslCaPath = null;
/**
* List of allowable ciphers for SSL connections to the MySQL server
@ -110,7 +108,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_ssl_ciphers
*/
public string|null $ssl_ciphers = null;
public string|null $sslCiphers = null;
/**
* MySQL 5.6 or later triggers the mysqlnd driver in PHP to validate the
@ -125,7 +123,7 @@ final class Server
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_ssl_verify
* @see https://bugs.php.net/68344
*/
public bool $ssl_verify;
public bool $sslVerify;
/**
* Use compressed protocol for the MySQL connection
@ -149,7 +147,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_controlhost
*/
public string $controlhost;
public string $controlHost;
/**
* MySQL control port. This permits to use a port different from the
@ -162,7 +160,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_controlport
*/
public string $controlport;
public string $controlPort;
/**
* MySQL control user settings (this user must have read-only
@ -175,7 +173,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_controluser
*/
public string $controluser;
public string $controlUser;
/**
* MySQL control user settings (this user must have read-only
@ -188,68 +186,68 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_controlpass
*/
public string $controlpass;
public string $controlPass;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$socket
*/
public string $control_socket;
public string $controlSocket;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl
*/
public bool $control_ssl;
public bool $controlSsl;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl_key
* @see self::$sslKey
*/
public string|null $control_ssl_key = null;
public string|null $controlSslKey = null;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl_cert
* @see self::$sslCert
*/
public string|null $control_ssl_cert = null;
public string|null $controlSslCert = null;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl_ca
* @see self::$sslCa
*/
public string|null $control_ssl_ca = null;
public string|null $controlSslCa = null;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl_ca_path
* @see self::$sslCaPath
*/
public string|null $control_ssl_ca_path = null;
public string|null $controlSslCaPath = null;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl_ciphers
* @see self::$sslCiphers
*/
public string|null $control_ssl_ciphers = null;
public string|null $controlSslCiphers = null;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$ssl_verify
* @see self::$sslVerify
* @see https://bugs.php.net/68344
*/
public bool $control_ssl_verify;
public bool $controlSslVerify;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$compress
*/
public bool $control_compress;
public bool $controlCompress;
/**
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*
* @see self::$hide_connection_errors
* @see self::$hideConnectionErrors
*/
public bool $control_hide_connection_errors;
public bool $controlHideConnectionErrors;
/**
* Authentication method (valid choices: config, http, signon or cookie)
@ -262,7 +260,7 @@ final class Server
*
* @psalm-var 'config'|'http'|'signon'|'cookie'
*/
public string $auth_type;
public string $authType;
/**
* HTTP Basic Auth Realm name to display (only used with 'HTTP' auth_type)
@ -273,7 +271,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_auth_http_realm
*/
public string $auth_http_realm;
public string $authHttpRealm;
/**
* MySQL user
@ -306,7 +304,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_SignonSession
*/
public string $SignonSession;
public string $signonSession;
/**
* Cookie params to match session to use for 'signon' authentication method
@ -323,7 +321,7 @@ final class Server
* lifetime: 0|positive-int, path: string, domain: string, secure: bool, httponly: bool, samesite?: 'Lax'|'Strict'
* }
*/
public array $SignonCookieParams;
public array $signonCookieParams;
/**
* PHP script to use for 'signon' authentication method
@ -334,7 +332,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_SignonScript
*/
public string $SignonScript;
public string $signonScript;
/**
* URL where to redirect user to login for 'signon' authentication method
@ -345,7 +343,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_SignonURL
*/
public string $SignonURL;
public string $signonUrl;
/**
* URL where to redirect user after logout
@ -356,7 +354,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_LogoutURL
*/
public string $LogoutURL;
public string $logoutUrl;
/**
* If set to a db-name, only this db is displayed in navigation panel
@ -370,7 +368,7 @@ final class Server
*
* @var string|string[]
*/
public string|array $only_db;
public string|array $onlyDb;
/**
* Database name to be hidden from listings
@ -381,7 +379,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_hide_db
*/
public string $hide_db;
public string $hideDb;
/**
* Verbose name for this host - leave blank to show the hostname
@ -407,7 +405,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_pmadb
*/
public string $pmadb;
public string $pmaDb;
/**
* Bookmark table
@ -420,7 +418,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_bookmarktable
*/
public string|false $bookmarktable;
public string|false $bookmarkTable;
/**
* table to describe the relation between links (see doc)
@ -446,7 +444,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_table_info
*/
public string|false $table_info;
public string|false $tableInfo;
/**
* table to describe the tables position for the designer and PDF schema
@ -459,7 +457,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_table_coords
*/
public string|false $table_coords;
public string|false $tableCoords;
/**
* table to describe pages of relationpdf
@ -472,7 +470,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_pdf_pages
*/
public string|false $pdf_pages;
public string|false $pdfPages;
/**
* table to store column information
@ -485,7 +483,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_column_info
*/
public string|false $column_info;
public string|false $columnInfo;
/**
* table to store SQL history
@ -537,7 +535,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_table_uiprefs
*/
public string|false $table_uiprefs;
public string|false $tableUiPrefs;
/**
* table to store SQL tracking
@ -563,7 +561,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_userconfig
*/
public string|false $userconfig;
public string|false $userConfig;
/**
* table to store users and their assignment to user groups
@ -589,7 +587,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_usergroups
*/
public string|false $usergroups;
public string|false $userGroups;
/**
* table to store information about item hidden from navigation tree
@ -602,7 +600,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_navigationhiding
*/
public string|false $navigationhiding;
public string|false $navigationHiding;
/**
* table to store information about saved searches from query-by-example on a db
@ -615,7 +613,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_savedsearches
*/
public string|false $savedsearches;
public string|false $savedSearches;
/**
* table to store central list of columns per database
@ -628,7 +626,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_central_columns
*/
public string|false $central_columns;
public string|false $centralColumns;
/**
* table to store designer settings
@ -641,7 +639,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_designer_settings
*/
public string|false $designer_settings;
public string|false $designerSettings;
/**
* table to store export templates
@ -654,7 +652,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_export_templates
*/
public string|false $export_templates;
public string|false $exportTemplates;
/**
* Maximum number of records saved in $cfg['Servers'][$i]['table_uiprefs'] table.
@ -673,7 +671,7 @@ final class Server
*
* @psalm-var positive-int
*/
public int $MaxTableUiprefs;
public int $maxTableUiPrefs;
/**
* Sets the time zone used by phpMyAdmin. Possible values are explained at
@ -685,7 +683,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_SessionTimeZone
*/
public string $SessionTimeZone;
public string $sessionTimeZone;
/**
* whether to allow root login
@ -696,7 +694,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_AllowRoot
*/
public bool $AllowRoot;
public bool $allowRoot;
/**
* whether to allow login of any user without a password
@ -707,7 +705,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_AllowNoPassword
*/
public bool $AllowNoPassword;
public bool $allowNoPassword;
/**
* Host authentication
@ -726,7 +724,7 @@ final class Server
* @var array<string, string|string[]>
* @psalm-var array{order: ''|'deny,allow'|'allow,deny'|'explicit', rules: string[]}
*/
public array $AllowDeny;
public array $allowDeny;
/**
* Disable use of INFORMATION_SCHEMA.
@ -739,7 +737,7 @@ final class Server
* @see https://github.com/phpmyadmin/phpmyadmin/issues/8970
* @see https://bugs.mysql.com/19588
*/
public bool $DisableIS;
public bool $disableIS;
/**
* Whether the tracking mechanism creates
@ -751,7 +749,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_tracking_version_auto_create
*/
public bool $tracking_version_auto_create;
public bool $trackingVersionAutoCreate;
/**
* Defines the list of statements
@ -765,7 +763,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_tracking_default_statements
*/
public string $tracking_default_statements;
public string $trackingDefaultStatements;
/**
* Whether a DROP VIEW IF EXISTS statement will be added
@ -777,7 +775,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_tracking_add_drop_view
*/
public bool $tracking_add_drop_view;
public bool $trackingAddDropView;
/**
* Whether a DROP TABLE IF EXISTS statement will be added
@ -789,7 +787,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_tracking_add_drop_table
*/
public bool $tracking_add_drop_table;
public bool $trackingAddDropTable;
/**
* Whether a DROP DATABASE IF EXISTS statement will be added
@ -801,7 +799,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_tracking_add_drop_database
*/
public bool $tracking_add_drop_database;
public bool $trackingAddDropDatabase;
/**
* Whether to show or hide detailed MySQL/MariaDB connection errors on the login page.
@ -812,7 +810,7 @@ final class Server
*
* @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_hide_connection_errors
*/
public bool $hide_connection_errors;
public bool $hideConnectionErrors;
/** @param array<int|string, mixed> $server */
public function __construct(array $server = [])
@ -821,71 +819,71 @@ final class Server
$this->port = $this->setPort($server);
$this->socket = $this->setSocket($server);
$this->ssl = $this->setSsl($server);
$this->ssl_key = $this->setSslKey($server);
$this->ssl_cert = $this->setSslCert($server);
$this->ssl_ca = $this->setSslCa($server);
$this->ssl_ca_path = $this->setSslCaPath($server);
$this->ssl_ciphers = $this->setSslCiphers($server);
$this->ssl_verify = $this->setSslVerify($server);
$this->sslKey = $this->setSslKey($server);
$this->sslCert = $this->setSslCert($server);
$this->sslCa = $this->setSslCa($server);
$this->sslCaPath = $this->setSslCaPath($server);
$this->sslCiphers = $this->setSslCiphers($server);
$this->sslVerify = $this->setSslVerify($server);
$this->compress = $this->setCompress($server);
$this->controlhost = $this->setControlHost($server);
$this->controlport = $this->setControlPort($server);
$this->controluser = $this->setControlUser($server);
$this->controlpass = $this->setControlPass($server);
$this->control_socket = $this->setControlSocket($server);
$this->control_ssl = $this->setControlSsl($server);
$this->control_ssl_key = $this->setControlSslKey($server);
$this->control_ssl_cert = $this->setControlSslCert($server);
$this->control_ssl_ca = $this->setControlSslCa($server);
$this->control_ssl_ca_path = $this->setControlSslCaPath($server);
$this->control_ssl_ciphers = $this->setControlSslCiphers($server);
$this->control_ssl_verify = $this->setControlSslVerify($server);
$this->control_compress = $this->setControlCompress($server);
$this->control_hide_connection_errors = $this->setControlHideConnectionErrors($server);
$this->auth_type = $this->setAuthType($server);
$this->auth_http_realm = $this->setAuthHttpRealm($server);
$this->controlHost = $this->setControlHost($server);
$this->controlPort = $this->setControlPort($server);
$this->controlUser = $this->setControlUser($server);
$this->controlPass = $this->setControlPass($server);
$this->controlSocket = $this->setControlSocket($server);
$this->controlSsl = $this->setControlSsl($server);
$this->controlSslKey = $this->setControlSslKey($server);
$this->controlSslCert = $this->setControlSslCert($server);
$this->controlSslCa = $this->setControlSslCa($server);
$this->controlSslCaPath = $this->setControlSslCaPath($server);
$this->controlSslCiphers = $this->setControlSslCiphers($server);
$this->controlSslVerify = $this->setControlSslVerify($server);
$this->controlCompress = $this->setControlCompress($server);
$this->controlHideConnectionErrors = $this->setControlHideConnectionErrors($server);
$this->authType = $this->setAuthType($server);
$this->authHttpRealm = $this->setAuthHttpRealm($server);
$this->user = $this->setUser($server);
$this->password = $this->setPassword($server);
$this->SignonSession = $this->setSignonSession($server);
$this->SignonCookieParams = $this->setSignonCookieParams($server);
$this->SignonScript = $this->setSignonScript($server);
$this->SignonURL = $this->setSignonUrl($server);
$this->LogoutURL = $this->setLogoutUrl($server);
$this->only_db = $this->setOnlyDb($server);
$this->hide_db = $this->setHideDb($server);
$this->signonSession = $this->setSignonSession($server);
$this->signonCookieParams = $this->setSignonCookieParams($server);
$this->signonScript = $this->setSignonScript($server);
$this->signonUrl = $this->setSignonUrl($server);
$this->logoutUrl = $this->setLogoutUrl($server);
$this->onlyDb = $this->setOnlyDb($server);
$this->hideDb = $this->setHideDb($server);
$this->verbose = $this->setVerbose($server);
$this->pmadb = $this->setPmadb($server);
$this->bookmarktable = $this->setBookmarktable($server);
$this->pmaDb = $this->setPmaDb($server);
$this->bookmarkTable = $this->setBookmarkTable($server);
$this->relation = $this->setRelation($server);
$this->table_info = $this->setTableInfo($server);
$this->table_coords = $this->setTableCoords($server);
$this->pdf_pages = $this->setPdfPages($server);
$this->column_info = $this->setColumnInfo($server);
$this->tableInfo = $this->setTableInfo($server);
$this->tableCoords = $this->setTableCoords($server);
$this->pdfPages = $this->setPdfPages($server);
$this->columnInfo = $this->setColumnInfo($server);
$this->history = $this->setHistory($server);
$this->recent = $this->setRecent($server);
$this->favorite = $this->setFavorite($server);
$this->table_uiprefs = $this->setTableUiprefs($server);
$this->tableUiPrefs = $this->setTableUiPrefs($server);
$this->tracking = $this->setTracking($server);
$this->userconfig = $this->setUserconfig($server);
$this->userConfig = $this->setUserConfig($server);
$this->users = $this->setUsers($server);
$this->usergroups = $this->setUsergroups($server);
$this->navigationhiding = $this->setNavigationhiding($server);
$this->savedsearches = $this->setSavedsearches($server);
$this->central_columns = $this->setCentralColumns($server);
$this->designer_settings = $this->setDesignerSettings($server);
$this->export_templates = $this->setExportTemplates($server);
$this->MaxTableUiprefs = $this->setMaxTableUiprefs($server);
$this->SessionTimeZone = $this->setSessionTimeZone($server);
$this->AllowRoot = $this->setAllowRoot($server);
$this->AllowNoPassword = $this->setAllowNoPassword($server);
$this->AllowDeny = $this->setAllowDeny($server);
$this->DisableIS = $this->setDisableIs($server);
$this->tracking_version_auto_create = $this->setTrackingVersionAutoCreate($server);
$this->tracking_default_statements = $this->setTrackingDefaultStatements($server);
$this->tracking_add_drop_view = $this->setTrackingAddDropView($server);
$this->tracking_add_drop_table = $this->setTrackingAddDropTable($server);
$this->tracking_add_drop_database = $this->setTrackingAddDropDatabase($server);
$this->hide_connection_errors = $this->setHideConnectionErrors($server);
$this->userGroups = $this->setUserGroups($server);
$this->navigationHiding = $this->setNavigationHiding($server);
$this->savedSearches = $this->setSavedSearches($server);
$this->centralColumns = $this->setCentralColumns($server);
$this->designerSettings = $this->setDesignerSettings($server);
$this->exportTemplates = $this->setExportTemplates($server);
$this->maxTableUiPrefs = $this->setMaxTableUiPrefs($server);
$this->sessionTimeZone = $this->setSessionTimeZone($server);
$this->allowRoot = $this->setAllowRoot($server);
$this->allowNoPassword = $this->setAllowNoPassword($server);
$this->allowDeny = $this->setAllowDeny($server);
$this->disableIS = $this->setDisableIs($server);
$this->trackingVersionAutoCreate = $this->setTrackingVersionAutoCreate($server);
$this->trackingDefaultStatements = $this->setTrackingDefaultStatements($server);
$this->trackingAddDropView = $this->setTrackingAddDropView($server);
$this->trackingAddDropTable = $this->setTrackingAddDropTable($server);
$this->trackingAddDropDatabase = $this->setTrackingAddDropDatabase($server);
$this->hideConnectionErrors = $this->setHideConnectionErrors($server);
}
/** @return array<string, string|bool|int|array<mixed>|null> */
@ -896,71 +894,71 @@ final class Server
'port' => $this->port,
'socket' => $this->socket,
'ssl' => $this->ssl,
'ssl_key' => $this->ssl_key,
'ssl_cert' => $this->ssl_cert,
'ssl_ca' => $this->ssl_ca,
'ssl_ca_path' => $this->ssl_ca_path,
'ssl_ciphers' => $this->ssl_ciphers,
'ssl_verify' => $this->ssl_verify,
'ssl_key' => $this->sslKey,
'ssl_cert' => $this->sslCert,
'ssl_ca' => $this->sslCa,
'ssl_ca_path' => $this->sslCaPath,
'ssl_ciphers' => $this->sslCiphers,
'ssl_verify' => $this->sslVerify,
'compress' => $this->compress,
'controlhost' => $this->controlhost,
'controlport' => $this->controlport,
'controluser' => $this->controluser,
'controlpass' => $this->controlpass,
'control_socket' => $this->control_socket,
'control_ssl' => $this->control_ssl,
'control_ssl_key' => $this->control_ssl_key,
'control_ssl_cert' => $this->control_ssl_cert,
'control_ssl_ca' => $this->control_ssl_ca,
'control_ssl_ca_path' => $this->control_ssl_ca_path,
'control_ssl_ciphers' => $this->control_ssl_ciphers,
'control_ssl_verify' => $this->control_ssl_verify,
'control_compress' => $this->control_compress,
'control_hide_connection_errors' => $this->control_hide_connection_errors,
'auth_type' => $this->auth_type,
'auth_http_realm' => $this->auth_http_realm,
'controlhost' => $this->controlHost,
'controlport' => $this->controlPort,
'controluser' => $this->controlUser,
'controlpass' => $this->controlPass,
'control_socket' => $this->controlSocket,
'control_ssl' => $this->controlSsl,
'control_ssl_key' => $this->controlSslKey,
'control_ssl_cert' => $this->controlSslCert,
'control_ssl_ca' => $this->controlSslCa,
'control_ssl_ca_path' => $this->controlSslCaPath,
'control_ssl_ciphers' => $this->controlSslCiphers,
'control_ssl_verify' => $this->controlSslVerify,
'control_compress' => $this->controlCompress,
'control_hide_connection_errors' => $this->controlHideConnectionErrors,
'auth_type' => $this->authType,
'auth_http_realm' => $this->authHttpRealm,
'user' => $this->user,
'password' => $this->password,
'SignonSession' => $this->SignonSession,
'SignonCookieParams' => $this->SignonCookieParams,
'SignonScript' => $this->SignonScript,
'SignonURL' => $this->SignonURL,
'LogoutURL' => $this->LogoutURL,
'only_db' => $this->only_db,
'hide_db' => $this->hide_db,
'SignonSession' => $this->signonSession,
'SignonCookieParams' => $this->signonCookieParams,
'SignonScript' => $this->signonScript,
'SignonURL' => $this->signonUrl,
'LogoutURL' => $this->logoutUrl,
'only_db' => $this->onlyDb,
'hide_db' => $this->hideDb,
'verbose' => $this->verbose,
'pmadb' => $this->pmadb,
'bookmarktable' => $this->bookmarktable,
'pmadb' => $this->pmaDb,
'bookmarktable' => $this->bookmarkTable,
'relation' => $this->relation,
'table_info' => $this->table_info,
'table_coords' => $this->table_coords,
'pdf_pages' => $this->pdf_pages,
'column_info' => $this->column_info,
'table_info' => $this->tableInfo,
'table_coords' => $this->tableCoords,
'pdf_pages' => $this->pdfPages,
'column_info' => $this->columnInfo,
'history' => $this->history,
'recent' => $this->recent,
'favorite' => $this->favorite,
'table_uiprefs' => $this->table_uiprefs,
'table_uiprefs' => $this->tableUiPrefs,
'tracking' => $this->tracking,
'userconfig' => $this->userconfig,
'userconfig' => $this->userConfig,
'users' => $this->users,
'usergroups' => $this->usergroups,
'navigationhiding' => $this->navigationhiding,
'savedsearches' => $this->savedsearches,
'central_columns' => $this->central_columns,
'designer_settings' => $this->designer_settings,
'export_templates' => $this->export_templates,
'MaxTableUiprefs' => $this->MaxTableUiprefs,
'SessionTimeZone' => $this->SessionTimeZone,
'AllowRoot' => $this->AllowRoot,
'AllowNoPassword' => $this->AllowNoPassword,
'AllowDeny' => $this->AllowDeny,
'DisableIS' => $this->DisableIS,
'tracking_version_auto_create' => $this->tracking_version_auto_create,
'tracking_default_statements' => $this->tracking_default_statements,
'tracking_add_drop_view' => $this->tracking_add_drop_view,
'tracking_add_drop_table' => $this->tracking_add_drop_table,
'tracking_add_drop_database' => $this->tracking_add_drop_database,
'hide_connection_errors' => $this->hide_connection_errors,
'usergroups' => $this->userGroups,
'navigationhiding' => $this->navigationHiding,
'savedsearches' => $this->savedSearches,
'central_columns' => $this->centralColumns,
'designer_settings' => $this->designerSettings,
'export_templates' => $this->exportTemplates,
'MaxTableUiprefs' => $this->maxTableUiPrefs,
'SessionTimeZone' => $this->sessionTimeZone,
'AllowRoot' => $this->allowRoot,
'AllowNoPassword' => $this->allowNoPassword,
'AllowDeny' => $this->allowDeny,
'DisableIS' => $this->disableIS,
'tracking_version_auto_create' => $this->trackingVersionAutoCreate,
'tracking_default_statements' => $this->trackingDefaultStatements,
'tracking_add_drop_view' => $this->trackingAddDropView,
'tracking_add_drop_table' => $this->trackingAddDropTable,
'tracking_add_drop_database' => $this->trackingAddDropDatabase,
'hide_connection_errors' => $this->hideConnectionErrors,
];
}
@ -1417,7 +1415,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setPmadb(array $server): string
private function setPmaDb(array $server): string
{
if (isset($server['pmadb'])) {
return (string) $server['pmadb'];
@ -1427,7 +1425,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setBookmarktable(array $server): false|string
private function setBookmarkTable(array $server): false|string
{
if (isset($server['bookmarktable'])) {
return $server['bookmarktable'] === false ? false : (string) $server['bookmarktable'];
@ -1517,7 +1515,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setTableUiprefs(array $server): false|string
private function setTableUiPrefs(array $server): false|string
{
if (isset($server['table_uiprefs'])) {
return $server['table_uiprefs'] === false ? false : (string) $server['table_uiprefs'];
@ -1537,7 +1535,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setUserconfig(array $server): false|string
private function setUserConfig(array $server): false|string
{
if (isset($server['userconfig'])) {
return $server['userconfig'] === false ? false : (string) $server['userconfig'];
@ -1557,7 +1555,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setUsergroups(array $server): false|string
private function setUserGroups(array $server): false|string
{
if (isset($server['usergroups'])) {
return $server['usergroups'] === false ? false : (string) $server['usergroups'];
@ -1567,7 +1565,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setNavigationhiding(array $server): false|string
private function setNavigationHiding(array $server): false|string
{
if (isset($server['navigationhiding'])) {
return $server['navigationhiding'] === false
@ -1579,7 +1577,7 @@ final class Server
}
/** @param array<int|string, mixed> $server */
private function setSavedsearches(array $server): false|string
private function setSavedSearches(array $server): false|string
{
if (isset($server['savedsearches'])) {
return $server['savedsearches'] === false ? false : (string) $server['savedsearches'];
@ -1627,7 +1625,7 @@ final class Server
*
* @psalm-return positive-int
*/
private function setMaxTableUiprefs(array $server): int
private function setMaxTableUiPrefs(array $server): int
{
if (isset($server['MaxTableUiprefs'])) {
$maxTableUiprefs = (int) $server['MaxTableUiprefs'];

31
libraries/classes/Dbal/DbiMysqli.php
View File

@ -57,23 +57,22 @@ class DbiMysqli implements DbiExtension
$clientFlags |= MYSQLI_CLIENT_COMPRESS;
}
// phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
/* Optionally enable SSL */
if ($server->ssl) {
$clientFlags |= MYSQLI_CLIENT_SSL;
if (
$server->ssl_key !== null && $server->ssl_key !== '' ||
$server->ssl_cert !== null && $server->ssl_cert !== '' ||
$server->ssl_ca !== null && $server->ssl_ca !== '' ||
$server->ssl_ca_path !== null && $server->ssl_ca_path !== '' ||
$server->ssl_ciphers !== null && $server->ssl_ciphers !== ''
$server->sslKey !== null && $server->sslKey !== '' ||
$server->sslCert !== null && $server->sslCert !== '' ||
$server->sslCa !== null && $server->sslCa !== '' ||
$server->sslCaPath !== null && $server->sslCaPath !== '' ||
$server->sslCiphers !== null && $server->sslCiphers !== ''
) {
$mysqli->ssl_set(
$server->ssl_key ?? '',
$server->ssl_cert ?? '',
$server->ssl_ca ?? '',
$server->ssl_ca_path ?? '',
$server->ssl_ciphers ?? '',
$server->sslKey ?? '',
$server->sslCert ?? '',
$server->sslCa ?? '',
$server->sslCaPath ?? '',
$server->sslCiphers ?? '',
);
}
@ -83,8 +82,8 @@ class DbiMysqli implements DbiExtension
* @link https://bugs.php.net/bug.php?id=68344
* @link https://github.com/phpmyadmin/phpmyadmin/pull/11838
*/
if (! $server->ssl_verify) {
$mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, (int) $server->ssl_verify);
if (! $server->sslVerify) {
$mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, (int) $server->sslVerify);
$clientFlags |= MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
}
}
@ -106,7 +105,9 @@ class DbiMysqli implements DbiExtension
* - #2001 - SSL Connection is required. Please specify SSL options and retry.
* - #9002 - SSL connection is required. Please specify SSL options and retry.
*/
// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$errorNumber = $mysqli->connect_errno;
// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$errorMessage = $mysqli->connect_error;
if (
! $server->ssl
@ -122,7 +123,7 @@ class DbiMysqli implements DbiExtension
return self::connect($user, $password, $server->withSSL(true));
}
if ($errorNumber === 1045 && $server->hide_connection_errors) {
if ($errorNumber === 1045 && $server->hideConnectionErrors) {
trigger_error(
sprintf(
__(
@ -143,8 +144,6 @@ class DbiMysqli implements DbiExtension
return null;
}
// phpcs:enable
$mysqli->options(MYSQLI_OPT_LOCAL_INFILE, (int) defined('PMA_ENABLE_LDI'));
mysqli_report(MYSQLI_REPORT_OFF);

128
test/classes/Config/Settings/ServerTest.php
View File

@ -7,8 +7,6 @@ namespace PhpMyAdmin\Tests\Config\Settings;
use PhpMyAdmin\Config\Settings\Server;
use PHPUnit\Framework\TestCase;
// phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
/** @covers \PhpMyAdmin\Config\Settings\Server */
class ServerTest extends TestCase
{
@ -93,7 +91,7 @@ class ServerTest extends TestCase
{
$server = new Server(['ssl_key' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->ssl_key);
$this->assertSame($expected, $server->sslKey);
$this->assertArrayHasKey('ssl_key', $serverArray);
$this->assertSame($expected, $serverArray['ssl_key']);
}
@ -112,7 +110,7 @@ class ServerTest extends TestCase
{
$server = new Server(['ssl_cert' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->ssl_cert);
$this->assertSame($expected, $server->sslCert);
$this->assertArrayHasKey('ssl_cert', $serverArray);
$this->assertSame($expected, $serverArray['ssl_cert']);
}
@ -122,7 +120,7 @@ class ServerTest extends TestCase
{
$server = new Server(['ssl_ca' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->ssl_ca);
$this->assertSame($expected, $server->sslCa);
$this->assertArrayHasKey('ssl_ca', $serverArray);
$this->assertSame($expected, $serverArray['ssl_ca']);
}
@ -132,7 +130,7 @@ class ServerTest extends TestCase
{
$server = new Server(['ssl_ca_path' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->ssl_ca_path);
$this->assertSame($expected, $server->sslCaPath);
$this->assertArrayHasKey('ssl_ca_path', $serverArray);
$this->assertSame($expected, $serverArray['ssl_ca_path']);
}
@ -142,7 +140,7 @@ class ServerTest extends TestCase
{
$server = new Server(['ssl_ciphers' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->ssl_ciphers);
$this->assertSame($expected, $server->sslCiphers);
$this->assertArrayHasKey('ssl_ciphers', $serverArray);
$this->assertSame($expected, $serverArray['ssl_ciphers']);
}
@ -152,7 +150,7 @@ class ServerTest extends TestCase
{
$server = new Server(['ssl_verify' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->ssl_verify);
$this->assertSame($expected, $server->sslVerify);
$this->assertArrayHasKey('ssl_verify', $serverArray);
$this->assertSame($expected, $serverArray['ssl_verify']);
}
@ -181,7 +179,7 @@ class ServerTest extends TestCase
{
$server = new Server(['controlhost' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlhost);
$this->assertSame($expected, $server->controlHost);
$this->assertArrayHasKey('controlhost', $serverArray);
$this->assertSame($expected, $serverArray['controlhost']);
}
@ -191,7 +189,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_host' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlhost);
$this->assertSame($expected, $server->controlHost);
$this->assertArrayHasKey('controlhost', $serverArray);
$this->assertSame($expected, $serverArray['controlhost']);
}
@ -210,7 +208,7 @@ class ServerTest extends TestCase
{
$server = new Server(['controlport' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlport);
$this->assertSame($expected, $server->controlPort);
$this->assertArrayHasKey('controlport', $serverArray);
$this->assertSame($expected, $serverArray['controlport']);
}
@ -220,7 +218,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_port' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlport);
$this->assertSame($expected, $server->controlPort);
$this->assertArrayHasKey('controlport', $serverArray);
$this->assertSame($expected, $serverArray['controlport']);
}
@ -239,7 +237,7 @@ class ServerTest extends TestCase
{
$server = new Server(['controluser' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controluser);
$this->assertSame($expected, $server->controlUser);
$this->assertArrayHasKey('controluser', $serverArray);
$this->assertSame($expected, $serverArray['controluser']);
}
@ -249,7 +247,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_user' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controluser);
$this->assertSame($expected, $server->controlUser);
$this->assertArrayHasKey('controluser', $serverArray);
$this->assertSame($expected, $serverArray['controluser']);
}
@ -268,7 +266,7 @@ class ServerTest extends TestCase
{
$server = new Server(['controlpass' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlpass);
$this->assertSame($expected, $server->controlPass);
$this->assertArrayHasKey('controlpass', $serverArray);
$this->assertSame($expected, $serverArray['controlpass']);
}
@ -278,7 +276,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_pass' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlpass);
$this->assertSame($expected, $server->controlPass);
$this->assertArrayHasKey('controlpass', $serverArray);
$this->assertSame($expected, $serverArray['controlpass']);
}
@ -288,7 +286,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_password' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->controlpass);
$this->assertSame($expected, $server->controlPass);
$this->assertArrayHasKey('controlpass', $serverArray);
$this->assertSame($expected, $serverArray['controlpass']);
}
@ -307,7 +305,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_socket' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_socket);
$this->assertSame($expected, $server->controlSocket);
$this->assertArrayHasKey('control_socket', $serverArray);
$this->assertSame($expected, $serverArray['control_socket']);
}
@ -317,7 +315,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl);
$this->assertSame($expected, $server->controlSsl);
$this->assertArrayHasKey('control_ssl', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl']);
}
@ -327,7 +325,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl_key' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl_key);
$this->assertSame($expected, $server->controlSslKey);
$this->assertArrayHasKey('control_ssl_key', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl_key']);
}
@ -337,7 +335,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl_cert' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl_cert);
$this->assertSame($expected, $server->controlSslCert);
$this->assertArrayHasKey('control_ssl_cert', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl_cert']);
}
@ -347,7 +345,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl_ca' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl_ca);
$this->assertSame($expected, $server->controlSslCa);
$this->assertArrayHasKey('control_ssl_ca', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl_ca']);
}
@ -357,7 +355,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl_ca_path' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl_ca_path);
$this->assertSame($expected, $server->controlSslCaPath);
$this->assertArrayHasKey('control_ssl_ca_path', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl_ca_path']);
}
@ -367,7 +365,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl_ciphers' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl_ciphers);
$this->assertSame($expected, $server->controlSslCiphers);
$this->assertArrayHasKey('control_ssl_ciphers', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl_ciphers']);
}
@ -377,7 +375,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_ssl_verify' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_ssl_verify);
$this->assertSame($expected, $server->controlSslVerify);
$this->assertArrayHasKey('control_ssl_verify', $serverArray);
$this->assertSame($expected, $serverArray['control_ssl_verify']);
}
@ -387,7 +385,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_compress' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_compress);
$this->assertSame($expected, $server->controlCompress);
$this->assertArrayHasKey('control_compress', $serverArray);
$this->assertSame($expected, $serverArray['control_compress']);
}
@ -397,7 +395,7 @@ class ServerTest extends TestCase
{
$server = new Server(['control_hide_connection_errors' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->control_hide_connection_errors);
$this->assertSame($expected, $server->controlHideConnectionErrors);
$this->assertArrayHasKey('control_hide_connection_errors', $serverArray);
$this->assertSame($expected, $serverArray['control_hide_connection_errors']);
}
@ -407,7 +405,7 @@ class ServerTest extends TestCase
{
$server = new Server(['auth_type' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->auth_type);
$this->assertSame($expected, $server->authType);
$this->assertArrayHasKey('auth_type', $serverArray);
$this->assertSame($expected, $serverArray['auth_type']);
}
@ -428,7 +426,7 @@ class ServerTest extends TestCase
{
$server = new Server(['auth_http_realm' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->auth_http_realm);
$this->assertSame($expected, $server->authHttpRealm);
$this->assertArrayHasKey('auth_http_realm', $serverArray);
$this->assertSame($expected, $serverArray['auth_http_realm']);
}
@ -485,7 +483,7 @@ class ServerTest extends TestCase
{
$server = new Server(['SignonSession' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->SignonSession);
$this->assertSame($expected, $server->signonSession);
$this->assertArrayHasKey('SignonSession', $serverArray);
$this->assertSame($expected, $serverArray['SignonSession']);
}
@ -508,7 +506,7 @@ class ServerTest extends TestCase
{
$server = new Server(['SignonCookieParams' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->SignonCookieParams);
$this->assertSame($expected, $server->signonCookieParams);
$this->assertArrayHasKey('SignonCookieParams', $serverArray);
$this->assertSame($expected, $serverArray['SignonCookieParams']);
}
@ -578,7 +576,7 @@ class ServerTest extends TestCase
{
$server = new Server(['SignonScript' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->SignonScript);
$this->assertSame($expected, $server->signonScript);
$this->assertArrayHasKey('SignonScript', $serverArray);
$this->assertSame($expected, $serverArray['SignonScript']);
}
@ -597,7 +595,7 @@ class ServerTest extends TestCase
{
$server = new Server(['SignonURL' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->SignonURL);
$this->assertSame($expected, $server->signonUrl);
$this->assertArrayHasKey('SignonURL', $serverArray);
$this->assertSame($expected, $serverArray['SignonURL']);
}
@ -616,7 +614,7 @@ class ServerTest extends TestCase
{
$server = new Server(['LogoutURL' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->LogoutURL);
$this->assertSame($expected, $server->logoutUrl);
$this->assertArrayHasKey('LogoutURL', $serverArray);
$this->assertSame($expected, $serverArray['LogoutURL']);
}
@ -639,7 +637,7 @@ class ServerTest extends TestCase
{
$server = new Server(['only_db' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->only_db);
$this->assertSame($expected, $server->onlyDb);
$this->assertArrayHasKey('only_db', $serverArray);
$this->assertSame($expected, $serverArray['only_db']);
}
@ -659,7 +657,7 @@ class ServerTest extends TestCase
{
$server = new Server(['hide_db' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->hide_db);
$this->assertSame($expected, $server->hideDb);
$this->assertArrayHasKey('hide_db', $serverArray);
$this->assertSame($expected, $serverArray['hide_db']);
}
@ -697,7 +695,7 @@ class ServerTest extends TestCase
{
$server = new Server(['pmadb' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->pmadb);
$this->assertSame($expected, $server->pmaDb);
$this->assertArrayHasKey('pmadb', $serverArray);
$this->assertSame($expected, $serverArray['pmadb']);
}
@ -716,7 +714,7 @@ class ServerTest extends TestCase
{
$server = new Server(['bookmarktable' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->bookmarktable);
$this->assertSame($expected, $server->bookmarkTable);
$this->assertArrayHasKey('bookmarktable', $serverArray);
$this->assertSame($expected, $serverArray['bookmarktable']);
}
@ -746,7 +744,7 @@ class ServerTest extends TestCase
{
$server = new Server(['table_info' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->table_info);
$this->assertSame($expected, $server->tableInfo);
$this->assertArrayHasKey('table_info', $serverArray);
$this->assertSame($expected, $serverArray['table_info']);
}
@ -756,7 +754,7 @@ class ServerTest extends TestCase
{
$server = new Server(['pdf_pages' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->pdf_pages);
$this->assertSame($expected, $server->pdfPages);
$this->assertArrayHasKey('pdf_pages', $serverArray);
$this->assertSame($expected, $serverArray['pdf_pages']);
}
@ -766,7 +764,7 @@ class ServerTest extends TestCase
{
$server = new Server(['column_info' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->column_info);
$this->assertSame($expected, $server->columnInfo);
$this->assertArrayHasKey('column_info', $serverArray);
$this->assertSame($expected, $serverArray['column_info']);
}
@ -802,11 +800,11 @@ class ServerTest extends TestCase
}
/** @dataProvider valuesForConfigStorageTablesProvider */
public function testTableUiprefs(mixed $actual, string|false $expected): void
public function testTableUiPrefs(mixed $actual, string|false $expected): void
{
$server = new Server(['table_uiprefs' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->table_uiprefs);
$this->assertSame($expected, $server->tableUiPrefs);
$this->assertArrayHasKey('table_uiprefs', $serverArray);
$this->assertSame($expected, $serverArray['table_uiprefs']);
}
@ -826,7 +824,7 @@ class ServerTest extends TestCase
{
$server = new Server(['userconfig' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->userconfig);
$this->assertSame($expected, $server->userConfig);
$this->assertArrayHasKey('userconfig', $serverArray);
$this->assertSame($expected, $serverArray['userconfig']);
}
@ -846,7 +844,7 @@ class ServerTest extends TestCase
{
$server = new Server(['usergroups' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->usergroups);
$this->assertSame($expected, $server->userGroups);
$this->assertArrayHasKey('usergroups', $serverArray);
$this->assertSame($expected, $serverArray['usergroups']);
}
@ -856,7 +854,7 @@ class ServerTest extends TestCase
{
$server = new Server(['navigationhiding' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->navigationhiding);
$this->assertSame($expected, $server->navigationHiding);
$this->assertArrayHasKey('navigationhiding', $serverArray);
$this->assertSame($expected, $serverArray['navigationhiding']);
}
@ -866,7 +864,7 @@ class ServerTest extends TestCase
{
$server = new Server(['savedsearches' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->savedsearches);
$this->assertSame($expected, $server->savedSearches);
$this->assertArrayHasKey('savedsearches', $serverArray);
$this->assertSame($expected, $serverArray['savedsearches']);
}
@ -876,7 +874,7 @@ class ServerTest extends TestCase
{
$server = new Server(['central_columns' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->central_columns);
$this->assertSame($expected, $server->centralColumns);
$this->assertArrayHasKey('central_columns', $serverArray);
$this->assertSame($expected, $serverArray['central_columns']);
}
@ -886,7 +884,7 @@ class ServerTest extends TestCase
{
$server = new Server(['designer_settings' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->designer_settings);
$this->assertSame($expected, $server->designerSettings);
$this->assertArrayHasKey('designer_settings', $serverArray);
$this->assertSame($expected, $serverArray['designer_settings']);
}
@ -896,23 +894,23 @@ class ServerTest extends TestCase
{
$server = new Server(['export_templates' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->export_templates);
$this->assertSame($expected, $server->exportTemplates);
$this->assertArrayHasKey('export_templates', $serverArray);
$this->assertSame($expected, $serverArray['export_templates']);
}
/** @dataProvider valuesForMaxTableUiprefsProvider */
public function testMaxTableUiprefs(mixed $actual, int $expected): void
/** @dataProvider valuesForMaxTableUiPrefsProvider */
public function testMaxTableUiPrefs(mixed $actual, int $expected): void
{
$server = new Server(['MaxTableUiprefs' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->MaxTableUiprefs);
$this->assertSame($expected, $server->maxTableUiPrefs);
$this->assertArrayHasKey('MaxTableUiprefs', $serverArray);
$this->assertSame($expected, $serverArray['MaxTableUiprefs']);
}
/** @return iterable<string, array{mixed, int}> */
public static function valuesForMaxTableUiprefsProvider(): iterable
public static function valuesForMaxTableUiPrefsProvider(): iterable
{
yield 'null value' => [null, 100];
yield 'valid value' => [1, 1];
@ -926,7 +924,7 @@ class ServerTest extends TestCase
{
$server = new Server(['SessionTimeZone' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->SessionTimeZone);
$this->assertSame($expected, $server->sessionTimeZone);
$this->assertArrayHasKey('SessionTimeZone', $serverArray);
$this->assertSame($expected, $serverArray['SessionTimeZone']);
}
@ -945,7 +943,7 @@ class ServerTest extends TestCase
{
$server = new Server(['AllowRoot' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->AllowRoot);
$this->assertSame($expected, $server->allowRoot);
$this->assertArrayHasKey('AllowRoot', $serverArray);
$this->assertSame($expected, $serverArray['AllowRoot']);
}
@ -955,7 +953,7 @@ class ServerTest extends TestCase
{
$server = new Server(['AllowNoPassword' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->AllowNoPassword);
$this->assertSame($expected, $server->allowNoPassword);
$this->assertArrayHasKey('AllowNoPassword', $serverArray);
$this->assertSame($expected, $serverArray['AllowNoPassword']);
}
@ -969,7 +967,7 @@ class ServerTest extends TestCase
{
$server = new Server(['AllowDeny' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->AllowDeny);
$this->assertSame($expected, $server->allowDeny);
$this->assertArrayHasKey('AllowDeny', $serverArray);
$this->assertSame($expected, $serverArray['AllowDeny']);
}
@ -1000,7 +998,7 @@ class ServerTest extends TestCase
{
$server = new Server(['DisableIS' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->DisableIS);
$this->assertSame($expected, $server->disableIS);
$this->assertArrayHasKey('DisableIS', $serverArray);
$this->assertSame($expected, $serverArray['DisableIS']);
}
@ -1010,7 +1008,7 @@ class ServerTest extends TestCase
{
$server = new Server(['tracking_version_auto_create' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->tracking_version_auto_create);
$this->assertSame($expected, $server->trackingVersionAutoCreate);
$this->assertArrayHasKey('tracking_version_auto_create', $serverArray);
$this->assertSame($expected, $serverArray['tracking_version_auto_create']);
}
@ -1020,7 +1018,7 @@ class ServerTest extends TestCase
{
$server = new Server(['tracking_default_statements' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->tracking_default_statements);
$this->assertSame($expected, $server->trackingDefaultStatements);
$this->assertArrayHasKey('tracking_default_statements', $serverArray);
$this->assertSame($expected, $serverArray['tracking_default_statements']);
}
@ -1044,7 +1042,7 @@ class ServerTest extends TestCase
{
$server = new Server(['tracking_add_drop_view' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->tracking_add_drop_view);
$this->assertSame($expected, $server->trackingAddDropView);
$this->assertArrayHasKey('tracking_add_drop_view', $serverArray);
$this->assertSame($expected, $serverArray['tracking_add_drop_view']);
}
@ -1054,7 +1052,7 @@ class ServerTest extends TestCase
{
$server = new Server(['tracking_add_drop_table' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->tracking_add_drop_table);
$this->assertSame($expected, $server->trackingAddDropTable);
$this->assertArrayHasKey('tracking_add_drop_table', $serverArray);
$this->assertSame($expected, $serverArray['tracking_add_drop_table']);
}
@ -1064,7 +1062,7 @@ class ServerTest extends TestCase
{
$server = new Server(['tracking_add_drop_database' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->tracking_add_drop_database);
$this->assertSame($expected, $server->trackingAddDropDatabase);
$this->assertArrayHasKey('tracking_add_drop_database', $serverArray);
$this->assertSame($expected, $serverArray['tracking_add_drop_database']);
}
@ -1074,7 +1072,7 @@ class ServerTest extends TestCase
{
$server = new Server(['hide_connection_errors' => $actual]);
$serverArray = $server->asArray();
$this->assertSame($expected, $server->hide_connection_errors);
$this->assertSame($expected, $server->hideConnectionErrors);
$this->assertArrayHasKey('hide_connection_errors', $serverArray);
$this->assertSame($expected, $serverArray['hide_connection_errors']);
}