Merge branch 'master' of github.com:belcheck-pty-ltd/laravel-openapi

Author: madhumohan-partscheck

src/Console/SchemaFactoryMakeCommand.php

@@ -35,7 +35,8 @@ protected function buildClass($name)
 
     protected function buildModel($output, $model)
     {
-        $model = Str::start($model, $this->laravel->getNamespace());
+        $namespace = app()::VERSION[0] >= 8 ? $this->laravel->getNamespace().'Models\\' : $this->laravel->getNamespace();
+        $model = Str::start($model, $namespace);
 
         if (! is_a($model, Model::class, true)) {
             throw new InvalidArgumentException('Invalid model');

src/RouteInformation.php

@@ -83,12 +83,14 @@ public static function createFromRoute(Route $route): RouteInformation
             $actionAttributes = collect($reflectionMethod->getAttributes())
                 ->map(fn (ReflectionAttribute $attribute) => $attribute->newInstance());
 
+            $containsControllerLevelParamter = $actionAttributes->contains(fn ($value) => $value instanceof \Vyuldashev\LaravelOpenApi\Attributes\Parameters);
+
             $instance->domain = $route->domain();
             $instance->method = $method;
 			$instance->uri = Str::start(preg_replace('/{(.*?)}/', '{${1}:id}', $route->uri), '/');
             $instance->name = $route->getName();
             $instance->controller = $controller;
-            $instance->parameters = $parameters;
+            $instance->parameters = $containsControllerLevelParamter ? collect([]) : $parameters;
             $instance->controllerAttributes = $controllerAttributes;
             $instance->action = $action;
             $instance->actionParameters = $reflectionMethod->getParameters();