bug #24626 streamed response should return $this (DQNEO)

nicolas-grekas · nicolas-grekas · commit 8ca490b490a0 · 2017-10-19T12:17:56.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #24626). Discussion ---------- streamed response should return $this | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | may be yes? | Deprecations? | no | Tests pass? | yes | License | MIT --- `sendHeaders()` and `sendContent()` should return $this, as in the parent class. related PRs: #2935 #20289 Commits ------- 058fb84 streamed response should return $this
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -83,12 +83,12 @@ public function setCallback($callback)
     public function sendHeaders()
     {
         if ($this->headersSent) {
-            return;
+            return $this;
         }
 
         $this->headersSent = true;
 
-        parent::sendHeaders();
+        return parent::sendHeaders();
     }
 
     /**
@@ -99,7 +99,7 @@ public function sendHeaders()
     public function sendContent()
     {
         if ($this->streamed) {
-            return;
+            return $this;
         }
 
         $this->streamed = true;
@@ -109,6 +109,8 @@ public function sendContent()
         }
 
         call_user_func($this->callback);
+
+        return $this;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
@@ -121,4 +121,15 @@ public function testCreate()
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response);
         $this->assertEquals(204, $response->getStatusCode());
     }
+
+    public function testReturnThis()
+    {
+        $response = new StreamedResponse(function () {});
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
+
+        $response = new StreamedResponse(function () {});
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,12 @@ public function setCallback($callback)`
`83`	`83`	`public function sendHeaders()`
`84`	`84`	`{`
`85`	`85`	`if ($this->headersSent) {`
`86`		`- return;`
	`86`	`+ return $this;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`$this->headersSent = true;`
`90`	`90`
`91`		`- parent::sendHeaders();`
	`91`	`+ return parent::sendHeaders();`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
`@@ -99,7 +99,7 @@ public function sendHeaders()`
`99`	`99`	`public function sendContent()`
`100`	`100`	`{`
`101`	`101`	`if ($this->streamed) {`
`102`		`- return;`
	`102`	`+ return $this;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`$this->streamed = true;`
`@@ -109,6 +109,8 @@ public function sendContent()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`call_user_func($this->callback);`
	`112`	`+`
	`113`	`+ return $this;`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`/**`