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

109 Commits

Author SHA1 Message Date
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
4ff3724c3f
Use union with null instead of short nullable type 
Since union type are now possible, using union with null makes more
clear that it is a union type.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 21:48:19 -03:00
Maurício Meneghini Fauth
b0bc4f460e
Use null safe object operator where possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 18:21:56 -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
Maximilian Krög
f6a850f1fb
Remove redundant @static annotations 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2023-02-17 23:03:20 +01: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
2b35303aae
Remove redundant code (#18063) 
PHPStorm has been a little annoying with showing all these code issues. I took some time to analyse most of them and fix whichever were easy to fix. This kind of change should improve future maintenance as developers do not need to wonder what a line of code does. Code that has no impact on functionality should be removed.

* Remove redundant variables
* Invert condition for better clarity
* Remove some of the redundant casts
* Replace switch with an if
* Fix foreach variable
* Remove redundant variable concat
* Remove redundant concats
* Replace for loop with str_repeat
* Remove always true param
* Turn property $position into local var
* Turn Pdf properties into local vars
* Remove unused properties in Pdf
* Change ternary into condition
* Remove redundant assignments
   They are immediately overwritten with a different value.
* Redundant array append
* Collapse if statements into assignments
* Use boolean constants instead of variables
* Remove unneeded parameter
* Remove null-coalesce
* Unnecessary assignment
* Remove redundant isset
* Remove readOnly flag for InsertEdit fields
* Remove function_exists and $mode var
* Remove duplicate condition
* Remove redundant elseif
* Remove redundant isset
* Use hasBodyParam()
* Simplify isRoutesCacheFileValid()
   Psalm complains but is wrong.

https://github.com/phpmyadmin/phpmyadmin/pull/18063

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-15 09:11:05 -03:00
Maurício Meneghini Fauth
41dec1effc
Extract connection type constants to the Connection class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-01-17 02:21:27 -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
Maurício Meneghini Fauth
c07a5e7230
Improve type inference of Tracker::getTrackedData() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-11-06 12:48:12 -03:00
Maurício Meneghini Fauth
3890d11dd8
Fix some coding style issues 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-16 17:18:54 -03:00
Maurício Meneghini Fauth
873eb098b9
Remove crlf global variable 
The crlf global variable is only diferent for SQL export method,
otherwise is always the value of the PHP_EOL constant.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-13 14:08:57 -03:00
Maurício Meneghini Fauth
0b5d7b67cf
Fix an error found by Psalm 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-01 22:48:41 -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
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
1b055dba90
Fix TypeError in the Tracker::handleQuery method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-11 14:50:22 -03:00
Kamil Tekiela
86031d2bf6 Deimplement fetchAssoc() helper 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 22:44:53 +00:00
Kamil Tekiela
f5bb90ebb9 Move queryAsControlUser - Dbal refactoring pt.3 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:31:27 +00:00
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
994cf8fa39
Remove Tracker::getTrackingTable method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-26 19:17:58 -03:00
Maurício Meneghini Fauth
d84af02945
Create VO classes for each RelationParameters features 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-26 19:17:58 -03:00
Kamil Tekiela
70c86f5e21 Remove $row_number from DatabaseInterface::fetchValue 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-21 21:09:38 +00:00
Maurício Meneghini Fauth
2a4b170a34
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-21 13:13:09 -03:00
Maurício Meneghini Fauth
c411121fd8
Move Relation classes into the ConfigStorage namespace 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-17 12:09:13 -03:00
William Desportes
13d3e93f84
#16005 - performance improvement on the Import page 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-12-12 20:56:10 +01:00
Maurício Meneghini Fauth
c4575fd48b
Add methods to check for RelationParameters features 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-11 08:10:40 -03:00
Kamil Tekiela
be87571da6 PHPStan checkAlwaysTrueStrictComparison fixes 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-08 15:26:52 +00: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
090d2eece7
Fix some issues found by PHPStan 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-16 15:11:57 -03:00
Maurício Meneghini Fauth
b2a51c4d84
Create the RelationParameters value object 
Replaces the $cfgRelation array with the RelationParameters value
object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-14 18:22:36 -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
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
William Desportes
36e24d174d
Make Tracking::enabled not use statics as it does mess up with tests 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-24 02:01:03 +02:00
Maurício Meneghini Fauth
1129b68d29
Refactor PhpMyAdmin\Plugins::getPlugin method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-25 17:40:20 -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
Maurício Meneghini Fauth
8d0c2a339c
Move both operands of an assignment to the same line 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-04-20 22:35:21 -03:00
William Desportes
48b382cb97
Merge branch 'origin/QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-20 12:21:24 +02:00
William Desportes
a6f7b4ee1c
Add more type safe guards for #16837 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-19 22:58:09 +02:00
Maurício Meneghini Fauth
59e4dae52a
Remove invalid inline doc comments 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-04-18 14:49:28 -03:00
Maurício Meneghini Fauth
3a161651ea
Rename variables to use camel case format 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-03-07 14:58:49 -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
William Desportes
48a6b710b4
Improve Tracker::getVersion failure case 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-02-17 19:11:20 +01:00
William Desportes
c76c6aecee
Do not output tracking query failure 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-02-17 18:37:20 +01:00
William Desportes
5abcae9255
Fixed some typos in the code base 
I used code spell checker and did all the libraries/classes/*.php files one by one.
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-11-01 22:46:01 +01:00
Maurício Meneghini Fauth
97f53937ee Merge branch 'QA_5_0' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-13 15:39:38 -03:00