Support PHP 8.1, minimum to 7.3 (#20)

Author: francislavoie

.dunitconfig

@@ -16,9 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        # TODO: Upgrade PHPUnit to support testing on PHP 8, will require bumping minimum
-        # php-versions: ['7.3', '7.4', '8.0']
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout

.github/workflows/ci.yml

@@ -5,3 +5,4 @@ composer.phar
 coverage/
 site/
 vendor/
+.phpunit.result.cache

.gitignore

@@ -29,17 +29,16 @@
     "source": "https://github.com/Vectorface/snappy-router"
   },
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=7.3.0",
     "vectorface/whip": "^0.4",
     "twig/twig": "^2.0",
     "nikic/fast-route":"^1.0.0",
     "psr/log": "^1.0",
     "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
-    "squizlabs/php_codesniffer": "1.*",
-    "vectorface/dunit": "~2.0"
+    "phpunit/phpunit": "^9.5.10",
+    "squizlabs/php_codesniffer": "1.*"
   },
   "scripts": {
     "test": [

composer.json

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="tests/bootstrap.php">
-    <testsuites>
-        <testsuite name="Main suite">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory addUncoveredFilesFromWhitelist="true">./src/Vectorface/SnappyRouter</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <ini name="register_argc_argv" value="On" />
-    </php>
-</phpunit>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  backupGlobals="false"
+  colors="true"
+  bootstrap="tests/bootstrap.php">
+  <coverage/>
+  <testsuites>
+    <testsuite name="Main suite">
+      <directory>tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <ini name="register_argc_argv" value="On"/>
+  </php>
+</phpunit>

phpunit.xml

@@ -55,6 +55,7 @@ public function __construct($config)
      * @param string $offset The key to be checked.
      * @return bool Returns true if the key exists and false otherwise.
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->config[$offset]);
@@ -65,6 +66,7 @@ public function offsetExists($offset)
      * @param string $offset The key to be fetched.
      * @return bool Returns the value associated with the key or null if no value exists.
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->offsetExists($offset) ? $this->config[$offset] : null;
@@ -77,6 +79,7 @@ public function offsetGet($offset)
      * @param mixed $value The value to be set.
      * @throws Exception
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if (null === $offset) {
@@ -90,6 +93,7 @@ public function offsetSet($offset, $value)
      * @param string $offset The key to unset.
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->config[$offset]);

src/Vectorface/SnappyRouter/Config/Config.php

@@ -18,7 +18,7 @@ class RouterHeaderPlugin extends AbstractPlugin
      */
     public function afterHandlerSelected(AbstractHandler $handler)
     {
-        parent::afterhandlerSelected($handler);
+        parent::afterHandlerSelected($handler);
         @header('X-Router: SnappyRouter');
     }
 }

src/Vectorface/SnappyRouter/Plugin/HttpHeader/RouterHeaderPlugin.php

@@ -55,7 +55,8 @@ public function testSynopsis()
      */
     public function testExceptionThrownWhenConfigIsAppended()
     {
-        $this->setExpectedException(Exception::class, "Config values must contain a key.");
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage("Config values must contain a key.");
 
         $config = new Config([]);
         $config[] = 'new value';

tests/Vectorface/SnappyRouterTests/Config/ConfigTest.php

@@ -84,7 +84,8 @@ public function testGetDefaultAndSetDefault()
      */
     public function testMissingServiceThrowsException()
     {
-        $this->setExpectedException(Exception::class, "No element registered for key: TestElement");
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage("No element registered for key: TestElement");
 
         $di = new Di();
         $di->get('TestElement');

tests/Vectorface/SnappyRouterTests/Di/DiTest.php

@@ -115,7 +115,8 @@ public function testNamespaceProvisioning()
      */
     public function testNamespaceProvisioningMissingService()
     {
-        $this->setExpectedException(Exception::class, "Controller class TestDummyController was not found in any listed namespace.");
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage("Controller class TestDummyController was not found in any listed namespace.");
 
         $serviceProvider = new ServiceProvider([]);
         $serviceProvider->setNamespaces([]);
@@ -151,7 +152,8 @@ public function testFolderProvisioning()
      */
     public function testFolderProvisioningMissingService()
     {
-        $this->setExpectedException(Exception::class, "Controller class NonExistentController not found in any listed folder.");
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage("Controller class NonExistentController not found in any listed folder.");
 
         $serviceProvider = new ServiceProvider([]);
         $folders = [realpath(__DIR__.'/../')];

tests/Vectorface/SnappyRouterTests/Di/ServiceProviderTest.php

@@ -63,7 +63,8 @@ public function encodeProvider()
      */
     public function testNonSerializableEncode()
     {
-        $this->setExpectedException(EncoderException::class, "Unable to encode response as JSON.");
+        $this->expectException(EncoderException::class);
+        $this->expectExceptionMessage("Unable to encode response as JSON.");
 
         $encoder = new JsonEncoder();
         $resource = fopen(__FILE__, 'r'); // resources can't be serialized

tests/Vectorface/SnappyRouterTests/Encoder/JsonEncoderTest.php

@@ -46,7 +46,8 @@ public function encodeProvider()
      */
     public function testMissingClientMethodThrowsException()
     {
-        $this->setExpectedException(Exception::class, "Client method missing from plugin options.");
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage("Client method missing from plugin options.");
 
         new JsonpEncoder([]);
     }

tests/Vectorface/SnappyRouterTests/Encoder/JsonpEncoderTest.php

@@ -78,7 +78,8 @@ public function testSynopsis()
      */
     public function testRouteToNonExistentController()
     {
-        $this->setExpectedException(ResourceNotFoundException::class, 'No such controller found "TestController".');
+        $this->expectException(ResourceNotFoundException::class);
+        $this->expectExceptionMessage('No such controller found "TestController".');
 
         $options = [];
         $handler = new ControllerHandler($options);
@@ -96,7 +97,8 @@ public function testRouteToNonExistentController()
      */
     public function testRouteToNonExistentControllerAction()
     {
-        $this->setExpectedException(ResourceNotFoundException::class, 'TestController does not have method notexistsAction');
+        $this->expectException(ResourceNotFoundException::class);
+        $this->expectExceptionMessage('TestController does not have method notexistsAction');
 
         $options = [
             Config::KEY_CONTROLLERS => [
@@ -119,7 +121,8 @@ public function testRouteToNonExistentControllerAction()
      */
     public function testMissingClassOnPlugin()
     {
-        $this->setExpectedException(PluginException::class, 'Invalid or missing class for plugin TestPlugin');
+        $this->expectException(PluginException::class);
+        $this->expectExceptionMessage('Invalid or missing class for plugin TestPlugin');
 
         $options = [
             Config::KEY_PLUGINS => [
@@ -137,7 +140,8 @@ public function testMissingClassOnPlugin()
      */
     public function testInvalidClassOnPlugin()
     {
-        $this->setExpectedException(PluginException::class, 'Invalid or missing class for plugin TestPlugin');
+        $this->expectException(PluginException::class);
+        $this->expectExceptionMessage('Invalid or missing class for plugin TestPlugin');
 
         $options = [
             Config::KEY_PLUGINS => [
@@ -156,7 +160,8 @@ public function testInvalidClassOnPlugin()
      */
     public function testInvalidViewConfiguration()
     {
-        $this->setExpectedException(InternalErrorException::class, 'View environment missing views path.');
+        $this->expectException(InternalErrorException::class);
+        $this->expectExceptionMessage('View environment missing views path.');
 
         $options = [
             ControllerHandler::KEY_BASE_PATH => '/',
@@ -270,7 +275,8 @@ public function testActionRendersNonDefaultView()
      */
     public function testExceptionForNullEncoderRenderView()
     {
-        $this->setExpectedException(Exception::class, 'The current encoder does not support the render view method.');
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('The current encoder does not support the render view method.');
 
         $options = [
             Config::KEY_CONTROLLERS => [

tests/Vectorface/SnappyRouterTests/Handler/ControllerHandlerTest.php

@@ -176,7 +176,8 @@ public function testHandleException()
      */
     public function testServiceNotFound()
     {
-        $this->setExpectedException(ResourceNotFoundException::class, "No such service: nonexistent");
+        $this->expectException(ResourceNotFoundException::class);
+        $this->expectExceptionMessage("No such service: nonexistent");
 
         $handler = new JsonRpcHandler([]);
         $this->setRequestPayload($handler, ['method' => 'someMethod', 'id' => '1']);

tests/Vectorface/SnappyRouterTests/Handler/JsonRpcHandlerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace casino\Tests\engine\ServiceRouter\Plugin\Authentication;
+namespace Vectorface\SnappyRouterTests\Plugin\Authentication;
 
 use PHPUnit\Framework\TestCase;
 use Vectorface\SnappyRouter\Authentication\CallbackAuthenticator;

tests/Vectorface/SnappyRouterTests/Plugin/Authentication/HttpBasicAuthenticationPluginTest.php

@@ -23,6 +23,7 @@ public function testSynopsis()
     {
         $handler = new ControllerHandler([]);
         $plugin = new RouterHeaderPlugin([]);
-        $plugin->afterhandlerSelected($handler);
+        $plugin->afterHandlerSelected($handler);
+        $this->assertEquals(1000, $plugin->getExecutionOrder());
     }
 }

tests/Vectorface/SnappyRouterTests/Plugin/HttpHeader/RouterHeaderPluginTest.php

@@ -73,7 +73,7 @@ public function testInputStream()
      */
     public function testInputStreamIncorrectTypeFailure()
     {
-        $this->setExpectedException(InternalErrorException::class);
+        $this->expectException(InternalErrorException::class);
 
         $request = new HttpRequest('TestService', 'TestMethod', 'GET', 1);
         $request->getBody();
@@ -86,7 +86,7 @@ public function testInputStreamIncorrectTypeFailure()
      */
     public function testInputStreamIncorrectFileFailure()
     {
-        $this->setExpectedException(InternalErrorException::class);
+        $this->expectException(InternalErrorException::class);
 
         $request = new HttpRequest('TestService', 'TestMethod', 'GET', 'file');
         $request->getBody();

tests/Vectorface/SnappyRouterTests/Request/HttpRequestTest.php

@@ -130,7 +130,8 @@ public function testNoHandlerFoundException()
      */
     public function testInvalidHandlerClass()
     {
-        $this->setExpectedException(Exception::class, "Cannot instantiate instance of Vectorface\SnappyRouter\Handler\NonexistentHandler");
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage("Cannot instantiate instance of Vectorface\SnappyRouter\Handler\NonexistentHandler");
 
         $config = $this->getStandardConfig();
         $config[Config::KEY_HANDLERS]['InvalidHandler'] = [

tests/Vectorface/SnappyRouterTests/SnappyRouterTest.php

@@ -56,7 +56,8 @@ public function testSynopsis()
      */
     public function testMissingActionOnTask()
     {
-        $this->setExpectedException(ResourceNotFoundException::class, "TestTask task does not have action missingAction.");
+        $this->expectException(ResourceNotFoundException::class);
+        $this->expectExceptionMessage("TestTask task does not have action missingAction.");
 
         $options = [
             Config::KEY_TASKS => [