From 36930a4c035ce1751834adc7f300dca620d27775 Mon Sep 17 00:00:00 2001 From: Evert Pot Date: Thu, 9 Jan 2014 18:23:46 -0500 Subject: [PATCH] Fixed some unfortunate post-release bugs. --- ChangeLog | 4 ++++ lib/Sabre/HTTP/Message.php | 2 ++ lib/Sabre/HTTP/Version.php | 2 +- tests/Sabre/HTTP/MessageTest.php | 11 ++++++++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e25f2ef..df1c2a0 100644 --- 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 index 4d13c2b..81168ae 100644 --- 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 index ea8a9dd..c9c1863 100644 --- 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 index 5ab2873..0897dce 100644 --- 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();