From 61f93147202847bfa0327e6eb411226e1ccbaf3c Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Tue, 28 Apr 2026 14:57:03 +0100 Subject: [PATCH] Upgrading phpstan/phpstan (2.1.51 => 2.1.52) Signed-off-by: Kamil Tekiela --- composer.lock | 8 +-- phpstan-baseline.neon | 116 +++++++++++++++++++++--------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/composer.lock b/composer.lock index 8ab986e7d8..ad2cb4890b 100644 --- a/composer.lock +++ b/composer.lock @@ -5430,11 +5430,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.51", + "version": "2.1.52", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc3b523c45e714c70de2ac5113b958223b55dc59", - "reference": "dc3b523c45e714c70de2ac5113b958223b55dc59", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/08a34f8db7ca4daabff74a474fe13c0e56e2b4e5", + "reference": "08a34f8db7ca4daabff74a474fe13c0e56e2b4e5", "shasum": "" }, "require": { @@ -5479,7 +5479,7 @@ "type": "github" } ], - "time": "2026-04-21T18:22:01+00:00" + "time": "2026-04-28T12:17:53+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index f7d7a1e307..b0b193bebc 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2463,6 +2463,12 @@ parameters: count: 1 path: src/Controllers/Server/Status/VariablesController.php + - + message: '#^Cannot access an offset on bool\|float\|int\|list\\|string\>\>\|string\|null\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: src/Controllers/Server/Status/VariablesController.php + - message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#' identifier: booleanNot.exprNotBoolean @@ -3177,12 +3183,6 @@ parameters: count: 1 path: src/Controllers/Table/SearchController.php - - - message: '#^Parameter \#1 \$type of method PhpMyAdmin\\Types\:\:getIntegerRange\(\) expects string, string\|null given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Table/SearchController.php - - message: '#^Parameter \#1 \$type of method PhpMyAdmin\\Types\:\:getTypeOperatorsHtml\(\) expects string, string\|null given\.$#' identifier: argument.type @@ -3687,12 +3687,6 @@ parameters: count: 1 path: src/Controllers/Table/ZoomSearchController.php - - - message: '#^Parameter \#1 \$type of method PhpMyAdmin\\Types\:\:getIntegerRange\(\) expects string, string\|null given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Table/ZoomSearchController.php - - message: '#^Parameter \#1 \$type of method PhpMyAdmin\\Types\:\:getTypeOperatorsHtml\(\) expects string, string\|null given\.$#' identifier: argument.type @@ -4680,12 +4674,6 @@ parameters: count: 4 path: src/Database/Routines.php - - - message: '#^Parameter \#2 \$array of function implode expects array, list\\|string given\.$#' - identifier: argument.type - count: 1 - path: src/Database/Routines.php - - message: '#^Parameter \#2 \$array of function implode expects array\, array\ given\.$#' identifier: argument.type @@ -5583,12 +5571,6 @@ parameters: count: 1 path: src/Error/Error.php - - - message: '#^Cannot access offset mixed on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: src/Error/Error.php - - message: '#^Only booleans are allowed in \|\|, int\<0, 18176\> given on the right side\.$#' identifier: booleanOr.rightNotBoolean @@ -5619,6 +5601,12 @@ parameters: count: 1 path: src/Error/Error.php + - + message: '#^Possibly invalid array key type mixed\.$#' + identifier: offsetAccess.invalidOffset + count: 1 + path: src/Error/Error.php + - message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#' identifier: foreach.nonIterable @@ -5934,12 +5922,6 @@ parameters: count: 1 path: src/Favorites/RecentFavoriteTables.php - - - message: '#^Cannot access an offset on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: src/Favorites/RecentFavoriteTables.php - - message: '#^Cannot access offset ''favoriteTables''\|''recentTables'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible @@ -8518,7 +8500,7 @@ parameters: path: src/Plugins/Auth/AuthenticationSignon.php - - message: '#^Parameter \#1 \$options of function session_set_cookie_params expects array\{lifetime\?\: int, path\?\: string\|null, domain\?\: string\|null, secure\?\: bool\|null, httponly\?\: bool\|null, samesite\?\: ''Lax''\|''lax''\|''None''\|''none''\|''Strict''\|''strict''\}, array\ given\.$#' + message: '#^Parameter \#1 \$options of function session_set_cookie_params expects array\{lifetime\?\: int, path\?\: string\|null, domain\?\: string\|null, secure\?\: bool\|null, httponly\?\: bool\|null, samesite\?\: ''Lax''\|''lax''\|''None''\|''none''\|''Strict''\|''strict''\}, non\-empty\-array\ given\.$#' identifier: argument.type count: 1 path: src/Plugins/Auth/AuthenticationSignon.php @@ -13536,18 +13518,6 @@ parameters: count: 1 path: tests/config.e2e.inc.php - - - message: '#^Cannot access offset ''auth_type'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/config.e2e.inc.php - - - - message: '#^Cannot access offset ''host'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/config.e2e.inc.php - - message: '#^Cannot access offset ''verbose'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible @@ -14031,64 +14001,76 @@ parameters: count: 3 path: tests/unit/Config/PageSettingsTest.php + - + message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertArrayHasKey\(\) with ''notice'' and array\{blowfish_secret\: ''aaaaaaaaaaaaaaaaaaa…'', Servers\: array\{1\: array\{host\: ''localhost'', auth_type\: ''cookie''\}\}\} will always evaluate to false\.$#' + identifier: staticMethod.impossibleType + count: 1 + path: tests/unit/Config/ServerConfigChecksTest.php + + - + message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertArrayHasKey\(\) with ''notice'' and array\{blowfish_secret\: ''aaaaaaaaaaaaaaaaaaa…'', Servers\: array\{1\: array\{host\: ''localhost'', ssl\: true, auth_type\: ''cookie'', AllowRoot\: false\}\}\} will always evaluate to false\.$#' + identifier: staticMethod.impossibleType + count: 1 + path: tests/unit/Config/ServerConfigChecksTest.php + + - + message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertArrayHasKey\(\) with ''notice'' and array\{blowfish_secret\: null, Servers\: array\{1\: array\{host\: ''localhost'', ssl\: true, auth_type\: ''cookie'', AllowRoot\: false\}\}, AllowArbitraryServer\: false, LoginCookieValidity\: \-1, LoginCookieStore\: 0, SaveDir\: '''', TempDir\: '''', GZipDump\: false, \.\.\.\} will always evaluate to false\.$#' + identifier: staticMethod.impossibleType + count: 1 + path: tests/unit/Config/ServerConfigChecksTest.php + - message: '#^Cannot access offset ''AllowArbitraryServer'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''BZipDump'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''GZipDump'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''LoginCookieStore'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''LoginCookieValidity'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''SaveDir'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''Servers'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 4 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''TempDir'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - message: '#^Cannot access offset ''ZipDump'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible - count: 2 - path: tests/unit/Config/ServerConfigChecksTest.php - - - - message: '#^Cannot access offset ''blowfish_secret'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 3 + count: 1 path: tests/unit/Config/ServerConfigChecksTest.php - @@ -14103,6 +14085,24 @@ parameters: count: 1 path: tests/unit/Config/ServerConfigChecksTest.php + - + message: '#^Offset ''blowfish_secret'' on array\{blowfish_secret\: ''aaaaaaaaaaaaaaaaaaa…'', Servers\: array\{1\: array\{host\: ''localhost'', auth_type\: ''cookie''\}\}\} on left side of \?\? always exists and is not nullable\.$#' + identifier: nullCoalesce.offset + count: 1 + path: tests/unit/Config/ServerConfigChecksTest.php + + - + message: '#^Offset ''blowfish_secret'' on array\{blowfish_secret\: ''aaaaaaaaaaaaaaaaaaa…'', Servers\: array\{1\: array\{host\: ''localhost'', ssl\: true, auth_type\: ''cookie'', AllowRoot\: false\}\}\} on left side of \?\? always exists and is not nullable\.$#' + identifier: nullCoalesce.offset + count: 1 + path: tests/unit/Config/ServerConfigChecksTest.php + + - + message: '#^Offset ''blowfish_secret'' on array\{blowfish_secret\: null, Servers\: array\{1\: array\{host\: ''localhost'', ssl\: true, auth_type\: ''cookie'', AllowRoot\: false\}\}, AllowArbitraryServer\: false, LoginCookieValidity\: \-1, LoginCookieStore\: 0, SaveDir\: '''', TempDir\: '''', GZipDump\: false, \.\.\.\} on left side of \?\? always exists and is always null\.$#' + identifier: nullCoalesce.offset + count: 1 + path: tests/unit/Config/ServerConfigChecksTest.php + - message: '#^Parameter \#1 \$array of function array_keys expects array, mixed given\.$#' identifier: argument.type