Commit Graph

181 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
5c5e8c2de1
Replace $GLOBALS['cfg']['MysqlMinVersion'] in Common class
Replaces with PhpMyAdmin\Config\Settings::$mysqlMinVersion access.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-02 17:29:54 -03:00
Maurício Meneghini Fauth
a035b5173d
Refactor Config\Settings::toArray() method
Rename it to asArray() and remove get_object_vars() function call.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-01 15:55:40 -03:00
Kamil Tekiela
276577ca2a
Remove $GLOBALS['PMA_PHP_SELF'] (#18149)
* Remove $GLOBALS['PMA_PHP_SELF']

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

* Remove $GLOBALS['PMA_PHP_SELF'] from tests

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

* Moved cleanupPathInfo to Routing

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

* Remove parse_url from getRootPath

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

* Update baselines

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

* Remove invalid tests

Surely, we never expect PATH to be backslash delimited. The code is not designed to handle this and the tests for this don't make much sense.

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

* Fix trailing slash in path

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-27 17:56:27 -03:00
Maurício Meneghini Fauth
16a0660a78
Add native property types to test classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 01:17:22 -03:00
Maurício Meneghini Fauth
556594b4cd
Fix coding standard spacing issues
- Fixes one line doc comments
- Fixes parent call spacing
- Fixes constant spacing

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 21:06:17 -03:00
Maurício Meneghini Fauth
77957a69a5
Add trailing comma for multi-line functions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-24 20:48:46 -03:00
Kamil Tekiela
54e4ec68fd
Stop using PHP_EOL (#18101)
* s/PHP_EOL/"\n"

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

* PHP_EOL seems to have been intentional here

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

* Merge concats together

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 11:58:56 -03:00
Maurício Meneghini Fauth
4ff3724c3f
Use union with null instead of short nullable type
Since union type are now possible, using union with null makes more
clear that it is a union type.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 21:48:19 -03:00
Maurício Meneghini Fauth
bec611d817
Update Psalm baseline
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-19 17:20:58 -03:00
William Desportes
a2e2ef9501
Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-19 13:58:34 +01:00
William Desportes
de35195d3c
Improve testGetTempDir and testGetUploadTempDir tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-19 13:30:22 +01:00
Maurício Meneghini Fauth
56446c0b15
Refactor Config::checkServers() method
Add more tests and ensures it has at least one valid server config.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-14 17:24:02 -03:00
Maurício Meneghini Fauth
ab80bd8730
Remove trigger_error from Config::checkServers()
Silent removes invalid server keys.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-14 16:36:06 -03:00
Maurício Meneghini Fauth
0ab9e4ac77
Change PHPUnit data providers to use static methods
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-14 12:42:16 -03:00
Maurício Meneghini Fauth
ef385e2259
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-01 22:04:27 -03:00
William Desportes
e11c385d35
Add TEST_PATH for out of source tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-01-31 23:48:29 +01:00
Maurício Meneghini Fauth
1ec3868265
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-28 14:45:42 -03:00
Maurício Meneghini Fauth
1a81122650
Fix Psalm error related to TEST_PATH constant
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-28 14:37:51 -03:00
Maurício Meneghini Fauth
47f1d677b3
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-28 13:09:51 -03:00
William Desportes
7ec4ea0e66
Add TEST_PATH for out of source tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-01-28 09:18:56 +01:00
Maurício Meneghini Fauth
41dec1effc
Extract connection type constants to the Connection class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-17 02:21:27 -03:00
Maurício Meneghini Fauth
b2eb6bf4c9
Extract config load and check from Config's constructor
This allows better handling of the user's config loading and validation.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-15 13:20:13 -03:00
Maurício Meneghini Fauth
346923e20a
Set dbi only when the test needs it
Related to https://github.com/phpmyadmin/phpmyadmin/pull/17637

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-14 02:21:45 -03:00
Maurício Meneghini Fauth
a57102412c
Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-26 10:42:45 -03:00
Maurício Meneghini Fauth
feda222da9
Fix failing tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-26 10:02:26 -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
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
William Desportes
587536b766
Remove non used variables
Running: composer run psalm -- --alter --issues=UnusedVariable
And removing the false positives I reported upstream

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-16 02:13:27 +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
e8c28d1883
Remove some globals from Config::enableBc method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-08 19:49:26 -03:00
Maurício Meneghini Fauth
21431578db
Fix some errors found by PHPStan and Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-24 18:03:14 -03:00
Maurício Meneghini Fauth
9920b877f9
Fix some tests with PHP 8.1
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-11 18:14:40 -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
b4f3a2c8aa
Fix some failing PHPUnit tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-02 14:53:17 -03:00
William Desportes
bca8284a37
Allow testGetThemeUniqueValue on 32-bit systems
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-05-25 01:11:11 +02:00
William Desportes
6699fb1923
Fix 32-bit issues
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-05-24 22:03:41 +02:00
William Desportes
3eb0c770fc
Replace assertFileDoesNotExist for older phpunit versions
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-20 22:26:01 +02:00
William Desportes
f8ebd7ad7b
Add test cases for config file loading and removing keys having a '/' in the name
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-20 21:50:33 +02:00
fliespl
ef6fb5e3bc drop nocache & server query string param from theme.css stylesheet
Signed-off-by: Arkadiusz Rzadkowolski <a.rzadkowolski@gmail.com>
2021-03-20 22:48:07 +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
2c2127b369
Rename PMA_Theme global variable to theme
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-07 15:15:27 -03:00
William Desportes
b5263d44c8
Replace PMA_MAJOR_VERSION by Version::SERIES
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-05 21:22:42 +01: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
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
William Desportes
1fcb62e563
Flag 32 bit incompatible tests
Group:  32bit-incompatible

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-10-11 19:05:14 +02:00
Maurício Meneghini Fauth
e66be179ca Use camel case naming for class members
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-05 10:37:07 -03:00