Commit Graph

59 Commits

Author SHA1 Message Date
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
Kamil Tekiela
e8c5eef6f8
Remove annoying empty statements (#18114)
* Remove annoying empty statements

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

* Make $extra strict and stop passing false to it

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

* Make $page strict and stop passing null

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-24 20:11:37 -03:00
Kamil Tekiela
902d1a1e77
Add native return type hints (#18126)
* Add remaining native return type hints to flush out bugs

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

* Cast the mixed value to int

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

* Fix tests

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

* getAutoIncrement() is supposed to return string

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

* Cast values to string in DummyResult

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

* Make getCollation() return non-nullable string

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

* Cast seqInIndex to int

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

* Cast $cardinality to int

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

* createFile may return false

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

* Remove redundant cast

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

* Update baselines

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-23 15:43:36 -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
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
Kamil Tekiela
cfe54a501b Add union types
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-15 15:23:28 +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
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
Kamil Tekiela
1e4af77416
Refactor Plugins.php (#17960)
* Remove temporary variable

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

* Remove pass-by-ref

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

* Refactor getOneOption

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

* Refactor getOptions

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 23:16:27 -03:00
Kamil Tekiela
a84cae6c2d
Refactor ExportSql - part 1 (#17955)
* Add getTableStatus method

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

* Remove unused $errorUrl parameter

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

* Remove unused parameter $table

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

* Add string return types

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

* Refactor exportUseStatement

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

* Specify param types for exportConfigurationMetadata

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

* param types for getTableDefForView

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

* Param types for getTableComments

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

* Small fixes

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

* Extract addCompatOptions() method

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

* Remove no longer needed suppress

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

* Merge if statements by SonarLint

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

* Update phpstan-baseline.neon

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

* Specify param types for exportRoutineSQL

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

* Specify param types for generateComment

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

* Specify param types for replaceWithAliases

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

* Update psalm-baseline.xml

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-12-14 11:56:22 -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
William Desportes
12fe46b2df
Fix a typo in export files
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-12-13 22:31:18 +01: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
a4f8c18808
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-20 14:48:45 -03:00
Maurício Meneghini Fauth
43cfe7d256
Mark Plugins\Plugin::isAvailable as static method
Allows for checking the availability before creating a new instance.

- Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17519

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-20 14:17:57 -03:00
Rodrigo Pokemaobr
be976e4b57 Adjusting parameters in ExportPlugin class
Signed-off-by: Rodrigo Pokemaobr <contato@pokemaobr.dev>
2022-04-28 16:32:06 -03:00
Rodrigo Wanderley de Melo Cardoso
518a37d23f
FIXES #17414 - Adjusting export object in PluginExport to export databases with comp… (#17491)
* Adjusting export object in PluginExport to export databases with compress

Signed-off-by: Rodrigo Pokemaobr <contato@pokemaobr.dev>

* Adjusting dbi in tests and psalm requisites

Signed-off-by: Rodrigo Pokemaobr <contato@pokemaobr.dev>

* Adjusting dbi in tests and psalm requisites

Signed-off-by: Rodrigo Pokemaobr <contato@pokemaobr.dev>

* Adjusting dbi in tests and psalm requisites

Signed-off-by: Rodrigo Pokemaobr <contato@pokemaobr.dev>
2022-04-23 00:33:41 -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
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
7f6472b2c2
Add void return type where possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-13 15:29:11 -03:00
Maurício Meneghini Fauth
53dd6f11b0
Refactor setProperties method of Plugin classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-08-28 16:50:08 -03:00
Maurício Meneghini Fauth
92dc790d78
Refactor PhpMyAdmin\Plugins::getPlugins method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-06-28 23:18:44 -03:00
Maurício Meneghini Fauth
1335f4bfc3
Rename ExportPlugin parameters to use camelCase
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-03-26 20:25:23 -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
Maurício Meneghini Fauth
ac9bccf67d Replace $GLOBALS['dbi'] with global $dbi
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-11 09:24:21 -03:00
Maurício Meneghini Fauth
f4582e083e Use early exit when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-27 00:35:24 -03:00
Maurício Meneghini Fauth
3baad2eb1c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 22:42:37 -03:00
William Desportes
501397a5d6
Add a message when the plugin does not support the export method
Example:
- no db, table selected.
- Type a raw query, export using codegen.
- See error message
CodeGen can not export if it does not have db and table params

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-01-27 21:16:37 +01:00
Saurabh Srivastava
1b56c8e0ed
Fix 15064 - instead of using free_query parameter, now updating export_type to raw -- more modular approach
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
2020-01-27 21:16:31 +01:00
Maurício Meneghini Fauth
676f48349a Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 22:13:36 -03:00
Maurício Meneghini Fauth
f80d3e3bd4 Remove unnecessary annotations
@package, @subpackage and others.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 17:35:56 -03:00
Maurício Meneghini Fauth
6283caaabf Use one line for comments with a single line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 16:04:09 -03:00
Maurício Meneghini Fauth
c231652c67 Remove useless comments in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 14:38:49 -03:00
Maurício Meneghini Fauth
8ec4209002 Fix some coding standard issues
- Inverts yoda comparisons
- Removes parentheses from return
- Removes useless ternary operators
- Adds paretheses to new instances
- Adds trailing array comma

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 00:38:34 -03:00
Maurício Meneghini Fauth
351e34ecf5 Upgrade PHPStan to version 0.12.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-07 20:26:39 -03:00
Hugues Peccatte
bf1bbe21ff Add default return value for unoverwritten methods
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-11-01 22:43:31 +01:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Maurício Meneghini Fauth
3262a276e8 Use the router for the export entry point
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-17 12:25:01 -03:00
Maurício Meneghini Fauth
469fd5c05c Use the router for the database operations page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-07-24 02:12:15 -03:00
Maurício Meneghini Fauth
7be0f6bfae Reference class names in use statements
Sort use statements

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 00:14:26 -03:00
Hugues Peccatte
69895e4bb1 Use "strpos" instead of "strstr" to improve performances
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-05-07 23:58:05 +02:00
Maurício Meneghini Fauth
7f793cdd59 Use DI for $dbi global in Export class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-17 22:10:43 -03:00
Maurício Meneghini Fauth
ae20364830 Upgrade phpmyadmin/coding-standard to v1.0
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-08 01:26:26 -02:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:56:34 -02:00
Tomas Votruba
637fe6de06 [cs] remove unused brackets, clean unused property assign
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-26 17:54:40 +01:00
Tomas Votruba
bf720bad29 remove unused and fix @param, @var and @return annotation values
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
2018-11-24 21:47:26 +01:00
Maurício Meneghini Fauth
d4b4124a5e Remove $GLOBALS['dbi'] from Relation class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-30 19:05:09 -03:00