From aeb1b4d08a48388a0b493bf64cd209696fafd40f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 21 Feb 2021 15:47:16 +0100 Subject: [PATCH] Update phpstan See: https://github.com/phpstan/phpstan/issues/4579 Signed-off-by: William Desportes --- composer.json | 2 +- phpstan-baseline.neon | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 41994ea91d..a8e8543392 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,7 @@ "php-webdriver/webdriver": "^1.8", "phpmyadmin/coding-standard": "^2.1.1", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^0.12.77", + "phpstan/phpstan": "^0.12.78", "phpstan/phpstan-phpunit": "^0.12.17", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", "pragmarx/google2fa-qrcode": "^1.0.1", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 91893edea4..6b0aa6fa5c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1015,6 +1015,16 @@ parameters: count: 1 path: libraries/classes/InsertEdit.php + - + message: "#^Cannot call method getInputHtml\\(\\) on class\\-string\\|object\\.$#" + count: 1 + path: libraries/classes/InsertEdit.php + + - + message: "#^Cannot call method getScripts\\(\\) on class\\-string\\|object\\.$#" + count: 1 + path: libraries/classes/InsertEdit.php + - message: "#^Parameter \\#2 \\$ipToTest of method PhpMyAdmin\\\\IpAllowDeny\\:\\:ipMaskTest\\(\\) expects string, string\\|true given\\.$#" count: 1 @@ -1807,7 +1817,7 @@ parameters: - message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:setMinMax\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#" - count: 3 + count: 1 path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - @@ -2240,6 +2250,11 @@ parameters: count: 1 path: libraries/classes/Types.php + - + message: "#^Offset 'header' does not exist on array\\('proxy' \\=\\> string, 'request_fulluri' \\=\\> true\\)\\.$#" + count: 1 + path: libraries/classes/Utils/HttpRequest.php + - message: "#^Variable \\$http_response_header in isset\\(\\) always exists and is not nullable\\.$#" count: 1