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

3631 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
7a5ad92e5f Fix collation error when checking for grant permission 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-22 17:40:39 -03:00
Maurício Meneghini Fauth
016fb0c095 Revert "Fix #19109 - Do not enforce character encoding when checking roles" 
This reverts commit 0878841fba.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-17 20:15:41 -03:00
William Desportes
e73dbd251c Merge #19612 - Fix #19611 - restore text operators order 
Pull-request: #19612
Fixes: #19611
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 19:59:20 +02:00
Daniel Schindler
0878841fba Fix #19109 - Do not enforce character encoding when checking roles 
The functions `getInformationSchemaDataForCreateRequest()` and `getInformationSchemaDataForGranteeRequest()` generate a query that fails with the error `COLLATION 'utf8mb4_general_ci' is not valid for CHARACTER SET 'utf8mb3'` on some servers that got migrated from MySql 5.7. This lead to admin users not being able to create new users via PhpMyAdmin's UI. Instead, the error message "You do not have the privileges to administrate the users!" is being shown. When not forcing the encoding to `utf8mb4_general_ci` in the query, everything works fine.

Signed-off-by: Daniel Schindler<post@danielschindler.de>
 2025-09-14 18:48:52 +02:00
Liviu-Mihail Concioiu
7b4712dca0 Rename PHPMyAdmin to phpMyAdmin 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-08 19:56:47 +02:00
Maurício Meneghini Fauth
d2fdad042c Merge pull request #19838 from MoonE/count-sql-no-cache 
Fix #19822 - Fix incorrect usage/placement of 'SQL_NO_CACHE'
 2025-09-08 13:34:51 -03:00
Maximilian Krög
a8249efd9b Fix linting errors 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2025-09-04 01:06:42 +02:00
Maximilian Krög
9d0f6110d5 Fix row count with SQL_NO_CACHE 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2025-08-31 23:09:44 +02:00
Hendrik Becker
b1896c0af0 QA_5_2: backport GD2 detection (use GD_MAJOR_VERSION) 
Adapted from phpmyadmin/phpmyadmin#19820; replaces legacy checks,
updates test, no functional change beyond precise version detection.

Signed-off-by: Hendrik Becker <luckyfellow@object.earth>
 2025-08-23 17:27:20 -06:00
Maurício Meneghini Fauth
5933619fee Fix AuthenticationSignonTest failing test with PHP 8.5 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-08-17 18:14:17 -03:00
Maurício Meneghini Fauth
e8c216b17e Fix PHP 8.5 Reflection*::setAccessible() deprecations 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-08-17 13:32:00 -03:00
Maximilian Krög
0c6d29358a Fix move column for table with foreign key 
Signed-off-by: Maximilian Krög <maximilian.kroeg@geocept.com>
 2025-07-09 16:41:57 +02:00
Liviu-Mihail Concioiu
baf4b407b3 Fix #19744 - Check if curl is enabled (#19748) 
* Check for curl

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

Fix #19744 

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-07-04 17:28:02 -03:00
Maurício Meneghini Fauth
521da921e7 Fix TwigLintCommandTest failing test 
Related to 960931e278

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-05-22 09:50:55 -03:00
Maurício Meneghini Fauth
65268af43e Fix TwigLintCommandTest failing test 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-05-10 14:39:00 -03:00
Maurício Meneghini Fauth
92efecc7f6 Add SQL parse error message when simulating DML 
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/18903

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-04-21 22:37:38 -03:00
Hervé BRY
3791a24901 Fix text operators order 
Signed-off-by: Hervé BRY <herve.bry@geneanet.org>
 2025-02-24 16:23:06 +01:00
Maurício Meneghini Fauth
298797c586 Simplify Core::downloadHeader tests 
Removes the need for xdebug extension

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-27 15:09:27 -03:00
Maurício Meneghini Fauth
e6f08a8682 Ignore ISO-2022-CN-EXT charset for iconv 
Fixes possible glibc/iconv vulnerability (CVE-2024-2961).

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-20 14:14:17 -05:00
Maurício Meneghini Fauth
7355ddff8d Fix XSS vulnerability on Insert page 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-20 14:02:28 -05:00
Maurício Meneghini Fauth
04a5ad592c Fix import shp failing test with dbase enabled 
Ref ded87e3301

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-17 20:39:25 -03:00
William Desportes
ded87e3301 Fix #16936 - Do not specify the collation when creating tables for imported data 
Backport of https://github.com/phpmyadmin/phpmyadmin/pull/19035

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-01-16 11:52:16 +01:00
Liviu-Mihail Concioiu
6ed8df9877 Fix badge colors 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-01-13 21:43:44 +01:00
Maurício Meneghini Fauth
1da6aeb6c6 Merge pull request #19499 from liviuconcioiu/17730 
Fix #17730 - Make LIKE %...% as default search operator
 2025-01-13 17:31:16 -03:00
Liviu-Mihail Concioiu
01013880df Fix Undefined global variable $col_priv (#19511) 
* Fix query

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix Undefined global variable $col_priv

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix test

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Update libraries/classes/Normalization.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@mfauth.net>

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Co-authored-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-13 14:49:00 -03:00
Maurício Meneghini Fauth
5ac0d3c6a4 Replace $GLOBALS['l'] with TCPDF::setLanguageArray() 
The l global variable was not being used by TCPDF.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-11 17:57:45 -03:00
Liviu-Mihail Concioiu
58bdf3994a Make LIKE %...% as default operator 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-01-04 19:55:13 +01:00
Maurício Meneghini Fauth
9ee8e20385 Merge pull request #19388 from MoonE/revert-query-stats-for-count 
Revert "Show query stats for count(*) query"

Didn't manage to fix the duplicate query results, so this is reverts #19221 #19237 for now
Fixes #19245
Should reopen #16869
 2024-12-25 12:12:58 -03:00
Maurício Meneghini Fauth
b76b7eef71 Merge pull request #19460 from liviuconcioiu/quotes 
Add double quotes for Windows
 2024-12-22 14:35:34 -03:00
William Desportes
0d961a4888 The tests testBlowfishWithInvalidSecret and testBlowfishWithValidSecret need zip and bz2 PHP exts 
Or assertArrayNotHasKey('error', $messages) does not PASS.
Found this on a new PHP 8.4 setup without zip and bz2.

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2024-12-21 15:06:14 +01:00
Liviu-Mihail Concioiu
6c4f66147a Add double quotes for Windows 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2024-12-19 16:33:45 +01:00
William Desportes
18f8ae0da1 Ref #19455 - Move all the code for revision-info.php to the Git class 
Pull-request: #19458
Ref: #19455

And add one more new line

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2024-12-19 02:08:35 +01:00
William Desportes
b950c49a77 Fix #19455 - Support reading all the commit info from revision-info.php 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2024-12-19 01:18:29 +01:00
Maximilian Krög
61b4f6739d Don't abuse name attribute of svg elements 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2024-11-28 09:49:39 -03:00
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
Liviu-Mihail Concioiu
78f3ff4554 Remove padding around varchar textarea 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2024-11-13 19:29:07 -03:00
Maurício Meneghini Fauth
f6ce169290 Fix issue when updating privs for various databases 
The sql_query global variable should be a string, and it can be a string
in this case, which will cause an error as the string will not be
converted to array.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-11-05 15:09:21 -03:00
Maurício Meneghini Fauth
dd83e9c50f Backport DatabaseInterface factory for tests 
- aa829af98c
- a9de979397

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-11-05 14:59:24 -03:00
Maurício Meneghini Fauth
12efd0a0fe Replace replication statements with new terminology 
SHOW MASTER LOGS was removed in MySQL 8.4.0 and SHOW BINARY LOGS is
available since MySQL 4.1.1.

As of MySQL 8.2.0, SHOW BINARY LOG STATUS is available.
As of MariaDB 10.5.2, SHOW BINLOG STATUS is available.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-31 13:50:11 -03:00
Liviu-Mihail Concioiu
f3c7a5eb14 Remove whitespace to avoid double whitespace (#19336) 
* Remove whitespace to avoid double whitespace

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2024-10-26 12:07:03 -03:00
Maurício Meneghini Fauth
0bf7c0fa18 Suppress deprecation message of E_STRICT constant 
The E_STRICT constant was deprecated in PHP 8.4.

It's still a possible error level when using PHP 7.2 and PHP 7.3.

See:
https://wiki.php.net/rfc/deprecations_php_8_4#remove_e_strict_error_level_and_deprecate_e_strict_constant

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-15 17:18:30 -03:00
Maurício Meneghini Fauth
598308d2aa Add covers annotations to TransformationPluginsTest 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-15 02:57:54 -03: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
2fb2477af5 Add phpstan/phpstan-deprecation-rules package 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-09-30 17:14:50 -03:00
Maurício Meneghini Fauth
a522a9982f Improve tests for WebAuthn 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-08-28 20:20:01 -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
Maurício Meneghini Fauth
587d185bb7 Validate *_structure_or_data param when exporting 
- Fixes #19213

This is not the best fix, but will avoid generating an invalid file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-07-18 16:07:46 -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
Maurício Meneghini Fauth
7baf4f8f3c Merge #19188 Simulate query fixes 
Fixes #19187

Depends on https://github.com/phpmyadmin/sql-parser/pull/560 to work
without regression in the case of a condition `0` because now the
query is parsed and built again to remove comments.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-06-16 11:55:04 -03:00