Use latest phpunit (#44)

Nyholm · web-flow · commit 985bcac7bcdb · 2018-07-30T01:38:07.000-07:00
* Use latest phpunit

* Updated tests not to use final class
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "symfony/console": "^3.4 || ^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27",
+        "phpunit/phpunit": "^7.2.7",
         "symfony/http-foundation": "^3.4 || ^4.0",
         "zendframework/zend-diactoros": "^1.8",
         "satooshi/php-coveralls": "^1.1"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,10 +6,9 @@
         </testsuite>
     </testsuites>
     <filter>
-        <blacklist>
-           <directory>vendor</directory>
-           <directory>test</directory>
-        </blacklist>
+        <whitelist>
+           <directory>src</directory>
+        </whitelist>
     </filter>
 </phpunit>
 
diff --git a/test/ApplicationFactoryTest.php b/test/ApplicationFactoryTest.php
@@ -4,11 +4,12 @@
 
 use PHPFastCGI\FastCGIDaemon\ApplicationFactory;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the application factory.
  */
-class ApplicationFactoryTest extends \PHPUnit_Framework_TestCase
+class ApplicationFactoryTest extends TestCase
 {
     /**
      * Tests that the factory can create a Symfony console application with a
@@ -43,11 +44,10 @@ public function testCreateApplication()
 
     /**
      * Tests that an invalid kernel throws an InvalidArgumentException.
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testInvalidKernel()
     {
+        $this->expectException(\InvalidArgumentException::class);
         (new ApplicationFactory())->createApplication('foo');
     }
 }
diff --git a/test/CallbackKernelTest.php b/test/CallbackKernelTest.php
@@ -4,21 +4,21 @@
 
 use PHPFastCGI\FastCGIDaemon\CallbackKernel;
 use PHPFastCGI\FastCGIDaemon\Http\Request;
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\Response;
 
 /**
  * Tests the callback wrapper.
  */
-class CallbackKernelTest extends \PHPUnit_Framework_TestCase
+class CallbackKernelTest extends TestCase
 {
     /**
      * Tests an \InvalidArgumentException is thrown when it isn't constructed
      * with a callable.
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testInvalidArgumentException()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new CallbackKernel('not a callable function');
     }
 
diff --git a/test/Command/DaemonRunCommandTest.php b/test/Command/DaemonRunCommandTest.php
@@ -8,14 +8,15 @@
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockDaemon;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockDaemonFactory;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Logger\ConsoleLogger;
 use Symfony\Component\Console\Output\NullOutput;
 
 /**
  * Tests the daemon run command.
  */
-class DaemonRunCommandTest extends \PHPUnit_Framework_TestCase
+class DaemonRunCommandTest extends TestCase
 {
     /**
      * Tests that the command options are configured properly.
@@ -95,15 +96,14 @@ public function testDaemonOptions()
     /**
      * Test with only the host option set. An Invalid argument exception should
      * be thrown if the host option is supplied without the port optional also.
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testHostOptionOnly()
     {
         $context = $this->createTestingContext([]);
 
         $input = new ArrayInput(['--host' => 'foo']);
 
+        $this->expectException(\InvalidArgumentException::class);
         $context['command']->run($input, new NullOutput());
     }
 
@@ -149,12 +149,11 @@ public function testShutdown()
 
     /**
      * Test flag shutdown with no daemon.
-     * 
-     * @expectedException \RuntimeException
      */
     public function testShutdownNoDaemon()
     {
         $command = new DaemonRunCommand(new MockKernel(), new MockDriverContainer());
+        $this->expectException(\RuntimeException::class);
         $command->flagShutdown();
     }
 
diff --git a/test/DaemonOptionsTest.php b/test/DaemonOptionsTest.php
@@ -3,12 +3,13 @@
 namespace PHPFastCGI\Test\FastCGIDaemon;
 
 use PHPFastCGI\FastCGIDaemon\DaemonOptions;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 
 /**
  * Tests the daemon options.
  */
-class DaemonOptionsTest extends \PHPUnit_Framework_TestCase
+class DaemonOptionsTest extends TestCase
 {
     /**
      * Tests that the daemon options object works properly.
@@ -35,33 +36,30 @@ public function testDaemonOptions()
     /**
      * Test that an InvalidArgumentException is thrown when an invalid logger
      * is provided.
-     * 
-     * @expectedException \InvalidArgumentException
      */
     public function testInvalidLogger()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new DaemonOptions([DaemonOptions::LOGGER => 'foo']);
     }
 
     /**
      * Test that an InvalidArgumentException is thrown when the object is
      * constructed with an unknown option.
-     * 
-     * @expectedException \InvalidArgumentException
      */
     public function testUnknownOptionInConstructor()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new DaemonOptions(['hello' => 'world']);
     }
 
     /**
      * Test that an InvalidArgumentException is thrown when ::getOption is
      * called with an unknown option.
-     * 
-     * @expectedException \InvalidArgumentException
      */
     public function testGetUnknownOption()
     {
+        $this->expectException(\InvalidArgumentException::class);
         (new DaemonOptions())->getOption('hello');
     }
 }
diff --git a/test/Driver/DriverContainerTest.php b/test/Driver/DriverContainerTest.php
@@ -3,22 +3,22 @@
 namespace PHPFastCGI\Test\FastCGIDaemon\Driver;
 
 use PHPFastCGI\FastCGIDaemon\Driver\DriverContainer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the driver container.
  */
-class DriverContainerTest extends \PHPUnit_Framework_TestCase
+class DriverContainerTest extends TestCase
 {
     /**
      * Tests that the driver container throws an InvalidArgumentException with
      * an unknown driver.
-     *
-     * @expectedException InvalidArgumentException
      */
     public function testInvalidDriver()
     {
         $driverContainer = new DriverContainer();
 
+        $this->expectException(\InvalidArgumentException::class);
         $driverContainer->getFactory('foo');
     }
 
diff --git a/test/Driver/Userland/Connection/StreamSocketConnectionPoolTest.php b/test/Driver/Userland/Connection/StreamSocketConnectionPoolTest.php
@@ -4,12 +4,13 @@
 
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\StreamSocketConnection;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\StreamSocketConnectionPool;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test to ensure that the StreamSocketConnectionPool class can accept new
  * connections and trigger updates when data is sent.
  */
-class StreamSocketConnectionPoolTest extends \PHPUnit_Framework_TestCase
+class StreamSocketConnectionPoolTest extends TestCase
 {
     /**
      * Test basic connection pool.
@@ -54,8 +55,6 @@ public function testConnectionPool()
 
     /**
      * Test basic stream_select fail.
-     *
-     * @expectedException \RuntimeException
      */
     public function testStreamSelectFail()
     {
@@ -65,6 +64,7 @@ public function testStreamSelectFail()
 
         fclose($serverSocket);
 
+        $this->expectException(\RuntimeException::class);
         $connectionPool->getReadableConnections(0);
     }
 
diff --git a/test/Driver/Userland/Connection/StreamSocketConnectionTest.php b/test/Driver/Userland/Connection/StreamSocketConnectionTest.php
@@ -4,12 +4,13 @@
 
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\StreamSocketConnection;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Exception\ConnectionException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test to ensure that the StreamSocketConnection class can read, write and
  * close.
  */
-class StreamSocketConnectionTest extends \PHPUnit_Framework_TestCase
+class StreamSocketConnectionTest extends TestCase
 {
     /**
      * Tests that the StreamSocketConnection class can read, write and close.
diff --git a/test/Driver/Userland/ConnectionHandler/ConnectionHandlerFactoryTest.php b/test/Driver/Userland/ConnectionHandler/ConnectionHandlerFactoryTest.php
@@ -2,13 +2,15 @@
 
 namespace PHPFastCGI\Test\FastCGIDaemon\Driver\Userland\ConnectionHandler;
 
+use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\ConnectionInterface;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\ConnectionHandler\ConnectionHandlerFactory;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the daemon.
  */
-class ConnectionHandlerFactoryTest extends \PHPUnit_Framework_TestCase
+class ConnectionHandlerFactoryTest extends TestCase
 {
     /**
      * Tests that the factory creates a connection handler from a kernel.
@@ -18,7 +20,7 @@ public function testCreatesConnectionHandlerFromKernel()
         $kernel = new MockKernel();
 
         $connection = $this
-            ->getMockBuilder('PHPFastCGI\\FastCGIDaemon\\Driver\\Userland\\Connection\\StreamSocketConnection')
+            ->getMockBuilder(ConnectionInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/test/Driver/Userland/ConnectionHandler/ConnectionHandlerTest.php b/test/Driver/Userland/ConnectionHandler/ConnectionHandlerTest.php
@@ -10,13 +10,14 @@
 use PHPFastCGI\FastCGIDaemon\DaemonInterface;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Client\ConnectionWrapper;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Response as HttpFoundationResponse;
 use Zend\Diactoros\Response;
 
 /**
  * Tests that the connection handler is correctly handling FastCGI connections.
  */
-class ConnectionHandlerTest extends \PHPUnit_Framework_TestCase
+class ConnectionHandlerTest extends TestCase
 {
     /**
      * Test that the daemon is correctly handling requests and PSR-7 and
diff --git a/test/Driver/Userland/UserlandDaemonFactoryTest.php b/test/Driver/Userland/UserlandDaemonFactoryTest.php
@@ -5,12 +5,13 @@
 use PHPFastCGI\FastCGIDaemon\DaemonOptions;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\UserlandDaemonFactory;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 
 /**
  * Tests the userland daemon factory.
  */
-class UserlandDaemonFactoryTest extends \PHPUnit_Framework_TestCase
+class UserlandDaemonFactoryTest extends TestCase
 {
     /**
      * Tests that the factory can create a daemon from a stream socket.
diff --git a/test/Driver/Userland/UserlandDaemonTest.php b/test/Driver/Userland/UserlandDaemonTest.php
@@ -11,12 +11,13 @@
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Client\ConnectionWrapper;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Logger\InMemoryLogger;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\Response;
 
 /**
  * Tests the daemon.
  */
-class UserlandDaemonTest extends \PHPUnit_Framework_TestCase
+class UserlandDaemonTest extends TestCase
 {
     /**
      * Tests that the daemon shuts down after being flagged for shutdown.
diff --git a/test/Helper/Client/ConnectionWrapper.php b/test/Helper/Client/ConnectionWrapper.php
@@ -3,6 +3,7 @@
 namespace PHPFastCGI\Test\FastCGIDaemon\Helper\Client;
 
 use PHPFastCGI\FastCGIDaemon\DaemonInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Helper class that wraps a stream resource and provides helper methods for
@@ -28,12 +29,12 @@ public function __construct($stream)
     /**
      * Read a request from the connection.
      *
-     * @param \PHPUnit_Framework_TestCase $testCase
+     * @param TestCase $testCase
      * @param string                      $requestId
      *
      * @return string
      */
-    public function readResponse(\PHPUnit_Framework_TestCase $testCase, $requestId)
+    public function readResponse(TestCase $testCase, $requestId)
     {
         $response = '';
 
@@ -53,11 +54,11 @@ public function readResponse(\PHPUnit_Framework_TestCase $testCase, $requestId)
     /**
      * Read a record from the connection.
      *
-     * @param \PHPUnit_Framework_TestCase $testCase
+     * @param TestCase $testCase
      *
      * @return array
      */
-    public function readRecord(\PHPUnit_Framework_TestCase $testCase)
+    public function readRecord(TestCase $testCase)
     {
         $headerData = fread($this->stream, 8);
         $headerFormat = 'Cversion/Ctype/nrequestId/ncontentLength/CpaddingLength/x';
diff --git a/test/Http/RequestTest.php b/test/Http/RequestTest.php
@@ -3,12 +3,13 @@
 namespace PHPFastCGI\Test\FastCGIDaemon\Http;
 
 use PHPFastCGI\FastCGIDaemon\Http\Request;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test that the request builder is correctly building the PSR-7 request
  * message.
  */
-class RequestTest extends \PHPUnit_Framework_TestCase
+class RequestTest extends TestCase
 {
     /**
      * Test that the request builder is correctly building the request messages.

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@`
`4`	`4`
`5`	`5`	`use PHPFastCGI\FastCGIDaemon\ApplicationFactory;`
`6`	`6`	`use PHPFastCGI\Test\FastCGIDaemon\Helper\Mocker\MockKernel;`
	`7`	`+use PHPUnit\Framework\TestCase;`
`7`	`8`
`8`	`9`	`/**`
`9`	`10`	`* Tests the application factory.`
`10`	`11`	`*/`
`11`		`-class ApplicationFactoryTest extends \PHPUnit_Framework_TestCase`
	`12`	`+class ApplicationFactoryTest extends TestCase`
`12`	`13`	`{`
`13`	`14`	`/**`
`14`	`15`	`* Tests that the factory can create a Symfony console application with a`
`@@ -43,11 +44,10 @@ public function testCreateApplication()`
`43`	`44`
`44`	`45`	`/**`
`45`	`46`	`* Tests that an invalid kernel throws an InvalidArgumentException.`
`46`		`- *`
`47`		`- * @expectedException \InvalidArgumentException`
`48`	`47`	`*/`
`49`	`48`	`public function testInvalidKernel()`
`50`	`49`	`{`
	`50`	`+ $this->expectException(\InvalidArgumentException::class);`
`51`	`51`	`(new ApplicationFactory())->createApplication('foo');`
`52`	`52`	`}`
`53`	`53`	`}`