Commit Graph

41 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
342ab3f67a
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 14:36:32 -03: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
William Desportes
f3aa3639b3
Remove chdir from GitTest after fixing #18112
Ref: d9a6f82bc1

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-26 23:57:54 +01:00
William Desportes
d9a6f82bc1
Fix #18112 - open base dir warning on git version class
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-26 23:31:28 +01: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
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
Kamil Tekiela
54e4ec68fd
Stop using PHP_EOL (#18101)
* s/PHP_EOL/"\n"

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

* PHP_EOL seems to have been intentional here

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

* Merge concats together

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

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-21 11:58:56 -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
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
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
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
d76b240176 Remove redundant pass-by-ref
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-10 16:30:12 -03:00
William Desportes
0fb9f4c266
Fix PHP 8.2: ${var} deprecated string interpolation syntax on Git class
Ref: af7338f706

Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-07-13 15:28:08 +02:00
Maurício Meneghini Fauth
9f3b4f04e9
Wrap variable variables in curly braces
See: https://www.php.net/manual/en/language.variables.variable.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-27 19:18:48 -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
90778eecf7
Upgrade phpmyadmin/coding-standard to 3.0.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-04-19 02:20:46 -03:00
William Desportes
676a9cea3d
Merge branch 'QA_5_1'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-31 13:20:05 +02:00
William Desportes
4c99a7d8f8
Split out git common dir detection to handle file_get_contents error cases
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-31 00:01:25 +02:00
William Desportes
84ede575e3
Remove dependency on Config class of Git class
Signed-off-by: William Desportes <williamdes@wdes.fr>
2021-03-24 18:29:52 +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
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
0ae5216e28
Improve Git class by removing switch cases on request responses
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-12-07 15:42:37 +01:00
William Desportes
5abcae9255
Fixed some typos in the code base
I used code spell checker and did all the libraries/classes/*.php files one by one.
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-11-01 22:46:01 +01:00
Maurício Meneghini Fauth
f2e49a92c6 Fix some type errors detected by PHPStan
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-09-30 19:23:01 -03:00
Maurício Meneghini Fauth
4821b45ef8 Return commit info in Git::checkGitRevision method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-30 03:23:08 -03:00
Maurício Meneghini Fauth
7486e99568 Extract HTML from Git::getHtml method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-30 01:33:34 -03:00
Maurício Meneghini Fauth
65c93872f0 Remove Display\GitRevision class
Move display method to Git class

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-29 22:50:49 -03:00
Maurício Meneghini Fauth
3b285ff17e Use identical operator for non-empty strings
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-10 18:06:29 -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
bd979dd1ff Remove useless elseif with if
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 22:53:44 -03:00
Maurício Meneghini Fauth
82c2964bb8 Remove useless elses
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 22:27:45 -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
Maurício Meneghini Fauth
9269d75fb4 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 20:22:18 -03:00
Maurício Meneghini Fauth
0b9c35a056 Remove uses statements from the same namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-24 13:00:24 -03:00
William Desportes
c12f341bbf
Split Git::checkGitRevision into Git::getHashFromHeadRef
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-17 22:21:01 +02:00
William Desportes
31d9f1e603
Split Git::unPackGz into Git::readPackFile and Git::getPackOffset
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-17 21:15:24 +02:00
William Desportes
a5788e0df5
Split checkGitRevision commit parsing part into extractDataFormTextBody and isRemoteCommit functions
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-16 16:13:51 +02:00
William Desportes
8e56addea7
Split checkGitRevision GZ part into unPackGz function
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-16 15:36:50 +02:00
William Desportes
585ae508eb
Move out of Config Class all Git methods
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-16 15:18:45 +02:00