webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-25 06:39:48 +03:00
Code Activity
127,988 Commits 12 Branches 481 Tags
STABLE
Commit Graph

167 Commits

Author SHA1 Message Date
Maximilian Krög
e9c3c282e4 Revert "Show query stats for count(*) query" 
This reverts commit b9c793e7f8.
This reverts commit 2a4fb46391.

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2024-11-14 01:36:30 +01:00
Maurício Meneghini Fauth
555ea56cbd Make PHPUnit's assertions stricter 
Backports #18993 to QA_5_2.

This makes merging QA_5_2 into master easier.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-12 15:33:45 -03:00
Maurício Meneghini Fauth
7fc96d6621 Call PHPUnit static methods using static calls 
Backports #18907 to QA_5_2.

This makes merging QA_5_2 into master easier.
Changes done using Rector.

- #18907

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-12 14:28:22 -03:00
Maurício Meneghini Fauth
46f2c8871c Backport some fixes for PHPUnit 10 compatibility 
- Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070623

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-08-13 20:13:18 -03:00
Maximilian Krög
2a4fb46391 Show query stats for count(*) query 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2024-07-05 00:04:49 +02:00
Maximilian Krög
901ea2646b Fix column sorting with limit subquery 
The used regex found the subquery limit and added the order
clause before that. Better to use Query::replaceClause here.

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2024-05-23 23:59:43 +02:00
Maximilian Krög
626aa23841 Remove duplicate server and lang param from links 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2024-05-03 02:54:06 +02:00
William Desportes
9743c82ba3 Write tests for #16851 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-02-20 23:52:40 +01:00
William Desportes
182cb205a7 Fix coding standard mistakes 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-11-20 21:55:52 +01:00
iifawzi
706c08a419 Adding PMA_TOKEN to the session 
Signed-off-by: iifawzi <iifawzie@gmail.com>
 2022-11-18 18:14:35 +02:00
iifawzi
669e30a9ce Adding PMA_TOKEN to the session 
Signed-off-by: iifawzi <iifawzie@gmail.com>
 2022-11-18 18:02:05 +02:00
iifawzi
5207fcdb68 phpcbf fixing trailing whitespaces 
Signed-off-by: iifawzi <iifawzie@gmail.com>
 2022-11-18 17:07:46 +02:00
iifawzi
b7bf83c24c Default to "Full texts" when running ANALYZE 
Signed-off-by: iifawzi <iifawzie@gmail.com>
 2022-11-18 17:00:10 +02:00
Maurício Meneghini Fauth
9f076774e5 Remove table-light CSS classes 
These classes were added by 6408b7179a.
However they aren't exactly the same as thead-light classes that exists
in Bootstrap 4.

Related to https://github.com/phpmyadmin/phpmyadmin/issues/17455.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-05-14 17:31:31 -03:00
Maurício Meneghini Fauth
0bee94b27e Merge branch 'QA_5_1-security' into master-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-11 14:31:56 -03:00
Kamil Tekiela
47a039d70c Implement ResultInterface & MysqliResult 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-31 23:59:24 +00:00
Maurício Meneghini Fauth
8e9dfe79db Merge pull request #17243 from kamil-tekiela/Refactor-Results.php 
Refactor results.php
 2021-12-27 09:21:49 -03:00
Kamil Tekiela
7a735ddf92 Redesign CSS class generation 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-26 23:10:34 +00:00
Kamil Tekiela
eba8621881 Use DI for Results.php 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-26 23:10:34 +00:00
Maurício Meneghini Fauth
d84af02945 Create VO classes for each RelationParameters features 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-26 19:17:58 -03:00
Maurício Meneghini Fauth
44fe103b9c Remove @access annotations 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-22 11:43:45 -03:00
Maurício Meneghini Fauth
bf49480160 Populate relation Session with RelationParameters class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-17 12:09:15 -03: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
220ed30ef8 Remove printview.css theme files 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-10-31 17:35:55 -03:00
Maurício Meneghini Fauth
3e0856c77b Remove useless string concatenations 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-27 21:40:22 -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
Lukas Bixen
13807a1049 Fix ResultsTest after pull-request #17070 
Signed-off-by: Lukas Bixen <lrb2_@outlook.com>
 2021-08-22 23:25:50 +02:00
Maurício Meneghini Fauth
f970299289 Remove $defaultFunction variable from Display\Results 
Makes the type of $transformationPlugin variable more strict.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-08-09 12:50:28 -03: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
b1c936a0f3 Fix some errors found by Psalm 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-25 15:03:05 -03:00
William Desportes
0a1f083990 Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-06-23 20:36:21 +02:00
William Desportes
5e557397b5 Fix tests after #16896 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-06-22 00:30:48 +02:00
Maurício Meneghini Fauth
b3f088e9fd Extract HTML from Results::getTableHeadersForColumns 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-17 22:40:53 -03:00
Maurício Meneghini Fauth
c3b453aa3a Extract the HTML from sorted table header 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-17 17:09:18 -03:00
Maurício Meneghini Fauth
fa12894e5f Add unit tests for Display\Results::setConfigParamsForDisplayTable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-16 20:26:24 -03:00
Maurício Meneghini Fauth
39c0908af5 Remove display/results/sort_by_key template 
Merges it with the `display/results/table` template.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-16 13:03:32 -03:00
Maurício Meneghini Fauth
81dfced388 Add unit test for Display\Results::getTable method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-06-14 18:47:17 -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
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
42f4464c07 Adjust testGetDataCellForNonNumericColumns test data 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-19 19:05:56 +02:00
William Desportes
ae4518be9b Add tests for #16836 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-19 19:00:35 +02:00
William Desportes
856145297f Merge branch 'origin/QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-13 17:46:06 +02:00
William Desportes
721e927f12 Fix #16791 - Undefined index table_schema and "DESCRIBE FILES" broken links 
Reverts: ca0244f06b because the code was guessing what the parent had already found but the code did not fine the same results between the parent and the child.

Now passing the result from the parent to the child will remove one guessing

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-12 22:26:51 +02:00
William Desportes
927689554e Remove impossible code since #1208 
Ref: 26dc919e68

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-04-12 21:50:51 +02:00
Maurício Meneghini Fauth
3d539b78e6 Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-03-27 16:07:09 -03:00
William Desportes
8992ef095f Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-03-14 11:54:03 +01:00
William Desportes
c62e27d650 Fix #16724 - Remove old unstable code to make column order work 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-03-13 01:19:58 +01: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
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