Commit Graph

377 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
74b1ffbf8c
Merge the DB and table trigger controllers
They are equivalent in current form.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-05-25 15:39:36 -03:00
Kamil Tekiela
fccaaf65a3 Remove all new Psalm issues
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-19 16:33:01 +01:00
Kamil Tekiela
231ec1ba8b Remove QBE
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-19 11:21:46 +01:00
Kamil Tekiela
15a83c32af $db in addNewRelation()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-12 22:50:32 +01: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
Maurício Meneghini Fauth
20d206a705
Merge pull request #18412 from kamil-tekiela/ShortenElseIfRector
Shorten else/if to elseif
2023-05-12 11:16:00 -03:00
Kamil Tekiela
dc471985b9
Short boolean conditions (#18413)
* Short boolean conditions

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

* Simplify conditions

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-12 11:09:21 -03:00
Kamil Tekiela
176645be7b Shorten else/if to elseif
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-12 00:12:58 +01:00
Evgeny Skorlov
4530585ad3
Replace superglobals with serverrequest in controllers
Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-12 15:49:31 -03:00
Kamil Tekiela
74a0c26129 Create DTO for TrackedData
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-04-07 13:46:26 +01:00
Kamil Tekiela
89fb8ee371 Remove count() boolean check
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-04-05 16:53:49 +01:00
Kamil Tekiela
218d59c661 Move getTrackedData to Tracking
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-04-04 23:13:18 +01:00
Kamil Tekiela
73d91f9852 Move deleteTracking to Tracking
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-04-04 22:01:25 +01: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
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
Maurício Meneghini Fauth
c7855f6e95
Create the PhpMyAdmin\Replication namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-20 14:16:01 -03:00
Kamil Tekiela
924fcc79f9 Refactor logic for getting Tracking status
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-17 22:36:21 +00:00
Kamil Tekiela
c0b367cc57 Create Tracking namespace
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-17 22:35:32 +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
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
142f15f373
Use quoteString in controllers (#18191)
* CreateController

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

* FindReplaceController

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

* SetVariableController

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

* GetVariableController

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

* UserGroupsFormController

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

* TablesController

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-03 17:40:45 -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
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
b0bc4f460e
Use null safe object operator where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 18:21:56 -03:00
Maurício Meneghini Fauth
5aeaca0a9a
Remove unnecessary global vars from QBE controller
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 17:51:18 -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
Maurício Meneghini Fauth
2a4803a81b
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 15:18:28 -03:00
Maurício Meneghini Fauth
0fa4ebdc59
Fix coding standard issues and update SA baselines
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 12:50:47 -03:00
ru-asdx
6dca8e722b
Ref #17769 - replace superglobals with serverrequest in database/ controllers (#17991)
* replace superglobals with serverrequest in database/ controllers

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* fix trailing whitespace

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* Update libraries/classes/Controllers/Database/QueryByExampleController.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/QueryByExampleController.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/QueryByExampleController.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/QueryByExampleController.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/TrackingController.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/TrackingController.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

---------

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 12:35:18 -03:00
Evgeny Skorlov
673882b281 libraries/classes/Controllers/Database/ExportController.php
Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
2023-02-20 12:29:09 -03:00
Kamil Tekiela
69f7a915eb Replace getTablesFull with getTables
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-18 14:33:41 +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
8a1d6f1eaa Convert var annotations to typed properties
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-12 21:31:04 +00:00
Maurício Meneghini Fauth
ede1e82c28
Refactor DB designer JS to use modules
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-04 18:26:08 -03:00
Evgeny Skorlov
1eb0e001d8
replace superglobas with serverrequest in database/designercontroller
Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-27 11:49:30 -03: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
ru-asdx
85443b1f5c
replace superglobals with serverrequest in Structure/AddPrefixController, Structure/AddPrefixTableController, (#17980)
Structure/ChangePrefixFormController, Structure/CopyFormController.php Structure/CopyTableController

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
2023-01-10 21:28:14 -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
70af3e9c1c Remove $GLOBALS['script_display_field'] & $GLOBALS['fullTableNames']
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-20 18:55:03 +00: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
8b0cf8c16c Remove dependancy in Database/StructureController
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-16 20:58:47 +00:00
Kamil Tekiela
47d9ad9b23 Remove always false $_error
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 17:17:47 +00:00
Kamil Tekiela
7c1bfec7f5 Removal of globals
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-13 09:43:01 -03:00
Maurício Meneghini Fauth
66f0c2869a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-30 15:34:47 -03:00