Commit Graph

39 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
64b0fd54c7
Merge pull request #18397 from kamil-tekiela/Fix-18396
Fix #18396 - Export page always exports data
2023-05-12 13:51:28 -03:00
Kamil Tekiela
94eee89a60
Remove unused param (#18398)
* Update phpstan-baseline.neon

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

* Removed unused param

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

* Narrow return type

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-12 13:49:28 -03:00
Kamil Tekiela
176645be7b Shorten else/if to elseif
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-12 00:12:58 +01:00
Kamil Tekiela
2e3de28080 Fix #18396
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-09 13:29:01 +01:00
Kamil Tekiela
34ad6b7ac4 Fix useSqlBackquotes in ExportSql
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-03-14 19:37:16 +00: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
8433f66447 Remove unused variable in catch
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-14 12:10:23 +00: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
7a22334167
Designer controller globals (#17985)
* Remove globals from DesignerController
* Remove $GLOBALS['params'] in ManageController
* Remove $GLOBALS['params']
* Remove $GLOBALS['total_num_tables']
* Remove $GLOBALS['tooltip_truename']
* Remove $GLOBALS['tooltip_aliasname']
* Remove $GLOBALS['pos']
* Remove $GLOBALS['tables'] (partially)
* Remove $GLOBALS['num_tables'] (partially)
* Remove redundant calls to Util::getDbInfo()
* Move unrelated functionality out of getDbInfo()
* Extract new method getTableListPosition()
* Code style changes
* Update phpstan-baseline.neon

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-01-26 22:58:24 -03:00
Maurício Meneghini Fauth
13890a947a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-12-16 11:53:18 -03:00
ru-asdx
3794031ebc
Ref #17769 - Replace superglobals with ServerRequest in Import & Export Controllers (#17949)
* Replace superglobals with ServerRequest in Import & Export Controllers

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* small fixes

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

* fixes

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>

Signed-off-by: Evgeny Skorlov <eugene@skorlov.name>
2022-12-14 12:04:38 -03:00
William Desportes
9c4a90137d
Fix #16988 - export as CSV/JSON/SQL/... no database selected
Fixes: #16988

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 23:27:07 +01:00
Kamil Tekiela
6ae40562e5
Remove globals from ExportController (#17948)
* Remove globals from Export controller

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

* filename_template

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

* export_plugin

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

* compression_methods

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

* onserver

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

* quick_export

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

* remember_template

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

* mime_type

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

* do_relation

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

* doComments

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

* do_mime

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

* do_dates

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

* whatStrucOrData

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

* db_select

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

* table_structure

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

* lock_tables

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

* allrows

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

Update ExportController.php

* limit_to

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

Update ExportController.php

Update ExportController.php

* limit_from

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

* Remove unused globals

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

* $GLOBALS['filename'] in ManageController

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

* filename

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

* Update psalm-baseline.xml

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

* Update phpstan-baseline.neon

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-13 12:09:56 -03:00
Kamil Tekiela
959849f446
Introduce ServerRequest::hasBodyParam() (#17870)
* Drop Sql::setUiProp()
* Remove ternary operator
* Improve array guard
* Remove redundant isset
* Implement hasBodyParam()
* Add has() and hasQueryParam()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-11-05 13:04:45 -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
Umang Patel
fdb5528648
Use Database type instead of string (#17746)
* Refactored tryColumnCreationQuery function inside CreateAddField to use DatabaseName type instead of string
* Refactored exportDatabase and lockTables function to use DatabaseName type instead of string for database name

Signed-off-by: Umang Patel <umang.patel@healthengine.com.au>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-20 21:34:10 -03:00
Kamil Tekiela
32d93281bb Make alias merging cleaner
No useless globals, no overwriting of the same value. The values seem to always be string|null so let's check explicitly for that.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-17 14:43:28 +01:00
Maurício Meneghini Fauth
bb97ed988f
Reduce usage of the containerBuilder global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-29 22:36:46 -03:00
Maurício Meneghini Fauth
873eb098b9
Remove crlf global variable
The crlf global variable is only diferent for SQL export method,
otherwise is always the value of the PHP_EOL constant.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-13 14:08:57 -03: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
Kamil Tekiela
cb06b06bda Refactor getHtmlForDisplayedExportHeader
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-06-02 23:06:36 +01:00
Maurício Meneghini Fauth
9faaad41ac
Fix export not working
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-15 17:12:37 -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
754e15ebab
Extract method to set globals in ExportController
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-03-08 19:18:50 -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
Kamil Tekiela
202b17c34c Replace if with coalesce
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-01-06 19:38:21 +00:00
Maurício Meneghini Fauth
feca48cc76
Change return type of DatabaseInterface::getError method
Now, it returns last error message or an empty string instead of false
if no errors occurred.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 14:43:14 -03:00
Maurício Meneghini Fauth
d84af02945
Create VO classes for each RelationParameters features
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-26 19:17:58 -03:00
Maurício Meneghini Fauth
c411121fd8
Move Relation classes into the ConfigStorage namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:13 -03:00
Maurício Meneghini Fauth
c4575fd48b
Add methods to check for RelationParameters features
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-11 08:10:40 -03:00
Kamil Tekiela
a42803297c
Psalm fixes 3 (#17221)
* Update psalm-baseline.xml

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

* Small bug fixes

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

* non-falsy-string is always true

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

* currentSearch property is nullable

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

* Remove unusued parameter $columnIndex

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

* Use parameters instead of globals in sendEditor()

The two globals in this method are read-only. There is an unused
parameter in the signature. Let's add one more and use them instead of globals.

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

* Remove unusued parameter $crlf

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-12-03 12:40:19 -03:00
Maurício Meneghini Fauth
b2a51c4d84
Create the RelationParameters value object
Replaces the $cfgRelation array with the RelationParameters value
object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-14 18:22:36 -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
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
e3554879ef
Extract actions from controllers to new controllers
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-07 21:19:43 -03:00
Maurício Meneghini Fauth
96adfe37f4
Extract actions from controllers to new ctrls
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-06 18:30:21 -03:00