Fix Psalm issues

buggregator · Jun 29, 2024 · 08171f6 · 08171f6
1 parent b2a1bc0
commit 08171f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Support/Stream/Base64DecodeFilter.php b/src/Support/Stream/Base64DecodeFilter.php
@@ -52,7 +52,7 @@ public function filter($in, $out, &$consumed, bool $closing): int
             }
 
             // Decode part of the data
-            $bucket->data = \base64_decode($this->buffer . \substr($bucket->data, 0, -$d));
+            $bucket->data = \base64_decode($this->buffer . \substr($bucket->data, 0, -$d), true);
             $consumed += $bucket->datalen;
             $this->buffer = \substr($bucket->data, -$d);
 

diff --git a/src/Traffic/Parser/Http.php b/src/Traffic/Parser/Http.php
@@ -4,6 +4,7 @@
 
 namespace Buggregator\Trap\Traffic\Parser;
 
+use Buggregator\Trap\Support\Stream\Base64DecodeFilter;
 use Buggregator\Trap\Support\StreamHelper;
 use Buggregator\Trap\Traffic\Message\Multipart\Field;
 use Buggregator\Trap\Traffic\Message\Multipart\File;
@@ -111,7 +112,9 @@ public static function parseMultipartBody(StreamInterface $stream, string $bound
                     $writeFilters = [];
                     if ($part->hasHeader('Content-Transfer-Encoding')) {
                         $encoding = $part->getHeaderLine('Content-Transfer-Encoding');
-                        $encoding === 'base64' and $writeFilters[] = \Buggregator\Trap\Support\Stream\Base64DecodeFilter::FILTER_NAME;
+                        if ($encoding === 'base64') {
+                            $writeFilters[] = Base64DecodeFilter::FILTER_NAME;
+                        }
                     }
 
                     $fileStream = StreamHelper::createFileStream(writeFilters: $writeFilters);