gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,619 Commits 12 Branches 481 Tags 2.4 GiB
03cd6b508d
Commit Graph

5172 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
03cd6b508d
Merge pull request #18409 from kamil-tekiela/Property-initialization 
Fix property initializations
 2023-05-12 12:15:54 -03:00
Maurício Meneghini Fauth
77dc78e32b
Merge pull request #18410 from kamil-tekiela/never-type 
Add never type
 2023-05-12 11:21:49 -03:00
Maurício Meneghini Fauth
20d206a705
Merge pull request #18412 from kamil-tekiela/ShortenElseIfRector 
Shorten else/if to elseif
 2023-05-12 11:16:00 -03:00
Kamil Tekiela
dc471985b9
Short boolean conditions (#18413) 
* Short boolean conditions

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Simplify conditions

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-12 11:09:21 -03:00
Kamil Tekiela
c94657bf77 Use empty string as sentinel instead of false 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-12 12:36:55 +01:00
Kamil Tekiela
176645be7b Shorten else/if to elseif 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-12 00:12:58 +01:00
Kamil Tekiela
111640ef36 Add never type 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-11 23:32:35 +01:00
Kamil Tekiela
d5cce547e7 Fix property initializations 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-11 23:25:01 +01:00
Maurício Meneghini Fauth
8bbb1edbea
Remove ThemeManager::getInstance() method 
Remove singleton from the Theme\ThemeManager class and uses DI where
possible.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-09 21:29:49 -03:00
Maurício Meneghini Fauth
3f09bc27c2
Fix color mode not changing for default theme 
Related to https://github.com/phpmyadmin/phpmyadmin/issues/18267

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-09 15:52:11 -03:00
Maurício Meneghini Fauth
a256228264
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-08 17:09:46 -03:00
Maurício Meneghini Fauth
5ed8e65b90
Fix list of users of an user group not showing up 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-08 16:56:47 -03:00
Maurício Meneghini Fauth
86ea50336b
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-07 18:13:26 -03:00
Maurício Meneghini Fauth
6875680de9
Fix double encoding on User Groups pages 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-07 17:52:26 -03:00
Maurício Meneghini Fauth
4331caa676
Add Server class as a param for DatabaseInterface::postConnect() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-07 02:26:34 -03:00
Maurício Meneghini Fauth
196c1d4255
Refactor Config::getConnectionParams() method 
Removes the $server array param and use the Server class instead.
Uses the user and pass Server properties instead of returning an array.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-07 02:26:33 -03:00
Maurício Meneghini Fauth
473057d175
Add null as default for Server control_ properties 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-06 15:21:41 -03:00
William Desportes
25bd2ac711
Merge #18223 - Add a configuration option to allow shared bookmarks: $cfg['AllowSharedBookmarks'] 
Pull-request: #18223

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-05-06 12:02:50 +02:00
William Desportes
b5899c2d53
Merge branch 'QA_5_2' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-05-06 11:25:42 +02:00
Liviu-Mihail Concioiu
175d01f0e0 Add CVE link to allowed domains 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2023-05-06 01:07:04 +02:00
Liviu-Mihail Concioiu
4951bc7fea Update CVE link with the new one 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2023-05-06 01:06:11 +02:00
Liviu-Mihail Concioiu
e4615acccf Revert "Add CVE MITRE link to allowed domains" 
This reverts commit 8c068dda1d.
 2023-05-06 01:04:17 +02:00
Liviu-Mihail Concioiu
8c068dda1d Add CVE MITRE link to allowed domains 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2023-05-05 22:50:41 +02:00
William Desportes
8027a84d66
Use quoteString intead of escapeString 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-05-04 22:40:03 +02:00
William Desportes
66f607c608
Merge branch 'QA_5_2' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-05-04 22:30:56 +02:00
William Desportes
4a5180c901
Merge #18252 - Fix #17654 - Unprivileged user cannot change password on MySQL >= 5.7.37 
Pull-request: #18252
Fixes: #17654

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-05-04 18:47:24 +02:00
Kamil Tekiela
82427ce600 Update psalm-baseline.xml 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-03 15:25:05 +01:00
Maurício Meneghini Fauth
1921a8bb1d
Rename Config\Settings\Server properties to use camel case 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-02 15:50:59 -03:00
Maurício Meneghini Fauth
2f4dab8880
Add missing Config\Settings\Server control_ properties 
https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-02 15:24:59 -03:00
Maurício Meneghini Fauth
250a32b795 Add the Config::getCurrentServer() method 
The Config::getCurrentServer() method returns the current server
configuration. It's an VO that is equivalent to
$GLOBALS['cfg']['Server'] setting.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-30 17:37:34 -03:00
Maurício Meneghini Fauth
aa119f7e62 Remove unused Config::$defaultServer property 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-30 13:23:27 -03:00
Maximilian Krög
d1a0aa45de
phpstan supports object shape since 1.10.12 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2023-04-29 22:43:55 +02:00
Maurício Meneghini Fauth
5ffe2847ac
Remove Config::checkServers() method 
Removes the Config::checkServers() method as it's duplicated in
Config\Settings class.
Also uses the Settings class to filter invalid config keys when loading
a config file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-29 14:50:18 -03:00
Maurício Meneghini Fauth
56926e807f
Move Config::loadDefaults() to constructor 
Makes sure that Config's properties are always initialized and that
the config property is in sync with the settings property.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-27 21:48:56 -03:00
Maurício Meneghini Fauth
fd88454d08
Update request URI scheme with config value 
Removes the Config::isHttps() call from constructor as PmaAbsoluteUri is
not available yet.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-27 16:40:29 -03:00
Maurício Meneghini Fauth
74ba4f17b0
Remove config global var from Logging class 
Uses the Settings class to access the log settings.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-27 14:38:18 -03:00
Kamil Tekiela
a01eefc4c2 Remove $timestampSeen which was always false 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
36481a0dca Change if into its short form 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
ae5b5a1a86 Remove $jsvkey and $vkey 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
fbb185e7a9 Remove globals 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
9124c19539 Remove $GLOBALS['columns_cnt'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
39035f91f9 Remove strlen 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
c3701e3fea Remove no longer needed @psalm-suppress 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
9a8fec903f Replace escapeString with quoteString 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
bfe1f4facf Remove redundant argument 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
b2357568a1 Use str_ends_with and str_starts_with 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
1e14d588a7 Replace ternary with boolean condition 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
0032b489f3 Merge $tabindex and $idindex into $fieldIndex 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
269535a7a5 Change $tabindex into a private property 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00
Kamil Tekiela
7f05587905 Remove method_exists 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-04-23 11:20:05 +01:00