minor #48453 [AbstractController] Using coalescing operator (BASAKSemih)

nicolas-grekas · nicolas-grekas · commit 8fa480054dfa · 2022-12-04T16:42:29.000+01:00
This PR was submitted for the 5.4 branch but it was merged into the 6.3 branch instead. Discussion ---------- [AbstractController] Using coalescing operator | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 3de59c9 feat: using coalescing operator in file function
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -166,7 +166,7 @@ protected function json(mixed $data, int $status = 200, array $headers = [], arr
     protected function file(\SplFileInfo|string $file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse
     {
         $response = new BinaryFileResponse($file);
-        $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName);
+        $response->setContentDisposition($disposition, $fileName ?? $response->getFile()->getFilename());
 
         return $response;
     }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ protected function json(mixed $data, int $status = 200, array $headers = [], arr`
`166`	`166`	`protected function file(\SplFileInfo\|string $file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse`
`167`	`167`	`{`
`168`	`168`	`$response = new BinaryFileResponse($file);`
`169`		`- $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName);`
	`169`	`+ $response->setContentDisposition($disposition, $fileName ?? $response->getFile()->getFilename());`
`170`	`170`
`171`	`171`	`return $response;`
`172`	`172`	`}`