Commit Graph

126 Commits

Author SHA1 Message Date
Kamil Tekiela
47a039d70c Implement ResultInterface & MysqliResult
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-31 23:59:24 +00:00
Maurício Meneghini Fauth
58ed5bfa9e
Extract Simulate DML action from ImportController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 18:37:15 -03:00
Maurício Meneghini Fauth
0f678e8d7d
Merge branch 'QA_5_1'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 16:19:18 -03:00
Maurício Meneghini Fauth
3968808e76
Fix broken link in the Simulate DML query modal
Fixes #17259

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 16:09:07 -03:00
Maurício Meneghini Fauth
feca48cc76
Change return type of DatabaseInterface::getError method
Now, it returns last error message or an empty string instead of false
if no errors occurred.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 14:43:14 -03:00
Maurício Meneghini Fauth
44fe103b9c
Remove @access annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-22 11:43:45 -03:00
Kamil Tekiela
ce527035c2 PHPStan checkAlwaysTrueCheckTypeFunctionCall fixes
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-08 15:26:52 +00:00
Kamil Tekiela
be87571da6 PHPStan checkAlwaysTrueStrictComparison fixes
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-08 15:26:52 +00:00
Maurício Meneghini Fauth
3e0856c77b
Remove useless string concatenations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-27 21:40:22 -03:00
Maurício Meneghini Fauth
7955f7d96d
Replace pow function with the ** operator
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-27 19:12:11 -03:00
Maurício Meneghini Fauth
f00d70cccb
Remove useless whitespaces
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-15 17:05:40 -03:00
Maurício Meneghini Fauth
9f3510d11a
Add bool return type where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-14 20:11:51 -03:00
William Desportes
cef66ddc19
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-27 02:59:31 +02:00
William Desportes
423613bb5b
Fix #17042 - SQL escaping bug on DB name with special chars on submit query with rollback option
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-27 01:35:51 +02:00
William Desportes
9373c8ec70
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-22 14:51:35 +02:00
William Desportes
d281dcc0bd
Fix #17026 - Handle possible invalid boolean values injected in SaveDir or UploadDir
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-22 12:59:54 +02:00
Maurício Meneghini Fauth
1835ebb4fc
Replace mb_strpos !== false with str_contains
See: https://wiki.php.net/rfc/str_contains#case-insensitivity_and_multibyte_strings

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-10 13:43:40 -03:00
Maurício Meneghini Fauth
bcdb7e40fb
Replace strncmp === 0 with str_starts_with
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-09 19:14:30 -03:00
Maurício Meneghini Fauth
9adaa912e1
Rename Response class to ResponseRenderer
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-30 12:35:22 -03:00
William Desportes
a6d39d39be
Improve non standard doc blocks
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-06-15 21:39:28 +02:00
William Desportes
796aa9f5b2
Merge branch 'QA_5_1'
Test fix was already added in: 3bc39289e7

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-06-04 00:14:23 +02:00
Maurício Meneghini Fauth
1c084de30b
Fix coding standard errors
Related to 62f142c9fa.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-03 16:50:33 -03:00
Maurício Meneghini Fauth
eb96360cda
Fix some failing tests for PHP 8.1
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-01 23:41:16 -03:00
William Desportes
f5f636ef3b
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-05-28 21:43:28 +02:00
William Desportes
a0b36073fe
Fix #16920 - Uncaught TypeError: PhpMyAdmin\Import::detectType(): Argument #2 ($cell) must be of type ?string, float given
Fixes: #16920

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-05-28 21:36:39 +02:00
Maurício Meneghini Fauth
9928882de3
Fix some errors found by Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-23 00:24:59 -03:00
Maurício Meneghini Fauth
9965311520
Rename Import class variables to use camel case
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-18 12:31:29 -03:00
William Desportes
85afe9a14f
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-12 19:01:36 +02:00
Saksham Gupta
9862b938ac
Fix #16789 Missing ; from Create PHP code
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2021-04-12 17:31:42 +02:00
Maurício Meneghini Fauth
d83abf63e7
Use PSR-12 for control structures spacing
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 15:27:03 -03:00
Maurício Meneghini Fauth
0b8edc5bde
Use PSR-12 for namespace use statements
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 14:18:35 -03:00
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