diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-09-07 20:20:39 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-09-07 20:20:39 +0300 |
| commit | e9d742fdb67f069864000deed1b25006c099043d (patch) | |
| tree | 3573db04eadcb6456184a9f7cd183359d7706869 | |
| parent | ec9af1bd65438d2839b6a810bed7ba40c622a9ff (diff) | |
Add better type description to Index::$registry
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
| -rw-r--r-- | libraries/classes/Index.php | 2 | ||||
| -rw-r--r-- | phpstan-baseline.neon | 17 | ||||
| -rw-r--r-- | psalm-baseline.xml | 29 |
3 files changed, 25 insertions, 23 deletions
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index 691ea919ac..1cc3b0c04c 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -24,7 +24,7 @@ class Index /** * Class-wide storage container for indexes (caching, singleton) * - * @var array + * @var array<string, array<string, array<string, Index>>> */ private static $registry = []; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 2ed643ebcf..ea634bf048 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -4241,7 +4241,7 @@ parameters: path: libraries/classes/Index.php - - message: "#^Property PhpMyAdmin\\\\Index\\:\\:\\$registry type has no value type specified in iterable type array\\.$#" + message: "#^Static property PhpMyAdmin\\\\Index\\:\\:\\$registry \\(array\\<string, array\\<string, array\\<string, PhpMyAdmin\\\\Index\\>\\>\\>\\) does not accept array\\<string, array\\<string, array\\<int\\|string, PhpMyAdmin\\\\Index\\>\\>\\>\\.$#" count: 1 path: libraries/classes/Index.php @@ -5851,6 +5851,11 @@ parameters: path: libraries/classes/Plugins/Import/ImportSql.php - + message: "#^Cannot assign new offset to array\\<int, array\\<int, string\\>\\|string\\>\\|string\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportXml.php + + - message: "#^Offset 'charset' does not exist on SimpleXMLElement\\|null\\.$#" count: 1 path: libraries/classes/Plugins/Import/ImportXml.php @@ -5866,6 +5871,16 @@ parameters: path: libraries/classes/Plugins/Import/ImportXml.php - + message: "#^Parameter \\#1 \\$str1 of function strcmp expects string, array\\<int, array\\<int, string\\>\\|string\\>\\|string given\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportXml.php + + - + message: "#^array\\<int, array\\<int, string\\>\\|string\\>\\|string does not accept array\\<int, string\\>\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportXml.php + + - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\Upload\\\\UploadNoplugin\\:\\:getUploadStatus\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/Plugins/Import/Upload/UploadNoplugin.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 2be64631a1..11ee1b52bc 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -7726,28 +7726,23 @@ <code>$key</code> <code>$params['columns']</code> </MixedArgument> - <MixedArrayAccess occurrences="2"> + <MixedArrayAccess occurrences="1"> <code>$_each_index['Key_name']</code> - <code>self::$registry[$schema][$table][$keyName]</code> </MixedArrayAccess> - <MixedArrayAssignment occurrences="3"> + <MixedArrayAssignment occurrences="1"> <code>$_each_index['Schema']</code> - <code>self::$registry[$schema][$table]</code> - <code>self::$registry[$schema][$table]</code> </MixedArrayAssignment> - <MixedArrayOffset occurrences="4"> + <MixedArrayOffset occurrences="3"> <code>$columns['sub_parts'][$key]</code> <code>self::$registry[$schema][$table][$keyName]</code> <code>self::$registry[$schema][$table][$keyName]</code> - <code>self::$registry[$schema][$table][$keyName]</code> </MixedArrayOffset> - <MixedAssignment occurrences="20"> + <MixedAssignment occurrences="19"> <code>$column</code> <code>$column</code> <code>$data['columns'][]</code> <code>$key</code> <code>$key</code> - <code>$key</code> <code>$keyName</code> <code>$name</code> <code>$sub_part</code> @@ -7763,23 +7758,15 @@ <code>$this->table</code> <code>$this->type</code> </MixedAssignment> - <MixedInferredReturnType occurrences="3"> - <code>Index</code> - <code>Index[]</code> - <code>Index|false</code> - </MixedInferredReturnType> - <MixedMethodCall occurrences="2"> - <code>addColumn</code> + <MixedMethodCall occurrences="1"> <code>getCompareData</code> </MixedMethodCall> <MixedOperand occurrences="1"> <code>$key</code> </MixedOperand> - <MixedReturnStatement occurrences="3"> - <code>self::$registry[$schema][$table]</code> - <code>self::$registry[$schema][$table][$index_name]</code> - <code>self::$registry[$schema][$table]['PRIMARY']</code> - </MixedReturnStatement> + <MixedPropertyTypeCoercion occurrences="1"> + <code>self::$registry</code> + </MixedPropertyTypeCoercion> <MixedReturnTypeCoercion occurrences="2"> <code>$this->columns</code> <code>IndexColumn[]</code> |