Merge branch 'hotfix/203'

Close #203

Author: weierophinney

composer.json

@@ -24,7 +24,7 @@
     "psr/http-message": "~1.0"
   },
   "require-dev": {
-    "phpunit/PHPUnit": "~4.6",
+    "phpunit/phpunit": "^4.6 || ^5.5",
     "squizlabs/php_codesniffer": "^2.3.1"
   },
   "provide": {

test/MessageTraitTest.php

@@ -24,7 +24,7 @@ class MessageTraitTest extends TestCase
 
     public function setUp()
     {
-        $this->message = new Request(null, null, $this->getMock('Psr\Http\Message\StreamInterface'));
+        $this->message = new Request(null, null, $this->getMockBuilder('Psr\Http\Message\StreamInterface')->getMock());
     }
 
     public function testProtocolHasAcceptableDefault()
@@ -69,14 +69,14 @@ public function testWithProtocolVersionRaisesExceptionForInvalidVersion($version
 
     public function testUsesStreamProvidedInConstructorAsBody()
     {
-        $stream  = $this->getMock('Psr\Http\Message\StreamInterface');
+        $stream  = $this->getMockBuilder('Psr\Http\Message\StreamInterface')->getMock();
         $message = new Request(null, null, $stream);
         $this->assertSame($stream, $message->getBody());
     }
 
     public function testBodyMutatorReturnsCloneWithChanges()
     {
-        $stream  = $this->getMock('Psr\Http\Message\StreamInterface');
+        $stream  = $this->getMockBuilder('Psr\Http\Message\StreamInterface')->getMock();
         $message = $this->message->withBody($stream);
         $this->assertNotSame($this->message, $message);
         $this->assertSame($stream, $message->getBody());

test/ServerTest.php

@@ -40,8 +40,8 @@ public function setUp()
         $this->callback   = function ($req, $res, $done) {
             //  Intentionally empty
         };
-        $this->request = $this->getMock('Psr\Http\Message\ServerRequestInterface');
-        $this->response = $this->getMock('Psr\Http\Message\ResponseInterface');
+        $this->request = $this->getMockBuilder('Psr\Http\Message\ServerRequestInterface')->getMock();
+        $this->response = $this->getMockBuilder('Psr\Http\Message\ResponseInterface')->getMock();
     }
 
     public function tearDown()
@@ -93,7 +93,7 @@ public function testEmmiterSetter()
             $this->request,
             $this->response
         );
-        $emmiter = $this->getMock('Zend\Diactoros\Response\EmitterInterface');
+        $emmiter = $this->getMockBuilder('Zend\Diactoros\Response\EmitterInterface')->getMock();
         $emmiter->expects($this->once())->method('emit');
 
         $server->setEmitter($emmiter);