#101098 Request class name with dir

Author: setopt

src/Generators/BaseGenerator.php

@@ -111,4 +111,18 @@ private function formattedGlobalParams(): array
 
         return $params;
     }
+
+    protected function getActualClassNameAndNamespace(string $className, string $namespace): array
+    {
+        $parseClassName = explode('/', $className);
+        if (count($parseClassName) > 1) {
+            $className = array_pop($parseClassName);
+            $namespace .= '\\' . implode('\\', $parseClassName);
+        }
+
+        return [
+            $className,
+            $namespace
+        ];
+    }
 }

src/Generators/ControllersGenerator.php

@@ -53,11 +53,7 @@ private function extractControllers(SpecObjectInterface $specObject): array
                     $requestClassName = $route->{'x-lg-request-class-name'} ?? ucfirst($route->operationId) . 'Request';
                     $requestNamespace = $this->getReplacedNamespace($handler->namespace, 'Controllers', 'Requests');
 
-                    $parseClassName = explode('/', $requestClassName);
-                    if (count($parseClassName) > 1) {
-                        $requestClassName = array_pop($parseClassName);
-                        $requestNamespace .= '\\' . implode('\\', $parseClassName);
-                    }
+                    list($requestClassName, $requestNamespace) = $this->getActualClassNameAndNamespace($requestClassName, $requestNamespace);
                     $requestNamespace .= '\\' .  ucfirst($requestClassName);
 
                     $controllers[$fqcn]['requestsNamespaces'][] = $requestNamespace;

src/Generators/RequestsGenerator.php

@@ -56,11 +56,7 @@ protected function extractRequests(SpecObjectInterface $specObject, array $names
                     continue;
                 }
 
-                $parseClassName = explode('/', $className);
-                if (count($parseClassName) > 1) {
-                    $className = array_pop($parseClassName);
-                    $newNamespace .= '\\' . implode('\\', $parseClassName);
-                }
+                list($className, $newNamespace) = $this->getActualClassNameAndNamespace($className, $newNamespace);
 
                 $validationRules = '//';
                 $usesEnums = '';