Commit Graph

217 Commits

Author SHA1 Message Date
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
Kamil Tekiela
80c4db7253 Use strict check when type is known
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-19 23:19:54 +00: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
Kamil Tekiela
87e42d591c Use short closures where possible
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-14 13:44:42 +00:00
Kamil Tekiela
8433f66447 Remove unused variable in catch
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-14 12:10:23 +00:00
Maurício Meneghini Fauth
930f8826d3
Remove dead code for old PHP versions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-12 13:59:40 -03:00
Kamil Tekiela
7e5d96b559 Use DI for UserPreferences
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-10 16:23:34 -03:00
Kamil Tekiela
8406f9596a Remove unused properties
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-01-24 00:19:53 +00: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
Kamil Tekiela
6264f6f1ea
Various refactorings 2 (#17965)
* Remove extra blank lines
* Remove useless param annotations
* Refactor Index::singleton
* Refactor Config.php
* Refactor Header::addRecentTable()
* Collapse return statement into a single line
* Refactor Message.php
* Convert $getUniqueCondition into a scalar
* Code style
* Fix invalid return phpdoc
* Remove unused variable
* Remove redundant empty array checks
* Refactor Export::closeFile()
* Simplify else statement
* Remove redundant else
* Refactor TablePartitionDefinition::getDetails
* Simpler returns
* Add types for getCellContent()
* Remove useless method mngInsideStructComm

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-24 12:54:23 -03:00
Maurício Meneghini Fauth
b783681a8b Remove Config::fatalErrorHandler() method
Since there is an error handler register already, error_get_last is
always empty.

Also adds a try-catch to catch exceptions from the config file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-16 10:27:18 -03:00
Maurício Meneghini Fauth
ad5e2abdab
Throw ConfigException for some Config errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-11-15 19:03:01 -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
de03f00cae
Remove Core::fatalError method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-31 22:18:47 -03:00
Maurício Meneghini Fauth
2c3ce59718
Remove isMinimumCommon variable from global space
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-21 13:51:58 -03:00
Maurício Meneghini Fauth
3d3010916e
Fix an issue reported by Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-21 17:31:03 -03:00
Maurício Meneghini Fauth
5950693fb3
Fix possible undefined globals
Related to https://github.com/phpmyadmin/phpmyadmin/pull/17427.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-10 18:05:21 -03:00
Maurício Meneghini Fauth
1438cb211e
Replace global keyword with $GLOBALS
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-07 17:31:11 -03:00
Maurício Meneghini Fauth
2061774013
Fix errors reported by Psalm/PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-16 14:37:25 -03:00
Maurício Meneghini Fauth
b40dc49d71
Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-16 14:21:23 -03:00
Maurício Meneghini Fauth
2fd5540fca
Add SameSite to session cookie for PHP 7.2
- Related to #16981

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-15 18:53:08 -03:00
Maurício Meneghini Fauth
9fe9fe8ad1
Merge branch 'QA_5_1' into QA_5_2 2022-01-22 16:19:24 -03:00
Maurício Meneghini Fauth
48b4ff8247
Fix hide_connection_errors being undefined when a controluser is set
Fixes #17307
Closes #17304

(cherry picked from commit fd692ca382)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-01-22 12:33:43 -03:00
Maurício Meneghini Fauth
ce18740be4
Remove passing null to Relation's constructor
Related to d296860a67.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:14 -03:00
Maurício Meneghini Fauth
857a9d3337
Remove unnecessary @var annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-18 12:15:30 -03:00
Maurício Meneghini Fauth
220ed30ef8
Remove printview.css theme files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-10-31 17:35:55 -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
Maurício Meneghini Fauth
9f3510d11a
Add bool return type where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-14 20:11:51 -03:00
Maurício Meneghini Fauth
6ae07c96fb
Replace strpos !== false with str_contains
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-09 22:30:42 -03: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
a0d91ec153
Move common.inc.php to classes/Common.php
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-06 14:00:44 -03:00
Maurício Meneghini Fauth
8e4d6229a9
Fix some errors found by Psalm
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-06 00:37:27 -03:00
Maurício Meneghini Fauth
76aabc9826
Remove PMA_MINIMUM_COMMON constant
Replaces it with the `$isMinimumCommon` global variable.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-02 01:29:07 -03:00
William Desportes
c7ee30a3fe
Document more static vars
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-06-17 15:22:37 +02: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
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
db01d6a9da
Remove some else conditions by using early exits or moving code
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-29 01:18:39 +02: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
a8f63ca458
Add PHP typehints to the filter config closure
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-20 22:41:58 +02:00
William Desportes
6d0e4b546e
Revert 8767499594 "Avoid using ARRAY_FILTER_USE_KEY" for HHVM compat
This reverts commit 8767499594

Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-20 21:27:13 +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
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
819c9433d3
Drop unused PMA_THEME_VERSION and PMA_THEME_GENERATION
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-05 21:30:51 +01: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