Merge branch 'hotfix/50'

Close #50

Author: weierophinney

test/MessageTraitTest.php

@@ -10,15 +10,19 @@
 namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Psr\Http\Message\MessageInterface;
 use Zend\Diactoros\Request;
-use Zend\Diactoros\Stream;
 
 class MessageTraitTest extends TestCase
 {
+    /**
+     * @var MessageInterface
+     */
+    protected $message;
+
     public function setUp()
     {
-        $this->stream  = new Stream('php://memory', 'wb+');
-        $this->message = new Request(null, null, $this->stream);
+        $this->message = new Request(null, null, $this->getMock('Psr\Http\Message\StreamInterface'));
     }
 
     public function testProtocolHasAcceptableDefault()
@@ -35,12 +39,14 @@ public function testProtocolMutatorReturnsCloneWithChanges()
 
     public function testUsesStreamProvidedInConstructorAsBody()
     {
-        $this->assertSame($this->stream, $this->message->getBody());
+        $stream  = $this->getMock('Psr\Http\Message\StreamInterface');
+        $message = new Request(null, null, $stream);
+        $this->assertSame($stream, $message->getBody());
     }
 
     public function testBodyMutatorReturnsCloneWithChanges()
     {
-        $stream  = new Stream('php://memory', 'wb+');
+        $stream  = $this->getMock('Psr\Http\Message\StreamInterface');
         $message = $this->message->withBody($stream);
         $this->assertNotSame($this->message, $message);
         $this->assertSame($stream, $message->getBody());
@@ -189,8 +195,8 @@ public function testWithoutHeaderDoesNothingIfHeaderDoesNotExist()
     public function testHeadersInitialization()
     {
         $headers = ['X-Foo' => ['bar']];
-        $this->message = new Request(null, null, $this->stream, $headers);
-        $this->assertSame($headers, $this->message->getHeaders());
+        $message = new Request(null, null, 'php://temp', $headers);
+        $this->assertSame($headers, $message->getHeaders());
     }
 
     public function testGetHeaderReturnsAnEmptyArrayWhenHeaderDoesNotExist()

test/PhpInputStreamTest.php

@@ -14,6 +14,16 @@
 
 class PhpInputStreamTest extends TestCase
 {
+    /**
+     * @var string
+     */
+    protected $file;
+
+    /**
+     * @var PhpInputStream
+     */
+    protected $stream;
+
     public function setUp()
     {
         $this->file = __DIR__ . '/TestAsset/php-input-stream.txt';

test/RequestTest.php

@@ -16,6 +16,11 @@
 
 class RequestTest extends TestCase
 {
+    /**
+     * @var Request
+     */
+    protected $request;
+
     public function setUp()
     {
         $this->request = new Request();
@@ -44,19 +49,6 @@ public function testConstructorRaisesExceptionForInvalidStream()
         new Request(['TOTALLY INVALID']);
     }
 
-    public function invalidUrls()
-    {
-        return [
-            'null'   => [null],
-            'true'   => [true],
-            'false'  => [false],
-            'int'    => [1],
-            'float'  => [1.1],
-            'array'  => [['foo']],
-            'object' => [(object) ['foo']],
-        ];
-    }
-
     public function testWithUriReturnsNewInstanceWithNewUri()
     {
         $request = $this->request->withUri(new Uri('https://example.com:10082/foo/bar?baz=bat'));

test/Response/SapiEmitterTest.php

@@ -17,6 +17,11 @@
 
 class SapiEmitterTest extends TestCase
 {
+    /**
+     * @var SapiEmitter
+     */
+    protected $emitter;
+
     public function setUp()
     {
         HeaderStack::reset();

test/ResponseTest.php

@@ -15,6 +15,11 @@
 
 class ResponseTest extends TestCase
 {
+    /**
+     * @var Response
+    */
+    protected $response;
+
     public function setUp()
     {
         $this->response = new Response();

test/ServerRequestTest.php

@@ -17,6 +17,11 @@
 
 class ServerRequestTest extends TestCase
 {
+    /**
+     * @var ServerRequest
+     */
+    protected $request;
+
     public function setUp()
     {
         $this->request = new ServerRequest();

test/ServerTest.php

@@ -10,24 +10,37 @@
 namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Server;
 use ZendTest\Diactoros\TestAsset\HeaderStack;
 
 class ServerTest extends TestCase
 {
+    /**
+     * @var Callable
+     */
+    protected $callback;
+
+    /**
+     * @var ServerRequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    /**
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $response;
+
     public function setUp()
     {
         HeaderStack::reset();
 
         $this->callback   = function ($req, $res, $done) {
             //  Intentionally empty
         };
-        $this->request = $this
-            ->getMockBuilder('Psr\Http\Message\ServerRequestInterface')
-            ->getMock();
-        $this->response = $this
-            ->getMockBuilder('Psr\Http\Message\ResponseInterface')
-            ->getMock();
+        $this->request = $this->getMock('Psr\Http\Message\ServerRequestInterface');
+        $this->response = $this->getMock('Psr\Http\Message\ResponseInterface');
     }
 
     public function tearDown()
@@ -129,7 +142,7 @@ public function testListenEmitsStatusHeaderWithoutReasonPhraseIfNoReasonPhrase()
             'QUERY_STRING' => 'bar=baz',
         ];
 
-        $callback = function ($req, $res) {
+        $callback = function (ServerRequestInterface $req, ResponseInterface $res) {
             $res = $res->withStatus(299);
             $res = $res->withAddedHeader('Content-Type', 'text/plain');
             $res->getBody()->write('FOOBAR');
@@ -155,7 +168,7 @@ public function testEnsurePercentCharactersDoNotResultInOutputError()
             'QUERY_STRING' => 'bar=baz',
         ];
 
-        $callback = function ($req, $res) {
+        $callback = function (ServerRequestInterface $req, ResponseInterface $res) {
             $res = $res->withAddedHeader('Content-Type', 'text/plain');
             $res->getBody()->write('100%');
             return $res;
@@ -178,7 +191,7 @@ public function testEmitsHeadersWithMultipleValuesMultipleTimes()
             'REQUEST_URI' => '/foo/bar',
         ];
 
-        $callback = function ($req, $res) {
+        $callback = function (ServerRequestInterface $req, ResponseInterface $res) {
             $res = $res->withAddedHeader('Content-Type', 'text/plain');
             $res = $res->withAddedHeader(
                 'Set-Cookie',

test/StreamTest.php

@@ -17,6 +17,11 @@ class StreamTest extends TestCase
 {
     public $tmpnam;
 
+    /**
+     * @var Stream
+     */
+    protected $stream;
+
     public function setUp()
     {
         $this->tmpnam = null;