Merge pull request #30 from ensi-platform/task-108364

#108364 fix request generating
ensi-platform · Jul 3, 2023 · 2a5cdfc · 2a5cdfc
2 parents e4f1ca6 + 20a5ca0
commit 2a5cdfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Generators/BaseGenerator.php b/src/Generators/BaseGenerator.php
@@ -115,10 +115,10 @@ private function formattedGlobalParams(): array
     protected function getActualClassNameAndNamespace(?string $className, ?string $namespace): array
     {
         $parseClassName = explode('/', $className);
-        if (count($parseClassName) > 1) {
 
-            if (str_contains($namespace, '\Request')) {
-                $namespace = substr($namespace, 0, strpos($namespace, '\Request') + 8);
+        if (count($parseClassName) > 1) {
+            if (str_contains($namespace, '\Requests')) {
+                $namespace = substr($namespace, 0, strpos($namespace, '\Requests') + 9);
             } elseif (str_contains($namespace, '\Resources')) {
                 $namespace = substr($namespace, 0, strpos($namespace, '\Resources') + 10);
             }

diff --git a/tests/GenerateServerTest.php b/tests/GenerateServerTest.php
@@ -43,7 +43,7 @@
         $this->makeFilePath('/app/Http/Tests/ResourcesComponentTest.php'),
         $this->makeFilePath('/app/Http/Requests/TestFooRenameRequest.php'),
 
-        $this->makeFilePath('/app/Http/Request/WithDirRequests/Request.php'),
+        $this->makeFilePath('/app/Http/Requests/WithDirRequests/Request.php'),
         $this->makeFilePath('/app/Http/Requests/Foo/TestNamespaceWithDirRequest.php'),
         $this->makeFilePath('/app/Http/Requests/LaravelValidationsApplicationJsonRequest.php'),
         $this->makeFilePath('/app/Http/Requests/LaravelValidationsMultipartFormDataRequest.php'),
@@ -161,6 +161,7 @@
     assertStringContainsString(
         "use App\Http\Controllers\Controller11;\n".
         "use App\Http\Controllers\Controller2;\n".
+        "use App\Http\Controllers\Foo\TestController;\n" .
         "use App\Http\Controllers\FooItemsController;\n".
         "use App\Http\Controllers\FoosController;\n",
         $routes