diff --git a/composer.lock b/composer.lock index 1e0883985f..723adb4925 100644 --- a/composer.lock +++ b/composer.lock @@ -5360,11 +5360,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.31", + "version": "2.1.32", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96", - "reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e126cad1e30a99b137b8ed75a85a676450ebb227", + "reference": "e126cad1e30a99b137b8ed75a85a676450ebb227", "shasum": "" }, "require": { @@ -5409,7 +5409,7 @@ "type": "github" } ], - "time": "2025-10-10T14:14:11+00:00" + "time": "2025-11-11T15:18:17+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -5460,21 +5460,21 @@ }, { "name": "phpstan/phpstan-phpunit", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "9a9b161baee88a5f5c58d816943cff354ff233dc" + "reference": "2fe9fbeceaf76dd1ebaa7bbbb25e2fb5e59db2fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9a9b161baee88a5f5c58d816943cff354ff233dc", - "reference": "9a9b161baee88a5f5c58d816943cff354ff233dc", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/2fe9fbeceaf76dd1ebaa7bbbb25e2fb5e59db2fe", + "reference": "2fe9fbeceaf76dd1ebaa7bbbb25e2fb5e59db2fe", "shasum": "" }, "require": { "php": "^7.4 || ^8.0", - "phpstan/phpstan": "^2.1.18" + "phpstan/phpstan": "^2.1.32" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -5507,9 +5507,9 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.7" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.8" }, - "time": "2025-07-13T11:31:46+00:00" + "time": "2025-11-11T07:55:22+00:00" }, { "name": "phpstan/phpstan-strict-rules", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 3f5d8ebc3a..8b1973b3b8 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -204,42 +204,18 @@ parameters: count: 1 path: examples/signon.php - - - message: '#^Binary operation "\." between ''\File \'' and mixed results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: public/index.php - - message: '#^Comparison operation "\<" between int\<80200, 80599\> and 80200 is always false\.$#' identifier: smaller.alwaysFalse count: 1 path: public/index.php - - - message: '#^Parameter \#1 \$filename of function is_readable expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: public/index.php - - - - message: '#^Binary operation "\." between ''\File \'' and mixed results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: public/setup/index.php - - message: '#^Comparison operation "\<" between int\<80200, 80599\> and 80200 is always false\.$#' identifier: smaller.alwaysFalse count: 1 path: public/setup/index.php - - - message: '#^Parameter \#1 \$filename of function is_readable expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: public/setup/index.php - - message: '#^Loose comparison via "\=\=" is not allowed\.$#' identifier: equal.notAllowed @@ -342,18 +318,6 @@ parameters: count: 1 path: src/Command/CacheWarmupCommand.php - - - message: '#^Parameter \#1 \$source of method PhpMyAdmin\\Config\:\:loadFromFile\(\) expects string\|null, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Command/CacheWarmupCommand.php - - - - message: '#^Parameter \#2 \.\.\.\$values of function sprintf expects bool\|float\|int\|string\|null, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Command/CacheWarmupCommand.php - - message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#' identifier: foreach.nonIterable @@ -489,12 +453,6 @@ parameters: count: 2 path: src/Config.php - - - message: '#^Method PhpMyAdmin\\Config\:\:getChangeLogFilePath\(\) should return string but returns mixed\.$#' - identifier: return.type - count: 1 - path: src/Config.php - - message: '#^Method PhpMyAdmin\\Config\:\:getUploadTempDir\(\) should return string\|null but returns string\|false\.$#' identifier: return.type @@ -1041,18 +999,6 @@ parameters: count: 45 path: src/Config/Settings.php - - - message: '#^Method PhpMyAdmin\\Config\\Settings\:\:setTempDir\(\) should return string but returns mixed\.$#' - identifier: return.type - count: 1 - path: src/Config/Settings.php - - - - message: '#^Method PhpMyAdmin\\Config\\Settings\:\:setVersionCheck\(\) should return bool but returns mixed\.$#' - identifier: return.type - count: 1 - path: src/Config/Settings.php - - message: '#^Cannot cast mixed to int\.$#' identifier: cast.int @@ -1347,18 +1293,6 @@ parameters: count: 1 path: src/Config/Validator.php - - - message: '#^Binary operation "\." between mixed and ''create_tables\.sql'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: src/ConfigStorage/Relation.php - - - - message: '#^Binary operation "\." between mixed and ''upgrade_column_info…'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: src/ConfigStorage/Relation.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -2445,18 +2379,6 @@ parameters: count: 1 path: src/Controllers/Import/StatusController.php - - - message: '#^Parameter \#1 \$filename of function is_readable expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/LicenseController.php - - - - message: '#^Parameter \#1 \$path of function basename expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/LicenseController.php - - message: '#^Parameter \#1 \$partialDependencies of method PhpMyAdmin\\Normalization\:\:createNewTablesFor2NF\(\) expects array\, mixed given\.$#' identifier: argument.type @@ -2571,12 +2493,6 @@ parameters: count: 1 path: src/Controllers/Preferences/ManageController.php - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Preferences/ManageController.php - - message: '#^Parameter \#1 \$json of function json_decode expects string, string\|false given\.$#' identifier: argument.type @@ -2901,24 +2817,6 @@ parameters: count: 1 path: src/Controllers/Server/Variables/SetVariableController.php - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/ConfigController.php - - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/FormController.php - - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/HomeController.php - - message: '#^Parameter \#1 \$id of method PhpMyAdmin\\Config\\ConfigFile\:\:getServerName\(\) expects int, \(int\|string\) given\.$#' identifier: argument.type @@ -2931,30 +2829,6 @@ parameters: count: 1 path: src/Controllers/Setup/HomeController.php - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/ServerDestroyController.php - - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/ServersController.php - - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/ShowConfigController.php - - - - message: '#^Parameter \#1 \$filename of function file_exists expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Controllers/Setup/ValidateController.php - - message: '#^Cannot access offset ''relational_display'' on mixed\.$#' identifier: offsetAccess.nonOffsetAccessible @@ -6690,12 +6564,6 @@ parameters: count: 1 path: src/Footer.php - - - message: '#^Parameter \#1 \$filename of static method PhpMyAdmin\\Html\\Generator\:\:renderCustom\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Footer.php - - message: '#^Parameter \#1 \$params of static method PhpMyAdmin\\Url\:\:getCommonRaw\(\) expects array\, array\ given\.$#' identifier: argument.type @@ -7329,12 +7197,6 @@ parameters: count: 6 path: src/Header.php - - - message: '#^Parameter \#1 \$filename of static method PhpMyAdmin\\Html\\Generator\:\:renderCustom\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Header.php - - message: '#^Parameter \#1 \$message of static method PhpMyAdmin\\Html\\Generator\:\:getMessage\(\) expects PhpMyAdmin\\Message\|string, mixed given\.$#' identifier: argument.type @@ -7461,12 +7323,6 @@ parameters: count: 1 path: src/Http/Middleware/Authentication.php - - - message: '#^Parameter \#1 \$source of method PhpMyAdmin\\Config\:\:loadFromFile\(\) expects string\|null, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Http/Middleware/ConfigLoading.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: @@ -7575,12 +7431,6 @@ parameters: count: 2 path: src/Http/ServerRequest.php - - - message: '#^Binary operation "\." between mixed and ''/'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: src/I18n/LanguageManager.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -7596,24 +7446,6 @@ parameters: count: 1 path: src/I18n/LanguageManager.php - - - message: '#^Parameter \#1 \$directory of function opendir expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/I18n/LanguageManager.php - - - - message: '#^Parameter \#1 \$filename of function is_dir expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/I18n/LanguageManager.php - - - - message: '#^Parameter \#2 \$path of function _bindtextdomain expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/I18n/LanguageManager.php - - message: '#^Property PhpMyAdmin\\I18n\\LanguageManager\:\:\$availableLocales \(array\\) does not accept array\.$#' identifier: assign.propertyType @@ -10704,12 +10536,6 @@ parameters: count: 2 path: src/Plugins/Import/Upload/UploadSession.php - - - message: '#^Only booleans are allowed in an if condition, mixed given\.$#' - identifier: if.condNotBoolean - count: 1 - path: src/Plugins/Import/Upload/UploadSession.php - - message: '#^Only booleans are allowed in \|\|, mixed given on the right side\.$#' identifier: booleanOr.rightNotBoolean @@ -11928,12 +11754,6 @@ parameters: count: 1 path: src/ResponseRenderer.php - - - message: '#^Binary operation "\." between mixed and ''routes\.cache\.php'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: src/Routing/Routing.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -11955,12 +11775,6 @@ parameters: count: 1 path: src/Routing/Routing.php - - - message: '#^Parameter \#1 \$filename of function is_writable expects string, mixed given\.$#' - identifier: argument.type - count: 1 - path: src/Routing/Routing.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -13710,12 +13524,6 @@ parameters: count: 6 path: src/Table/TableMover.php - - - message: '#^Binary operation "\." between mixed and ''twig'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: src/Template.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -14607,12 +14415,6 @@ parameters: count: 8 path: src/Utils/SessionCache.php - - - message: '#^Binary operation "\." between ''6\.0\.0\-dev'' and mixed results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: src/Version.php - - message: '#^Binary operation "\+" between mixed and 21600 results in an error\.$#' identifier: binaryOp.invalid @@ -15561,12 +15363,6 @@ parameters: count: 1 path: tests/unit/ConfigTest.php - - - message: '#^Parameter \#1 \$source of method PhpMyAdmin\\Config\:\:loadFromFile\(\) expects string\|null, mixed given\.$#' - identifier: argument.type - count: 1 - path: tests/unit/ConfigTest.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -17121,18 +16917,6 @@ parameters: count: 1 path: tests/unit/Http/Middleware/TokenRequestParamCheckingTest.php - - - message: '#^Binary operation "\." between mixed and ''/'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: tests/unit/I18n/LanguageManagerTest.php - - - - message: '#^Binary operation "\." between mixed and ''/cs/LC_MESSAGES…'' results in an error\.$#' - identifier: binaryOp.invalid - count: 1 - path: tests/unit/I18n/LanguageManagerTest.php - - message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#' identifier: staticMethod.alreadyNarrowedType @@ -17532,12 +17316,6 @@ parameters: count: 1 path: tests/unit/Plugins/Auth/AuthenticationConfigTest.php - - - message: '#^Binary operation "\." between mixed and ''/cs/LC_MESSAGES…'' results in an error\.$#' - identifier: binaryOp.invalid - count: 2 - path: tests/unit/Plugins/Auth/AuthenticationCookieTest.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -17901,12 +17679,6 @@ parameters: count: 1 path: tests/unit/Routing/RoutingTest.php - - - message: '#^Parameter \#1 \$directory of static method PHPUnit\\Framework\\Assert\:\:assertDirectoryIsWritable\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 3 - path: tests/unit/Routing/RoutingTest.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -18369,12 +18141,6 @@ parameters: count: 2 path: tests/unit/UserPreferencesTest.php - - - message: '#^Binary operation "\." between mixed and ''/cs/LC_MESSAGES…'' results in an error\.$#' - identifier: binaryOp.invalid - count: 2 - path: tests/unit/UtilTest.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -18567,6 +18333,12 @@ parameters: count: 1 path: tests/unit/VersionTest.php + - + message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertIsString\(\) with string will always evaluate to true\.$#' + identifier: staticMethod.alreadyNarrowedType + count: 1 + path: tests/unit/VersionTest.php + - message: '#^Call to function base64_decode\(\) requires parameter \#2 to be set\.$#' identifier: function.strict