sendBody tests + fixes

sabre-io · Oct 7, 2012 · 693c250 · 693c250
1 parent dba804f
commit 693c250
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/lib/Sabre/HTTP/Message.php b/lib/Sabre/HTTP/Message.php
@@ -39,7 +39,7 @@ public function sendBody($body) {
         if (is_scalar($body)) {
             fwrite($this->getBody(), $body);
         } elseif (is_resource($body)) {
-            stream_copy_to_stream($this->getBody(), $body);
+            stream_copy_to_stream($body, $this->getBody());
         } else {
             throw new \InvalidArgumentException('You must either pass a string or a stream');
         }
@@ -59,7 +59,7 @@ public function sendBody($body) {
      */
     public function getBody() {
 
-        if (is_null($body)) {
+        if (is_null($this->body)) {
             // Creating a new body stream
             $this->body = fopen('php://temp', 'r+');
         }

diff --git a/tests/Sabre/HTTP/MessageTest.php b/tests/Sabre/HTTP/MessageTest.php
@@ -43,6 +43,35 @@ function testHeaders() {
 
     }
 
+    function testSendBody() {
+
+        $message = new MessageMock();
+
+        // String
+        $message->sendBody('foo');
+
+        // Stream
+        $h = fopen('php://memory','r+');
+        fwrite($h,'bar');
+        rewind($h);
+        $message->sendBody($h);
+
+        $body = $message->getBody();
+        rewind($body);
+
+        $this->assertEquals('foobar', stream_get_contents($body));
+
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    function testSendBadBody() {
+
+        $message = new MessageMock();
+        $message->sendBody(array());
+
+    }
 
 }