#104744

Author: Kapitanov Andrey

src/Data/Controllers/ControllersStorage.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Ensi\LaravelOpenApiServerGenerator\Data\Controllers;
+
+class ControllersStorage
+{
+    /** @var array Recently created controllers */
+    protected array $controllers = [];
+
+    public function markNewControllerMethod(
+        string $serversUrl,
+        string $path,
+        string $method,
+        array $responseCodes
+    ): void {
+        $this->controllers[$serversUrl][$path][$method] = $responseCodes;
+    }
+
+    public function isExistControllerMethod(
+        string $serversUrl,
+        string $path,
+        string $method,
+        int $responseCode
+    ): bool {
+        $codes = $this->controllers[$serversUrl][$path][$method] ?? [];
+
+        return !in_array($responseCode, $codes);
+    }
+}

src/Generators/BaseGenerator.php

@@ -2,6 +2,7 @@
 
 namespace Ensi\LaravelOpenApiServerGenerator\Generators;
 
+use Ensi\LaravelOpenApiServerGenerator\Data\Controllers\ControllersStorage;
 use Ensi\LaravelOpenApiServerGenerator\Utils\ClassParser;
 use Ensi\LaravelOpenApiServerGenerator\Utils\PhpDocGenerator;
 use Ensi\LaravelOpenApiServerGenerator\Utils\PSR4PathConverter;
@@ -14,9 +15,6 @@
 
 class BaseGenerator
 {
-    /** @var array Recently created controllers */
-    public static array $controllers = [];
-
     protected array $options = [];
 
     public function __construct(
@@ -27,29 +25,10 @@ public function __construct(
         protected TypesMapper $typesMapper,
         protected PhpDocGenerator $phpDocGenerator,
         protected ClassParser $classParser,
+        protected ControllersStorage $controllersStorage,
     ) {
     }
 
-    public static function markNewControllerMethod(
-        string $serversUrl,
-        string $path,
-        string $method,
-        array $responseCodes
-    ): void {
-        static::$controllers[$serversUrl][$path][$method] = $responseCodes;
-    }
-
-    public static function isExistControllerMethod(
-        string $serversUrl,
-        string $path,
-        string $method,
-        int $responseCode
-    ): bool {
-        $codes = static::$controllers[$serversUrl][$path][$method] ?? [];
-
-        return !in_array($responseCode, $codes);
-    }
-
     public function setOptions(array $options): static
     {
         $this->options = $options;

src/Generators/ControllersGenerator.php

@@ -188,7 +188,7 @@ private function convertMethodsToString(ClassParser $class, array $methods, arra
                 ]
             );
 
-            static::markNewControllerMethod(
+            $this->controllersStorage->markNewControllerMethod(
                 serversUrl: $this->serversUrl,
                 path: $method['route']['path'],
                 method: $method['route']['method'],

src/Generators/PestTestsGenerator.php

@@ -44,7 +44,7 @@ protected function convertRoutesToTestsString(array $routes, string $serversUrl,
                     continue;
                 }
 
-                $methodExists = static::isExistControllerMethod(
+                $methodExists = $this->controllersStorage->isExistControllerMethod(
                     serversUrl: $serversUrl,
                     path: $route['path'],
                     method: $route['method'],
@@ -57,7 +57,7 @@ protected function convertRoutesToTestsString(array $routes, string $serversUrl,
 
                 $url = $serversUrl . $route['path'];
                 $testName = strtoupper($route['method']) . ' ' . $url. ' ' .  $responseCode;
-                $phpHttpMethod =  $this->getPhpHttpTestMethod($route['method'], $route['responseContentType']);
+                $phpHttpMethod = $this->getPhpHttpTestMethod($route['method'], $route['responseContentType']);
                 $testsFunctions[] = <<<FUNC
 
                 test('{$testName}', function () {

src/LaravelOpenApiServerGeneratorServiceProvider.php

@@ -3,6 +3,7 @@
 namespace Ensi\LaravelOpenApiServerGenerator;
 
 use Ensi\LaravelOpenApiServerGenerator\Commands\GenerateServer;
+use Ensi\LaravelOpenApiServerGenerator\Data\Controllers\ControllersStorage;
 use Ensi\LaravelOpenApiServerGenerator\Utils\PSR4PathConverter;
 use Ensi\LaravelOpenApiServerGenerator\Utils\TemplatesManager;
 use Illuminate\Support\ServiceProvider;
@@ -28,6 +29,10 @@ public function register()
         $this->app->when(PSR4PathConverter::class)
             ->needs('$mappings')
             ->give(config('openapi-server-generator.namespaces_to_directories_mapping', []));
+
+        $this->app->singleton(ControllersStorage::class, function () {
+            return new ControllersStorage();
+        });
     }
 
     /**

tests/GenerateServerTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Config;
 use function Pest\Laravel\artisan;
+use function PHPUnit\Framework\assertEquals;
 use function PHPUnit\Framework\assertEqualsCanonicalizing;
 use function PHPUnit\Framework\assertNotTrue;
 use function PHPUnit\Framework\assertStringContainsString;
@@ -162,19 +163,22 @@
     );
 });
 
-test("Update tests success", function () {
+test("Update tests success", function (array $parameters, bool $withControllerEntity) {
     /** @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);
 
+    $appRoot = realpath($this->makeFilePath(__DIR__ . '/../vendor/orchestra/testbench-core/laravel/'));
+
     $existTest = $this->makeFilePath('/app/Http/Tests/ResourcesComponentTest.php');
 
     $filesystem = $this->mock(Filesystem::class);
-    $filesystem->shouldReceive('exists')->andReturnUsing(function ($path) {
-        // todo
-        return false;
+    $filesystem->shouldReceive('exists')->andReturnUsing(function ($path) use ($appRoot, $existTest) {
+        $filePath = $this->makeFilePath(str_replace($appRoot, '', $path));
+
+        return $filePath === $existTest;
     });
 
     $filesystem->shouldReceive('get')->withArgs(function ($path) {
@@ -183,7 +187,7 @@
         return file_get_contents($path);
     });
     $filesystem->shouldReceive('cleanDirectory', 'ensureDirectoryExists');
-    $appRoot = realpath($this->makeFilePath(__DIR__ . '/../vendor/orchestra/testbench-core/laravel/'));
+
     $putFiles = [];
     $filesystem->shouldReceive('put')->withArgs(function ($path, $content) use (&$putFiles, $appRoot) {
         $filePath = $this->makeFilePath(str_replace($appRoot, '', $path));
@@ -192,8 +196,38 @@
         return true;
     });
 
-    artisan(GenerateServer::class);
+    $appendFiles = [];
+    $filesystem->shouldReceive('append')->withArgs(function ($filePath, $data) use (&$appendFiles, $appRoot, $existTest) {
+        $filePath = $this->makeFilePath(str_replace($appRoot, '', $filePath));
+        $appendFiles[$filePath] = $data;
 
-    // todo: check exist test
+        return true;
+    });
 
-});
+    artisan(GenerateServer::class, $parameters);
+
+    $appendData = [
+        'POST /resources:test-generate-without-properties 200',
+        'POST /resources:test-empty-rename-request 200',
+        'POST /resources:test-rename-request 200',
+        'POST /resources:test-laravel-validations-application-json-request 200',
+        'POST /resources:test-laravel-validations-multipart-form-data-request 200',
+        'POST /resources:test-laravel-validations-non-available-content-type 200',
+        'POST /resources:test-generate-resource-bad-response-key 200',
+        'POST /resources:test-generate-without-properties 200',
+    ];
+
+    assertEquals(isset($appendFiles[$existTest]), $withControllerEntity);
+
+    if ($withControllerEntity) {
+        $appendTestData = $appendFiles[$existTest];
+        foreach ($appendData as $data) {
+            assertStringContainsString($data, $appendTestData);
+        }
+    }
+})->with([
+    [['-e' => 'pest_tests'], false],
+    [['-e' => 'controllers,pest_tests'], true],
+    [['-e' => 'pest_tests,controllers'], true],
+    [[], true],
+]);