Merge branch 'hotfix/cant-read-model-from-lumen-closure'

Author: LIQRGV

src/RequestParser.php

@@ -40,7 +40,7 @@ class RequestParser
     public function __construct(Request $request)
     {
         $requestParserConfig = Config::get('request_parser');
-        if(is_null($requestParserConfig) || empty($requestParserConfig)) {
+        if (is_null($requestParserConfig) || empty($requestParserConfig)) {
             $this->modelNamespaces = ["App\\Models"];
         } else {
             $this->modelNamespaces = $requestParserConfig['model_namespaces'];
@@ -92,7 +92,8 @@ private function getBaseModelName(Request $request): string
 
         $exploded = explode("/", $request->getRequesturi());
         $lastURISegment = strtolower(end($exploded));
-        $camelizeURI = str_replace('_', '', ucwords($lastURISegment, '_'));
+        $lastURINoQuery = current(explode("?", $lastURISegment, 2));
+        $camelizeURI = str_replace('_', '', ucwords($lastURINoQuery, '_'));
         $modelCandidates[] = $camelizeURI;
 
         $modelName = $this->getModelFromNamespaces($camelizeURI, $this->modelNamespaces);
@@ -205,8 +206,12 @@ private function createModel(string $baseModelName)
     private function getControllerFromRoute($route)
     {
         if (is_array($route)) {
-            $controllerWithMethod = current($route[1]);
-            $splitedControllerMethod = explode('@', $controllerWithMethod);
+            $maybeControllerWithMethod = current($route[1]);
+            if ($maybeControllerWithMethod instanceof \Closure) {
+                return null;
+            }
+
+            $splitedControllerMethod = explode('@', $maybeControllerWithMethod);
             $routingHandler = current($splitedControllerMethod);
             $maybeController = new $routingHandler;
 

tests/RequestParserLumenTest.php

@@ -16,6 +16,29 @@ function testFilterRouteIsArray()
         $routeResolverResult = [
             'uses' => MockLumenModelController::class . '@' . 'index',
         ];
+        $query = new ParameterBag([]);
+        $requestParserOptions = [
+            'model_namespaces' => [
+                'LIQRGV\QueryFilter\Mocks',
+            ]
+        ];
+
+        $request = $this->createRequestWithRouteArray($uri, $routeResolverResult, $query, $requestParserOptions);
+
+        $requestParser = new RequestParser($request);
+        $builder = $requestParser->getBuilder();
+
+        $query = $builder->getQuery();
+        $this->assertEquals("mock_lumen_models", $query->from);
+        $this->assertEquals([], $builder->getBindings());
+    }
+
+    function testFilterRouteIsArrayURIHasFilter()
+    {
+        $uri = 'mock_model?filter[x][is]=1';
+        $routeResolverResult = [
+            function() {}
+        ];
         $query = new ParameterBag([
             "filter" => [
                 "x" => [
@@ -35,7 +58,7 @@ function testFilterRouteIsArray()
         $builder = $requestParser->getBuilder();
 
         $query = $builder->getQuery();
-        $this->assertEquals("mock_lumen_models", $query->from);
+        $this->assertEquals("mock_models", $query->from);
         $this->assertEquals("x", $query->wheres[0]['column']);
         $this->assertEquals("=", $query->wheres[0]['operator']);
         $this->assertEquals([1], $builder->getBindings());