gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update PHPStan and Psalm baselines

Browse Source 
- Fix coding standard error
- Remove strict option from composer validate because the sql-parser is
  pointing to a commit-ref

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2022-11-23 17:28:31 -03:00
parent f883d9021f
commit aabdbe7357
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 96 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lint-and-analyse-php.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
php-version: ${{ matrix.php-version }}
- name: Validate composer.json and composer.lock
run: composer validate --strict
run: composer validate
- name: Install Composer dependencies
uses: ramsey/composer-install@v1

65
phpstan-baseline.neon
View File

@ -1355,6 +1355,36 @@ parameters:
count: 1
path: libraries/classes/Controllers/HomeController.php
-
message: "#^Parameter \\#3 \\$normalizedTo of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlFor1NFStep1\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/FirstNormalForm/FirstStepController.php
-
message: "#^Parameter \\#1 \\$repeatingColumns of method PhpMyAdmin\\\\Normalization\\:\\:moveRepeatingGroup\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php
-
message: "#^Parameter \\#2 \\$primaryColumns of method PhpMyAdmin\\\\Normalization\\:\\:moveRepeatingGroup\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php
-
message: "#^Parameter \\#3 \\$newTable of method PhpMyAdmin\\\\Normalization\\:\\:moveRepeatingGroup\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php
-
message: "#^Parameter \\#4 \\$newColumn of method PhpMyAdmin\\\\Normalization\\:\\:moveRepeatingGroup\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php
-
message: "#^Parameter \\#1 \\$json of function json_decode expects string, mixed given\\.$#"
count: 2
path: libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php
-
message: "#^Parameter \\#1 \\$partialDependencies of method PhpMyAdmin\\\\Normalization\\:\\:createNewTablesFor2NF\\(\\) expects array, mixed given\\.$#"
count: 1
@ -1365,21 +1395,41 @@ parameters:
count: 1
path: libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php
-
message: "#^Parameter \\#1 \\$json of function json_decode expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php
-
message: "#^Parameter \\#1 \\$partialDependencies of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlForNewTables2NF\\(\\) expects array, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php
-
message: "#^Parameter \\#1 \\$json of function json_decode expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php
-
message: "#^Parameter \\#1 \\$newTables of method PhpMyAdmin\\\\Normalization\\:\\:createNewTablesFor3NF\\(\\) expects array, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php
-
message: "#^Parameter \\#2 \\$tables of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlFor3NFstep1\\(\\) expects array, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/ThirdNormalForm/FirstStepController.php
-
message: "#^Parameter \\#1 \\$dependencies of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlForNewTables3NF\\(\\) expects object, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php
-
message: "#^Parameter \\#1 \\$json of function json_decode expects string, mixed given\\.$#"
count: 2
path: libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php
-
message: "#^Parameter \\#2 \\$tables of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlForNewTables3NF\\(\\) expects array, mixed given\\.$#"
count: 1
@ -1890,6 +1940,21 @@ parameters:
count: 1
path: libraries/classes/Controllers/TableController.php
-
message: "#^Parameter \\#1 \\$pmaPw of method PhpMyAdmin\\\\UserPassword\\:\\:setChangePasswordMsg\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/UserPasswordController.php
-
message: "#^Parameter \\#2 \\$authenticationPlugin of method PhpMyAdmin\\\\UserPassword\\:\\:changePassword\\(\\) expects string\\|null, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/UserPasswordController.php
-
message: "#^Parameter \\#2 \\$pmaPw2 of method PhpMyAdmin\\\\UserPassword\\:\\:setChangePasswordMsg\\(\\) expects string, mixed given\\.$#"
count: 1
path: libraries/classes/Controllers/UserPasswordController.php
-
message: "#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#"
count: 1

83
psalm-baseline.xml
View File

@ -2332,95 +2332,77 @@
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Controllers/Normalization/FirstNormalForm/FirstStepController.php">
<PossiblyInvalidArgument occurrences="1">
<MixedArgument occurrences="1">
<code>$normalForm</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="1">
</MixedArgument>
<MixedAssignment occurrences="2">
<code>$normalForm</code>
</PossiblyInvalidCast>
<code>$normalizeTo</code>
</MixedAssignment>
</file>
<file src="libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php">
<PossiblyInvalidArgument occurrences="4">
<MixedArgument occurrences="4">
<code>$newColumn</code>
<code>$newTable</code>
<code>$primary_columns</code>
<code>$repeatingColumns</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="4">
</MixedArgument>
<MixedAssignment occurrences="4">
<code>$newColumn</code>
<code>$newTable</code>
<code>$primary_columns</code>
<code>$repeatingColumns</code>
</PossiblyInvalidCast>
</MixedAssignment>
</file>
<file src="libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php">
<MixedArgument occurrences="2">
<MixedArgument occurrences="4">
<code>$partialDependencies</code>
<code>$request-&gt;getParsedBodyParam('newTablesName')</code>
<code>$request-&gt;getParsedBodyParam('pd')</code>
<code>$tablesName</code>
</MixedArgument>
<MixedAssignment occurrences="2">
<code>$partialDependencies</code>
<code>$tablesName</code>
</MixedAssignment>
<PossiblyInvalidArgument occurrences="2">
<code>$_POST['newTablesName']</code>
<code>$_POST['pd']</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="2">
<code>$_POST['newTablesName']</code>
<code>$_POST['pd']</code>
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php">
<MixedArgument occurrences="1">
<MixedArgument occurrences="2">
<code>$partialDependencies</code>
<code>$request-&gt;getParsedBodyParam('pd')</code>
</MixedArgument>
<MixedAssignment occurrences="1">
<code>$partialDependencies</code>
</MixedAssignment>
<PossiblyInvalidArgument occurrences="1">
<code>$_POST['pd']</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="1">
<code>$_POST['pd']</code>
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php">
<MixedArgument occurrences="1">
<MixedArgument occurrences="2">
<code>$newtables</code>
<code>$request-&gt;getParsedBodyParam('newTables')</code>
</MixedArgument>
<MixedAssignment occurrences="1">
<code>$newtables</code>
</MixedAssignment>
<PossiblyInvalidArgument occurrences="1">
<code>$_POST['newTables']</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="1">
<code>$_POST['newTables']</code>
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Controllers/Normalization/ThirdNormalForm/FirstStepController.php">
<PossiblyInvalidArgument occurrences="1">
<MixedArgument occurrences="1">
<code>$tables</code>
</PossiblyInvalidArgument>
</MixedArgument>
<MixedAssignment occurrences="1">
<code>$tables</code>
</MixedAssignment>
</file>
<file src="libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php">
<MixedArgument occurrences="2">
<MixedArgument occurrences="4">
<code>$dependencies</code>
<code>$request-&gt;getParsedBodyParam('pd')</code>
<code>$request-&gt;getParsedBodyParam('tables')</code>
<code>$tables</code>
</MixedArgument>
<MixedAssignment occurrences="2">
<code>$dependencies</code>
<code>$tables</code>
</MixedAssignment>
<PossiblyInvalidArgument occurrences="2">
<code>$_POST['pd']</code>
<code>$_POST['tables']</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="2">
<code>$_POST['pd']</code>
<code>$_POST['tables']</code>
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Controllers/PhpInfoController.php">
<InvalidArrayOffset occurrences="1">
@ -4217,13 +4199,16 @@
<InvalidArrayOffset occurrences="1">
<code>$GLOBALS['cfg']['ShowChgPassword']</code>
</InvalidArrayOffset>
<MixedArgument occurrences="4">
<MixedArgument occurrences="7">
<code>$GLOBALS['change_password_message']['msg']</code>
<code>$GLOBALS['msg']</code>
<code>$GLOBALS['msg']-&gt;getDisplay()</code>
<code>$GLOBALS['password']</code>
<code>$pmaPw</code>
<code>$pmaPw2</code>
<code>$request-&gt;getParsedBodyParam('authentication_plugin')</code>
</MixedArgument>
<MixedAssignment occurrences="7">
<MixedAssignment occurrences="8">
<code>$GLOBALS['change_password_message']</code>
<code>$GLOBALS['msg']</code>
<code>$GLOBALS['msg']</code>
@ -4231,19 +4216,11 @@
<code>$GLOBALS['password']</code>
<code>$noPass</code>
<code>$pmaPw</code>
<code>$pmaPw2</code>
</MixedAssignment>
<MixedMethodCall occurrences="1">
<code>getDisplay</code>
</MixedMethodCall>
<PossiblyInvalidArgument occurrences="3">
<code>$_POST['authentication_plugin'] ?? null</code>
<code>$_POST['pma_pw']</code>
<code>$_POST['pma_pw2']</code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast occurrences="2">
<code>$_POST['pma_pw']</code>
<code>$_POST['pma_pw2']</code>
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Controllers/VersionCheckController.php">
<MixedArgument occurrences="1">

1
test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
View File

@ -60,7 +60,6 @@ class NewTablesControllerTest extends AbstractTestCase
['pd', null, $pd],
]);
$controller = new NewTablesController(
$response,
$template,