Commit Graph

46 Commits

Author SHA1 Message Date
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
Kamil Tekiela
3774c29604 Fix implicit nulls
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-17 12:45:18 +00:00
Kamil Tekiela
555c6798eb Add native param types
Includes TypeHints.UnionTypeHintFormat

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-17 12:45:18 +00: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
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
2b35303aae
Remove redundant code (#18063)
PHPStorm has been a little annoying with showing all these code issues. I took some time to analyse most of them and fix whichever were easy to fix. This kind of change should improve future maintenance as developers do not need to wonder what a line of code does. Code that has no impact on functionality should be removed.

* Remove redundant variables
* Invert condition for better clarity
* Remove some of the redundant casts
* Replace switch with an if
* Fix foreach variable
* Remove redundant variable concat
* Remove redundant concats
* Replace for loop with str_repeat
* Remove always true param
* Turn property $position into local var
* Turn Pdf properties into local vars
* Remove unused properties in Pdf
* Change ternary into condition
* Remove redundant assignments
   They are immediately overwritten with a different value.
* Redundant array append
* Collapse if statements into assignments
* Use boolean constants instead of variables
* Remove unneeded parameter
* Remove null-coalesce
* Unnecessary assignment
* Remove redundant isset
* Remove readOnly flag for InsertEdit fields
* Remove function_exists and $mode var
* Remove duplicate condition
* Remove redundant elseif
* Remove redundant isset
* Use hasBodyParam()
* Simplify isRoutesCacheFileValid()
   Psalm complains but is wrong.

https://github.com/phpmyadmin/phpmyadmin/pull/18063

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-15 09:11:05 -03:00
Maurício Meneghini Fauth
66e2650e06
Replace Core::fatalError() calls in controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-31 20:25:55 -03:00
Maurício Meneghini Fauth
49e7d82c0f
Extract setup routing logic to the Routing class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-22 09:56:21 -03:00
Maurício Meneghini Fauth
eb3703882b
Move Routing::getCurrentRoute to ServerRequest
The route is retrieved from the request, so it makes sense to move the
method to the Http\ServerRequest class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-06 23:36:57 -03:00
Maurício Meneghini Fauth
37d55ee355
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-13 22:22:36 -03:00
Maurício Meneghini Fauth
680e59eb5f
Ignore invalid routes cache file
If the `libraries/cache/routes.cache.php` file is invalid (usually from
5.1), ignores it and try to write a new one instead of failing.

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17522.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-13 21:46:17 -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
d1b99c4a15 Fix merge conflicts
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-11 10:07:02 -03:00
Isaac Bennetch
5127b31144 Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2022-02-10 23:38:23 -05:00
Maurício Meneghini Fauth
c04f85f2bb Fix path disclosure on misconfigured servers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-10 20:59:06 -06:00
Maurício Meneghini Fauth
4c3bf41d56
Use DatabaseName for RelationParameters::db instead of string
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-11 08:10:40 -03:00
Maurício Meneghini Fauth
bfaf16f56b
Use only callable controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-11 15:20:46 -03:00
Maurício Meneghini Fauth
a2ed4dfe68
Make controllers callable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-30 13:16:29 -03:00
Maurício Meneghini Fauth
e4ed0cc8be
Replace fopen, fwrite and fclose with file_put_contents
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-13 11:51:57 -03:00
Maurício Meneghini Fauth
282fbe76c5
Fix case where $_SERVER['REQUEST_METHOD'] is undefined
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/16991

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-05 17:23:32 -03:00
Maurício Meneghini Fauth
80e39b9b55
Move ServerRequest creation to common.inc.php
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-05 13:20:43 -03:00
Maurício Meneghini Fauth
6f894e7ea7
Add support for PSR-7 request objects in controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-07-03 18:54:42 -03:00
Maurício Meneghini Fauth
9adaa912e1
Rename Response class to ResponseRenderer
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-30 12:35:22 -03:00
William Desportes
0a1f083990
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-06-23 20:36:21 +02:00
William Desportes
97a7d88db6
Ignore psalm UnresolvableInclude for routing cache
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-06-21 23:43:24 +02:00
Maurício Meneghini Fauth
6989d615a5
Fix some errors found by PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-09 13:07:40 -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
William Desportes
75c148b885
Update psalm baseline and include ignores
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-29 00:43:20 +02:00
Maurício Meneghini Fauth
18f9c6a9ad
Suppress Psalm MissingFile error on routes cache file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit 1e34437e63)
2021-04-28 01:09:47 +02:00
Maurício Meneghini Fauth
1e34437e63
Suppress Psalm MissingFile error on routes cache file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-27 15:56:18 -03:00
Maurício Meneghini Fauth
59e4dae52a
Remove invalid inline doc comments
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-18 14:49:28 -03: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
William Desportes
778d916adf
Re-write the route cache handling
See: https://github.com/nikic/FastRoute/issues/224
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-02-21 19:40:32 +01:00
William Desportes
81cc352f0d
Disable cache when the file is not writable
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-02-13 22:22:43 +01:00
Maurício Meneghini Fauth
3f01cd8c13 Remove Message::display method
Related to https://github.com/phpmyadmin/phpmyadmin/issues/16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-20 19:43:46 -03:00
Maurício Meneghini Fauth
e23f933d97 Use early exit for Routing::callControllerForRoute
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-08 19:12:49 -03:00
William Desportes
5234f6b3d4
Fix a coding standard issue for #16180
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-09 13:46:25 +02:00
William Desportes
655389292d
Fix #16180 - [5.1-dev, security] XSS, unescaped route displayed on 404 page
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-06-09 13:45:14 +02:00
Maurício Meneghini Fauth
a64393e7f5 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-13 00:23:28 -03:00
Maurício Meneghini Fauth
1481534ff1 Add php extension to routes cache file
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-01 16:10:46 -03:00
William Desportes
d56bb6cf00
Change ROUTING_CACHE_DIR into CACHE_DIR
Ref: 4d2800daa49819b85aceba9089f6bec3da254608

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
aed59d758c
Remove a blank line
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
c85fb43da0
Create ROUTING_CACHE_DIR contstant
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
bde3e5ae65
Move all index.php code to PhpMyAdmin\Routing and change cache name
Signed-off-by: William Desportes <williamdes@wdes.fr>

Fix some phpdoc comments

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00