webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-23 18:29:15 +03:00
Code Activity
137,012 Commits 12 Branches 481 Tags
master
Commit Graph

430 Commits

Author SHA1 Message Date
Rowan Merewood
768edc6a21 Allow google/recaptcha 2.x 
Signed-off-by: Rowan Merewood <merewood@google.com>
 2026-09-28 15:04:50 +01:00
Maurício Meneghini Fauth
132d046294 Upgrade web-auth/webauthn-lib to version ^5.3 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
 2026-09-20 04:42:32 -03:00
Maurício Meneghini Fauth
1811f19e50 Bump phpmyadmin/coding-standard to version 5 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
 2026-08-13 16:11:38 -03:00
Maurício Meneghini Fauth
fafff3dc9a Update Composer dependencies 
- Upgrading amphp/pipeline (v1.2.5 => v1.2.6)
  - Upgrading brick/math (0.17.2 => 0.18.0)
  - Upgrading composer/ca-bundle (1.5.12 => 1.5.13)
  - Upgrading guzzlehttp/psr7 (2.12.3 => 2.13.0)
  - Upgrading nikic/fast-route (v1.3.0 => 1.3.1)
  - Upgrading phpstan/phpdoc-parser (2.3.2 => 2.3.3)
  - Upgrading phpstan/phpstan (2.2.4 => 2.2.5)
  - Upgrading phpunit/phpunit (11.5.55 => 11.5.56)
  - Upgrading spomky-labs/cbor-php (3.2.3 => 3.3.0)
  - Upgrading spomky-labs/pki-framework (1.4.2 => 1.5.0)
  - Upgrading web-auth/cose-lib (4.5.2 => 4.6.0)

Ignores the PKSA-zk1n-qbm6-d3rq advisory as it does not affects
phpMyAdmin.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
 2026-07-18 12:31:49 -03:00
Maurício Meneghini Fauth
49791c2114 Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2026-03-13 16:21:03 -03:00
Maurício Meneghini Fauth
c15edf86fe Add --no-cache --threads=max to composer update:baselines 
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2026-03-07 17:04:52 -03:00
Maurício Meneghini Fauth
efa8ce431b Introduce support for PSR-20 ClockInterface 
Related to https://github.com/phpmyadmin/phpmyadmin/pull/20030

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2026-01-19 19:22:53 -03:00
William Desportes
6f8e08653d Remove roave/security-advisories, composer 2.9. has it built in now 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-11-25 10:55:53 +01:00
Maurício Meneghini Fauth
c1a82cee2a Update Composer dependencies 
- Upgrading nikic/php-parser (v5.6.1 => v5.6.2)
  - Downgrading phpmyadmin/motranslator (dev-master 4ac3205 => 6.0.0)
  - Downgrading phpmyadmin/shapefile (dev-master 6aab917 => 4.0.0)
  - Downgrading phpmyadmin/sql-parser (dev-master 339c469 => 6.0.0)
  - Upgrading phpunit/phpunit (11.5.42 => 11.5.43)
  - Upgrading roave/security-advisories (dev-latest 7a8f128 => dev-latest d2e1583)
  - Upgrading spomky-labs/pki-framework (1.3.0 => 1.4.0)
  - Upgrading symfony/cache (v7.3.4 => v7.3.5)
  - Upgrading symfony/console (v7.3.4 => v7.3.5)
  - Upgrading twig/twig (v3.21.1 => v3.22.0)
  - Upgrading webmozart/assert (1.11.0 => 1.12.1)

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-11-01 09:06:24 -03:00
William Desportes
66b797e199 Migrate psr/http-message to v2 
Needed in Debian soon, other tools are migrating too

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-10-17 23:02:04 +02:00
Liviu-Mihail Concioiu
8c3dbf7d56 Drop support for BaconQrCode v2 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-10 22:20:56 +02:00
Maurício Meneghini Fauth
5c6bcaa220 Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-10 12:57:14 -03:00
Liviu-Mihail Concioiu
5060169e19 Add support for bacon-qr-code v3 (#19837) 
* Add support for bacon-qr-code v3

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

* Fix

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

* Fix #2

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

* Quote packages

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

* Fix

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

* Fix

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

* Fix

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

* Fix

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

* Fix

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

* Fix

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

* Fix

Co-authored-by: Maximilian Krög <maxi_kroeg@web.de>

* Fix

Co-authored-by: William Desportes <williamdes@wdes.fr>

* Add quotes to the package version

* Fix again

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

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Co-authored-by: Maximilian Krög <maxi_kroeg@web.de>
Co-authored-by: William Desportes <williamdes@wdes.fr>
 2025-09-09 20:04:47 -03:00
Maurício Meneghini Fauth
be01432c56 Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-08 14:12:06 -03: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
Maurício Meneghini Fauth
02927c8d00 Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-06 20:21:55 -03:00
Liviu-Mihail Concioiu
8a9086db0d Add symfony/polyfill-iconv 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-07 00:04:59 +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
Maurício Meneghini Fauth
9c576fcc9c Refactor Twig extensions to use Twig's AttributeExtension 
This allows to remove most extensions.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-07-08 13:23:34 -03:00
Maurício Meneghini Fauth
4cea383ece Fix thecodingmachine/safe deprecations using a fork 
Forces Composer to use a fork of thecodingmachine/safe to fix its PHP
8.4 deprecations.

https://github.com/MauricioFauth/thecodingmachine-safe/compare/v1.3.3...v1-php8.4

- Fixes https://github.com/phpmyadmin/phpmyadmin/issues/19404

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-04-24 18:42:46 -03:00
Kamil Tekiela
d534e135b4 Force Twig version to be 3.19 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2025-01-30 17:06:54 +00:00
Maurício Meneghini Fauth
a2b07b92ee Upgrade PHPUnit to version 11.5 
- Upgrading amphp/amp (v3.0.2 => v3.1.0)
  - Upgrading phpmyadmin/sql-parser (dev-master ab0d173 => dev-master 00c8e55)
  - Upgrading phpstan/phpstan-phpunit (2.0.3 => 2.0.4)
  - Upgrading phpunit/php-code-coverage (10.1.16 => 11.0.8)
  - Upgrading phpunit/php-file-iterator (4.1.0 => 5.1.0)
  - Upgrading phpunit/php-invoker (4.0.0 => 5.0.1)
  - Upgrading phpunit/php-text-template (3.0.1 => 4.0.1)
  - Upgrading phpunit/php-timer (6.0.0 => 7.0.1)
  - Upgrading phpunit/phpunit (10.5.41 => 11.5.4)
  - Upgrading roave/security-advisories (dev-latest e7a38fc => dev-latest 3f5a01e)
  - Upgrading sebastian/cli-parser (2.0.1 => 3.0.2)
  - Upgrading sebastian/code-unit (2.0.0 => 3.0.2)
  - Upgrading sebastian/code-unit-reverse-lookup (3.0.0 => 4.0.1)
  - Upgrading sebastian/comparator (5.0.3 => 6.3.0)
  - Upgrading sebastian/complexity (3.2.0 => 4.0.1)
  - Upgrading sebastian/diff (5.1.1 => 6.0.2)
  - Upgrading sebastian/environment (6.1.0 => 7.2.0)
  - Upgrading sebastian/exporter (5.1.2 => 6.3.0)
  - Upgrading sebastian/global-state (6.0.2 => 7.0.2)
  - Upgrading sebastian/lines-of-code (2.0.2 => 3.0.1)
  - Upgrading sebastian/object-enumerator (5.0.0 => 6.0.1)
  - Upgrading sebastian/object-reflector (3.0.0 => 4.0.1)
  - Upgrading sebastian/recursion-context (5.0.0 => 6.0.2)
  - Upgrading sebastian/type (4.0.0 => 5.1.0)
  - Upgrading sebastian/version (4.0.1 => 5.0.2)
  - Upgrading squizlabs/php_codesniffer (3.11.2 => 3.11.3)
  - Locking staabm/side-effects-detector (1.0.5)
  - Upgrading tecnickcom/tcpdf (6.8.0 => 6.8.2)

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-01-28 18:43:58 -03:00
Kamil Tekiela
34d955f41e Upgrade to Psalm v6 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2025-01-26 14:16:31 +00:00
William Desportes
5a10863529 Fix Twig deprecations - allow twig-i18n-extension v5 
https://github.com/phpmyadmin/twig-i18n-extension/releases/tag/5.0.0

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-01-08 14:37:42 +01:00
Maurício Meneghini Fauth
54278b5920 Add PHPStan stricter rules 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-12-02 11:16:30 -03:00
Maurício Meneghini Fauth
7a72db64c9 Bump PHPStan version to ^2.0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-11-16 12:03:54 -03:00
Maurício Meneghini Fauth
926762abc2 Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-09-30 20:17:57 -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
ea2a474d7b Upgrade Composer dependencies 
- Upgrading composer/pcre (3.3.0 => 3.3.1)
  - Upgrading fidry/cpu-core-counter (1.1.0 => 1.2.0)
  - Upgrading phpmyadmin/sql-parser (dev-master f2bafbb => dev-master 91d2bbf)
  - Upgrading phpstan/extension-installer (1.4.1 => 1.4.2)
  - Upgrading phpstan/phpdoc-parser (1.29.1 => 1.30.0)
  - Upgrading phpstan/phpstan (1.11.11 => 1.12.0)
  - Upgrading roave/security-advisories (dev-latest f8de2a8 => dev-latest 5ddbc0b)
  - Upgrading symfony/cache (v7.1.3 => v7.1.4)
  - Upgrading symfony/config (v6.4.8 => v7.1.1)
  - Upgrading symfony/console (v6.4.10 => v7.1.4)
  - Upgrading symfony/dependency-injection (v6.4.10 => v7.1.4)
  - Upgrading symfony/expression-language (v6.4.8 => v7.1.4)
  - Upgrading symfony/process (v5.4.40 => v7.1.3)
  - Upgrading symfony/string (v7.1.3 => v7.1.4)
  - Upgrading symfony/uid (v7.1.1 => v7.1.4)
  - Upgrading twig/twig (v3.11.0 => v3.12.0)

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-08-31 13:03:34 -03:00
Maurício Meneghini Fauth
5664cde45c Bump web-auth/webauthn-lib version to 4.9 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-08-29 17:05:36 -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
b1ae10df76 Bump minimum PHP version to 8.2.0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-07-31 15:14:12 -03:00
Maurício Meneghini Fauth
18ad00f7a5 Remove the phpmyadmin/twig-i18n-extension package 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-04-25 14:42:13 -03:00
Maurício Meneghini Fauth
de45958d54 Allow installation of Twig >= 3.9 
- Fixes #19112

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-04-19 14:25:24 -03:00
William Desportes
add463dfe0 Ref #19112, #19114 - Prevent upgrade to Twig 3.9.0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2024-04-17 21:15:24 +02:00
Maurício Meneghini Fauth
9a0d34b01d Rename tests/selenium to tests/end-to-end 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-02-23 13:29:07 -03:00
Maurício Meneghini Fauth
606f66b5df Rename tests/classes to tests/unit 
This directory is for unit tests only, so let's rename it to unit to be
more clear.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-02-23 13:29:07 -03:00
Kamil Tekiela
d8a9637536 Use ini_parse_quantity() 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-02-05 16:06:15 +01:00
Maurício Meneghini Fauth
033dcf21e0 Change Core::getContainerBuilder return to ContainerInterface 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-12-21 16:46:11 -03:00
Maurício Meneghini Fauth
1d1c55e250 Move test directory to tests 
- Related to #18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-11-30 10:47:42 -03:00
Maurício Meneghini Fauth
f56284d80b Rename scripts directory to bin 
- Related to #18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-11-24 20:40:25 -03:00
Maurício Meneghini Fauth
5379d443d3 Remove motranslator functions file from composer.json 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-10-27 18:20:12 -03:00
Maurício Meneghini Fauth
c3a489e441 Update Composer dependencies 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-10-17 12:58:31 -03:00
Maurício Meneghini Fauth
ed3d632a99 Add composer.lock to version control 
This will allow more control over the dependencies and will be easier to
investigate issues from past commits as the dependencies will be locked.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-10-04 11:25:26 -03:00
Maurício Meneghini Fauth
043e1e4b30 Bump phpmyadmin/twig-i18n-extension version to 5.0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-09-12 15:53:59 -03:00
Maurício Meneghini Fauth
f33d75b257 Bump phpmyadmin/shapefile to 4.0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-09-11 15:41:31 -03:00
Maurício Meneghini Fauth
97ebf29d61 Allow GIS tests to test against different TCPDF versions 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-09-06 19:23:17 -03:00
Maurício Meneghini Fauth
a88176fb6f Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-09-04 18:51:53 -03:00
Maurício Meneghini Fauth
3435db3261 Add security link to composer.json file 
https://getcomposer.org/doc/04-schema.md#support

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-09-04 15:11:41 -03:00
Maurício Meneghini Fauth
1ddcad2bfb Replace libraries/classes references with src 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-08-30 15:59:29 -03:00