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

262 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
556594b4cd
Fix coding standard spacing issues 
- Fixes one line doc comments
- Fixes parent call spacing
- Fixes constant spacing

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-24 21:06:17 -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
Maurício Meneghini Fauth
2137664f82
Merge pull request #18116 from kamil-tekiela/Remove-strlen 
Remove strlen when used in a condition
 2023-02-24 20:20:12 -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
dcc912fdef Remove strlen when used in a condition 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-24 22:58:47 +00: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
47846068fa
Remove some useless comments 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 23:45:06 -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
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
48f671d956
Replace get_class() with ::class constant 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 18:58:13 -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
80c4db7253 Use strict check when type is known 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-19 23:19:54 +00:00
Kamil Tekiela
cfe54a501b Add union types 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-15 15:23:28 +00:00
Maurício Meneghini Fauth
4e4e2e56fd
Refactor NodeFactory::getInstance() to use class strings 
Improves type inference.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-15 11:46:04 -03: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
Kamil Tekiela
69f8d9f85c Replace switch with match 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-14 13:07:00 +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
67fbb4011d
Remove dead code in Navigation (#17969) 
* Remove temporary variable $node

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

* Simplify Generator::getNavigationLink

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-10 16:07:11 -03:00
Kamil Tekiela
32626b1333 NodeDatabase memoization 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-01-25 21:17:55 +00:00
Kamil Tekiela
6665289780 Remove dead code 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-01-25 15:17:51 -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
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
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
ce0ee04406 Remove temporary variables 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-14 17:23:44 +00:00
Maurício Meneghini Fauth
0f57dfff5b
Merge pull request #17800 from kamil-tekiela/Fix-phpstan-issues-2 
Fix PHPStan issues 2
 2022-10-17 20:32:59 -03:00
Maurício Meneghini Fauth
e641c70110
Refactor the NodeColumn::getTruncateValue method 
Removes the unnecessary switch construct.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-16 17:29:09 -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
Kamil Tekiela
746dbc5300 Make parent actually null 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-15 21:16:04 +01:00
Kamil Tekiela
b6db957a76 Specify parameter types 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-15 21:16:04 +01:00
Kamil Tekiela
84ea3c844c Modest refactoring of Node classes 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-15 21:16:04 +01:00
Maurício Meneghini Fauth
cd90930d12
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-07-23 18:55:51 -03:00
Maurício Meneghini Fauth
e2c7aa8628
Fix error when a db group name is same as container name 
Fixes #17659

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-07-23 18:38:22 -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
f911458b71
Fix CSS class name conflict in navigation tree 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-03 18:09:21 -03:00
Isaac Bennetch
985912f58f Fix merge conflicts from security branch 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:28:17 -05:00
Maurício Meneghini Fauth
0bee94b27e
Merge branch 'QA_5_1-security' into master-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-11 14:31:56 -03:00
Maurício Meneghini Fauth
02e8588404
Merge branch 'QA_4_9-security' into QA_5_1-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 18:39:23 -03:00
Maurício Meneghini Fauth
4fd7aa7a2c
Use POST for Navigation's aPath and vPath 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:44 -03:00
Maurício Meneghini Fauth
6f0d19f394
Do not encrypt params if used in data-post attribute 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:43 -03:00
Maurício Meneghini Fauth
d057b68aa1
Add unit tests 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:43 -03:00
Maurício Meneghini Fauth
3095181bb3
Encrypt query params of Navigation links 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:43 -03:00
Kamil Tekiela
2edc9da063 Deimplement dataSeek() helper 
There were only two usages remaining. This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-07 23:22:49 +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
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
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
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
Maurício Meneghini Fauth
4001460066
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-21 15:00:06 -03:00