Commit Graph

125211 Commits

Author SHA1 Message Date
phpMyAdmin bot
e5e070c814 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2022-12-18 00:18:18 +00:00
Maurício Meneghini Fauth
13890a947a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-16 11:53:18 -03:00
Maurício Meneghini Fauth
90f9e708cc
Fix missing icon for collapse all button
Fixes #17967

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-16 11:16:26 -03:00
Maurício Meneghini Fauth
63102c1253
Add unit test for Plugins\TwoFactor\Key::getRegistrations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-15 22:54:33 -03:00
Kamil Tekiela
3ff0dd38d4
Remove invalid usages of htmlspecialchars()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
(cherry picked from commit 59ba203280)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-15 14:00:41 -03:00
Maurício Meneghini Fauth
a5e81ad7d0
Ignore test/test_data/gis directory
Related to 5116b0f0fe.

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-15 13:48:00 -03:00
Maurício Meneghini Fauth
d57b955802
Bump selenium/standalone-chrome docker image to latest v4
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit dc5450d409)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-15 13:46:07 -03:00
Kamil Tekiela
db5db26c60
Refactor Database Search (#17962)
* Refactor Search::getWhereClause()

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

* Refactor Search::getSearchSqls()

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

* Fix HTML escaping issues in Database search

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

* Change links to buttons

More semantically correct, does not link to a separate page on middleclick, and looks better.

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

* Refactor Search::getSearchResults()

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-15 13:43:29 -03:00
Kamil Tekiela
1e4af77416
Refactor Plugins.php (#17960)
* Remove temporary variable

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

* Remove pass-by-ref

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

* Refactor getOneOption

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

* Refactor getOptions

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 23:16:27 -03:00
Maurício Meneghini Fauth
08a27b8b7e
Merge pull request #17959 from kamil-tekiela/various-refactorings
Various refactorings
2022-12-14 23:10:11 -03:00
Maurício Meneghini Fauth
ab96edf359
Extract Navigation object dependency from CommonParams
This removes a circular dependency.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-14 20:08:58 -03:00
Maurício Meneghini Fauth
fafa7d289d
Merge pull request #17961 from MauricioFauth/selenium-4
Bump selenium/standalone-chrome docker image to latest v4
2022-12-14 18:26:23 -03:00
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
dc5450d409
Bump selenium/standalone-chrome docker image to latest v4
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-14 16:22:12 -03:00
Kamil Tekiela
0f1b6ec51d Remove temporary $backend var
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
1bb0e830c0 Remove temporary variables from Table
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
0ae0516084 Refactor Table::countRecords()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
e64bbe2926 Remove temporary var $releases
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
ce0ee04406 Remove temporary variables
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
59ba203280 Remove invalid usages of htmlspecialchars()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
7cc0fbcf56 Fix nullable arrays that should not be nullable
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
f174282442 Remove temporary var $column_names
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
1c51769b32 Simplify for statement into foreach
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
9e795e27a1 Remove temporary variable $cf
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
8d7e3e2229 Simplified switch
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
8d06fda694 Remove redundant operations
These are noop anyway.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
29a055b497 Remove redundant cast during concat
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:44 +00:00
Kamil Tekiela
99f37f4b7b Remove redundant is_array check
It's always array because of `if (empty($view['name']))` check

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:23:35 +00:00
Kamil Tekiela
47d9ad9b23 Remove always false $_error
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:17:47 +00: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
William Desportes
9c4a90137d
Fix #16988 - export as CSV/JSON/SQL/... no database selected
Fixes: #16988

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 23:27:07 +01:00
William Desportes
d258e4ed14
Fix mistake in pull-request #15121 to fix #15064 - do not display the SQL, execute it !
Ref: #15121

all other plugins execute it

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 22:32:19 +01:00
William Desportes
12fe46b2df
Fix a typo in export files
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 22:31:18 +01:00
Kristijan Fremen Velkovski
9e31295234
Translated using Weblate (Serbian (latin))
Currently translated at 38.9% (1339 of 3434 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sr_Latn/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2022-12-13 21:50:34 +01:00
Kristijan Fremen Velkovski
370c6d372a
Translated using Weblate (Serbian (latin))
Currently translated at 39.2% (1340 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/sr_Latn/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2022-12-13 21:49:32 +01:00
William Desportes
aa0ca0a989
Allow phpstan analyse to fail
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 20:47:24 +01:00
William Desportes
6ab275e12b
Update phpstan baseline
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 20:46:24 +01:00
William Desportes
ba23175d6a
Allow composer validate to fail
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 20:38:20 +01:00
William Desportes
67f3901b74
Add a ChangeLog entry for #17927
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 20:29:20 +01:00
William Desportes
800b36b445
Update sql-parser to fix #17422
Fixes #17422

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 20:27:43 +01: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
11e2f3391d
Merge pull request #17956 from MoonE/qa-scaling
Fix centering of generated gis images
2022-12-13 09:38:10 -03:00
Maurício Meneghini Fauth
58852d7159
Fix coding standard issue in ajax.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-12 20:38:04 -03:00
Maurício Meneghini Fauth
4e40aef04f
Extract CommonActions.refreshMain into a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-12 19:59:04 -03:00
William Desportes
49933b7fc4
Add a ChangeLog entry for #17944
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-12 22:04:39 +01:00
William Desportes
556aacbc0f
Fix #17944 - unable to create a view from tree view button
- Add the modal to the navigation panel
- Prevent modals to be removed on navigation bar is replaced

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-12 22:04:37 +01:00