[HttpFoundation] don't override StreamedResponse::setNotModified()

nicolas-grekas · nicolas-grekas · commit 9ef7f7038d87 · 2018-09-16T21:50:20.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -123,6 +123,8 @@ public function setContent($content)
         if (null !== $content) {
             throw new \LogicException('The content cannot be set on a StreamedResponse instance.');
         }
+
+        $this->streamed = true;
     }
 
     /**
@@ -134,16 +136,4 @@ public function getContent()
     {
         return false;
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return $this
-     */
-    public function setNotModified()
-    {
-        $this->setCallback(function () {});
-
-        return parent::setNotModified();
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,8 @@ public function setContent($content)`
`123`	`123`	`if (null !== $content) {`
`124`	`124`	`throw new \LogicException('The content cannot be set on a StreamedResponse instance.');`
`125`	`125`	`}`
	`126`	`+`
	`127`	`+ $this->streamed = true;`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`/**`
`@@ -134,16 +136,4 @@ public function getContent()`
`134`	`136`	`{`
`135`	`137`	`return false;`
`136`	`138`	`}`
`137`		`-`
`138`		`- /**`
`139`		`- * {@inheritdoc}`
`140`		`- *`
`141`		`- * @return $this`
`142`		`- */`
`143`		`- public function setNotModified()`
`144`		`- {`
`145`		`- $this->setCallback(function () {});`
`146`		`-`
`147`		`- return parent::setNotModified();`
`148`		`- }`
`149`	`139`	`}`