Commit Graph

54 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
adf0f1f4c2
Remove the row global variable
Replaces it with Results::$row static property.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2025-01-10 15:53:53 -03:00
Maurício Meneghini Fauth
1998aa70e5
Remove some unused global variables
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2025-01-08 17:21:45 -03:00
Maurício Meneghini Fauth
081d6c13d0
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-12-25 12:37:15 -03:00
Kamil Tekiela
8015e4de72 Move DatabaseInterface to Dbal
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-12-22 18:34:53 +00:00
Maurício Meneghini Fauth
f2de7c9a16
Update Composer dependencies
- Upgrading phpdocumentor/type-resolver (1.9.0 => 1.10.0)
  - Upgrading phpmyadmin/sql-parser (dev-master 5c4dc47 => dev-master 6d8c215)

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-11-10 03:11:15 -03:00
Kamil Tekiela
b6bea791aa Split getForeigners into getForeignersInternal
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-09-30 14:11:14 +01:00
Kamil Tekiela
d0f797e50c More refactoring
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-09-28 21:41:57 +01:00
Kamil Tekiela
625dcf215a Split up getForeignKeysData from getForeigners
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-09-28 14:48:44 +01:00
Kamil Tekiela
1be98e1d60 Rename variables
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-09-28 14:11:18 +01:00
Kamil Tekiela
ec977df5cd ForeignerKey
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-09-24 18:35:32 +01:00
Maurício Meneghini Fauth
a44ae81ad0
Merge pull request #19264 from kamil-tekiela/Readonly-value-objects
Make value objects readonly
2024-08-16 19:23:11 -03:00
Maurício Meneghini Fauth
7d1ddd22a5
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-08-16 18:10:05 -03:00
Kamil Tekiela
26eed395e8 Make value objects readonly
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-08-16 11:40:56 +02:00
Maurício Meneghini Fauth
70105294ef
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-22 15:44:41 -03:00
Maurício Meneghini Fauth
dc1bd60dd1
Fix boolean usage of the return value of preg_match()
preg_match() and preg_match_all() returns the number of pattern matches
(which might be zero), or false on failure. However, preg_match() always
returns 1 when a pattern is matched as it stops searching after the
first match.

- https://www.php.net/manual/en/function.preg-match.php
- https://www.php.net/manual/en/function.preg-match-all.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-13 14:43:05 -03:00
Maurício Meneghini Fauth
90ee00efd5
Create the 'pma' global variable for Twig templates
Creates the Twig\PmaGlobalVariable class to handle the 'pma' Twig global
variable.

The idea of this global variable is to automatically inject in all
templates some useful information.

For now it only includes `pma.version` to get the phpMyAdmin version
and `pma.text_dir` to get the text direction ('ltr' or 'rtl').

Adding new variables to the `pma` global variable should be done with
caution.

- https://twig.symfony.com/doc/3.x/advanced.html#globals

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-09 20:30:48 -03:00
Kamil Tekiela
65cbcfa880 Privatize constants
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-06-26 17:22:28 +02:00
Maurício Meneghini Fauth
1db76c69f1
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-06-03 22:04:18 -03:00
Kamil Tekiela
99c4d34db2 Create MessageType enum
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-05-14 16:30:45 +02:00
Kamil Tekiela
24e6089625 Add UiProperty enum
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-05-02 23:01:12 +02:00
Kamil Tekiela
bec92e7c19 Fix inheritance of TransformationsInterface
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-03-12 17:15:37 +01:00
Kamil Tekiela
5536e35cd5 Refactor $transformationInfo
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-03-12 17:15:37 +01:00
Kamil Tekiela
0c7c968104 Refactor Transformation plugin instantiation
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-03-12 17:15:37 +01:00
Kamil Tekiela
54b5464ec2 Replace function casts with normal casts
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-03-03 15:07:57 +01:00
Kamil Tekiela
8e4443b17b
Applying suggestions from static analysis tools (#19013)
* Drop array keys from lists

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

* Import UrlTest

When it doesn't exist in Prod, the code will still work the same.
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Drop redundant return [];

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

* Fix object access checks

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

* Use strict comparison

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

* Int keys should be specified as integers

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

* Use empty string check instead of strlen

Potential null deprecations are replaced with loose condition.

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

* Use stripos instead of *substr

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

* Simplify substr's 3rd param

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

* Remove unnecessary defaults

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

* Replace isZeroBasedArray with array_is_list

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

* Simplify texEscape()

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

* Simplify exportZeroBasedArray()

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

* Replace for loop with array_diff

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

* Replace for with foreach

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

* Remove nullable param in backquoteCompat

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

* Use null-coalescing operator

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

* Inline $result variable

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

* Turn $event into a constant

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

* Move selectDb outside the loop

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

* Fix code style order of operation

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

* Remove unnecessary isset argument

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

* Remove line break

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

* Use foreach instead of for

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-02-27 12:29:02 -03:00
Maurício Meneghini Fauth
bfc1926cf6
Extract Config from Display\Results class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-02-12 19:09:33 -03:00
Kamil Tekiela
79a68a4349
Add type hints instead of mixed (#18976)
* Remove some empty() statements

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

* Fix docbloc

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

* Add type hint to getHtmlForOneKey()

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

* Add type to buildColumnCreationStatement()

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

* Add return type to fetchByMode()

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

* Add type to getCompatibilities()

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

* Add type to getDirContent

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

* Add type to getCharLists()

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

* Add type to executeSqlQuery()

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

* Add type to findLineNumberAndColumn

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

* Add type to lint()

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

* Add type to getHtmlForNewTables3NF()

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

* Add type to getViewsAndCreateSqlViewStandIn()

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

* Add type to getPossibleRowFormat()

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

* Add type to getTableAltersArray()

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

* Add type to getValuesForColumn()

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

* Add type to getAvailableMimeTypes()

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

* Add types to TwigLintCommand

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

* Add type to isRowCountApproximated

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

* Add type to getReplicationStatus()

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

* Add type in formatVariable()

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

* Add type to fetchSingleRow()

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

* Add type to getPages()

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

* Add type to CentralColumns::getParams()

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

* Add type to removeRelation()

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

* Add type to getWarnings()

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

* Add type to getTableCommentsArray()

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

* Fix docbloc comment

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

* Add type to sanitizeUrl()

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

* Add type to uploadProgressSetup()

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

* Add type to explodeMarkup()

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

* Add types in Table

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

* Add type to getHtmlForDataStatements()

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-02-07 19:19:12 -03:00
Maurício Meneghini Fauth
e9671ea610
Replace StatementInfo class with SqlParser\Utils\StatementInfo
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-02-06 08:07:13 -03:00
Kamil Tekiela
822ebbfe59 Remove unnecessary parentheses
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-01-12 15:26:31 +01:00
Kamil Tekiela
bccbda7249 Small code quality fixes
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-01-12 14:57:46 +01:00
Kamil Tekiela
68509598f0 Replace strpos with str_contains
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-01-12 03:01:17 +01:00
Kamil Tekiela
4975df100b Replace mb_strpos
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2024-01-12 03:01:17 +01:00
Maurício Meneghini Fauth
98ee8f7158
Merge pull request #18862 from MauricioFauth/server-global
Replace server global with Current::$server
2023-12-24 17:48:28 -03:00
Maurício Meneghini Fauth
f43da40442
Merge pull request #18856 from kamil-tekiela/getTablesFull
Refactoring of getTablesFull and Query/Cache
2023-12-24 03:04:13 -03:00
Maurício Meneghini Fauth
1129750eee
Replace server global with Current::$server
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-12-24 02:08:50 -03:00
Maurício Meneghini Fauth
74054cb4d3
Extract container builder logic to ContainerBuilder class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-12-22 19:22:18 -03:00
Kamil Tekiela
1c9831f1ed Simplify code
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-12-20 21:07:03 +01:00
Maurício Meneghini Fauth
711f6c0f14
Replace db global variable with static class property
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-12-17 14:58:59 -03:00
Kamil Tekiela
d204a758fd Remove $GLOBALS['showtable']
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-12-15 20:00:31 +01:00
Kamil Tekiela
4fb335e960 Make in_array strict
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-12-07 17:11:48 +01:00
Maurício Meneghini Fauth
c11b620d01
Merge pull request #18825 from kamil-tekiela/sanitizeMessage
Refactor Sanitize::sanitizeMessage
2023-12-04 21:58:33 -03:00
Kamil Tekiela
e90cfe584f Change method name
This method doesn't sanitize anything. While it does format the message into HTML, it doesn't remove or clean anything. What it does is replace BB codes into HTML.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-12-02 00:10:16 +01:00
Kamil Tekiela
b97f8fca9a getSortOrderHiddenInputs
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-12-01 12:38:57 +01:00
Maurício Meneghini Fauth
582809d589
Move Table class into Table namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-11-15 16:09:42 -03:00
Maurício Meneghini Fauth
5f092a8b94
Remove theme global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-11-14 15:43:46 -03:00
Kamil Tekiela
461655f4c1 Apply suggestions from code review
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-23 17:31:04 +01:00
Kamil Tekiela
2e81a808f7 Create UniqueCondition class
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 21:18:48 +01:00
Kamil Tekiela
b230b1ae31 Remove 1st param in getUniqueCondition()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 19:56:08 +01:00
Kamil Tekiela
d3b1714593 Remove $properties
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 19:46:24 +01:00
Kamil Tekiela
ba61dee11f Simplify getColumnParams()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-10-21 10:11:23 +01:00