Changes to match updates to PSR-7 in progress

src/Message/Response.php

@@ -62,17 +62,17 @@ class Response extends Message implements ResponseInterface
      * @link http://tools.ietf.org/html/rfc7231#section-6
      * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
      * @param integer $code The 3-digit integer result code to set.
-     * @param null|string $reasonPhrase The reason phrase to use with the
+     * @param string $reasonPhrase The reason phrase to use with the
      *     provided status code; if none is provided, implementations MAY
      *     use the defaults as suggested in the HTTP specification.
      * @return self
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus($code, $reasonPhrase = null)
+    public function withStatus($code, $reasonPhrase = "")
     {
         $response = clone $this;
         $response->statusCode = $code;
-        if ($reasonPhrase === null) {
+        if (!$reasonPhrase) {
             $reasonPhrase = $this->getDefaultReasonPhraseForStatusCode($code);
         }
         $response->reasonPhrase = $reasonPhrase;
@@ -103,8 +103,6 @@ class Response extends Message implements ResponseInterface
      */
     private function getDefaultReasonPhraseForStatusCode($statusCode)
     {
-        static $reasonPhraseLookup = null;
-        if ($reasonPhraseLookup === null) {
         $reasonPhraseLookup = [
             100 => "Continue",
             101 => "Switching Protocols",
@@ -165,7 +163,6 @@ class Response extends Message implements ResponseInterface
             510 => "Not Extended",
             511 => "Network Authentication Required"
         ];
-        }
         if (isset($reasonPhraseLookup[$statusCode])) {
             return $reasonPhraseLookup[$statusCode];
         }

src/Message/Stream.php

@@ -49,8 +49,14 @@ class Stream implements StreamInterface
      */
     public function __toString()
     {
+        $string = "";
+        try {
             rewind($this->resource);
-        return $this->getContents();
+            $string = $this->getContents();
+        } catch (Exception $e) {
+            // Silence exceptions in order to conform with PHP's string casting operations.
+        }
+        return $string;
     }
 
     /**

test/tests/unit/Message/ResponseTest.php

@@ -76,7 +76,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
             [503, null, "Service Unavailable"],
             [504, null, "Gateway Timeout"],
             [505, null, "HTTP Version Not Supported"],
-            [598, null, null],
+            [598, null, ""],
             [599, "Nonstandard", "Nonstandard"]
         ];
     }