From 3f5a65b98183effd4449850a2b1efc37bc82f113 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 29 May 2026 00:35:19 +0700 Subject: [PATCH] chore: bump PHPStan to ^2.2.1 and regenerate baseline --- composer.json | 2 +- .../function.alreadyNarrowedType.neon | 13 ------------- .../function.impossibleType.neon | 18 ------------------ utils/phpstan-baseline/loader.neon | 4 +--- 4 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 utils/phpstan-baseline/function.alreadyNarrowedType.neon delete mode 100644 utils/phpstan-baseline/function.impossibleType.neon diff --git a/composer.json b/composer.json index 31ade5c8da14..a886223ce131 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "mikey179/vfsstream": "^1.6.12", "nexusphp/tachycardia": "^2.0", "phpstan/extension-installer": "^1.4", - "phpstan/phpstan": "^2.1.55", + "phpstan/phpstan": "^2.2.1", "phpstan/phpstan-strict-rules": "^2.0", "phpunit/phpcov": "^9.0.2 || ^10.0", "phpunit/phpunit": "^10.5.16 || ^11.2", diff --git a/utils/phpstan-baseline/function.alreadyNarrowedType.neon b/utils/phpstan-baseline/function.alreadyNarrowedType.neon deleted file mode 100644 index 3ca000aeecb5..000000000000 --- a/utils/phpstan-baseline/function.alreadyNarrowedType.neon +++ /dev/null @@ -1,13 +0,0 @@ -# total 2 errors - -parameters: - ignoreErrors: - - - message: '#^Call to function property_exists\(\) with \$this\(class@anonymous/tests/system/API/ResponseTraitTest\.php\:198\) and ''stringAsHtml'' will always evaluate to true\.$#' - count: 1 - path: ../../tests/system/API/ResponseTraitTest.php - - - - message: '#^Call to function property_exists\(\) with \$this\(class@anonymous/tests/system/API/ResponseTraitTest\.php\:318\) and ''stringAsHtml'' will always evaluate to true\.$#' - count: 1 - path: ../../tests/system/API/ResponseTraitTest.php diff --git a/utils/phpstan-baseline/function.impossibleType.neon b/utils/phpstan-baseline/function.impossibleType.neon deleted file mode 100644 index f13d9a4010c2..000000000000 --- a/utils/phpstan-baseline/function.impossibleType.neon +++ /dev/null @@ -1,18 +0,0 @@ -# total 3 errors - -parameters: - ignoreErrors: - - - message: '#^Call to function property_exists\(\) with \$this\(CodeIgniter\\Debug\\ExceptionHandler\) and ''stringAsHtml'' will always evaluate to false\.$#' - count: 1 - path: ../../system/Debug/ExceptionHandler.php - - - - message: '#^Call to function property_exists\(\) with \$this\(class@anonymous/tests/system/API/ResponseTraitTest\.php\:140\) and ''stringAsHtml'' will always evaluate to false\.$#' - count: 1 - path: ../../tests/system/API/ResponseTraitTest.php - - - - message: '#^Call to function property_exists\(\) with \$this\(class@anonymous/tests/system/API/ResponseTraitTest\.php\:638\) and ''stringAsHtml'' will always evaluate to false\.$#' - count: 1 - path: ../../tests/system/API/ResponseTraitTest.php diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon index 815fa2376cc0..32a5e05024d3 100644 --- a/utils/phpstan-baseline/loader.neon +++ b/utils/phpstan-baseline/loader.neon @@ -1,4 +1,4 @@ -# total 2015 errors +# total 2010 errors includes: - argument.type.neon @@ -10,8 +10,6 @@ includes: - codeigniter.superglobalAccessAssign.neon - deadCode.unreachable.neon - empty.notAllowed.neon - - function.alreadyNarrowedType.neon - - function.impossibleType.neon - method.alreadyNarrowedType.neon - method.childParameterType.neon - method.childReturnType.neon