#85995 generate controller without namespace

MsNatali · MsNatali · commit dd2698c7ef42 · 2022-02-11T14:54:18.000+03:00
diff --git a/src/Generators/BaseGenerator.php b/src/Generators/BaseGenerator.php
@@ -8,6 +8,7 @@
 use Ensi\LaravelOpenApiServerGenerator\Utils\TypesMapper;
 use Illuminate\Filesystem\Filesystem;
 use InvalidArgumentException;
+use RuntimeException;
 
 class BaseGenerator
 {
@@ -39,7 +40,20 @@ protected function trimPath(string $path): string
         return $path === '/' ? $path : ltrim($path, '/');
     }
 
-    protected function getNamespacedFilePath(string $fileName, string $namespace, ): string
+    protected function getReplacedNamespace(?string $baseNamespace, string $replaceFromNamespace, string $replaceToNamespace): ?string
+    {
+        if ($baseNamespace) {
+            if (!str_contains($baseNamespace, $replaceFromNamespace)) {
+                throw new RuntimeException("Can't replace namespace");
+            }
+
+            return str_replace($replaceFromNamespace, $replaceToNamespace, $baseNamespace);
+        }
+
+        return null;
+    }
+
+    protected function getNamespacedFilePath(string $fileName, ?string $namespace): string
     {
         $toDir = $this->psr4PathConverter->namespaceToPath($namespace);
 
diff --git a/src/Generators/ControllersGenerator.php b/src/Generators/ControllersGenerator.php
@@ -33,7 +33,7 @@ private function extractControllers(SpecObjectInterface $specObject): array
 
                 $handler = $this->routeHandlerParser->parse($route->{'x-lg-handler'});
                 $fqcn = $handler->fqcn;
-                if (!$fqcn || !$handler->namespace) {
+                if (!$fqcn) {
                     continue;
                 }
 
diff --git a/src/Generators/RequestsGenerator.php b/src/Generators/RequestsGenerator.php
@@ -4,6 +4,7 @@
 
 use cebe\openapi\SpecObjectInterface;
 use InvalidArgumentException;
+use RuntimeException;
 
 class RequestsGenerator extends BaseGenerator implements GeneratorInterface
 {
@@ -40,11 +41,13 @@ protected function extractRequests(SpecObjectInterface $specObject, array $names
                 }
 
                 $handler = $this->routeHandlerParser->parse($route->{'x-lg-handler'});
-                if (!$handler->namespace || !str_contains($handler->namespace, $replaceFromNamespace)) {
+
+                try {
+                    $newNamespace = $this->getReplacedNamespace($handler->namespace, $replaceFromNamespace, $replaceToNamespace);
+                } catch (RuntimeException) {
                     continue;
                 }
 
-                $newNamespace = str_replace($replaceFromNamespace, $replaceToNamespace, $handler->namespace);
                 $className = $route->{'x-lg-request-class-name'} ?? ucfirst($route->operationId) . 'Request';
                 if (!$className) {
                     continue;
diff --git a/src/Generators/TestsGenerator.php b/src/Generators/TestsGenerator.php
@@ -4,6 +4,7 @@
 
 use cebe\openapi\SpecObjectInterface;
 use InvalidArgumentException;
+use RuntimeException;
 use stdClass;
 
 abstract class TestsGenerator extends BaseGenerator implements GeneratorInterface
@@ -47,11 +48,14 @@ protected function constructTests(stdClass $openApiData, array $namespaceData):
                 }
 
                 $handler = $this->routeHandlerParser->parse($route->{'x-lg-handler'});
-                if (!$handler->namespace || !str_contains($handler->namespace, $replaceFromNamespace)) {
+
+                try {
+                    $newNamespace = $this->getReplacedNamespace($handler->namespace, $replaceFromNamespace, $replaceToNamespace);
+                } catch (RuntimeException) {
                     continue;
                 }
 
-                $newNamespace = str_replace($replaceFromNamespace, $replaceToNamespace, $handler->namespace);
+
                 $className = str_replace("Controller", "", $handler->class) . "ComponentTest";
                 if (!$className) {
                     continue;
diff --git a/src/Utils/PSR4PathConverter.php b/src/Utils/PSR4PathConverter.php
@@ -19,8 +19,11 @@ public function addMappings(array $mappings): static
         return $this;
     }
 
-    public function namespaceToPath(string $namespace): string
+    public function namespaceToPath(?string $namespace): string
     {
+        if (is_null($namespace)) {
+            return '';
+        }
         foreach ($this->mappings as $mappingNamescape => $mappingPath) {
             if (str_starts_with($namespace, $mappingNamescape)) {
                 $namespaceWithoutBase = substr($namespace, strlen($mappingNamescape));
diff --git a/tests/GenerateServerTest.php b/tests/GenerateServerTest.php
@@ -5,12 +5,17 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Config;
 use function Pest\Laravel\artisan;
+use function PHPUnit\Framework\assertEquals;
 
+function makeFilePath(string $path): string
+{
+    return str_replace('/', DIRECTORY_SEPARATOR, $path);
+}
 test("Command GenerateServer success", function () {
     /** @var TestCase $this */
     $mapping = Config::get('openapi-server-generator.api_docs_mappings');
     $mappingValue = current($mapping);
-    $mapping = [__DIR__ . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'index.yaml' => $mappingValue];
+    $mapping = [makeFilePath(__DIR__ . '/resources/index.yaml') => $mappingValue];
     Config::set('openapi-server-generator.api_docs_mappings', $mapping);
 
     $filesystem = $this->mock(Filesystem::class);
@@ -20,7 +25,35 @@
     })->andReturnUsing(function ($path) {
         return file_get_contents($path);
     });
-    $filesystem->shouldReceive('put', 'cleanDirectory', 'ensureDirectoryExists');
+    $filesystem->shouldReceive('cleanDirectory', 'ensureDirectoryExists');
+    $appRoot = realpath(makeFilePath(__DIR__ . '/../vendor/orchestra/testbench-core/laravel/'));
+    $putFiles = [];
+    $filesystem->shouldReceive('put')->withArgs(function ($path, $content) use (&$putFiles, $appRoot) {
+        $putFiles[] = str_replace($appRoot, '', $path);
+
+        return true;
+    });
 
     artisan(GenerateServer::class);
+
+    $needFiles = [
+        makeFilePath('/app/Http/ApiV1/OpenApiGenerated/routes.php'),
+
+        makeFilePath('/app/Http/Controllers/ResourcesController.php'),
+        makeFilePath('/app/Http/Requests/TestFullGenerateRequest.php'),
+        makeFilePath('/app/Http/Tests/ResourcesComponentTest.php'),
+        makeFilePath('/app/Http/Requests/TestFooRenameRequest.php'),
+
+        makeFilePath('/app/Http/Controllers/WithoutResponsesController.php'),
+
+        makeFilePath('/WithoutNamespaceController.php'),
+        makeFilePath('/WithoutNamespaceRequest.php'),
+        makeFilePath('/WithoutNamespaceComponentTest.php'),
+
+        makeFilePath('/app/Http/ApiV1/OpenApiGenerated/Enums/TestIntegerEnum.php'),
+        makeFilePath('/app/Http/ApiV1/OpenApiGenerated/Enums/TestStringEnum.php'),
+    ];
+    sort($needFiles);
+    sort($putFiles);
+    assertEquals($needFiles, $putFiles);
 });
diff --git a/tests/resources/index.yaml b/tests/resources/index.yaml
@@ -30,10 +30,11 @@ paths:
       responses:
         "200":
           description: Успешный ответ
-  /resources:test-without-context:
+  /resources:test-rename-request:
     post:
-      operationId: testWithoutContext
-      x-lg-handler: '\App\Http\Controllers\ResourcesController@testWithoutContext'
+      operationId: testRenameRequest
+      x-lg-handler: '\App\Http\Controllers\ResourcesController@testRenameRequest'
+      x-lg-request-class-name: 'TestFooRenameRequest'
       responses:
         "200":
           description: Успешный ответ
@@ -46,6 +47,7 @@ paths:
   /resources:test-with-skip:
     post:
       operationId: testWithSkip
+      x-lg-handler: '\App\Http\Controllers\SkipController@testWithSkip'
       x-lg-skip-controller-generation: true
       x-lg-skip-request-generation: true
       x-lg-skip-tests-generation: true
@@ -55,14 +57,22 @@ paths:
   /resources:test-bad-handler:
     post:
       operationId: testBadHandler
-      x-lg-handler: 'bad'
+      x-lg-handler: ''
+      responses:
+        "200":
+          description: Успешный ответ
+  /resources:test-global-namespace:
+    post:
+      operationId: withoutNamespace
+      x-lg-handler: 'WithoutNamespaceController@testWithoutContext'
       responses:
         "200":
           description: Успешный ответ
   /resources:test-without-responses:
     post:
       operationId: testWithoutResponses
-      x-lg-handler: '\App\Http\Controllers\ResourcesController@testWithoutResponses'
+      x-lg-handler: '\App\Http\Controllers\WithoutResponsesController@testWithoutResponses'
+      x-lg-skip-request-generation: true
 
 components:
   responses:

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private function extractControllers(SpecObjectInterface $specObject): array`
`33`	`33`
`34`	`34`	`$handler = $this->routeHandlerParser->parse($route->{'x-lg-handler'});`
`35`	`35`	`$fqcn = $handler->fqcn;`
`36`		`- if (!$fqcn \|\| !$handler->namespace) {`
	`36`	`+ if (!$fqcn) {`
`37`	`37`	`continue;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use cebe\openapi\SpecObjectInterface;`
`6`	`6`	`use InvalidArgumentException;`
	`7`	`+use RuntimeException;`
`7`	`8`
`8`	`9`	`class RequestsGenerator extends BaseGenerator implements GeneratorInterface`
`9`	`10`	`{`
`@@ -40,11 +41,13 @@ protected function extractRequests(SpecObjectInterface $specObject, array $names`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`$handler = $this->routeHandlerParser->parse($route->{'x-lg-handler'});`
`43`		`- if (!$handler->namespace \|\| !str_contains($handler->namespace, $replaceFromNamespace)) {`
	`44`	`+`
	`45`	`+ try {`
	`46`	`+ $newNamespace = $this->getReplacedNamespace($handler->namespace, $replaceFromNamespace, $replaceToNamespace);`
	`47`	`+ } catch (RuntimeException) {`
`44`	`48`	`continue;`
`45`	`49`	`}`
`46`	`50`
`47`		`- $newNamespace = str_replace($replaceFromNamespace, $replaceToNamespace, $handler->namespace);`
`48`	`51`	`$className = $route->{'x-lg-request-class-name'} ?? ucfirst($route->operationId) . 'Request';`
`49`	`52`	`if (!$className) {`
`50`	`53`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,11 @@ public function addMappings(array $mappings): static`
`19`	`19`	`return $this;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function namespaceToPath(string $namespace): string`
	`22`	`+ public function namespaceToPath(?string $namespace): string`
`23`	`23`	`{`
	`24`	`+ if (is_null($namespace)) {`
	`25`	`+ return '';`
	`26`	`+ }`
`24`	`27`	`foreach ($this->mappings as $mappingNamescape => $mappingPath) {`
`25`	`28`	`if (str_starts_with($namespace, $mappingNamescape)) {`
`26`	`29`	`$namespaceWithoutBase = substr($namespace, strlen($mappingNamescape));`