Merge branch 'Sam-Burns-increase-phpunit-version'

Closes #23
slimphp · May 7, 2017 · d4c8756 · d4c8756
2 parents af684c7 + d07c784
commit d4c8756
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "psr/http-message": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.0"
+    "phpunit/phpunit": "^5.7|^6.0"
   },
   "conflict": {
     "slim/slim": "^3.0"

diff --git a/tests/BodyTest.php b/tests/BodyTest.php
@@ -8,10 +8,11 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\Body;
 
-class BodyTest extends \PHPUnit_Framework_TestCase
+class BodyTest extends TestCase
 {
     /**
      * @var string
@@ -187,6 +188,9 @@ public function testTellAttached()
         $this->assertEquals(10, $body->tell());
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testTellDetachedThrowsRuntimeException()
     {
         $this->stream = $this->resourceFactory();
@@ -195,7 +199,6 @@ public function testTellDetachedThrowsRuntimeException()
         $bodyStream->setAccessible(true);
         $bodyStream->setValue($body, null);
 
-        $this->setExpectedException('\RuntimeException');
         $body->tell();
     }
 
@@ -310,13 +313,15 @@ public function testSeekAttached()
         $this->assertEquals(10, ftell($this->stream));
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testSeekDetachedThrowsRuntimeException()
     {
         $this->stream = $this->resourceFactory();
         $body = new Body($this->stream);
         $body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $body->seek(10);
     }
 
@@ -330,13 +335,15 @@ public function testRewindAttached()
         $this->assertEquals(0, ftell($this->stream));
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testRewindDetachedThrowsRuntimeException()
     {
         $this->stream = $this->resourceFactory();
         $body = new Body($this->stream);
         $body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $body->rewind();
     }
 
@@ -348,13 +355,15 @@ public function testReadAttached()
         $this->assertEquals(substr($this->text, 0, 10), $body->read(10));
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testReadDetachedThrowsRuntimeException()
     {
         $this->stream = $this->resourceFactory();
         $body = new Body($this->stream);
         $body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $body->read(10);
     }
 
@@ -370,13 +379,15 @@ public function testWriteAttached()
         $this->assertEquals($this->text . 'foo', (string)$body);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testWriteDetachedThrowsRuntimeException()
     {
         $this->stream = $this->resourceFactory();
         $body = new Body($this->stream);
         $body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $body->write('foo');
     }
 
@@ -389,13 +400,15 @@ public function testGetContentsAttached()
         $this->assertEquals(substr($this->text, 10), $body->getContents());
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testGetContentsDetachedThrowsRuntimeException()
     {
         $this->stream = $this->resourceFactory();
         $body = new Body($this->stream);
         $body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $body->getContents();
     }
 }
diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
@@ -8,10 +8,11 @@
  */
 namespace Slim\Tests;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\Collection;
 
-class CollectionTest extends \PHPUnit_Framework_TestCase
+class CollectionTest extends TestCase
 {
     /**
      * @var Collection

diff --git a/tests/CookiesTest.php b/tests/CookiesTest.php
@@ -8,10 +8,11 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\Cookies;
 
-class CookiesTest extends \PHPUnit_Framework_TestCase
+class CookiesTest extends TestCase
 {
     // public function testArrayToString()
     // {

diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
@@ -8,9 +8,10 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use Slim\Http\Environment;
 
-class EnvironmentTest extends \PHPUnit_Framework_TestCase
+class EnvironmentTest extends TestCase
 {
     /**
      * Server settings for the default HTTP request

diff --git a/tests/HeadersTest.php b/tests/HeadersTest.php
@@ -8,11 +8,12 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\Environment;
 use Slim\Http\Headers;
 
-class HeadersTest extends \PHPUnit_Framework_TestCase
+class HeadersTest extends TestCase
 {
     public function testCreateFromEnvironment()
     {

diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -8,10 +8,11 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use Slim\Http\Headers;
 use Slim\Tests\Http\Mocks\MessageStub;
 
-class MessageTest extends \PHPUnit_Framework_TestCase
+class MessageTest extends TestCase
 {
     /*******************************************************************************
      * Protocol

diff --git a/tests/RequestBodyTest.php b/tests/RequestBodyTest.php
@@ -8,10 +8,11 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\RequestBody;
 
-class RequestBodyTest extends \PHPUnit_Framework_TestCase
+class RequestBodyTest extends TestCase
 {
     /** @var string */
     protected $text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
@@ -136,6 +137,9 @@ public function testToStringDetached()
         $this->assertEquals('', (string)$this->body);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testClose()
     {
         $this->body->close();
@@ -145,7 +149,6 @@ public function testClose()
         $this->assertFalse($this->body->isWritable());
         $this->assertEquals('', (string)$this->body);
 
-        $this->setExpectedException('RuntimeException');
         $this->body->tell();
     }
 
@@ -170,13 +173,15 @@ public function testTellAttached()
         $this->assertEquals(10, $this->body->tell());
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testTellDetachedThrowsRuntimeException()
     {
         $bodyStream = new ReflectionProperty($this->body, 'stream');
         $bodyStream->setAccessible(true);
         $bodyStream->setValue($this->body, null);
 
-        $this->setExpectedException('\RuntimeException');
         $this->body->tell();
     }
 
@@ -250,11 +255,13 @@ public function testSeekAttached()
         $this->assertEquals(10, $this->body->tell());
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testSeekDetachedThrowsRuntimeException()
     {
         $this->body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $this->body->seek(10);
     }
 
@@ -266,11 +273,13 @@ public function testRewindAttached()
         $this->assertEquals(0, $this->body->tell());
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testRewindDetachedThrowsRuntimeException()
     {
         $this->body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $this->body->rewind();
     }
 
@@ -279,11 +288,13 @@ public function testReadAttached()
         $this->assertEquals(substr($this->text, 0, 10), $this->body->read(10));
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testReadDetachedThrowsRuntimeException()
     {
         $this->body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $this->body->read(10);
     }
 
@@ -297,11 +308,13 @@ public function testWriteAttached()
         $this->assertEquals($this->text . 'foo', (string)$this->body);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testWriteDetachedThrowsRuntimeException()
     {
         $this->body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $this->body->write('foo');
     }
 
@@ -312,11 +325,13 @@ public function testGetContentsAttached()
         $this->assertEquals(substr($this->text, 10), $this->body->getContents());
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testGetContentsDetachedThrowsRuntimeException()
     {
         $this->body->detach();
 
-        $this->setExpectedException('\RuntimeException');
         $this->body->getContents();
     }
 }
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -9,6 +9,7 @@
 
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\Collection;
 use Slim\Http\Environment;
@@ -19,7 +20,7 @@
 use Slim\Http\Uri;
 use Slim\Http\FactoryDefault;
 
-class RequestTest extends \PHPUnit_Framework_TestCase
+class RequestTest extends TestCase
 {
     public function requestFactory(array $customGlobals = [])
     {

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -8,12 +8,13 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Slim\Http\Body;
 use Slim\Http\Headers;
 use Slim\Http\Response;
 
-class ResponseTest extends \PHPUnit_Framework_TestCase
+class ResponseTest extends TestCase
 {
     /*******************************************************************************
      * Create

diff --git a/tests/UploadedFilesTest.php b/tests/UploadedFilesTest.php
@@ -8,6 +8,7 @@
  */
 namespace Slim\Tests\Http;
 
+use PHPUnit\Framework\TestCase;
 use Slim\Http\Environment;
 use Slim\Http\Headers;
 use Slim\Http\Request;
@@ -16,7 +17,7 @@
 use Slim\Http\UploadedFile;
 use Slim\Http\Uri;
 
-class UploadedFilesTest extends \PHPUnit_Framework_TestCase
+class UploadedFilesTest extends TestCase
 {
     static private $filename = './phpUxcOty';
     /**

diff --git a/tests/UriTest.php b/tests/UriTest.php
@@ -9,11 +9,12 @@
 namespace Slim\Tests\Http;
 
 use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 use Slim\Http\Environment;
 use Slim\Http\Uri;
 use Slim\Http\FactoryDefault;
 
-class UriTest extends \PHPUnit_Framework_TestCase
+class UriTest extends TestCase
 {
     public function uriFactory(array $customGlobals = [])
     {