gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,236 Commits 12 Branches 481 Tags 2.4 GiB
5708596146
Commit Graph

22362 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
5708596146
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-24 13:52:00 -03:00
Maurício Meneghini Fauth
551c317aee
Merge pull request #17982 from kamil-tekiela/Elvis 
Remove usage of elvis operator

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-24 13:46:33 -03:00
Maurício Meneghini Fauth
fdf474abf9
Merge pull request #17981 from kamil-tekiela/getTables-investigation 
Improve some type inference in various places

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-24 13:44:45 -03:00
Maurício Meneghini Fauth
d5f3c91b29
Merge pull request #17979 from kamil-tekiela/Optimize-fetchResult 
Microoptimization of fetchResult()

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-24 13:32:45 -03:00
Kamil Tekiela
f1a0f9d196
Minor refactoring of NavigationTree (#17970) 
* Fix boolean expression
* Fix docbloc type
* Remove redundant arguments
* Refactor Node::hasChildren()
* Remove redundant count()
* Make $pos property not null
* Improve condition
* Replace escapeString with quoteString
* Update phpstan-baseline.neon
* Update psalm-baseline.xml

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-24 13:25:03 -03:00
Maurício Meneghini Fauth
f4f933df8b
Merge pull request #17968 from kamil-tekiela/Remove-dependencies 
Remove unused class dependencies

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-24 13:09:00 -03:00
Kamil Tekiela
2b2a758d1a Replace escapeString with quoteString 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-24 13:04:10 -03:00
Kamil Tekiela
6264f6f1ea
Various refactorings 2 (#17965) 
* Remove extra blank lines
* Remove useless param annotations
* Refactor Index::singleton
* Refactor Config.php
* Refactor Header::addRecentTable()
* Collapse return statement into a single line
* Refactor Message.php
* Convert $getUniqueCondition into a scalar
* Code style
* Fix invalid return phpdoc
* Remove unused variable
* Remove redundant empty array checks
* Refactor Export::closeFile()
* Simplify else statement
* Remove redundant else
* Refactor TablePartitionDefinition::getDetails
* Simpler returns
* Add types for getCellContent()
* Remove useless method mngInsideStructComm

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-24 12:54:23 -03:00
Kamil Tekiela
9a8dc40ae9 Remove usage of elvis operator 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 19:50:58 +00:00
Kamil Tekiela
70af3e9c1c Remove $GLOBALS['script_display_field'] & $GLOBALS['fullTableNames'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 18:55:03 +00:00
Kamil Tekiela
ba110e8638 Remove $GLOBALS['tab_pos'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 18:55:03 +00:00
Kamil Tekiela
4b4bd00f37 Simplify fetchResult in Common 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 18:55:03 +00:00
Kamil Tekiela
2bda275524 Add better type inference 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 18:55:03 +00:00
Kamil Tekiela
bc6fb312db Improve type inference in getTables() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-19 23:29:25 +00:00
Kamil Tekiela
fd52b85eed Microoptimization of fetchResult() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-19 19:30:13 +00:00
Maurício Meneghini Fauth
4e49c7760a
Add support for more PSR-7 packages 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-19 01:40:05 -03:00
Kamil Tekiela
65ab1608f8 Remove dependency in DatabasesController 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-16 20:58:48 +00:00
Kamil Tekiela
6735938f12 Remove dependancy in Table/StructureController 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-16 20:58:48 +00:00
Kamil Tekiela
8b0cf8c16c Remove dependancy in Database/StructureController 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-16 20:58:47 +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
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
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
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
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
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