diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-19 19:10:34 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-19 19:10:34 +0300 |
| commit | 7576d5cf86dac92d872e0f86aa27db08fe889460 (patch) | |
| tree | 66d85936ad1bab7136adb919beec1810ad56195c | |
| parent | 2532c25c8d8c835858849d2da0aeb4a3d7731fe2 (diff) | |
| parent | 6957064cea185c43f7222a215abb19ed17538f21 (diff) | |
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libraries/classes/Table.php | 6 | ||||
| -rw-r--r-- | phpstan-baseline.neon | 5 | ||||
| -rw-r--r-- | psalm-baseline.xml | 5 |
4 files changed, 4 insertions, 13 deletions
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog - issue #17584 It's now possible to browse a database that includes two % in its name - issue Fix PHP 8.2 deprecated string interpolation syntax - issue Some languages are now correctly detected from the HTTP header +- issue #17617 Sorting is correctly remembered when $cfg['RememberSorting'] is true 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index e43ddd9347..3b0eaf1277 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -1869,7 +1869,7 @@ class Table implements Stringable */ public function getUiProp($property) { - if (! isset($this->uiprefs)) { + if (empty($this->uiprefs)) { $this->loadUiPrefs(); } @@ -1939,7 +1939,7 @@ class Table implements Stringable */ public function setUiProp($property, $value, $tableCreateTime = null) { - if (! isset($this->uiprefs)) { + if (empty($this->uiprefs)) { $this->loadUiPrefs(); } @@ -1986,7 +1986,7 @@ class Table implements Stringable */ public function removeUiProp($property) { - if (! isset($this->uiprefs)) { + if (empty($this->uiprefs)) { $this->loadUiPrefs(); } diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 93b2e2279c..aa0ed2f75c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -7726,11 +7726,6 @@ parameters: path: libraries/classes/Table.php - - message: "#^Property PhpMyAdmin\\\\Table\\:\\:\\$uiprefs \\(array\\) in isset\\(\\) is not nullable\\.$#" - count: 3 - path: libraries/classes/Table.php - - - message: "#^Property PhpMyAdmin\\\\Table\\:\\:\\$uiprefs type has no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/Table.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 961745067d..6bf88aed27 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -13071,11 +13071,6 @@ </PossiblyNullArgument> </file> <file src="libraries/classes/Table.php"> - <DocblockTypeContradiction occurrences="3"> - <code>isset($this->uiprefs)</code> - <code>isset($this->uiprefs)</code> - <code>isset($this->uiprefs)</code> - </DocblockTypeContradiction> <InvalidReturnStatement occurrences="1"> <code>$tableAutoIncrement ?? ''</code> </InvalidReturnStatement> |