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

295 Commits

Author SHA1 Message Date
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
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
d76b240176 Remove redundant pass-by-ref 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-10 16:30:12 -03:00
Kamil Tekiela
2b32209ae8
Remove useless references (#18058) 
* Remove useless references
* Change out param to returning
* Add missing type declarations
* Update psalm-baseline.xml

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-10 16:25:35 -03:00
Kamil Tekiela
7e5d96b559 Use DI for UserPreferences 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-10 16:23:34 -03:00
Kamil Tekiela
d1bda5c5dc Refactor config forms 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-01-23 23:32:27 +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
William Desportes
e4b0e6bf81
Merge branch 'QA_5_2' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-11-25 21:39:21 +01:00
Scott Mcgowan
6fc1401ee2
Fix column names option for CSV Export 
Previously work was done to enable column names in CSV exports by
default. This change actually ended up overwriting the column name value
so that column names were included in all exports regardless of whether
or not the property was disabled. This commit changes the default for
column names to enabled as the original change intended, and removes
the property overwrite.

Signed-off-by: Scott McGowan mcgowanscott16@gmail.com
 2022-11-25 21:15:49 +01:00
William Desportes
ea5a541f7b
Merge branch 'QA_5_2' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-10-29 17:26:44 +02:00
Liviu-Mihail Concioiu
a366032ab9 Fix 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2022-10-29 16:09:09 +02:00
Liviu-Mihail Concioiu
73f6017f2f Fix 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2022-10-29 15:33:19 +02:00
Liviu-Mihail Concioiu
e64d7e2661 Fix SCHEMA_NAME links 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2022-10-28 09:49:38 +02:00
Maurício Meneghini Fauth
0216137094
Merge pull request #17799 from kamil-tekiela/js-escaping 
Refactor JS escaping mechanism
 2022-10-17 20:24:33 -03:00
Kamil Tekiela
fd7b043cf3 Use json_encode in addJsValidate 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 21:28:57 +01:00
Kamil Tekiela
270ad693eb Replace uses of escapeJsString with json_encode 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 21:28:56 +01:00
Kamil Tekiela
35a4291d57 Refactor ServerConfigChecks::performConfigChecks 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 21:26:05 +01:00
Maurício Meneghini Fauth
a52f50ad58 Merge branch 'standan-hulk-fix-phpstan-issues' 
Resolves https://github.com/phpmyadmin/phpmyadmin/pull/17782

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-17 16:42:36 -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
Daniel Platt
93cc48c33b fix return type errors from phpstan - add more specific array types 
Signed-off-by: Daniel Platt <82732185+standan-hulk@users.noreply.github.com>
 2022-10-13 12:11:11 +02:00
Maurício Meneghini Fauth
8da8d3f8c8 Add types for Config\FormDisplay::save() parameters 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-12 19:19:36 -03:00
Maurício Meneghini Fauth
6a9fe03ff2
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-29 00:45:10 -03:00
Maurício Meneghini Fauth
700db7e72b
Update the docs to reflect the blowfish_secret changes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-26 17:34:13 -03:00
Maurício Meneghini Fauth
5d4884d294
Update setup page to generate better blowfish_secret keys 
Instead of generating a printable string, it generates a binary string
and converts it to an hexadecimal string.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-26 17:33:38 -03:00
Maurício Meneghini Fauth
d3a267fdfc
Refactor DbiMysqli::connect to use Server value object 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-08-29 18:19:38 -03:00
Maurício Meneghini Fauth
a55b8e88f9
Assign config.js globals to the window object 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-07-01 16:23:22 -03:00
Maurício Meneghini Fauth
4891f2dc74
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-04-21 14:45:17 -03:00
Maurício Meneghini Fauth
2c5143feda Remove ResponseRenderer::getFooter method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-04-09 12:32:14 -03:00
Maurício Meneghini Fauth
c0941401c1
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-03-11 14:26:19 -03:00
Erol Guven
b20111d63b Allow removing DEFINER clause from exported SQL 
Signed-off-by: Erol Guven <erol.guven@appian.com>
 2022-03-10 13:32:04 +00: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
Jonah Tan
0ea87bc42c Replace html in export description with bb code 
Signed-off-by: Jonah Tan <47470981+jonahtanjz@users.noreply.github.com>
 2022-02-08 00:32:43 +08:00