1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-25 06:39:48 +03:00
Commit Graph

189 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
4c1668d663 Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-21 14:29:25 -03:00
Maurício Meneghini Fauth
533766b3d7 Merge pull request #17437 from erolatreston/switch-user-QA_5_1
Allow authentication plugin to switch database users
2022-04-21 13:55:47 -03:00
Maurício Meneghini Fauth
cd1bef6c70 Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-05 19:50:06 -03:00
Maurício Meneghini Fauth
e33e164e90 Fix PhpMyAdmin\Util::getConditionValue tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-05 15:50:05 -03:00
Erol Guven
8920eae5db Allow authentication plugin to switch database users
Signed-off-by: Erol Guven <erol.guven@appian.com>
2022-03-09 11:53:50 +00:00
Kamil Tekiela
1270efc2a9 Refactor util.php (#17212)
* Remove extra space

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

* Remove null checks on properties that cannot be null

The value could be null only if the property exists in stdClass
returned by mysqli but is null. Mysqli doesn't do that. Unless the value
can be null in some other way, this check is redundant.

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

* Add psalm-return

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

* Remove $handle parameter of getUniqueCondition()

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

* Type hint the $row parameter

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

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-02 17:37:09 -03:00
Maurício Meneghini Fauth
a835d7cfcc Remove array support from Util::backquote
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-10 19:33:09 -03:00
Maurício Meneghini Fauth
67e96cf40c Get default config values from Config\Settings classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-30 12:04:47 -03:00
Maurício Meneghini Fauth
4834c5fe7d Remove bypass flag from Util::backquote method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-26 11:51:34 -03:00
Maurício Meneghini Fauth
f00d70cccb Remove useless whitespaces
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-15 17:05:40 -03:00
William Desportes
dd4f0571ac Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-08-14 14:42:12 +02:00
William Desportes
89365207c6 Add test cases for phpmyadmin/docker#328
Closes: phpmyadmin/docker#328

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-08-13 02:35:35 +02:00
Maximilian Krög
c1c6b01195 Use correct min MySQL version for axis-order (8.0.1)
There was no version 8.0.10
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2021-07-20 01:28:29 +02:00
Maurício Meneghini Fauth
355f6d9d20 Remove PhpMyAdmin\Config::enableBc method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-09 13:59:04 -03:00
Maurício Meneghini Fauth
9adaa912e1 Rename Response class to ResponseRenderer
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-30 12:35:22 -03:00
Maurício Meneghini Fauth
a96be01b6d Fix some failing tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-13 15:01:07 -03:00
Maurício Meneghini Fauth
f3b79d83c0 Add PHPUnit's Covers annotation on test classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-04 23:39:26 -03:00
Maurício Meneghini Fauth
1c084de30b Fix coding standard errors
Related to 62f142c9fa.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-03 16:50:33 -03:00
William Desportes
280a201f79 Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-05-28 17:42:02 +02:00
Maurício Meneghini Fauth
fd4cf3b4f7 Add tests for the Util::getUniqueCondition method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-25 14:43:15 -03:00
William Desportes
6699fb1923 Fix 32-bit issues
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-05-24 22:03:41 +02:00
Maurício Meneghini Fauth
878ab12dec Change Util::getUrlForOption fallback to base route
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-11 20:19:05 -03:00
William Desportes
8fbb01a684 Merge branch 'origin/QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-19 21:51:45 +02:00
William Desportes
94add64100 Add tests for #16777
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-19 16:46:08 +02:00
William Desportes
ba35901594 Merge branch 'origin/QA_5_1' into master
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-17 00:53:14 +02:00
William Desportes
3ba356759e Merge #16818 - Fix #16792 - Remove useless htmlspecialchars on URL generation
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-17 00:30:00 +02:00
William Desportes
f547765120 Add testcases for #16797
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-13 22:08:52 +02:00
William Desportes
7a3978a948 Remove useless htmlspecialchars on URL generation
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-13 17:23:12 +02:00
William Desportes
993a6aa8a0 Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-23 01:13:58 +01:00
William Desportes
942a252b46 Fix #16694 - Do not escape _ for TABLE_NAME in information schema
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-22 23:20:23 +01:00
Maurício Meneghini Fauth
035e29a80b Extract GIS related methods from Util class
Creates the PhpMyAdmin\Utils\Gis class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-22 15:03:39 -03:00
Maurício Meneghini Fauth
caa3337411 Extract FK related methods from Util class
Creates the PhpMyAdmin\Utils\ForeignKey class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-21 15:25:45 -03:00
Maurício Meneghini Fauth
33d711215d Remove the PMA_VERSION constant
Uses the PhpMyAdmin\Version::VERSION constant instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-08 22:22:55 -03:00
Maurício Meneghini Fauth
7e33d227f5 Rename the PMA_Config global variable to config
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-08 15:03:12 -03:00
Maurício Meneghini Fauth
d83abf63e7 Use PSR-12 for control structures spacing
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 15:27:03 -03:00
Maurício Meneghini Fauth
0b8edc5bde Use PSR-12 for namespace use statements
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-05 14:18:35 -03:00
William Desportes
7943c8a497 Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-05 16:21:32 +01:00
William Desportes
3ad189b452 Add tests for #16713 and #16698
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-05 15:45:54 +01:00
William Desportes
76803f9422 Replace deprecated ->setMethods by ->onlyMethods
See: https://github.com/sebastianbergmann/phpunit/pull/3687
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-04 23:24:25 +01:00
William Desportes
09736fc882 Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-04 20:54:48 +01:00
William Desportes
29c31be315 Ref #16694 - Cover currentUserHasUserPrivilege with new tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-01 18:43:25 +01:00
William Desportes
c5155ecae9 Refactor field flags to use an object an not strpos
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-02-24 23:56:33 +01:00
William Desportes
fb53951a2d Cover Util::handleDisableFKCheckInit and Util::handleDisableFKCheckCleanup
Ref: #16353

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-02-09 17:22:58 +01:00
Saksham Gupta
8e8b7df450 Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/15389
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Add Unit Test

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix Lint

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Add comment

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2021-01-28 16:37:07 +05:30
William Desportes
d402c0fd6b Ref #16429 - PHP 8 error TypeError: Unsupported operand types: string / int
1) PhpMyAdmin\Tests\Engines\PbxtTest::testResolveTypeSize with data set #2 ('A4', array('0', 'B'))
TypeError: Unsupported operand types: string / int

libraries/classes/Util.php:528
libraries/classes/Engines/Pbxt.php:156
test/classes/Engines/PbxtTest.php:175
vendor/phpunit/phpunit/phpunit:61

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-11-20 00:07:38 +01:00
William Desportes
50e900a1bf Remove all @test annotations
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-11-08 23:01:26 +01:00
Maurício Meneghini Fauth
e4e274976e Extract cache methods from Util to SessionCache class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-25 22:45:56 -03:00
Maurício Meneghini Fauth
db3da81056 Remove some useless comments
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-13 19:56:56 -03:00
William Desportes
0d97b16d16 Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-10-13 14:13:03 +02:00
Saksham Gupta
280188f1fb Fix #16326 - Latitude and Longitudes swap
Fixes: #16326

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2020-10-13 13:38:28 +02:00