Commit Graph

95 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
db3da81056 Remove some useless comments
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-13 19:56:56 -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
fa67657b1a Remove Display\Import class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-20 00:21:26 -03:00
Maurício Meneghini Fauth
578d70e9de Remove import_handle global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-18 20:45:33 -03:00
Maurício Meneghini Fauth
9cab697cfa Remove Import::stop method
Related to #16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-18 17:29:05 -03:00
Maurício Meneghini Fauth
be5f9824b1 Merge branch 'QA_5_0'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-16 20:16:05 -03:00
Maurício Meneghini Fauth
51b04c9b5c Fix missing error message after failed import
Fixes #15328 (no message after import of zipped shapefile without
php-zip).

Closes #15643.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-16 20:09:47 -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
Maurício Meneghini Fauth
7544375867 Remove exit from Import::stop method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-09 17:06:30 -03: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
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
9269d75fb4 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 20:22:18 -03:00
William Desportes
dfa718c1c6
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-17 16:48:09 +02:00
William Desportes
7fc4722155
Fix #16093 - Error importing utf-8 with bom sql file
Do not use mb_ functions they are sensible to mb_internal_encoding()

Fixes: #16093

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-17 16:40:16 +02:00
Maurício Meneghini Fauth
8dd310fb6a Remove assignments in if conditions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-16 01:35:19 -03: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
972180a862
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-04 09:18:44 +02:00
William Desportes
13651548ae
#16093 - Move BOM stripping to a function and add tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-04 00:56:17 +02:00
William Desportes
13b699e04a
Fix 2 phpstan errors in libraries/classes/Import.php
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-18 12:18:53 +01:00
William Desportes
01cd7dc33b
Some code improvements suggested by Scrutinizer
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-02-14 22:23:16 +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
c231652c67 Remove useless comments in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 14:38:49 -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
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
William Desportes
5f13152857
Fix some PHPStan level 3 errors
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-12-06 09:02:41 +01: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
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
William Desportes
40ed155775
Merge branch 'QA_5_0' into 'master'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-20 11:09:55 +02:00
William Desportes
f428277bad
Merge branch 'QA_4_9' into 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-20 11:08:28 +02:00
Maurício Meneghini Fauth
ea3599194e Use the router for table operations page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-14 13:57:33 -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
4bc08bb098 Fix some errors detected by PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-31 20:59:24 -03:00
Hugues Peccatte
0aeb0963ae Fix #15388 Allow rollback if empty statement
When statement finishes with spaces, there is an "empty" statement. An empty statement is rollbackable.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-07-28 21:16:50 +02:00
Maurício Meneghini Fauth
469fd5c05c Use the router for the database operations page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-24 02:12:15 -03:00
Maurício Meneghini Fauth
aec0402679 Use the router for table structure page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-19 20:18:06 -03:00
Maurício Meneghini Fauth
682e7a160e Use the router for database structure page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-18 14:33:43 -03:00