From d3b5b8c06eab4073896347060f0c03754c9cbfe4 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sat, 12 Apr 2025 23:45:17 +0800 Subject: [PATCH] refactor: add `CITestStreamFilter` to phpstan-analysed list and fix errors --- phpstan.neon.dist | 1 - system/Test/Filters/CITestStreamFilter.php | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index bc3a0fc7ef34..a353de443e81 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -19,7 +19,6 @@ parameters: - system/Commands/Generators/Views/* - system/Debug/Toolbar/Views/toolbar.tpl.php - system/Images/Handlers/GDHandler.php - - system/Test/Filters/CITestStreamFilter.php - system/ThirdParty/* - system/Validation/Views/single.php - tests/system/View/Views/* diff --git a/system/Test/Filters/CITestStreamFilter.php b/system/Test/Filters/CITestStreamFilter.php index 64c3d64d65c5..538c0741ba8d 100644 --- a/system/Test/Filters/CITestStreamFilter.php +++ b/system/Test/Filters/CITestStreamFilter.php @@ -48,13 +48,14 @@ class CITestStreamFilter extends php_user_filter * @param resource $out * @param int $consumed * @param bool $closing + * + * @param-out int $consumed */ public function filter($in, $out, &$consumed, $closing): int { while ($bucket = stream_bucket_make_writeable($in)) { static::$buffer .= $bucket->data; - - $consumed += $bucket->datalen; + $consumed += (int) $bucket->datalen; } return PSFS_PASS_ON; @@ -92,11 +93,13 @@ public static function removeOutputFilter(): void } /** - * @param resource $stream + * @param resource|null $stream + * + * @param-out null $stream */ protected static function removeFilter(&$stream): void { - if (is_resource($stream)) { + if ($stream !== null) { stream_filter_remove($stream); $stream = null; }