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

54 Commits

Author SHA1 Message Date
Kamil Tekiela
555c6798eb Add native param types 
Includes TypeHints.UnionTypeHintFormat

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-17 12:45:18 +00:00
Kamil Tekiela
142f15f373
Use quoteString in controllers (#18191) 
* CreateController

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

* FindReplaceController

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

* SetVariableController

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

* GetVariableController

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

* UserGroupsFormController

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

* TablesController

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-03 17:40:45 -03:00
Kamil Tekiela
0bdcaba2d2
Add native property types (#18143) 
* Add native property types

Includes TypeHints.UnionTypeHintFormat

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

* Set some default values for properties

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

* Format and promote properties

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

* Remove redundant asserts

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

* Redundant cast

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

* $tmanager->theme is never null

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

* Redundant variable

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

* Fix empty on $statementInfo bool

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

* Redundant casts

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

* Redundant issets

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

* getPacked() returns nullable string

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

* Redundant if

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

* $this->content can be null

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

* Simplify ThemeManager::getInstance()

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

* Use isset for checking if property is initialized

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

* Use nullable instead of uninitialized property

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

* password is no longer nullable

I can't verify that none of the globals ever tried to set it to null, but the variable should never be nullable.

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

* Update baselines

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

* $same_wide_width param can be float or int

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

* Update Message.php

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

* Cast Sub_part to int

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

* Fix one line doc comments

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-26 23:30:41 -03:00
Maurício Meneghini Fauth
77957a69a5
Add trailing comma for multi-line functions 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-24 20:48:46 -03:00
Kamil Tekiela
e8c5eef6f8
Remove annoying empty statements (#18114) 
* Remove annoying empty statements

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

* Make $extra strict and stop passing false to it

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

* Make $page strict and stop passing null

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-24 20:11:37 -03:00
Kamil Tekiela
902d1a1e77
Add native return type hints (#18126) 
* Add remaining native return type hints to flush out bugs

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

* Cast the mixed value to int

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

* Fix tests

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

* getAutoIncrement() is supposed to return string

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

* Cast values to string in DummyResult

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

* Make getCollation() return non-nullable string

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

* Cast seqInIndex to int

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

* Cast $cardinality to int

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

* createFile may return false

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

* Remove redundant cast

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

* Update baselines

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-23 15:43:36 -03:00
Maurício Meneghini Fauth
785f8c1c00
Use constructor property promotion where possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 19:39:02 -03:00
Maurício Meneghini Fauth
613678f8f5
Replace assignments with null coalesce equal operator 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 17:03:05 -03:00
Kamil Tekiela
cfe54a501b Add union types 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-15 15:23:28 +00:00
Kamil Tekiela
8a1d6f1eaa Convert var annotations to typed properties 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-12 21:31:04 +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
594454eff2 Replace for loop with foreach 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-14 20:42:42 +01:00
Maurício Meneghini Fauth
3c618c22a9
Add ServerRequest parameter to all controllers 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-07-28 01:00:08 -03:00
Maurício Meneghini Fauth
cba9b38a28
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-07-19 15:51:12 -03:00
Ankush Patil
987cb5043d
fixed find replace regex issue if no matching result set found 
When find and replace searching used with regex, at the time of replace
empty CASE END condition was causing issue.

Fixes #17388
Closes #17641

Signed-off-by: Ankush Patil <aspraz2658@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-07-19 15:28:43 -03:00
Maurício Meneghini Fauth
5950693fb3
Fix possible undefined globals 
Related to https://github.com/phpmyadmin/phpmyadmin/pull/17427.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-03-10 18:05:21 -03:00
Maurício Meneghini Fauth
f940693c75
Move Util::checkParameters method to the AbstractController 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-03-07 22:59:33 -03:00
Maurício Meneghini Fauth
1438cb211e
Replace global keyword with $GLOBALS 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-03-07 17:31:11 -03:00
Maurício Meneghini Fauth
5a34a3bb04
Remove db and table properties from controllers 
Replaces them with their respective globals.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-02 14:48:43 -03:00
Maurício Meneghini Fauth
a8d514a350
Remove db and table globals from DbTableExists class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-28 16:43:48 -03:00
Kamil Tekiela
83b4dda1a3 Change QUERY_STORE to QUERY_BUFFERED 
Set the value to 0 instead of 1 and remove all unnecessary usages of this constant

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-01 01:46:01 +00:00
Kamil Tekiela
47a039d70c Implement ResultInterface & MysqliResult 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-31 23:59:24 +00:00
Kamil Tekiela
56a832948c
Refactor DatabaseInterface.php (#17209) 
* Use str_starts_with()

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

* Remove redundant !empty()

!empty() on a declared variable is redundant.

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

* Replace loop with array_column()

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

* Simpify assignment by removing temporary variable

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

* Remove redundant if statements and array_merge

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

* Remove temporary variable

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

* Unindent code

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

* Add helper method fetchByMode()

This is done to avoid calling methods through variables. It is the same
in terms of performance.

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

* Move if statements to where they are relevant

I had a choice to either move the while loop out of the if statements
or move the if statements inside. I decided it made more sense to move
them inside.

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

* Add NULL to phpdoc for the two parameters that can be null

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

* Simplify return statement

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

* Improve performance and simplify code

Since we are always using STORE mode then we can use data_seek() method.
This will allow us to get rid of the loop and use fetchByMode() method.

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

* Inline value defaulting

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

* Remove redundant check

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

* [bugfix] getColumnNames() should return an array of strings

There were multiple issues here. If we are selecting only a certain
column from the SQL then let's use the handy function instead of
array_keys. We will never get anything other than an array so checking
if it is not an array makes no sense. Returning null only to cast it to
an array is pointless. If really necessary, we could still check for an
empty array. The ColumnController returned the value without even
casting it to an array. I am not sure how jQuery/JavaScript dealt with it.

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

* Refactor getColumnMapFromSql and add type hint

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

* Refactor getVirtualTables

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

* Remove redundant loop

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

* Remove redundant usage of freeResult()

If there was no chance for the object to leak the scope and it is the
end of the scope then there's no reason to call this method.

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

* Replace dynamic variable with declare one

It's always the same name. If we were creating more than one, we could
use associative array, but in this case there seems to be absolutely no
need for any of this. Dynamic variables make it harder to debug the code.

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

* Update psalm-baseline.xml

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

* Widen the condition per williamdes suggestion

This will allow value such as '' and '0' to pass through. Previously
`if(! empty($database))` and `if($database)` dissallowed them.

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

* fetchResult() should return only arrays

Tests fixed to return arrays. Non-empty in case of true, empty in case
of false.
Fixed a lot of Psalm issues where the condition was always true.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-11-26 20:17:46 -03:00
Kamil Tekiela
58d9bb4a32 Refactor DatabaseInterface::getColumns() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-11-25 10:28:39 +00: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
7f6472b2c2
Add void return type where possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-13 15:29:11 -03:00
Maurício Meneghini Fauth
3531775b7c
Add type declarations to the controllers contructors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-11 17:32:22 -03:00
Maurício Meneghini Fauth
a2ed4dfe68
Make controllers callable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-08-30 13:16:29 -03:00
Maurício Meneghini Fauth
6ae07c96fb
Replace strpos !== false with str_contains 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-07-09 22:30:42 -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
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
44bdd1d390
Rename $url_params global to $urlParams 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-03-24 22:48:14 -03:00
Maurício Meneghini Fauth
91bd0df2e5
Rename $err_url global to $errorUrl 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-03-24 19:39:28 -03: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
ef62d7a9f5 Remove is_system_schema PHP global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-11-02 18:48:23 -03:00
Maurício Meneghini Fauth
36d93cf2f9 Remove Common::table method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-11-02 18:48:23 -03:00
Maurício Meneghini Fauth
601ed4649e Remove DBI dep from Table\AbstractController 
Moves the DatabaseInterface class dependency to the classes that use it.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-12 12:53:03 -03:00
Maurício Meneghini Fauth
f2e49a92c6 Fix some type errors detected by PHPStan 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-09-30 19:23:01 -03:00
Rosheen Naeem
673c194b01 Fixed underscore prefixes 
Signed-off-by: Rosheen Naeem <rosheennaeem4@gmail.com>
 2020-08-06 17:51:34 +05:00
Maurício Meneghini Fauth
1dccc10493 Extract method for adding script files 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-07-12 16:58:33 -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
2937e9796d Remove underscore prefix from some method names 
Related to #16149

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-05-30 17:20:43 -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
a64393e7f5 Fix some coding standard issues 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-05-13 00:23:28 -03:00
Maurício Meneghini Fauth
9b7c4931d3 Add AbstractController::render method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-04-16 20:15:42 -03: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
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