Phan error fixes and more unit test

Author: joeySchentrup

sample/src/Routes/Post.php

@@ -3,8 +3,6 @@
 namespace PhpApiSample\Routes;
 
 use PhpApi\Model\Request\AbstractRequest;
-use PhpApi\Model\Request\Attribute\CookieRequestParam;
-use PhpApi\Model\Request\Attribute\HeaderRequestParam;
 use PhpApi\Model\Response\AbstractJsonResponse;
 use PhpApi\Swagger\Attribute\SwaggerTag;
 
@@ -20,8 +18,6 @@ public function execute(PostRequest $request): PostResponse
 class PostRequest extends AbstractRequest
 {
     public function __construct(
-        #[HeaderRequestParam(name: 'X-My-Authorization')]
-        public readonly string $authorization,
         public readonly string $someVar,
         public readonly string $someMessage,
         public readonly PostRequestSubObject $subObject,

src/Model/Request/RequestParser.php

@@ -150,8 +150,7 @@ public static function getParamTypes(string $requestClass, ?string $httpMethod,
                 && $inputParamType != $contentType
             ) {
                 throw new InvalidArgumentException(
-                    "Request class $requestClass has conflicting input types for property $name. "
-                    . "Cannot be both $inputParamType and $contentType",
+                    "Request class $requestClass has conflicting input types for property $name.",
                 );
             }
 

src/Router.php

@@ -104,8 +104,6 @@ public function route(?Request $request = null): ?Response
             } else {
                 throw new InvalidArgumentException("Error handler must return a Response object");
             }
-
-            return null;
         }
 
         $action = ($this->controllerFactory)($route->class);

tests/RouterTest.php

@@ -2,18 +2,24 @@
 
 namespace PhpApi\Test;
 
+require_once __DIR__ . '/../sample/vendor/autoload.php';
+
 use InvalidArgumentException;
 use PhpApi\Model\RouterOptions;
 use PhpApi\Router;
 use PHPUnit\Framework\TestCase;
+use Sapien\Request;
 
 class RouterTest extends TestCase
 {
+    public const Directory =  __DIR__ . '/../sample/src/Routes';
+
     public function test_construct_hasGoodOptions_constructs(): void
     {
         $router = new Router(
             new RouterOptions(
                 namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
             )
         );
 
@@ -27,10 +33,133 @@ public function test_construct_invalidFactory_throwsException(): void
         $router = new Router(
             new RouterOptions(
                 namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
             ),
             controllerFactory: 'test',
         );
 
         $this->assertInstanceOf(Router::class, $router);
     }
+
+    public function test_route_getEndpoint_returnsResponse(): void
+    {
+        $router = new Router(
+            new RouterOptions(
+                namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
+            )
+        );
+
+        $response = $router->route(new Request(
+            method: 'GET',
+            url: [
+                '/'
+            ],
+        ));
+
+        $this->assertNotNull($response);
+        $this->assertInstanceOf(\PhpApiSample\Routes\GetResponse::class, $response);
+    }
+
+    public function test_route_postEndpoint_returnsResponse(): void
+    {
+        $router = new Router(
+            new RouterOptions(
+                namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
+            )
+        );
+
+        $response = $router->route(new Request(
+            method: 'POST',
+            url: [
+                '/'
+            ],
+            globals: [
+                '_POST' => [
+                    'someVar' => 'test',
+                    'someMessage' => 'test',
+                    'subObject' => [
+                        'subMessage' => 'test',
+                        'subID' => 123,
+                    ],
+                ],
+            ],
+        ));
+
+        $this->assertNotNull($response);
+        $this->assertInstanceOf(\PhpApiSample\Routes\PostResponse::class, $response);
+        $this->assertEquals('{"someVar":"test","someMessage":"test","subObject":{"subMessage":"test","subID":123}}', $response->message);
+    }
+
+    public function test_route_putEndpoint_returnsResponse(): void
+    {
+        $router = new Router(
+            new RouterOptions(
+                namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
+            )
+        );
+
+        $response = $router->route(new Request(
+            method: 'PUT',
+            url: [
+                '/'
+            ],
+        ));
+
+        $this->assertNotNull($response);
+        $this->assertInstanceOf(\PhpApiSample\Routes\PutResponse::class, $response);
+    }
+
+    public function test_route_deleteEndpoint_returnsResponse(): void
+    {
+        $router = new Router(
+            new RouterOptions(
+                namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
+            )
+        );
+
+        $response = $router->route(new Request(
+            method: 'DELETE',
+            url: [
+                '/'
+            ],
+        ));
+
+        $this->assertNotNull($response);
+        $this->assertInstanceOf(\PhpApiSample\Routes\DeleteResponse::class, $response);
+    }
+
+    public function test_route_invalidEndpoint_throwsException(): void
+    {
+        $router = new Router(
+            new RouterOptions(
+                namespace: 'PhpApiSample\\Routes',
+                directory: self::Directory,
+            )
+        );
+
+        $router->handleNotFound(
+            'four04',
+        );
+
+        $response = $router->route(new Request(
+            method: 'GET',
+            url: [
+                'http://',
+                'localhost',
+                80,
+                '',
+                '',
+                '/invalid',
+                '',
+                '',
+            ],
+        ));
+
+        $this->assertNotNull($response);
+        $this->assertEquals(404, $response->getCode());
+    }
 }