Merge pull request #24 from ensi-platform/task-104747

#104747 Правки в генерации контроллера

Author: MsNatali

src/Generators/ControllersGenerator.php

@@ -23,7 +23,6 @@ private function extractControllers(SpecObjectInterface $specObject): array
         $paths = $openApiData->paths ?: [];
         foreach ($paths as $routes) {
             foreach ($routes as $method => $route) {
-                $requestName = null;
                 $requestClassName = null;
                 $methodWithRequest = in_array(strtoupper($method), $this->methodsWithRequests);
 
@@ -52,15 +51,14 @@ private function extractControllers(SpecObjectInterface $specObject): array
 
                 if ($methodWithRequest && empty($route->{'x-lg-skip-request-generation'})) {
                     $requestClassName = $route->{'x-lg-request-class-name'} ?? ucfirst($route->operationId) . 'Request';
-                    $requestName = lcfirst($requestClassName);
                     $controllers[$fqcn]['requestsNamespaces'][] = $this->getReplacedNamespace($handler->namespace, 'Controllers', 'Requests') . '\\' .  ucfirst($requestClassName);
                 } elseif ($methodWithRequest) {
                     $controllers[$fqcn]['requestsNamespaces'][] = 'Illuminate\Http\Request';
                 }
 
                 $controllers[$fqcn]['actions'][] = [
                     'name' => $handler->method ?: '__invoke',
-                    'parameters' => array_merge($this->extractPathParameters($route), $this->getActionExtraParameters($methodWithRequest, $requestName, $requestClassName)),
+                    'parameters' => array_merge($this->extractPathParameters($route), $this->getActionExtraParameters($methodWithRequest, $requestClassName)),
                 ];
             }
         }
@@ -78,11 +76,11 @@ private function extractPathParameters(stdClass $route): array
         ], $oasRoutePath);
     }
 
-    private function getActionExtraParameters(bool $methodWithRequest, $requestName = null, $requestClassName = null): array
+    private function getActionExtraParameters(bool $methodWithRequest, $requestClassName = null): array
     {
         if ($methodWithRequest) {
             return [[
-                'name' => $requestName ?? 'request',
+                'name' => 'request',
                 'type' => $requestClassName ?? 'Request',
             ]];
         }
@@ -101,28 +99,13 @@ private function createControllersFiles(array $controllers, string $template): v
                 continue;
             }
 
-            $methodsString = '';
-            foreach ($controller['actions'] as $action) {
-                $methodName = $action['name'];
-                $paramsString = $this->formatActionParamsAsString($action['parameters']);
-                $methodsString .= <<<METHOD
-
-                    public function {$methodName}({$paramsString}) 
-                    {
-                        //
-                    }
-
-                METHOD;
-            }
-            $methodsString = trim($methodsString, "\n");
-
             $this->putWithDirectoryCheck(
                 $filePath,
                 $this->replacePlaceholders($template, [
                     '{{ namespace }}' => $namespace,
                     '{{ className }}' => $className,
-                    '{{ methods }}' => $methodsString,
                     '{{ requestsNamespaces }}' => $this->formatRequestNamespaces($controller['requestsNamespaces']),
+                    '{{ methods }}' => $this->convertMethodsToString($controller['actions']),
                 ])
             );
         }
@@ -133,6 +116,23 @@ private function formatActionParamsAsString(array $params): string
         return implode(', ', array_map(fn (array $param) => $param['type'] . " $" . $param['name'], $params));
     }
 
+    private function convertMethodsToString(array $methods): string
+    {
+        $methodsStrings = [];
+
+        foreach ($methods as $method) {
+            $methodsStrings[] = $this->replacePlaceholders(
+                $this->templatesManager->getTemplate('ControllerMethod.template'),
+                [
+                    '{{ method }}' => $method['name'],
+                    '{{ params }}' => $this->formatActionParamsAsString($method['parameters']),
+                ]
+            );
+        }
+
+        return implode("\n\n    ", $methodsStrings);
+    }
+
     protected function formatRequestNamespaces(array $namespaces): string
     {
         $namespaces = array_unique($namespaces);

templates/Controller.template

@@ -2,9 +2,10 @@
 
 namespace {{ namespace }};
 
+use Illuminate\Contracts\Support\Responsable;
 {{ requestsNamespaces }}
 
 class {{ className }}
 {
-{{ methods }}
+    {{ methods }}
 }

templates/ControllerMethod.template

@@ -0,0 +1,4 @@
+public function {{ method }}({{ params }}): Responsable
+    {
+        //
+    }

tests/GenerateServerTest.php

@@ -103,7 +103,7 @@
         'ResourceController import'
     );
     assertStringContainsString(
-        'TestFullGenerateRequest $testFullGenerateRequest',
+        'TestFullGenerateRequest $request',
         $resourceController,
         'ResourceController function parameter'
     );