minor #28483 [HttpFoundation] don't override StreamedResponse::setNotModified() (nicolas-grekas)

fabpot · fabpot · commit a9004b320817 · 2018-09-18T06:45:48.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [HttpFoundation] don't override StreamedResponse::setNotModified() | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Alternative implementation to #27937, because `Response::setNotModified()` has been made final in 4.0 so we shouldn't override it. Commits ------- 9ef7f70 [HttpFoundation] don't override StreamedResponse::setNotModified()
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`	`}`