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

389 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
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
437215cab2
Rename variables to use camel case format 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-26 21:47:50 -03:00
Kamil Tekiela
74c48a499b Fix error in normalization 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-19 21:56:01 +00: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
8a5ce0b557 Split long lines 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-17 12:48:12 +00:00
Kamil Tekiela
3ecf14df34 Fixing erroneous params 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-17 12:47:43 +00: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
df9d76e2a2 Use quoteString in Events 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-03 17:37:44 -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
Maurício Meneghini Fauth
82693daebc
Improve type declaration of SavedSearches::$criterias 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-02-20 18:12:19 -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
cb2e1932f8
Better array types part 1 (#18096) 
* Plugins getScripts() return array of strings

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

* These methods always return an array

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

* extractPrivInfo returns an array of strings

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

* getInfoPages returns an array of strings

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

* returnClassNamesFromMenuButtons returns a string map

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

* Use array shape for getDatabasesForSelectOptions

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

* Some methods in Table return array of strings

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

* getLines returns an array if ints

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

* Array shapes in TwoFactor

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

* parseEnumSetValues always returns an array of strings

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-15 16:52:00 -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
b6f0da1c09 Convert to first class callables 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-14 14:18:23 +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
7a22334167
Designer controller globals (#17985) 
* Remove globals from DesignerController
* Remove $GLOBALS['params'] in ManageController
* Remove $GLOBALS['params']
* Remove $GLOBALS['total_num_tables']
* Remove $GLOBALS['tooltip_truename']
* Remove $GLOBALS['tooltip_aliasname']
* Remove $GLOBALS['pos']
* Remove $GLOBALS['tables'] (partially)
* Remove $GLOBALS['num_tables'] (partially)
* Remove redundant calls to Util::getDbInfo()
* Move unrelated functionality out of getDbInfo()
* Extract new method getTableListPosition()
* Code style changes
* Update phpstan-baseline.neon

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-01-26 22:58:24 -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
Maurício Meneghini Fauth
fdf474abf9
Merge pull request #17981 from kamil-tekiela/getTables-investigation 
Improve some type inference in various places

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-24 13:44:45 -03: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
Kamil Tekiela
ba110e8638 Remove $GLOBALS['tab_pos'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 18:55:03 +00:00
Kamil Tekiela
4b4bd00f37 Simplify fetchResult in Common 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-20 18:55:03 +00:00
Kamil Tekiela
bc6fb312db Improve type inference in getTables() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-19 23:29:25 +00:00
Kamil Tekiela
db5db26c60
Refactor Database Search (#17962) 
* Refactor Search::getWhereClause()

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

* Refactor Search::getSearchSqls()

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

* Fix HTML escaping issues in Database search

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

* Change links to buttons

More semantically correct, does not link to a separate page on middleclick, and looks better.

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

* Refactor Search::getSearchResults()

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

* Update psalm-baseline.xml

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

* Update phpstan-baseline.neon

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-15 13:43:29 -03:00
Kamil Tekiela
59ba203280 Remove invalid usages of htmlspecialchars() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-14 17:23:44 +00:00
Kamil Tekiela
7cc0fbcf56 Fix nullable arrays that should not be nullable 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-12-14 17:23:44 +00:00
Maurício Meneghini Fauth
47238d6c8c
Fix ImportController failing test and other minor fixes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-12-14 13:33:37 -03: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
Kamil Tekiela
95a93ba909
Minor stylistic changes (#17865) 
* Stylistic changes to make refactoring easier
* Parameter $where was unnecessarily nullable
* Refactor Routines::getDetails()
* Refactor Events::getDetails()
* Refactor Triggers::getDetails()
* Split up QueryGenerator::getInformationSchemaColumnsFullRequest

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-11-05 12:55:44 -03:00
Kamil Tekiela
e62241b079 Update Routines.php 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-11-02 15:15:58 +00:00
Kamil Tekiela
98902c87a8 Update Designer.php 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-11-02 15:15:58 +00: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
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
Kamil Tekiela
2c416128e5 Pass as argument to Table 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-17 22:30:33 +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
Kamil Tekiela
629a921759 Fix bug with 0-string 
I can't be bothered to check how the bug manifests itself, but a table called 0 is not special.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-15 21:16:04 +01:00
Kamil Tekiela
418ebe02ac Casting to array something that's already array 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-15 21:16:04 +01:00
Kamil Tekiela
20ce0a8f2f Refactor $GLOBALS['display_page'] 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-10-15 20:15:50 +01:00
Maurício Meneghini Fauth
e96fab654d
Move DBI's getProceduresOrFunctions into Routines class 
Splits the method into Routines::getFunctionNames and
Routines::getProcedureNames and adds tests.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-11 17:32:44 -03:00
Maurício Meneghini Fauth
7975f5fb05
Move DBI's getDefinition into the Routines and Events classes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-11 15:48:26 -03:00