Commit Graph

125611 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
e7a5cc897a
Refactor Server\PrivilegesTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 14:56:25 -03:00
Maurício Meneghini Fauth
0ba371f921
Refactor ConfigStorage\UserGroups::delete()
- Extracts dbi global variable
- Replaces escapeString with quoteString

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 14:40:25 -03:00
Maurício Meneghini Fauth
19762dbf75
Refactor TrackerTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 14:09:05 -03:00
Maurício Meneghini Fauth
2722ea717d
Replace escapeString with quoteString in AccountLocking class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 13:43:14 -03:00
Maurício Meneghini Fauth
5cf1ec8bc3
Refactor UtilTest to remove withConsecutive method
The PHPUnit's InvocationMocker::withConsecutive() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 13:22:30 -03:00
Maurício Meneghini Fauth
193862ca92
Merge pull request #18135 from kamil-tekiela/Remove-generateRowQueryOutput
Remove generateRowQueryOutput() method
2023-02-21 12:03:48 -03:00
Kamil Tekiela
54e4ec68fd
Stop using PHP_EOL (#18101)
* s/PHP_EOL/"\n"

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

* PHP_EOL seems to have been intentional here

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

* Merge concats together

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 11:58:56 -03:00
Maurício Meneghini Fauth
1210a256a2
Update PHPStan/Psalm baselines
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-21 11:48:15 -03:00
Kamil Tekiela
f874bf1d99 Remove generateRowQueryOutput() method
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 14:45:59 +00: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
8eb1cef07d
Use generic template for ExportRelationSchema::$diagram
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 21:18:39 -03:00
Maurício Meneghini Fauth
772648a97b
Use DatabaseName object for ExportRelationSchema::$db
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 20:30:29 -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
48f671d956
Replace get_class() with ::class constant
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 18:58:13 -03:00
Maurício Meneghini Fauth
efed55320d
Fix invalid PHP doc blocks
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 18:46:35 -03:00
Maurício Meneghini Fauth
bd095c7bb4
Merge pull request #18132 from kamil-tekiela/fix-after-merge
Fix merge issues
2023-02-20 18:24:18 -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
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
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
Kamil Tekiela
c311b9fdcb Fix merge issues
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-20 20:43:12 +00: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
5cbb878dda
Replace Heredoc strings with Nowdoc strings
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 16:46:21 -03:00
Maurício Meneghini Fauth
4b71da0566
Merge pull request #18127 from kamil-tekiela/nonUnique-to-bool
Change nonUnique prop to be bool
2023-02-20 16:32:44 -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
6b35829406
Add ChangeLog entries for #18106 and #18120
- https://github.com/phpmyadmin/phpmyadmin/pull/18120
- https://github.com/phpmyadmin/phpmyadmin/pull/18106
- https://github.com/phpmyadmin/phpmyadmin/issues/18105

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 13:50:54 -03:00
Maurício Meneghini Fauth
6eb4b4d5ad
Merge pull request #18120 from kamil-tekiela/bug-with-numerical-table-names-during-rename
Fix bug with numerical tables during renaming DB
2023-02-20 13:43:51 -03:00
Kamil Tekiela
fa339143ea
Fix renaming db with a view (#18106)
* Fix renaming DB with a view

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

* Add test for the bug

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-20 13:36:46 -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
Maurício Meneghini Fauth
c9659f4028
Merge branch 'QA_5_2' 2023-02-20 12:18:12 -03:00
Maurício Meneghini Fauth
cc1ceba841
Add ChangeLog entries for #17599 and #17364
- Closes #17364
- Closes #17599

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 12:16:52 -03:00
Maurício Meneghini Fauth
49d24c3a37
Merge pull request #18067 from liviuconcioiu/filereader
Fix #17364 - Fix Argument 1 is not an object
2023-02-20 12:10:13 -03:00
Maurício Meneghini Fauth
5548c9de49
Fix issue reported by PHPStan in ConfigTest
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 12:05:18 -03:00
Liviu-Mihail Concioiu
3224f6c47d
Fix #17599 - Fix passwordForm is null (#18043)
* Fix passwordForm is null

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2023-02-20 12:03:44 -03:00
Maurício Meneghini Fauth
9bc8257326
Remove failing workflow for arm32v6
- https://github.com/phpmyadmin/phpmyadmin/issues/18121

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 11:36:41 -03:00
Kamil Tekiela
1967a2511f Change nonUnique prop to be bool
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-20 12:30:53 +00:00
Maurício Meneghini Fauth
820e14e55c
Merge pull request #18111 from liviuconcioiu/linnks
Update links
2023-02-19 22:05:21 -03:00
Maurício Meneghini Fauth
8f1eba4255
Merge pull request #18113 from MoonE/remove-static-annotations
Remove redundant `@static` annotations
2023-02-19 21:58:51 -03:00
Maurício Meneghini Fauth
5280f044f5
Merge pull request #18125 from kamil-tekiela/UseIdenticalOverEqualWithSameTypeRector
Use identical over equal with same type rector
2023-02-19 20:25:11 -03:00
Kamil Tekiela
8f7c28b181 Refactor the condition to get rid of redundant code
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-19 23:19:54 +00: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
Maurício Meneghini Fauth
41e9b64418
Remove exception variable from non-capturing catch
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-19 18:55:35 -03:00
Maurício Meneghini Fauth
f5ed30d772
Upgrade to phpmyadmin/coding-standard 4.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-19 18:37:56 -03:00
Maurício Meneghini Fauth
bec611d817
Update Psalm baseline
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-19 17:20:58 -03:00
William Desportes
a2e2ef9501
Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-19 13:58:34 +01:00
William Desportes
45c4152c4a
Output the version of sphinx-build in create-release.sh
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-19 13:48:27 +01:00
William Desportes
3ca687a35c
Fix folder management and building kits in create-release.sh
Fixes 67e18b7354 where it was a bit wrong

+ typo fix

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-19 13:46:08 +01:00
William Desportes
de35195d3c
Improve testGetTempDir and testGetUploadTempDir tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-19 13:30:22 +01:00