Commit Graph

203 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
a9f8e503a3
Replace $GLOBALS['cfg'] with Config::$settings array
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-27 22:23:36 -03:00
Maurício Meneghini Fauth
0f31d66274
Replace $GLOBALS['cfg']['Server'] with Config::$selectedServer
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-20 14:49:57 -03:00
Maurício Meneghini Fauth
78a33f1ff1
Add the Config::hasSelectedServer() method
Avoids the need of checking if $GLOBALS['cfg']['Server'] is empty.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-20 12:49:08 -03:00
Maurício Meneghini Fauth
83b1d6be45
Replace DatabaseInterface global var with a singleton object
Removes the DbiLoading middleware.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-18 14:08:10 -03:00
Maurício Meneghini Fauth
9e9611d162
Replace config global with Config singleton
This is as bad as the global variable, however at least will have better
static analysis of it.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-15 01:11:54 -03:00
Maurício Meneghini Fauth
a520e235eb
Move Core::sendHeaderLocation() to ResponseRenderer::redirect()
Removes the IIS specific logic.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-06 17:43:42 -03:00
Maximilian Krög
7c842b6021
Change deprecated ReflectionProperty method call
Is being deprecated in PHP 8.3

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-07-21 19:07:24 +02:00
Kamil Tekiela
f8111a7a7e
Replace inline static with class static (#18490)
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-06-26 16:00:51 -03:00
Maurício Meneghini Fauth
3f2c53ef1d
Replace PHPUnit annotations with attributes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-06-07 11:44:01 -03:00
Kamil Tekiela
dc471985b9
Short boolean conditions (#18413)
* Short boolean conditions

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

* Simplify conditions

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-12 11:09:21 -03:00
Maurício Meneghini Fauth
8bbb1edbea
Remove ThemeManager::getInstance() method
Remove singleton from the Theme\ThemeManager class and uses DI where
possible.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-05-09 21:29:49 -03:00
Maurício Meneghini Fauth
196c1d4255
Refactor Config::getConnectionParams() method
Removes the $server array param and use the Server class instead.
Uses the user and pass Server properties instead of returning an array.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-05-07 02:26:33 -03:00
Maurício Meneghini Fauth
250a32b795 Add the Config::getCurrentServer() method
The Config::getCurrentServer() method returns the current server
configuration. It's an VO that is equivalent to
$GLOBALS['cfg']['Server'] setting.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-30 17:37:34 -03:00
Maurício Meneghini Fauth
aa119f7e62 Remove unused Config::$defaultServer property
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-30 13:23:27 -03:00
Maurício Meneghini Fauth
5ffe2847ac
Remove Config::checkServers() method
Removes the Config::checkServers() method as it's duplicated in
Config\Settings class.
Also uses the Settings class to filter invalid config keys when loading
a config file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-29 14:50:18 -03:00
Maurício Meneghini Fauth
56926e807f
Move Config::loadDefaults() to constructor
Makes sure that Config's properties are always initialized and that
the config property is in sync with the settings property.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-27 21:48:56 -03:00
Maurício Meneghini Fauth
6a2c12bdc8
Add missing traversable type hints
Replace array type hint with mixed[] type hint, since it means the same.
This way it's possible to require traversable type hint for new code.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-02 01:32:12 -03:00
Maurício Meneghini Fauth
dd885dc7b8
Use single-line arrays when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-27 17:39:17 -03:00
Maurício Meneghini Fauth
e5698c85e9
Require single line for function calls
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-26 23:10:10 -03:00
Maurício Meneghini Fauth
437215cab2
Rename variables to use camel case format
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-26 21:47:50 -03:00
Maurício Meneghini Fauth
b95aca9090
Fix some coding standard issues on tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-26 12:54:23 -03:00
Kamil Tekiela
266f69ffb6 Fix param type in setUserValue
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-25 13:57:54 +00:00
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