From 042f61670a71174ddbe41e59a4a9d9f6d2d89079 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 27 Apr 2025 22:36:10 +0100 Subject: [PATCH] Update PHPStan Signed-off-by: Kamil Tekiela --- composer.lock | 24 ++++++++++++------------ phpstan-baseline.neon | 29 ++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index e6de028f23..ba1fbe1586 100644 --- a/composer.lock +++ b/composer.lock @@ -5229,16 +5229,16 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.12", + "version": "2.1.13", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c" + "reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/96dde49e967c0c22812bcfa7bda4ff82c09f3b0c", - "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e55e03e6d4ac49cd1240907e5b08e5cd378572a9", + "reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9", "shasum": "" }, "require": { @@ -5283,25 +5283,25 @@ "type": "github" } ], - "time": "2025-04-16T13:19:18+00:00" + "time": "2025-04-27T12:28:25+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", - "reference": "1cc1259cb91ee4cfbb5c39bca9f635f067c910b4" + "reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/1cc1259cb91ee4cfbb5c39bca9f635f067c910b4", - "reference": "1cc1259cb91ee4cfbb5c39bca9f635f067c910b4", + "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/9d8e7d4e32711715ad78a1fb6ec368df9af01fdf", + "reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf", "shasum": "" }, "require": { "php": "^7.4 || ^8.0", - "phpstan/phpstan": "^2.0" + "phpstan/phpstan": "^2.1.13" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", @@ -5328,9 +5328,9 @@ "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", "support": { "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues", - "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.1" + "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.2" }, - "time": "2024-11-28T21:56:36+00:00" + "time": "2025-04-26T19:59:57+00:00" }, { "name": "phpstan/phpstan-phpunit", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index fed592c22c..b5db46b34d 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -16479,6 +16479,21 @@ parameters: count: 2 path: src/WebAuthn/WebauthnLibServer.php + - + message: '#^Call to method findAllForUserEntity\(\) of deprecated interface Webauthn\\PublicKeyCredentialSourceRepository\.$#' + identifier: method.deprecatedInterface + count: 1 + path: src/WebAuthn/WebauthnLibServer.php + + - + message: ''' + #^Call to method load\(\) of deprecated class Webauthn\\PublicKeyCredentialLoader\: + since 4\.8\.0 and will be removed in 5\.0\.0\. Please use the Symfony serializer instead$# + ''' + identifier: method.deprecatedClass + count: 2 + path: src/WebAuthn/WebauthnLibServer.php + - message: '#^Call to static method Webmozart\\Assert\\Assert\:\:isInstanceOf\(\) with Webauthn\\PublicKeyCredentialCreationOptions and ''Webauthn\\\\PublicKeyCredentialCreationOptions'' will always evaluate to true\.$#' identifier: staticMethod.alreadyNarrowedType @@ -16523,7 +16538,7 @@ parameters: #^Instantiation of deprecated class Webauthn\\TokenBinding\\IgnoreTokenBindingHandler\: Since 4\.3\.0 and will be removed in 5\.0\.0$# ''' - identifier: new.deprecated + identifier: new.deprecatedClass count: 2 path: src/WebAuthn/WebauthnLibServer.php @@ -18792,12 +18807,6 @@ parameters: count: 7 path: tests/unit/GitTest.php - - - message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertNotNull\(\) with array\{hash\: string, branch\: string\|false, message\: string, author\: array\{name\: string, email\: string, date\: string\}, committer\: array\{name\: string, email\: string, date\: string\}, is_remote_commit\: bool, is_remote_branch\: bool\} will always evaluate to true\.$#' - identifier: staticMethod.alreadyNarrowedType - count: 1 - path: tests/unit/GitTest.php - - message: '#^Cannot unset offset ''git_location'' on array\\.$#' identifier: unset.offset @@ -19518,6 +19527,12 @@ parameters: count: 2 path: tests/unit/Plugins/Export/ExportSqlTest.php + - + message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertStringContainsString\(\) expects string, string\|null given\.$#' + identifier: argument.type + count: 3 + path: tests/unit/Plugins/Export/ExportSqlTest.php + - message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\) does not accept array\{host\: string, port\: 80, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\.$#' identifier: assign.propertyType