Fixed some unfortunate post-release bugs.

sabre-io · Jan 9, 2014 · 36930a4 · 36930a4
1 parent f9a8dfc
commit 36930a4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2.0.1-stable (2014-01-09)
+	* Fixed: getBodyAsString on an empty body now works.
+	* Fixed: Version string
+
 2.0.0-stable (2014-01-08)
 	* Removed: Request::createFromPHPRequest. This is now handled by
 	  Sapi::getRequest.

diff --git a/lib/Sabre/HTTP/Message.php b/lib/Sabre/HTTP/Message.php
@@ -71,6 +71,8 @@ public function getBodyAsString() {
         $body = $this->getBody();
         if (is_string($body)) {
             return $body;
+        } elseif (is_null($body)) {
+            return '';
         } else {
             return stream_get_contents($body);
         }

diff --git a/lib/Sabre/HTTP/Version.php b/lib/Sabre/HTTP/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '2.0.0alpha6';
+    const VERSION = '2.0.1';
 
 }
diff --git a/tests/Sabre/HTTP/MessageTest.php b/tests/Sabre/HTTP/MessageTest.php
@@ -43,7 +43,7 @@ function testStringBody() {
     }
 
 
-    function testGetEmptyBody() {
+    function testGetEmptyBodyStream() {
 
         $message = new MessageMock();
         $body = $message->getBodyAsStream();
@@ -52,6 +52,15 @@ function testGetEmptyBody() {
 
     }
 
+    function testGetEmptyBodyString() {
+
+        $message = new MessageMock();
+        $body = $message->getBodyAsString();
+
+        $this->assertEquals('', $body);
+
+    }
+
     function testHeaders() {
 
         $message = new MessageMock();