bug #51972 [HttpKernel] Handle nullable callback of StreamedResponse (elementaire)

nicolas-grekas · nicolas-grekas · commit dd6342a4e672 · 2023-10-12T15:49:32.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [HttpKernel] Handle nullable callback of `StreamedResponse` | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT This PR fixes a bug introduced by #51396. Having a callback in `StreamResponsed` is not a mandatory by design. So the method `getCallback` must check it like `sendContent` does. When we are dealing with cacheable ressource, only headers are sent from `StreamResponsed`, for example: ```php #[Route(path: '/download')] public function download(Request $request): StreamedResponse { // Get the last modified of a file. $lastModified = \DateTime::createFromFormat('d/m/Y H:i:s', '10/10/2023 13:22:00'); $response = (new StreamedResponse())->setLastModified($lastModified); if ($response->isNotModified($request)) { return $response; } // Get the stream of a file and attach it to the callback. // ... return $response; } ``` `HttpKernel` class have to handle it else if you obtain `HTTP 500` with message `Value of type null is not callable`. cc `@nicolas`-grekas Commits ------- 66648c5 [HttpKernel] Handle nullable callback of StreamedResponse
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -56,8 +56,12 @@ public function setCallback(callable $callback): static
         return $this;
     }
 
-    public function getCallback(): \Closure
+    public function getCallback(): ?\Closure
     {
+        if (!isset($this->callback)) {
+            return null;
+        }
+
         return ($this->callback)(...);
     }
 
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -92,8 +92,7 @@ public function handle(Request $request, int $type = HttpKernelInterface::MAIN_R
         } finally {
             $this->requestStack->pop();
 
-            if ($response instanceof StreamedResponse) {
-                $callback = $response->getCallback();
+            if ($response instanceof StreamedResponse && $callback = $response->getCallback()) {
                 $requestStack = $this->requestStack;
 
                 $response->setCallback(static function () use ($request, $callback, $requestStack) {

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,12 @@ public function setCallback(callable $callback): static`
`56`	`56`	`return $this;`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function getCallback(): \Closure`
	`59`	`+ public function getCallback(): ?\Closure`
`60`	`60`	`{`
	`61`	`+ if (!isset($this->callback)) {`
	`62`	`+ return null;`
	`63`	`+ }`
	`64`	`+`
`61`	`65`	`return ($this->callback)(...);`
`62`	`66`	`}`
`63`	`67`