Commit Graph

83 Commits

Author SHA1 Message Date
Maximilian Krög
e8e877b662
Small change to urlParams and errorUrl globals initialization
Default to emtpy array for urlParams, remove null initialazation for
errorUrl.

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
c24e1674c1
Extract method getVisualizationSettings
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
3891f2bca2
Add and use getters for GisVisualization properties
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
a64fbedb3f
Rename / refactor useBaseLayer option
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
975305398b
Remove settings and userSpecifiedSettings properties
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
2f428e5c93
Extract getRows and getPos methods
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
d2560e793d
Extract getColumnMeta method
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
21b81ad04e
Extrace getSqlQuery method
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:19 +01:00
Maximilian Krög
07388c10a7
Remove default width / height
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:53:17 +01:00
Maximilian Krög
6b9f0d8441
Add pos and rows properties
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:52:49 +01:00
Maximilian Krög
b656f09713
Move db version checks into GisVisualization
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-13 21:52:22 +01:00
Maximilian Krög
fa7ec73dd2
Make sure a spatial column is available
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-05 15:29:19 +01:00
Maximilian Krög
d7003fbbe8
Remove visualization property from controller
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-03-05 15:29:19 +01:00
Kamil Tekiela
0bdcaba2d2
Add native property types (#18143)
* Add native property types

Includes TypeHints.UnionTypeHintFormat

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

* Set some default values for properties

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

* Format and promote properties

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

* Remove redundant asserts

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

* Redundant cast

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

* $tmanager->theme is never null

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

* Redundant variable

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

* Fix empty on $statementInfo bool

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

* Redundant casts

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

* Redundant issets

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

* getPacked() returns nullable string

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

* Redundant if

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

* $this->content can be null

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

* Simplify ThemeManager::getInstance()

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

* Use isset for checking if property is initialized

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

* Use nullable instead of uninitialized property

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

* password is no longer nullable

I can't verify that none of the globals ever tried to set it to null, but the variable should never be nullable.

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

* Update baselines

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

* $same_wide_width param can be float or int

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

* Update Message.php

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

* Cast Sub_part to int

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

* Fix one line doc comments

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-26 23:30:41 -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
Maurício Meneghini Fauth
785f8c1c00
Use constructor property promotion where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 19:39:02 -03:00
Maurício Meneghini Fauth
613678f8f5
Replace assignments with null coalesce equal operator
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-20 17:03:05 -03:00
Kamil Tekiela
8a1d6f1eaa Convert var annotations to typed properties
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-12 21:31:04 +00:00
Kamil Tekiela
e3e351c676 Remove dead code
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-01-25 00:59:43 +00:00
Maurício Meneghini Fauth
2076d52480
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-19 23:26:15 -03:00
William Desportes
6230c197dd
Fix PHP warning on GIS visualization when there is only one GIS column
```
Warning in ./libraries/classes/Controllers/Table/GisVisualizationController.php#174
 Undefined array key "labelColumn"

Backtrace

Routing.php#191: PhpMyAdmin\Controllers\Table\GisVisualizationController->__invoke(
,
array,
)
./../../../../index.php#43: PhpMyAdmin\Routing::callControllerForRoute(
,
string '/table/gis-visualization',
,
,
)
```
Structure:
- A table with only one GIS column

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-09-10 14:05:34 +02:00
Maurício Meneghini Fauth
3c618c22a9
Add ServerRequest parameter to all controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-28 01:00:08 -03:00
Maurício Meneghini Fauth
b008cca95d
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-26 21:20:06 -03:00
Maurício Meneghini Fauth
04f3f5a4b6
Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-26 21:03:20 -03:00
Maurício Meneghini Fauth
5d80594341 Remove jQuery SVG JS dependency
Removed by https://github.com/phpmyadmin/phpmyadmin/pull/17041.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-04-24 20:39:12 -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
f940693c75
Move Util::checkParameters method to the AbstractController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-07 22:59:33 -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
5a34a3bb04
Remove db and table properties from controllers
Replaces them with their respective globals.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-02-02 14:48:43 -03: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
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
3531775b7c
Add type declarations to the controllers contructors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-11 17:32:22 -03:00
Maurício Meneghini Fauth
8f2f3eff40
Remove the Core::isValid method
This improves the type checking and simplifies the code.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-02 13:20:50 -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
William Desportes
fa88ce2f00
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-08-10 15:39:23 +02:00
Maximilian Krög
cda569635b
Fix saving gis visualization with different label / column
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2021-07-30 21:08:57 +02:00
William Desportes
f77433b9b7
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-07-28 01:37:17 +02:00
Maximilian Krög
315426324d
Respect pos and limit in gis visualization
Co-Authored-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2021-07-28 01:26:17 +02: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
Maurício Meneghini Fauth
cc0cc79253
Accept only string for Response::addHTML method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-29 18:04:18 -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
4dec56d883
Remove get_start_and_number_of_rows_panel() Twig function
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-17 17:56:34 -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
William Desportes
deac7cffde
Fix not working export to PNG, SVG, PDF on GIS visialization
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-04-17 00:28:38 +02:00
Maurício Meneghini Fauth
44bdd1d390
Rename $url_params global to $urlParams
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-24 22:48:14 -03:00
Maurício Meneghini Fauth
91bd0df2e5
Rename $err_url global to $errorUrl
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-24 19:39: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
c5155ecae9
Refactor field flags to use an object an not strpos
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-02-24 23:56:33 +01: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