gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,748 Commits 12 Branches 481 Tags 2.4 GiB
8bb312514e
Commit Graph

326 Commits

Author SHA1 Message Date
Kamil Tekiela
f4f2f93b1c NullableCompareToNullRector 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-27 21:58:12 +01:00
Kamil Tekiela
231ec1ba8b Remove QBE 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-19 11:21:46 +01:00
Maurício Meneghini Fauth
78be90b34b
Merge pull request #18418 from kamil-tekiela/strlen 
Remove strlen in boolean conditions
 2023-05-16 17:23:58 -03:00
Kamil Tekiela
4ec3b99ba3
Improve boolean conditions with arrays (#18417) 
* Remove empty() on array

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

* Remove boolean count()

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-12 15:16:26 -03:00
Kamil Tekiela
c13f68ccc7 Remove strlen in boolean conditions 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-12 17:45:07 +01:00
Kamil Tekiela
d5cce547e7 Fix property initializations 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-05-11 23:25:01 +01:00
Maurício Meneghini Fauth
473057d175
Add null as default for Server control_ properties 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-06 15:21:41 -03:00
William Desportes
25bd2ac711
Merge #18223 - Add a configuration option to allow shared bookmarks: $cfg['AllowSharedBookmarks'] 
Pull-request: #18223

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-05-06 12:02:50 +02:00
Maurício Meneghini Fauth
1921a8bb1d
Rename Config\Settings\Server properties to use camel case 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-02 15:50:59 -03:00
Maurício Meneghini Fauth
2f4dab8880
Add missing Config\Settings\Server control_ properties 
https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-02 15:24:59 -03:00
Maurício Meneghini Fauth
5ffe2847ac
Remove Config::checkServers() method 
Removes the Config::checkServers() method as it's duplicated in
Config\Settings class.
Also uses the Settings class to filter invalid config keys when loading
a config file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-29 14:50:18 -03:00
Maurício Meneghini Fauth
74ba4f17b0
Remove config global var from Logging class 
Uses the Settings class to access the log settings.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-27 14:38:18 -03:00
Erki Aring
c716102d09
Add configuration option to allow shared bookmarks 
Signed-off-by: Erki Aring <erki@example.ee>
 2023-04-14 12:09:01 +03:00
Maurício Meneghini Fauth
6a2c12bdc8
Add missing traversable type hints 
Replace array type hint with mixed[] type hint, since it means the same.
This way it's possible to require traversable type hint for new code.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-04-02 01:32:12 -03:00
Maurício Meneghini Fauth
dd885dc7b8
Use single-line arrays when possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-27 17:39:17 -03:00
Maurício Meneghini Fauth
e5698c85e9
Require single line for function calls 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-26 23:10:10 -03:00
Maurício Meneghini Fauth
802d8f13b6
Merge pull request #18203 from kamil-tekiela/first-class-callable 
Use first class callables
 2023-03-25 15:16:07 -03:00
Maurício Meneghini Fauth
9d19822fff
Remove the _overrides key of the ConfigFile::$cfgDb 
It's always empty. It was introduced by 5c658310aa
and its last usage was removed by 2a8962aa95

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-21 11:06:18 -03:00
Maurício Meneghini Fauth
b836ace0f1
Merge config.values.php with ConfigFile class 
This file is only used by the ConfigFile class, so makes sense to this
information to be inside the class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-20 21:26:37 -03:00
Maurício Meneghini Fauth
f13bd41bac
Merge pull request #18247 from kamil-tekiela/Native-param-types 
Native param types
 2023-03-17 17:52:45 -03:00
Kamil Tekiela
3774c29604 Fix implicit nulls 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-17 12:45:18 +00:00
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
Maximilian Krög
79ab3dfe11
Fix some comment typos 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2023-03-16 21:26:19 +01:00
Kamil Tekiela
31ec12455f Add private prop $isSetupScript 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-12 23:35:19 +00:00
Erki Aring
b7ce755f07 Make database and web server info separately configurable 
Signed-off-by: Erki Aring <erki@example.ee>
 2023-03-10 10:12:24 +02:00
Maurício Meneghini Fauth
8123a81235
Remove $GLOBALS['cfg'] from BrowseForeigners class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-03 16:15:40 -03:00
Kamil Tekiela
e71b8c2030 Use first class callables 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-02 23:00:43 +00:00
Maurício Meneghini Fauth
687c51dc1e
Replace $GLOBALS['cfg']['ZeroConf'] in Common class 
Replaces it with PhpMyAdmin\Config\Settings::$zeroConf access.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-02 17:55:58 -03:00
Maurício Meneghini Fauth
5c5e8c2de1
Replace $GLOBALS['cfg']['MysqlMinVersion'] in Common class 
Replaces with PhpMyAdmin\Config\Settings::$mysqlMinVersion access.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-02 17:29:54 -03:00
Maurício Meneghini Fauth
a035b5173d
Refactor Config\Settings::toArray() method 
Rename it to asArray() and remove get_object_vars() function call.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 15:55:40 -03:00
Maurício Meneghini Fauth
684d8973ec
Add Config\Settings\Transformations::asArray() method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 15:30:35 -03:00
Maurício Meneghini Fauth
afcb4e406d
Add Config\Settings\SqlQueryBox::asArray() method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 15:22:56 -03:00
Maurício Meneghini Fauth
51a20c09fc
Add Config\Settings\Server::asArray() method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 15:16:26 -03:00
Maurício Meneghini Fauth
7fde991c6a
Add Config\Settings\Schema::asArray() method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 15:01:53 -03:00
Maurício Meneghini Fauth
2ef2e44201
Add Config\Settings\Import::asArray() method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 14:54:28 -03:00
Maurício Meneghini Fauth
395e46d637
Add Config\Settings\Export::asArray() method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 14:45:38 -03:00
Maurício Meneghini Fauth
50f9a90275
Add Config\Settings\Debug::asArray() method 
Refactor the test to test each property individually.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-01 14:28:01 -03:00
Maurício Meneghini Fauth
7f5a1b799f
Add Config\Settings\Console::asArray() method 
Refactor the test to test each property individually.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-28 17:52:40 -03:00
Maurício Meneghini Fauth
25cce47ae2
Merge config.default.php with Config\Settings classes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-28 12:19:02 -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
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
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
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
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
Kamil Tekiela
69f8d9f85c Replace switch with match 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-14 13:07:00 +00:00