Improve type hinting in unit tests

rougin · Dec 26, 2023 · a7f272b · a7f272b
1 parent cc46a04
commit a7f272b
Show file tree

Hide file tree

Showing 32 changed files with 192 additions and 284 deletions.
diff --git a/tests/Application/ApplicationTest.php b/tests/Application/ApplicationTest.php
@@ -8,7 +8,6 @@
 use Rougin\Slytherin\Dispatching\Phroute\Router as PhrouteRouter;
 use Rougin\Slytherin\Dispatching\Vanilla\Router;
 use Rougin\Slytherin\Http\Uri;
-use Rougin\Slytherin\IoC\Vanilla\Container;
 use Rougin\Slytherin\Testcase;
 
 /**
@@ -57,7 +56,7 @@ public function testRunMethod()
     {
         $this->expectOutputString('Hello');
 
-        $this->runApplication('GET', '/')->run();
+        $this->setUrl('GET', '/')->run();
     }
 
     /**
@@ -70,7 +69,7 @@ public function testRunMethodWithResponse()
     {
         $this->expectOutputString('Hello with response');
 
-        $this->runApplication('GET', '/hello')->run();
+        $this->setUrl('GET', '/hello')->run();
     }
 
     /**
@@ -83,7 +82,7 @@ public function testRunMethodWithParameter()
     {
         $this->expectOutputString('Hello');
 
-        $this->runApplication('GET', '/parameter')->run();
+        $this->setUrl('GET', '/parameter')->run();
     }
 
     /**
@@ -96,7 +95,7 @@ public function testRunMethodWithOptionalParameter()
     {
         $this->expectOutputString('Hello');
 
-        $this->runApplication('GET', '/optional')->run();
+        $this->setUrl('GET', '/optional')->run();
     }
 
     /**
@@ -109,7 +108,7 @@ public function testRunMethodWithCallback()
     {
         $this->expectOutputString('Hello');
 
-        $this->runApplication('GET', '/callback')->run();
+        $this->setUrl('GET', '/callback')->run();
     }
 
     /**
@@ -122,7 +121,7 @@ public function testRunMethodWithPutHttpMethod()
     {
         $this->expectOutputString('Hello from PUT HTTP method');
 
-        $this->runApplication('PUT', '/hello', array('_method' => 'PUT'))->run();
+        $this->setUrl('PUT', '/hello', array('_method' => 'PUT'))->run();
     }
 
     /**
@@ -133,10 +132,12 @@ public function testRunMethodWithPutHttpMethod()
      */
     public function testRunMethodWithPhroute()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('Phroute\Phroute\RouteCollector'))
         {
             $this->markTestSkipped('Phroute is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         $this->expectOutputString('Hello');
 
@@ -150,7 +151,7 @@ public function testRunMethodWithPhroute()
 
         $this->components->setDispatcher($dispatcher);
 
-        $this->runApplication('GET', '/')->run();
+        $this->setUrl('GET', '/')->run();
     }
 
     /**
@@ -200,7 +201,7 @@ public function testRunMethodWithIntegrateMethod()
      * @param  array<string, string> $data
      * @return \Rougin\Slytherin\Application
      */
-    private function runApplication($method, $uri, $data = array())
+    private function setUrl($method, $uri, $data = array())
     {
         $result = $this->components->getHttp();
 
@@ -214,18 +215,14 @@ private function runApplication($method, $uri, $data = array())
 
         $request = $request->withMethod($method)->withUri($uri);
 
-        switch ($method)
+        if ($method === 'GET')
         {
-            case 'GET':
-                $request = $request->withQueryParams($data);
-
-                break;
-            case 'POST':
-            case 'PUT':
-            case 'DELETE':
-                $request = $request->withParsedBody($data);
+            $request = $request->withQueryParams($data);
+        }
 
-                break;
+        if (in_array($method, array('POST', 'PUT', 'DELETE')))
+        {
+            $request = $request->withParsedBody($data);
         }
 
         $this->components->setHttp($request, $response);

diff --git a/tests/Application/ApplicationTestCases.php b/tests/Application/ApplicationTestCases.php
@@ -26,7 +26,9 @@ class ApplicationTestCases extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         $this->markTestSkipped('No implementation style defined.');
+        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -242,18 +244,14 @@ protected function request($method, $uri, $data = array(), $server = array())
 
         $request = new ServerRequest($server);
 
-        switch ($method)
+        if ($method === 'GET')
         {
-            case 'GET':
-                $request = $request->withQueryParams($data);
-
-                break;
-            case 'POST':
-            case 'PUT':
-            case 'DELETE':
-                $request = $request->withParsedBody($data);
+            $request = $request->withQueryParams($data);
+        }
 
-                break;
+        if (in_array($method, array('POST', 'PUT', 'DELETE')))
+        {
+            $request = $request->withParsedBody($data);
         }
 
         return $request;

diff --git a/tests/Application/AurynContainerTest.php b/tests/Application/AurynContainerTest.php
@@ -24,10 +24,12 @@ class AurynContainerTest extends ApplicationTestCases
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('Auryn\Injector'))
         {
             $this->markTestSkipped('Auryn is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         $container = new AurynContainer(new Injector);
 

diff --git a/tests/Application/IntegrationInterfaceTest.php b/tests/Application/IntegrationInterfaceTest.php
@@ -19,23 +19,21 @@ class IntegrationInterfaceTest extends ApplicationTestCases
      */
     protected function doSetUp()
     {
-        $integrations = array();
+        $items = array();
 
-        $integrations[] = 'Rougin\Slytherin\Debug\ErrorHandlerIntegration';
-        $integrations[] = 'Rougin\Slytherin\Http\HttpIntegration';
-        $integrations[] = 'Rougin\Slytherin\Routing\RoutingIntegration';
-        $integrations[] = 'Rougin\Slytherin\Middleware\MiddlewareIntegration';
-        $integrations[] = 'Rougin\Slytherin\Template\RendererIntegration';
-        $integrations[] = 'Rougin\Slytherin\Integration\ConfigurationIntegration';
+        $items[] = 'Rougin\Slytherin\Debug\ErrorHandlerIntegration';
+        $items[] = 'Rougin\Slytherin\Http\HttpIntegration';
+        $items[] = 'Rougin\Slytherin\Routing\RoutingIntegration';
+        $items[] = 'Rougin\Slytherin\Middleware\MiddlewareIntegration';
+        $items[] = 'Rougin\Slytherin\Template\RendererIntegration';
+        $items[] = 'Rougin\Slytherin\Integration\ConfigurationIntegration';
 
         $config = new Configuration;
 
-        $router = $this->router();
-
-        $config->set('app.router', $router);
+        $config->set('app.router', $this->router());
 
         $app = new Application;
 
-        $this->application = $app->integrate($integrations, $config);
+        $this->application = $app->integrate($items, $config);
     }
 }
diff --git a/tests/Component/CollectionTest.php b/tests/Component/CollectionTest.php
@@ -190,10 +190,12 @@ public function testSetHttpResponseMethod()
      */
     public function testSetMiddlewareMethod()
     {
+        // @codeCoverageIgnoreStart
         if (! Interop::exists())
         {
             $this->markTestSkipped('Interop middleware/s not yet installed');
         }
+        // @codeCoverageIgnoreEnd
 
         $expected = new VanillaMiddleware;
 
@@ -213,10 +215,12 @@ public function testSetTemplateMethod()
     {
         $twig = new TwigLoader;
 
+        // @codeCoverageIgnoreStart
         if (! $twig->exists())
         {
             $this->markTestSkipped('Twig is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         /** @var string */
         $path = realpath(__DIR__ . '/../../Fixture/Templates');

diff --git a/tests/Container/AurynContainerTest.php b/tests/Container/AurynContainerTest.php
@@ -22,7 +22,12 @@ class AurynContainerTest extends \Rougin\Slytherin\Testcase
      */
     protected function doSetUp()
     {
-        class_exists('Auryn\Injector') || $this->markTestSkipped('Auryn is not installed.');
+        // @codeCoverageIgnoreStart
+        if (! class_exists('Auryn\Injector'))
+        {
+            $this->markTestSkipped('Auryn is not installed.');
+        }
+        // @codeCoverageIgnoreEnd
 
         $this->container = new \Rougin\Slytherin\Container\AurynContainer(new \Auryn\Injector);
     }

diff --git a/tests/Container/LeagueContainerTest.php b/tests/Container/LeagueContainerTest.php
@@ -25,10 +25,12 @@ class LeagueContainerTest extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('League\Container\Container'))
         {
             $this->markTestSkipped('League Container is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         $this->container = new LeagueContainer;
     }

diff --git a/tests/Debug/Whoops/DebuggerTest.php b/tests/Debug/Whoops/DebuggerTest.php
@@ -32,10 +32,12 @@ class DebuggerTest extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('Whoops\Run'))
         {
             $this->markTestSkipped('Whoops is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         $this->debugger = new Debugger(new \Whoops\Run);
     }

diff --git a/tests/Dispatching/FastRoute/DispatcherTest.php b/tests/Dispatching/FastRoute/DispatcherTest.php
@@ -27,10 +27,12 @@ class DispatcherTest extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! interface_exists('FastRoute\Dispatcher'))
         {
             $this->markTestSkipped('FastRoute is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         $middleware = 'Rougin\Slytherin\Fixture\Middlewares\LastMiddleware';
 

diff --git a/tests/Dispatching/FastRoute/RouterTest.php b/tests/Dispatching/FastRoute/RouterTest.php
@@ -33,10 +33,12 @@ class RouterTest extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('FastRoute\RouteCollector'))
         {
             $this->markTestSkipped('FastRoute is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         // Generate a sample route for testing --------------
         $class = 'Rougin\Slytherin\Fixture\Classes\NewClass';

diff --git a/tests/Dispatching/Phroute/DispatcherTest.php b/tests/Dispatching/Phroute/DispatcherTest.php
@@ -31,10 +31,12 @@ class DispatcherTest extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('Phroute\Phroute\Dispatcher'))
         {
             $this->markTestSkipped('Phroute is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         $routes = array();
         $routes[] = array('GET', '/', array('Rougin\Slytherin\Fixture\Classes\NewClass', 'index'));

diff --git a/tests/Dispatching/Phroute/RouterTest.php b/tests/Dispatching/Phroute/RouterTest.php
@@ -31,10 +31,12 @@ class RouterTest extends Testcase
      */
     protected function doSetUp()
     {
+        // @codeCoverageIgnoreStart
         if (! class_exists('Phroute\Phroute\RouteCollector'))
         {
             $this->markTestSkipped('Phroute is not installed.');
         }
+        // @codeCoverageIgnoreEnd
 
         // Generate a sample route for testing --------------
         $class = 'Rougin\Slytherin\Fixture\Classes\NewClass';

diff --git a/tests/Fixture/Classes/Container.php b/tests/Fixture/Classes/Container.php