bug fix filename encoding in AbstractCsv::output method

1 files changed, 4 insertions, 6 deletions

diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 45cdefc..8f337f4 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -317,14 +317,12 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
         if (! is_null($filename) && self::isValidString($filename)) {
             $filename = (string) $filename;
             $filename = filter_var($filename, FILTER_UNSAFE_RAW, ['flags' => FILTER_FLAG_STRIP_LOW]);
-            $bom = '';
-            if ($this->bom_on_output) {
-                $bom = chr(239).chr(187).chr(191);
-            }
             header('Content-Type: application/octet-stream');
             header('Content-Transfer-Encoding: binary');
-            header('Content-Disposition: attachment; filename="'.$filename.'"');
-            echo $bom;
+            header('Content-Disposition: attachment; filename="'.rawurlencode($filename).'"');
+            if ($this->bom_on_output) {
+                echo chr(239).chr(187).chr(191);
+            }
         }
         //@codeCoverageIgnoreEnd
         $iterator->rewind();