Commit Graph

4669 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
55e95ccd09
Fix type error when copying tables
Related to 873eb098b9 and
a84cae6c2d.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-14 18:24:11 -03:00
Maurício Meneghini Fauth
47238d6c8c
Fix ImportController failing test and other minor fixes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-14 13:33:37 -03:00
ru-asdx
3794031ebc
Ref #17769 - Replace superglobals with ServerRequest in Import & Export Controllers (#17949)
* Replace superglobals with ServerRequest in Import & Export Controllers

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* small fixes

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* fixes

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
2022-12-14 12:04:38 -03:00
Kamil Tekiela
a84cae6c2d
Refactor ExportSql - part 1 (#17955)
* Add getTableStatus method

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

* Remove unused $errorUrl parameter

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

* Remove unused parameter $table

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

* Add string return types

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

* Refactor exportUseStatement

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

* Specify param types for exportConfigurationMetadata

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

* param types for getTableDefForView

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

* Param types for getTableComments

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

* Small fixes

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

* Extract addCompatOptions() method

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

* Remove no longer needed suppress

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

* Merge if statements by SonarLint

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

* Update phpstan-baseline.neon

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

* Specify param types for exportRoutineSQL

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

* Specify param types for generateComment

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

* Specify param types for replaceWithAliases

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

* Update psalm-baseline.xml

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 11:56:22 -03:00
Kamil Tekiela
6ae40562e5
Remove globals from ExportController (#17948)
* Remove globals from Export controller

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

* filename_template

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

* export_plugin

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

* compression_methods

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

* onserver

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

* quick_export

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

* remember_template

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

* mime_type

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

* do_relation

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

* doComments

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

* do_mime

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

* do_dates

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

* whatStrucOrData

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

* db_select

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

* table_structure

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

* lock_tables

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

* allrows

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

Update ExportController.php

* limit_to

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

Update ExportController.php

Update ExportController.php

* limit_from

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

* Remove unused globals

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

* $GLOBALS['filename'] in ManageController

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

* filename

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

* Update psalm-baseline.xml

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

* Update phpstan-baseline.neon

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-13 12:09:56 -03:00
Kamil Tekiela
f783bdea6c Change variable name case
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-13 09:47:30 -03:00
Kamil Tekiela
7c1bfec7f5 Removal of globals
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-13 09:43:01 -03:00
Maurício Meneghini Fauth
729b21b911
Extract Functions.ignorePhpErrors() into a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-10 19:24:20 -03:00
Kamil Tekiela
78e3f495cd Replace escapeString with quoteString
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-10 17:56:11 -03:00
MoonE
5116b0f0fe
Simplify gis polygon handling (#17904)
* 'Expected' is first param for assertEquals

* Do direct string comparisons with gis svg test

Ids are not random during tests.

* Test gis png and pdf output

* Add pdf for i386 architecter, points are slightly different

* No special handling for inner and outer rings

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2022-12-10 15:09:40 -03:00
Maurício Meneghini Fauth
3bc3c7de4d
Extract Functions.ajaxShowMessage() into ajax-messages.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-06 08:21:58 -03:00
Maurício Meneghini Fauth
9546a45e98
Revert "Move menuResizer related functions to menu-resizer.js"
That commit broke the onload and teardown calls.
Reverting fixes the tests.

This reverts commit 5e6541e08a.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-04 15:15:44 -03:00
Kamil Tekiela
7354773dfa
Replace escapeString with quoteString (#17946)
* Replace escapeString with quoteString

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

* Fix SQL injection

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-04 12:20:16 -03:00
Maurício Meneghini Fauth
5e6541e08a
Move menuResizer related functions to menu-resizer.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-01 23:17:33 -03:00
Maurício Meneghini Fauth
b98fcd20f3
Merge pull request #17938 from kamil-tekiela/Remove-$params
Remove $params
2022-12-01 10:49:37 -03:00
Maurício Meneghini Fauth
83e8ed59cc
Remove Config object from the Window global object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-30 22:00:29 -03:00
Kamil Tekiela
b29eccd70b Remove $params
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-11-30 22:20:19 +00:00
Maurício Meneghini Fauth
5f7ab155fd
Update Psalm and PHPStan baselines
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-30 15:46:06 -03:00
Maurício Meneghini Fauth
66f0c2869a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-30 15:34:47 -03:00
MoonE
4e529ae399
Refactor gis color (#17895)
* Use int srid in gis tests

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>

* Typecheck gis color

Only use array<int> as color

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2022-11-30 14:49:06 -03:00
ru-asdx
22d07e3884
Ref #17769 - Replace superglobals with ServerRequest in NavigationController (#17916)
* Replace superglobals with ServerRequest in NavigationController

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* Update libraries/classes/Controllers/NavigationController.php

Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>

* Update libraries/classes/Controllers/NavigationController.php

Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>

* Update libraries/classes/Controllers/NavigationController.php

Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>
2022-11-30 14:34:42 -03:00
ru-asdx
eff7e23b60
Ref #17769 - Replace superglobals with ServerRequest in Server/Status (#17912)
* Replace superglobals with ServerRequest in Server/Status

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
2022-11-30 14:30:46 -03:00
Maurício Meneghini Fauth
e6f8623e1f
Merge pull request #17921 from kamil-tekiela/like
Clean up LIKE escaping
2022-11-30 14:27:14 -03:00
Maurício Meneghini Fauth
95c9fa430c
Merge pull request #17889 from kamil-tekiela/Index-controllers
Refactor Index controllers
2022-11-30 13:58:56 -03:00
Maurício Meneghini Fauth
49865fe647
Remove Indexes object from the Window global object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-29 14:39:16 -03:00
Maurício Meneghini Fauth
b7a710e83f
Remove common.js from Header::addDefaultScripts()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-29 14:17:04 -03:00
Maurício Meneghini Fauth
e8e62fdf86
Move some config messages to the JS Messages Controller
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-29 13:48:05 -03:00
Maurício Meneghini Fauth
caf19897ac
Remove crossFramingProtection from the Window global
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-28 23:43:35 -03:00
Maurício Meneghini Fauth
332e27ad39
Remove KeyHandlerEvents from the Window global object
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-28 23:11:13 -03:00
Maurício Meneghini Fauth
479f10289f
Remove the Navigation object from the Window global
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-28 22:29:13 -03:00
Maurício Meneghini Fauth
f115608c45
Extract inline JS for import's upload progress logic
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-28 21:03:30 -03:00
William Desportes
ddd512cd8b
Fix #15887 - Drop table errors ignored
Fixes: #15887

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-11-26 00:22:54 +01:00
William Desportes
69768f15e1
Fix #17632 - Login Page: Tab keypress to Text Fields
Closes: #17633
Fixes: #17632

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-11-25 22:17:26 +01:00
William Desportes
e4b0e6bf81
Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-11-25 21:39:21 +01:00
Scott Mcgowan
6fc1401ee2
Fix column names option for CSV Export
Previously work was done to enable column names in CSV exports by
default. This change actually ended up overwriting the column name value
so that column names were included in all exports regardless of whether
or not the property was disabled. This commit changes the default for
column names to enabled as the original change intended, and removes
the property overwrite.

Signed-off-by: Scott McGowan mcgowanscott16@gmail.com
2022-11-25 21:15:49 +01:00
Maurício Meneghini Fauth
2e001c186a
Remove PageSettings from the window object
Imports PageSettings in the main.js file instead of relying on the
global window object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-24 22:00:56 -03:00
Kamil Tekiela
dd699f348d Clean up LIKE escaping
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-11-25 00:06:52 +00:00
Maurício Meneghini Fauth
b2971d618f
Import the AJAX object where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-24 15:21:18 -03:00
Maurício Meneghini Fauth
3ce84326f2
Import the Functions object where possible
Instead of using from the Window global object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-24 14:43:25 -03:00
Maurício Meneghini Fauth
6f54621b41
Create a shared.js file for common JS dependencies
Instead of using the Webpack's dependOn setting, uses the splitChunks
setting to automatically generate the shared.js file.

As the contents of these shared dependencies are being moved to the
shared.js file, the generated file for each dependency is now empty.

Is probably safe to not generate them, but some adjustments are needed
for that first. For example, the AJAX's onload and teardown functions
expects that some of these files exists.

For now, only dependencies that are loaded for all pages should be added
in this shared.js file.

This will facilitate the refactoring of the JS files, but the trade off,
at least for now, is that will be a single large file instead of a few
medium ones.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-24 14:43:24 -03:00
Maurício Meneghini Fauth
80b5358bc0
Add an unit test for Header::addDefaultScripts()
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-24 14:34:10 -03:00
ru-asdx
f883d9021f
Replace POST vars with ServerRequest (#17903)
* Replace POST vars with ServerRequest in UserPasswordController
* Replace POST vars with ServerRequest in Normalization

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
2022-11-23 17:14:14 -03:00
Maurício Meneghini Fauth
df23516145
Reorder JS scripts loading in Header class
First load vendor scripts, then load the Messages, then the other
scripts.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-23 15:57:06 -03:00
Maurício Meneghini Fauth
5ab7640bc7
Remove force_file_* global vars and param
Uses a HTML data attribute instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-21 17:30:55 -03:00
Maurício Meneghini Fauth
ba81cdabce
Catch exceptions/errors in the config file
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17911

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-21 15:57:03 -03:00
Maurício Meneghini Fauth
e194eb3961
Improve type DatabaseInterface's $link params
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-21 14:50:52 -03:00
Maurício Meneghini Fauth
d2809ca096
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-21 13:50:30 -03:00
William Desportes
883226c1f7
Ref #17478 - Fix mistake in PHP operators
Ref: 630f9bf00e
Thank you @MoonE !

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-11-21 16:37:44 +01:00
William Desportes
630f9bf00e
Ref #17478 - Fix PHP Undefined array key "auth_type" when server does not start at 0
```
Internal error in ./libraries/classes/Controllers/HomeController.php#235
 ErrorException: Undefined array key "auth_type"
```

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-11-20 23:02:50 +01:00
William Desportes
182cb205a7
Fix coding standard mistakes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-11-20 21:55:52 +01:00