diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml
index 377e703953..5c95a862b2 100644
--- a/.github/workflows/lint-and-analyse-php.yml
+++ b/.github/workflows/lint-and-analyse-php.yml
@@ -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
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fc2d7cca6a..5cc9065c19 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -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
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 82b27fd7d4..026b2a7b43 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2332,95 +2332,77 @@
-
+
$normalForm
-
-
+
+
$normalForm
-
+ $normalizeTo
+
-
+
$newColumn
$newTable
$primary_columns
$repeatingColumns
-
-
+
+
$newColumn
$newTable
$primary_columns
$repeatingColumns
-
+
-
+
$partialDependencies
+ $request->getParsedBodyParam('newTablesName')
+ $request->getParsedBodyParam('pd')
$tablesName
$partialDependencies
$tablesName
-
- $_POST['newTablesName']
- $_POST['pd']
-
-
- $_POST['newTablesName']
- $_POST['pd']
-
-
+
$partialDependencies
+ $request->getParsedBodyParam('pd')
$partialDependencies
-
- $_POST['pd']
-
-
- $_POST['pd']
-
-
+
$newtables
+ $request->getParsedBodyParam('newTables')
$newtables
-
- $_POST['newTables']
-
-
- $_POST['newTables']
-
-
+
$tables
-
+
+
+ $tables
+
-
+
$dependencies
+ $request->getParsedBodyParam('pd')
+ $request->getParsedBodyParam('tables')
$tables
$dependencies
$tables
-
- $_POST['pd']
- $_POST['tables']
-
-
- $_POST['pd']
- $_POST['tables']
-
@@ -4217,13 +4199,16 @@
$GLOBALS['cfg']['ShowChgPassword']
-
+
$GLOBALS['change_password_message']['msg']
$GLOBALS['msg']
$GLOBALS['msg']->getDisplay()
$GLOBALS['password']
+ $pmaPw
+ $pmaPw2
+ $request->getParsedBodyParam('authentication_plugin')
-
+
$GLOBALS['change_password_message']
$GLOBALS['msg']
$GLOBALS['msg']
@@ -4231,19 +4216,11 @@
$GLOBALS['password']
$noPass
$pmaPw
+ $pmaPw2
getDisplay
-
- $_POST['authentication_plugin'] ?? null
- $_POST['pma_pw']
- $_POST['pma_pw2']
-
-
- $_POST['pma_pw']
- $_POST['pma_pw2']
-
diff --git a/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php b/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
index 97d5b4edf7..6b65cea0c6 100644
--- a/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
+++ b/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
@@ -60,7 +60,6 @@ class NewTablesControllerTest extends AbstractTestCase
['pd', null, $pd],
]);
-
$controller = new NewTablesController(
$response,
$template,