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

159 Commits

Author SHA1 Message Date
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
8972c0ec22
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-24 18:15:47 -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
Kamil Tekiela
3db245f462 Optimize export of many tables 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-15 19:59:35 +00: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
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
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
87e42d591c Use short closures where possible 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-14 13:44:42 +00:00
Kamil Tekiela
6264f6f1ea
Various refactorings 2 (#17965) 
* Remove extra blank lines
* Remove useless param annotations
* Refactor Index::singleton
* Refactor Config.php
* Refactor Header::addRecentTable()
* Collapse return statement into a single line
* Refactor Message.php
* Convert $getUniqueCondition into a scalar
* Code style
* Fix invalid return phpdoc
* Remove unused variable
* Remove redundant empty array checks
* Refactor Export::closeFile()
* Simplify else statement
* Remove redundant else
* Refactor TablePartitionDefinition::getDetails
* Simpler returns
* Add types for getCellContent()
* Remove useless method mngInsideStructComm

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-24 12:54:23 -03:00
Maurício Meneghini Fauth
13890a947a
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-16 11:53:18 -03:00
William Desportes
9c4a90137d
Fix #16988 - export as CSV/JSON/SQL/... no database selected 
Fixes: #16988

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-12-13 23:27:07 +01:00
Maurício Meneghini Fauth
d0d90551c3 Remove the dblist global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-11-13 21:08:00 -03:00
Maurício Meneghini Fauth
32d06ae22e
Extract schema export from schema plugins 
Moves the response handling to the SchemaExportController.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-11-12 12:56:48 -03:00
Maurício Meneghini Fauth
b62062b3aa
Refactor Export::processExportSchema() to use DatabaseName object 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-11-11 00:57:24 -03:00
Kamil Tekiela
3b49a5bedb Implement quoteString() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-11-06 19:06:48 +00:00
Maurício Meneghini Fauth
c88152cf59
Use more specific exceptions for some errors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-31 22:32:12 -03:00
Maurício Meneghini Fauth
62530b48a5
Replace Core::fatalError with an exception in Export::processExportSchema() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-31 20:25:51 -03:00
Umang Patel
fdb5528648
Use Database type instead of string (#17746) 
* Refactored tryColumnCreationQuery function inside CreateAddField to use DatabaseName type instead of string
* Refactored exportDatabase and lockTables function to use DatabaseName type instead of string for database name

Signed-off-by: Umang Patel <umang.patel@healthengine.com.au>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-20 21:34:10 -03:00
Maurício Meneghini Fauth
b054d0091e
Merge pull request #17807 from kamil-tekiela/table-dbi 
Pass $dbi as argument to Table
 2022-10-18 11:08:36 -03:00
Kamil Tekiela
2c416128e5 Pass as argument to Table 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 22:30:33 +01:00
Kamil Tekiela
32d93281bb Make alias merging cleaner 
No useless globals, no overwriting of the same value. The values seem to always be string|null so let's check explicitly for that.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 14:43:28 +01:00
Kamil Tekiela
1e7997b761 Set property type to string 
It must be string as it's used only in string context.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 14:43:28 +01:00
Kamil Tekiela
53b832211c Make the condition clearer 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 14:43:28 +01:00
Kamil Tekiela
fd5c96e250 This should only check for empty string 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 14:43:28 +01: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
059705f06e
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-10-11 19:53:54 -03:00
Kamil Tekiela
c19f6ae9ce Fix isNumeric 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-10 15:02:15 +01:00
Maurício Meneghini Fauth
bb97ed988f
Reduce usage of the containerBuilder global variable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-29 22:36:46 -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
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
a7a7490e15
Merge pull request #17579 from kamil-tekiela/ExportController 
Refactor getHtmlForDisplayedExportHeader
 2022-06-11 01:20:44 -03:00
Kamil Tekiela
1b663ab3bc Refactor getHTMLForBackButton 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-06-10 21:13:22 +01:00
Maurício Meneghini Fauth
775108a527
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-06-10 03:16:58 -03:00
Kamil Tekiela
cb06b06bda Refactor getHtmlForDisplayedExportHeader 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-06-02 23:06:36 +01:00
Liviu-Mihail Concioiu
d14e5a74f8 Fix export limit size calculation 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2022-05-31 08:22:25 +02: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
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
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