Merge remote-tracking branch 'beaucollins/http-response-emit-end'

* beaucollins/http-response-emit-end: React\Http\Response emits 'end' event when stream is ended
skny5 · Dec 19, 2012 · 4ce8583 · 4ce8583
2 parents 6c2b060 + a7a6184
commit 4ce8583
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/React/Http/Response.php b/src/React/Http/Response.php
@@ -98,7 +98,7 @@ public function end($data = null)
             $this->conn->write("0\r\n\r\n");
         }
 
-        $this->emit('close');
+        $this->emit('end');
         $this->removeAllListeners();
         $this->conn->end();
     }

diff --git a/tests/React/Tests/Http/ResponseTest.php b/tests/React/Tests/Http/ResponseTest.php
@@ -71,6 +71,19 @@ public function testResponseBodyShouldBeChunkedCorrectly()
         $response->write("World\n");
         $response->end();
     }
+
+    public function testResponseShouldEmitEndOnStreamEnd(){
+      $conn = $this->getMock('React\Socket\ConnectionInterface');
+      $response = new Response( $conn );
+      $ended = false;
+      $response->on( 'end', function() use (&$ended){
+        $ended = true;
+      });
+      $response->end();
+
+      $this->assertTrue( $ended, "Response did not emit 'end'" );
+
+    }
 
     /** @test */
     public function writeContinueShouldSendContinueLineBeforeRealHeaders()