Commit Graph

175 Commits

Author SHA1 Message Date
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
d43f16f616
Fix user pagination for 'Any' user
If the user name is empty any user may login from this host.

This fixes the pagination to display 'Any' instead of an empty string
and makes filtering with this link work.

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-09-09 17:44:17 +02:00
Maximilian Krög
bf17145c70
Fix filtering by initials for user accounts starting with %, \, or _
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-09-09 17:44:17 +02:00
Kamil Tekiela
a4b2d7e524 Deimplement fetchRow() helper
This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-09 22:44:53 +00: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
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
Maurício Meneghini Fauth
cb3f7fbb16
Move Server\UserGroups to ConfigStorage namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:14 -03:00
Maurício Meneghini Fauth
c411121fd8
Move Relation classes into the ConfigStorage namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:13 -03:00
Kamil Tekiela
a42803297c
Psalm fixes 3 (#17221)
* Update psalm-baseline.xml

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

* Small bug fixes

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

* non-falsy-string is always true

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

* currentSearch property is nullable

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

* Remove unusued parameter $columnIndex

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

* Use parameters instead of globals in sendEditor()

The two globals in this method are read-only. There is an unused
parameter in the signature. Let's add one more and use them instead of globals.

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

* Remove unusued parameter $crlf

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-03 12:40:19 -03:00
Kamil Tekiela
a7053f14a8 Add tests for bug #17216 (multi-assignment of privileges)
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-01 13:20:08 +00:00
Maurício Meneghini Fauth
b2a51c4d84
Create the RelationParameters value object
Replaces the $cfgRelation array with the RelationParameters value
object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-14 18:22:36 -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
Maurício Meneghini Fauth
d441c88aad
Fix failing unit tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-13 14:20:21 -03:00
Maurício Meneghini Fauth
5f4fd07483
Remove some assignments to the $_POST global
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-03 15:49:39 -03:00
Maurício Meneghini Fauth
f7fc4177af
Add support for account locking
- https://dev.mysql.com/doc/refman/en/account-locking.html
- https://mariadb.com/kb/en/account-locking/

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-21 00:55:33 -03:00
Maurício Meneghini Fauth
a1379fa1c6
Remove $dbi mock from PrivilegesTest::testGetHtmlForUserProperties test
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-13 17:00:18 -03:00
William Desportes
ab2e5358f7
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-21 18:49:19 +02:00
William Desportes
6d5c5e69d6
Add tests after #17015
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-21 18:42:16 +02:00
William Desportes
25c2cfe699
Fix tests after #17015
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-21 18:39:59 +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
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
Maurício Meneghini Fauth
b4f3a2c8aa
Fix some failing PHPUnit tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-02 14:53:17 -03:00
Daniel Tiringer
debb6af80f Move html from server/select to template
Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Factor out logic from server listing

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Create the base twig skeleton

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Insert template and variables to form part

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Insert list view template part

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Insert just options fork

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Factor out repeating code into server_options template

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Render the template

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Comment out test parts that don't work due to translate

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Fix the typos in the translatable elements

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Refactor the test into separate scenarios

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Remove indentation spaces

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Codesniffer cleanup

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Add test for fieldset existence

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Code style fixes

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Reorder lines in test

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Replace include function with tag

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Removing the escape calls

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>
2021-05-05 16:17:20 +02:00
Maurício Meneghini Fauth
5750dfb1bb
Extract method to get edit user group modal form
Creates a new route: /server/user-groups/edit-form

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-26 22:59:09 -03:00
Maurício Meneghini Fauth
8d0c2a339c
Move both operands of an assignment to the same line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-20 22:35:21 -03: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
Maurício Meneghini Fauth
4273634c17
Extract getActiveAuthPlugins method to Plugins class
Extracts the getActiveAuthPlugins method from the
PhpMyAdmin\Server\Privileges class to the PhpMyAdmin\Server\Plugins
class, rename it to getAuthentication and adds tests.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-14 16:07:40 -03: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
Maurício Meneghini Fauth
a7d6df17d6
Remove warnings from PHPUnit
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-09 13:28:47 -03:00
Maurício Meneghini Fauth
d05ba8e733
Remove PHPUnit's at() matchers from Server\UserGroupsTest
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-05 22:53:04 -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
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
Maurício Meneghini Fauth
1e5fbd57fc
Create Twig\AssetExtension and image Twig function
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-01-28 16:09:17 -03:00
Maurício Meneghini Fauth
443e4289c3
Replace user groups jQuery UI's dialog with a modal
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-01-12 17:28:22 -03:00
Maurício Meneghini Fauth
4ad6e2ea4e
Use Bootstrap's pagination for user accounts page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-12-29 17:59:59 -03:00
Maurício Meneghini Fauth
5178f76f95
Move fieldset CSS style to the .pma-fieldset class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-12-28 19:46:40 -03:00
William Desportes
1b5781f825
Fix #16477 - Fix failing unit test
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-11-15 22:54:05 +01:00
Saksham Gupta
be3905944f Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/16477
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix db Edit privileges

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

Fix conflict

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

Add missing bracket

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

Fix Lint

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2020-11-16 02:09:54 +05:30
Maurício Meneghini Fauth
4873c32273 Remove DatabaseInterface::isUserType method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-25 20:53:50 -03:00
Maurício Meneghini Fauth
71d9a8f760 Remove is_grantuser and is_createuser PHP globals
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-23 22:58:49 -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
Maurício Meneghini Fauth
34dd2a61f8 Remove strPrivDesc* global variables
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-11 17:22:30 -03:00
Maurício Meneghini Fauth
ceac762e09 Remove pmaThemePath and pmaThemeImage PHP globals
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-02 10:57:57 -03:00
Maurício Meneghini Fauth
ba09c84a05 Fix PHPStan errors for PHPUnit assert methods
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-08-10 16:20:53 -03:00