[#50] Reinstated tests and made proper docblocks

- Reinstated the two tests that were removed.
- Updated property docblocks to be full length vs single-line, per our CS.

Author: weierophinney

test/MessageTraitTest.php

@@ -15,7 +15,9 @@
 
 class MessageTraitTest extends TestCase
 {
-    /** @var MessageInterface */
+    /**
+     * @var MessageInterface
+     */
     protected $message;
 
     public function setUp()
@@ -35,6 +37,13 @@ public function testProtocolMutatorReturnsCloneWithChanges()
         $this->assertEquals('1.0', $message->getProtocolVersion());
     }
 
+    public function testUsesStreamProvidedInConstructorAsBody()
+    {
+        $stream  = $this->getMock('Psr\Http\Message\StreamInterface');
+        $message = new Request(null, null, $stream);
+        $this->assertSame($stream, $message->getBody());
+    }
+
     public function testBodyMutatorReturnsCloneWithChanges()
     {
         $stream  = $this->getMock('Psr\Http\Message\StreamInterface');
@@ -183,6 +192,13 @@ public function testWithoutHeaderDoesNothingIfHeaderDoesNotExist()
         $this->assertFalse($message->hasHeader('X-Foo'));
     }
 
+    public function testHeadersInitialization()
+    {
+        $headers = ['X-Foo' => ['bar']];
+        $message = new Request(null, null, 'php://temp', $headers);
+        $this->assertSame($headers, $message->getHeaders());
+    }
+
     public function testGetHeaderReturnsAnEmptyArrayWhenHeaderDoesNotExist()
     {
         $this->assertSame([], $this->message->getHeader('X-Foo-Bar'));

test/PhpInputStreamTest.php

@@ -14,10 +14,14 @@
 
 class PhpInputStreamTest extends TestCase
 {
-    /** @var string */
+    /**
+     * @var string
+     */
     protected $file;
 
-    /** @var PhpInputStream */
+    /**
+     * @var PhpInputStream
+     */
     protected $stream;
 
     public function setUp()

test/RequestTest.php

@@ -16,7 +16,9 @@
 
 class RequestTest extends TestCase
 {
-    /** @var Request */
+    /**
+     * @var Request
+     */
     protected $request;
 
     public function setUp()

test/Response/SapiEmitterTest.php

@@ -17,7 +17,9 @@
 
 class SapiEmitterTest extends TestCase
 {
-    /** @var SapiEmitter */
+    /**
+     * @var SapiEmitter
+     */
     protected $emitter;
 
     public function setUp()

test/ResponseTest.php

@@ -15,7 +15,9 @@
 
 class ResponseTest extends TestCase
 {
-    /** @var Response */
+    /**
+     * @var Response
+    */
     protected $response;
 
     public function setUp()

test/ServerRequestTest.php

@@ -17,7 +17,9 @@
 
 class ServerRequestTest extends TestCase
 {
-    /** @var ServerRequest */
+    /**
+     * @var ServerRequest
+     */
     protected $request;
 
     public function setUp()

test/ServerTest.php

@@ -17,13 +17,19 @@
 
 class ServerTest extends TestCase
 {
-    /** @var Callable */
+    /**
+     * @var Callable
+     */
     protected $callback;
 
-    /** @var ServerRequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var ServerRequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
     protected $request;
 
-    /** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
     protected $response;
 
     public function setUp()

test/StreamTest.php

@@ -17,7 +17,9 @@ class StreamTest extends TestCase
 {
     public $tmpnam;
 
-    /** @var Stream */
+    /**
+     * @var Stream
+     */
     protected $stream;
 
     public function setUp()