Skip to content

Commit

Permalink
TransformationsPlugin:getOptions() takes mixed[]
Browse files Browse the repository at this point in the history
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
  • Loading branch information
kamil-tekiela authored and MauricioFauth committed Mar 4, 2023
1 parent f8d6b0a commit f7449dd
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 58 deletions.
6 changes: 3 additions & 3 deletions libraries/classes/Plugins/TransformationsPlugin.php
Expand Up @@ -43,10 +43,10 @@ abstract public function applyTransformation(
/**
* Returns passed options or default values if they were not set
*
* @param string[] $options List of passed options
* @param string[] $defaults List of default values
* @param mixed[] $options List of passed options
* @param mixed[] $defaults List of default values
*
* @return array List of options possibly filled in by defaults.
* @return mixed[] List of options possibly filled in by defaults.
*/
public function getOptions(array $options, array $defaults): array
{
Expand Down
45 changes: 40 additions & 5 deletions phpstan-baseline.neon
Expand Up @@ -7090,6 +7090,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\Bool2TextTransformationsPlugin\\:\\:applyTransformation\\(\\) should return string but returns mixed\\.$#"
count: 2
path: libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\CodeMirrorEditorTransformationPlugin\\:\\:applyTransformation\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -7120,6 +7125,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php

-
message: "#^Parameter \\#1 \\$string of function mb_strtolower expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\DownloadTransformationsPlugin\\:\\:applyTransformation\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -7175,11 +7185,26 @@ parameters:
count: 1
path: libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php

-
message: "#^Cannot cast mixed to int\\.$#"
count: 2
path: libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\InlineTransformationsPlugin\\:\\:applyTransformation\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php

-
message: "#^Parameter \\#1 \\.\\.\\.\\$arrays of function array_merge expects array, mixed given\\.$#"
count: 1
path: libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php

-
message: "#^Parameter \\#2 \\$additionalParameters of static method PhpMyAdmin\\\\Url\\:\\:getFromRoute\\(\\) expects array, mixed given\\.$#"
count: 2
path: libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\LongToIPv4TransformationsPlugin\\:\\:applyTransformation\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
count: 1
Expand All @@ -7190,6 +7215,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php

-
message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, mixed given\\.$#"
count: 2
path: libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\RegexValidationTransformationsPlugin\\:\\:applyTransformation\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
count: 1
Expand All @@ -7200,6 +7230,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php

-
message: "#^Cannot cast mixed to int\\.$#"
count: 2
path: libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php

-
message: "#^Casting to string something that's already string\\.$#"
count: 3
Expand All @@ -7225,6 +7260,11 @@ parameters:
count: 1
path: libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php

-
message: "#^Cannot cast mixed to int\\.$#"
count: 2
path: libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\Transformations\\\\Abs\\\\TextImageLinkTransformationsPlugin\\:\\:applyTransformation\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -7295,11 +7335,6 @@ parameters:
count: 1
path: libraries/classes/Plugins/TransformationsPlugin.php

-
message: "#^Method PhpMyAdmin\\\\Plugins\\\\TransformationsPlugin\\:\\:getOptions\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Plugins/TransformationsPlugin.php

-
message: "#^Parameter \\#1 \\$secret of method PragmaRX\\\\Google2FA\\\\Google2FA\\:\\:verifyKey\\(\\) expects string, mixed given\\.$#"
count: 1
Expand Down
57 changes: 7 additions & 50 deletions psalm-baseline.xml
Expand Up @@ -12229,9 +12229,6 @@
</RiskyCast>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php">
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
<MixedInferredReturnType>
<code>string</code>
</MixedInferredReturnType>
Expand All @@ -12241,9 +12238,6 @@
</MixedReturnStatement>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['DateFormat']]]></code>
</InvalidArgument>
<InvalidOperand>
<code>$timestamp</code>
</InvalidOperand>
Expand All @@ -12252,9 +12246,6 @@
<code>$options[1]</code>
<code>$options[2]</code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
<RedundantCastGivenDocblockType>
<code>(string) $buffer</code>
<code>(string) $buffer</code>
Expand Down Expand Up @@ -12295,12 +12286,6 @@
</PossiblyNullIterator>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['External']]]></code>
</InvalidArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
<MixedArrayAccess>
<code>$allowed_programs[$options[0]]</code>
<code>$allowed_programs[0]</code>
Expand All @@ -12318,14 +12303,6 @@
<code>$program</code>
</MixedOperand>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['Hex']]]></code>
</InvalidArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php">
<MixedArgument>
<code><![CDATA[$options['wrapper_params']]]></code>
Expand All @@ -12337,39 +12314,24 @@
</MixedArgument>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['Inline']]]></code>
</InvalidArgument>
<MixedArgument>
<code><![CDATA[$options['wrapper_params']]]></code>
<code><![CDATA[$options['wrapper_params']]]></code>
<code><![CDATA[$options['wrapper_params']]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php">
<MixedArgument>
<code>$options[0]</code>
<code>$options[1]</code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php">
<MixedArgument>
<code>$options[0]</code>
</MixedArgument>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['Substring']]]></code>
</InvalidArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
<MixedOperand>
<code>$options[2]</code>
<code>$options[2]</code>
Expand All @@ -12381,27 +12343,15 @@
</RedundantCastGivenDocblockType>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['TextImageLink']]]></code>
</InvalidArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
<MixedOperand>
<code>$options[0]</code>
</MixedOperand>
</file>
<file src="libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php">
<InvalidArgument>
<code><![CDATA[$cfg['DefaultTransformations']['TextLink']]]></code>
</InvalidArgument>
<MixedArgument>
<code>$options[1] ?? $buffer</code>
<code><![CDATA[$options[1] ?? '']]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code>$options</code>
</MixedArgumentTypeCoercion>
<MixedOperand>
<code><![CDATA[$options[0] ?? '']]></code>
</MixedOperand>
Expand Down Expand Up @@ -12469,6 +12419,13 @@
<code>getMIMEType</code>
</PossiblyUnusedMethod>
</file>
<file src="libraries/classes/Plugins/TransformationsPlugin.php">
<MixedAssignment>
<code>$result[$key]</code>
<code>$result[$key]</code>
<code>$value</code>
</MixedAssignment>
</file>
<file src="libraries/classes/Plugins/TwoFactor/Application.php">
<MixedArgument>
<code>$secret</code>
Expand Down

0 comments on commit f7449dd

Please sign in to comment.