Merge branch 'master' into task-106821

# Conflicts:
#	tests/GenerateServerTest.php

Author: valerialukinykh

src/Generators/RoutesGenerator.php

@@ -112,7 +112,12 @@ private function formatControllerNamespaces(array $controllerNamespaces): string
             }
         }
 
-        sort($namespaces);
+        uasort($namespaces, function (string $first, string $second) {
+            $firstNamespace = str_replace('\\', ' ', trim(preg_replace('%/\*(.*)\*/%s', '', $first)));
+            $secondNamespace = str_replace('\\', ' ',  trim(preg_replace('%/\*(.*)\*/%s', '', $second)));
+
+            return strcasecmp($firstNamespace, $secondNamespace);
+        });
 
         return implode("\n", array_map(fn (string $namespace) => "use {$namespace};", $namespaces));
     }

tests/GenerateServerTest.php

@@ -62,6 +62,10 @@
         $this->makeFilePath('/app/Http/Requests/TestRenameFromKeyRequestRequest.php'),
         $this->makeFilePath('/app/Http/Resources/ResourcesDataWithNameResource.php'),
 
+        $this->makeFilePath('/app/Http/Controllers/Controller11.php'),
+        $this->makeFilePath('/app/Http/Controllers/Controller2.php'),
+        $this->makeFilePath('/app/Http/Controllers/FooItemsController.php'),
+        $this->makeFilePath('/app/Http/Controllers/FoosController.php'),
         $this->makeFilePath('/app/Http/Controllers/PoliciesController.php'),
         $this->makeFilePath('/app/Http/Tests/PoliciesComponentTest.php'),
         $this->makeFilePath('/app/Http/Policies/PoliciesControllerPolicy.php'),
@@ -123,3 +127,39 @@
         'WithoutResponsesController function parameter'
     );
 });
+
+
+test('namespace sorting', function () {
+    /** @var TestCase $this */
+    $mapping = Config::get('openapi-server-generator.api_docs_mappings');
+    $mappingValue = current($mapping);
+    $mapping = [$this->makeFilePath(__DIR__ . '/resources/index.yaml') => $mappingValue];
+    Config::set('openapi-server-generator.api_docs_mappings', $mapping);
+
+    $filesystem = $this->mock(Filesystem::class);
+    $filesystem->shouldReceive('exists')->andReturn(false);
+    $filesystem->shouldReceive('get')->withArgs(function ($path) {
+        return (bool)strstr($path, '.template');
+    })->andReturnUsing(function ($path) {
+        return file_get_contents($path);
+    });
+    $filesystem->shouldReceive('cleanDirectory', 'ensureDirectoryExists');
+    $routes = '';
+    $filesystem->shouldReceive('put')->withArgs(function ($path, $content) use (&$routes, &$rr) {
+        if (str_contains($path, 'routes.php')) {
+            $routes = $content;
+        }
+
+        return true;
+    });
+
+    artisan(GenerateServer::class, ['-e' => 'routes']);
+
+    assertStringContainsString(
+        "use App\Http\Controllers\Controller11;\n".
+        "use App\Http\Controllers\Controller2;\n".
+        "use App\Http\Controllers\FooItemsController;\n".
+        "use App\Http\Controllers\FoosController;\n",
+        $routes
+    );
+});

tests/resources/index.yaml

@@ -182,6 +182,42 @@ paths:
       responses:
         "200":
           description: Успешный ответ c контекстом
+  /namespace-sort-1:
+    post:
+      operationId: namespaceSort1
+      x-lg-handler: '\App\Http\Controllers\FooItemsController@test'
+      x-lg-skip-request-generation: true
+      x-lg-skip-tests-generation: true
+      responses:
+        "200":
+          description: Успешный ответ
+  /namespace-sort-2:
+    post:
+      operationId: namespaceSort2
+      x-lg-handler: '\App\Http\Controllers\FoosController@test'
+      x-lg-skip-request-generation: true
+      x-lg-skip-tests-generation: true
+      responses:
+        "200":
+          description: Успешный ответ
+  /namespace-sort-3:
+    post:
+      operationId: namespaceSort3
+      x-lg-handler: '\App\Http\Controllers\Controller11@test'
+      x-lg-skip-request-generation: true
+      x-lg-skip-tests-generation: true
+      responses:
+        "200":
+          description: Успешный ответ
+  /namespace-sort-4:
+    post:
+      operationId: namespaceSort4
+      x-lg-handler: '\App\Http\Controllers\Controller2@test'
+      x-lg-skip-request-generation: true
+      x-lg-skip-tests-generation: true
+      responses:
+        "200":
+          description: Успешный ответ
 components:
   responses:
     ServerError: