1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Commit Graph

223 Commits

Author SHA1 Message Date
William Desportes
d042b6e2bb Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-01-24 23:25:07 +01:00
William Desportes
3db8949ad3 Fix #15200 - server-side HTTPS detection misses support for Forwarded HTTP Extension (RFC 7239)
Fixes: #15200
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-01-24 22:56:55 +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
676f48349a Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 22:13:36 -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
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
William Desportes
249ee4dbd2 Improve JS and phpdoc by removing useless spaces
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-01-16 18:39:42 +01:00
Yash Bothra
4d4cb09037 #15780 fixed action links UI
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
2020-01-15 00:18:41 +01:00
Jayati Shrivastava
9cae108c11 Fix #15693 - tab focus using refresh button
Fixes #15693
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
2020-01-02 16:12:10 +01:00
William Desportes
cd7504b2a2 Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-31 12:03:51 +01:00
William Desportes
609cd722e9 Fix #15725 - error 500 when exporting - set time limit
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-31 12:00:25 +01:00
William Desportes
9799dfc643 Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-29 15:46:26 +01:00
William Desportes
de652cd95a Add some typecasts to fix #15719 and other possible issues
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-29 15:39:04 +01:00
William Desportes
ba1e22c92b Fix some primitive types not in lower case and add some return type hints
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-29 13:49:03 +01:00
William Desportes
28e2814ee9 Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-21 21:04:39 +01:00
William Desportes
aa2f369bf3 Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-21 20:27:25 +01:00
William Desportes
313da618bd Fix redirection form secure.php.net to www.php.net
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-21 11:03:10 +01:00
Maurício Meneghini Fauth
04b72cf560 Merge branch 'QA_5_0'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-17 22:39:13 -03:00
Maurício Meneghini Fauth
4cbcf4889b Fix TypeError in Util class
TypeError: str_replace() expects parameter 3 to be string or array, int given

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-17 22:37:14 -03:00
Maurício Meneghini Fauth
39f42f848b Remove some useless docblock comments
Fixes docblock spacing

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-13 21:15:00 -03:00
Maurício Meneghini Fauth
dd2b05330a Remove useless parentheses
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-12 00:18:01 -03:00
Maurício Meneghini Fauth
dd06cd38f8 Defines rules for double quote usage
Makes sure that any use of double quotes strings are warranted.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-01 14:10:07 -03:00
Hugues Peccatte
3255e4ad7b Split Util class regarding the responsabilities (#15567)
PhpMyAdmin\Util is a very huge class with a lot of responsabilities.

There is a lot of work to split it, but this may be just a small start, waiting for a more normalized code.

* Split Util class regarding the responsabilities
* Split the buttonOrImage function

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-11-21 20:20:05 -03:00
Maurício Meneghini Fauth
e8c5ba4f80 Convert Messages to Bootstrap Alerts
Replaces Messages custom styles with a Bootstrap Alerts theme

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-11-12 15:28:47 -03:00
William Desportes
a845d2fbe5 Fix phpcs issue introduced by PR #15556
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-10 21:11:17 +01:00
William Desportes
f52f3afff3 Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-09 15:48:34 +01:00
William Desportes
c16891cb40 Merge branch 'QA_4_9' into QA_5_0 2019-11-09 15:41:21 +01:00
William Desportes
4ae14a3da9 Improve l10n context for translators and fix a typo
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-09 15:35:59 +01:00
Maurício Meneghini Fauth
0406ee2f5e Move ajax entry point logic to routes file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-11-06 00:19:26 -03:00
William Desportes
a9df8a4dbb Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-05 23:15:34 +01:00
William Desportes
9e90099ffa Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-05 23:10:52 +01:00
Hugues Peccatte
170714f033 Fix Long2IP issue with PHP7.1
Since PHP7.1, as long2ip expects an int, due to the strict_mode, PHP throws an error.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-11-03 20:51:54 +01:00
Maurício Meneghini Fauth
1c32c4cc8e Merge pull request #15545 from Tithugues/refactor-duplicated-methods
Refactor duplicated methods
2019-11-01 20:32:48 -03:00
Hugues Peccatte
69a4061441 Refactor duplicated methods
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-11-01 19:20:15 +01:00
William Desportes
0eeb98275e Merge #15514 - Unit test fixes for phpunit 8 compatibility
Pull-request: #15514
Ref: #15236

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-28 22:30:40 +01:00
Oleg Abrazhaev
e0c9ee99b1 extract TWIG template from import_status.php #14801
Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
2019-10-27 14:06:11 +01:00
Maurício Meneghini Fauth
1a2cef1ae1 Fix some coding standard issues detected by PHPCS
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-21 09:57:06 -03:00
William Desportes
dd0596816a Fix a bug in formatByteDown
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-19 21:17:06 +02:00
Maurício Meneghini Fauth
441f8daa1a Use gender-neutral pronouns
Replaces gender-specific pronouns with gender-neutral pronouns.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-18 09:13:08 -03:00
Maurício Meneghini Fauth
6ea135a0d0 Merge branch 'QA_5_0' 2019-09-21 17:31:48 -03:00
Maurício Meneghini Fauth
3e330fd403 Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-21 17:30:44 -03:00
Maurício Meneghini Fauth
0a8fc4446b Fix some invalid array accesses with PHP 7.4
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-21 17:22:52 -03:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Maurício Meneghini Fauth
74ac30fa55 Use the router for navigation.php
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-19 23:04:55 -03:00
Maurício Meneghini Fauth
e779a72ce5 Use the router for the import entry point
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-19 19:20:39 -03:00
Maurício Meneghini Fauth
208b0e25e1 Use the router for the sql pages
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-03 21:25:27 -03:00
Maurício Meneghini Fauth
df48b1dab4 Fix some errors detected by PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-01 03:26:28 -03:00