Commit Graph

195 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
d23be36126
Fix some errors found by PHPStan and Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-11-26 15:20:44 -03:00
Saksham Gupta
be3905944f Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/16477
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix db Edit privileges

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix conflict

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Add missing bracket

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix Lint

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2020-11-16 02:09:54 +05:30
Isaac Bennetch
4d99680147 Force BINARY comparison when looking at privileges.
Otherwise, a mismatch between the "Server connection collation" dropdown
and the system tables/views causes an error message.

Fixes: #15463

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-10-29 09:23:38 -04:00
Maurício Meneghini Fauth
a83ec78ebf Make DatabaseInterface::isUserType method private
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-24 00:40:03 -03:00
Maurício Meneghini Fauth
71d9a8f760 Remove is_grantuser and is_createuser PHP globals
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-23 22:58:49 -03:00
Maurício Meneghini Fauth
ac9bccf67d Replace $GLOBALS['dbi'] with global $dbi
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-11 09:24:21 -03:00
Maurício Meneghini Fauth
bb32ba6d9c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-04 12:31:43 -03:00
Maurício Meneghini Fauth
e7c8e20edb Fix some type errors detected by PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-02 00:37:23 -03:00
Maurício Meneghini Fauth
f2e49a92c6 Fix some type errors detected by PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-30 19:23:01 -03:00
Maurício Meneghini Fauth
34dd2a61f8 Remove strPrivDesc* global variables
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-11 17:22:30 -03:00
Maurício Meneghini Fauth
ceac762e09 Remove pmaThemePath and pmaThemeImage PHP globals
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-02 10:57:57 -03:00
Maurício Meneghini Fauth
c92663adbb Move ChangePassword::getHtml to Server\Privileges class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-29 19:12:35 -03:00
Maurício Meneghini Fauth
2bf9d2bf68 Ignore too long lines warn in Server\Privileges class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-22 18:26:53 -03:00
William Desportes
9e39713b5a
Document "DELETE HISTORY" for translators
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-07-22 21:45:02 +02:00
Maurício Meneghini Fauth
ae975e594e Remove Privileges::getHtmlForUserGroupDialog method
Related to https://github.com/phpmyadmin/phpmyadmin/issues/16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-17 12:42:58 -03:00
Maurício Meneghini Fauth
3b285ff17e Use identical operator for non-empty strings
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-10 18:06:29 -03:00
William Desportes
fd775cb9f9
Split some code from Privileges::updatePrivileges into Privileges::generateQueriesForUpdatePrivileges
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-07 19:23:46 +02:00
William Desportes
42e5ccda77
Improve Privileges::wildcardEscapeForGrant
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-07 18:58:06 +02:00
William Desportes
076d7b1a7f
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-07 18:27:18 +02:00
William Desportes
5164bea16a
Fix #16166 - Make the alter user privileges MySQL 8.0.11+ compatible
Ref: #14217
Ref: #14788

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-07 18:08:50 +02:00
Maurício Meneghini Fauth
f4582e083e Use early exit when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-27 00:35:24 -03:00
Maurício Meneghini Fauth
bd979dd1ff Remove useless elseif with if
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 22:53:44 -03:00
Maurício Meneghini Fauth
82c2964bb8 Remove useless elses
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 22:27:45 -03:00
Maurício Meneghini Fauth
2d02a15de3 Add static to closures that don't use $this
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 18:30:57 -03:00
Maurício Meneghini Fauth
3ae05c785d Use short list syntax and single line arrays
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 03:32:59 -03:00
Maurício Meneghini Fauth
3baad2eb1c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 22:42:37 -03:00
Maurício Meneghini Fauth
80a45fa0ae Break too long lines
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-16 18:08:20 -03:00
William Desportes
821441f0cd
Remove some useless lines in test files and remove an else
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-16 20:16:00 +02:00
Maurício Meneghini Fauth
84139f4d51 Remove some useless variables
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-13 16:15:37 -03:00
Maurício Meneghini Fauth
a64393e7f5 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-13 00:23:28 -03:00
William Desportes
7db0debd05
Fix some failing tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-02 01:51:51 +02:00
William Desportes
cc82f092ce
Fix MissingClosureParamType errors
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-29 01:08:40 +02:00
William Desportes
b8b5c026a9
Remove MissingReturnType psalm ignore
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-28 23:30:00 +02:00
William Desportes
54e0250dae
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-18 12:50:30 +02:00
William Desportes
62a6591d3f
Fix some phpcs issues after latest phpcs 3.5.5 release
I left the false positives unfixed: https://github.com/squizlabs/PHP_CodeSniffer/issues/2937#issuecomment-615498860
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-18 01:01:38 +02:00
Maurício Meneghini Fauth
d612215aab Remove dropdown field generator
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-03-30 01:59:03 -03:00
Isaac Bennetch
6efdd77483 Merge branch 'QA_5_0' 2020-03-20 22:50:16 -04:00
Isaac Bennetch
0d4c7c66a5 Merge branch 'QA_4_9' into QA_5_0 2020-03-20 22:01:14 -04:00
Isaac Bennetch
3258978c38 More escaping of username and password.
Improves upon 89fbcd7c39

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-18 22:16:53 -04:00
Maurício Meneghini Fauth
89fbcd7c39 Escape user and hostname when getting auth plugin
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-03-05 20:10:13 -03:00
William Desportes
d95e8ca4a1
Fix PHP Fatal error: Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given
Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given in libraries/classes/Server/Privileges.php:2777

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-23 14:00:46 +01:00
William Desportes
966e9277a6
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-23 00:47:55 +01:00
William Desportes
e671ee3ebb
Fix #15282 - MySQL 8.0 password syntax error when creating a replication user
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-23 00:39:06 +01:00
Maurício Meneghini Fauth
206199105e Remove useless return type annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 13:03:29 -03:00
Maurício Meneghini Fauth
6584b01824 Use short versions of scalar types in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 12:20:04 -03:00
Maurício Meneghini Fauth
6b7af13f8f Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 00:33:24 -03:00
Maurício Meneghini Fauth
f80d3e3bd4 Remove unnecessary annotations
@package, @subpackage and others.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 17:35:56 -03:00
Maurício Meneghini Fauth
6283caaabf Use one line for comments with a single line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 16:04:09 -03:00
Maurício Meneghini Fauth
8ec4209002 Fix some coding standard issues
- Inverts yoda comparisons
- Removes parentheses from return
- Removes useless ternary operators
- Adds paretheses to new instances
- Adds trailing array comma

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 00:38:34 -03:00
Maurício Meneghini Fauth
285907991e Add coding standard rules for whitespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-19 22:29:54 -03:00