Merge pull request #5 from ilbee/ilbee-patch-1

Update composer.json

composer.json

@@ -21,7 +21,7 @@
   },
   "require": {
     "php": ">=7.4 <9",
-    "symfony/http-foundation": "^4 || ^5 || ^6"
+    "symfony/http-foundation": "^4 || ^5 || ^6 || ^7"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6",

src/CSVResponse.php

@@ -6,7 +6,7 @@
 
 class CSVResponse extends Response
 {
-    private string $fileName = 'CSVExport';
+    private string $fileName = 'CSVExport.csv';
     private ?string $separator = null;
 
     public const COMMA = ',';
@@ -18,15 +18,20 @@ public function __construct(array $data, ?string $fileName = null, ?string $sepa
 
         $this->separator = $separator;
         if ($fileName) {
-            $this->fileName = $fileName;
+            $this->setFileName($fileName);
         }
 
         $this->setContent($this->initContent($data));
         $this->headers->set('Content-Type', 'text/csv');
         $this->headers->set('Content-Disposition', sprintf('attachment; filename="%s"', $this->fileName));
     }
 
-    private function initContent($data): string
+    private function setFileName(string $fileName): void
+    {
+        $this->fileName = $fileName;
+    }
+
+    private function initContent(array $data): string
     {
         $fp = fopen('php://temp', 'w');
         foreach ($this->prepareData($data) as $fields) {
@@ -55,10 +60,8 @@ private function prepareData(array $data): array
 
             $line = [];
             foreach ($row as $key => $value) {
-                if (is_object($value)) {
-                    if (get_class($value) == 'DateTime') {
-                        $value = $value->format('Y-m-d H:i:s');
-                    }
+                if (is_object($value) && get_class($value) == 'DateTime') {
+                    $value = $value->format('Y-m-d H:i:s');
                 }
                 $line[] = $value;
             }

tests/CSVResponseTest.php

@@ -34,7 +34,7 @@ public function testResponse(): void
             $response->getContent()
         );
         // Use a comma to separate values.
-        $response = new CSVResponse($this->getData(), 'my-file-name', CSVResponse::COMMA);
+        $response = new CSVResponse($this->getData(), 'my-file-name.csv', CSVResponse::COMMA);
         $this->assertSame(
             "firstName,lastName\nMarcel,TOTO\nMaurice,TATA\n",
             $response->getContent()