fix: dependency injection issue

-- Failed to instantiate class for action params
-- It occured due mismatched param type
-- Eloquent model constructor accepts array but it passes scalar value
-- Now, if not possible to create object, will return original value

Author: abdul-kaioum

src/Http/Router/AjaxRouter.php

@@ -27,17 +27,16 @@ public function registerRoutes()
 
     public function addRoute(RouteRegister $route)
     {
-
         $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? sanitize_text_field($_SERVER['REQUEST_METHOD']) : '';
-        $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
+        $action        = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
 
-        if (strpos($action, $this->_router->getAjaxPrefix()) === false
+        if (strpos($action, $route->getRouter()->getAjaxPrefix()) === false
             || !\in_array(strtoupper($requestMethod), $route->getMethods())
         ) {
             return;
         }
 
-        $requestPath = str_replace($this->_router->getAjaxPrefix(), '', $action);
+        $requestPath = str_replace($route->getRouter()->getAjaxPrefix(), '', $action);
         if (!$this->isRouteMatched($route, $requestPath)) {
             return;
         }
@@ -47,15 +46,15 @@ public function addRoute(RouteRegister $route)
             Hooks::addAction('wp_ajax_nopriv_' . $action, [$route, 'handleRequest']);
         }
 
-        $this->_router->addRegisteredRoute($this->currentRouteName(), $route);
+        $route->getRouter()->addRegisteredRoute($this->currentRouteName(), $route);
     }
 
     public function currentRouteName()
     {
         $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? sanitize_text_field($_SERVER['REQUEST_METHOD']) : '';
-        $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
-        
-        return $requestMethod. $action;
+        $action        = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
+
+        return $requestMethod . $action;
     }
 
     /**

src/Http/Router/RouteRegister.php

@@ -250,7 +250,15 @@ public function getParamValue(ReflectionParameter $param)
             $this->setRequest($type);
             $value = $this->getRequest();
         } elseif ($isRouteParam && $value === $isRouteParam && method_exists($type, '__construct')) {
-            $value = new $type($value);
+            $constructor = new ReflectionMethod($type, '__construct');
+            if ($constructor->getNumberOfParameters() === 1) {
+                $parameter = $constructor->getParameters()[0];
+                if ($parameter->getType()->getName() != 'array') {
+                    $value = new $type($value);
+                } elseif (method_exists($type, 'query')) {
+                    $value = $type::query()->find($value);
+                }
+            }
         } elseif (!$param->isOptional()) {
             $value = new $type();
         }

src/Http/Router/Router.php

@@ -88,6 +88,13 @@ public static function instance($type = 'ajax', $namespace = null, $version = nu
         return self::$_instance;
     }
 
+    public function registerFile($routeFile)
+    {
+        self::$_instance = $this;
+
+        include_once $routeFile;
+    }
+
     public function register()
     {
         if ($this->getRequestType() === 'ajax') {