tmp

RonasIT · Nov 27, 2024 · 6fa4ecb · 6fa4ecb
1 parent 9d84bcf
commit 6fa4ecb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/config/auto-doc.php b/config/auto-doc.php
@@ -125,8 +125,6 @@
     */
     'documentation_viewer' => env('SWAGGER_SPEC_VIEWER', 'swagger'),
 
-    'tmp_dir' => storage_path('tmp_documentation'),
-
     'drivers' => [
         'local' => [
             'class' => LocalDriver::class,

diff --git a/src/Drivers/BaseDriver.php b/src/Drivers/BaseDriver.php
@@ -2,7 +2,6 @@
 
 namespace RonasIT\AutoDoc\Drivers;
 
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\ParallelTesting;
 use RonasIT\AutoDoc\Contracts\SwaggerDriverContract;
 
@@ -12,11 +11,9 @@ abstract class BaseDriver implements SwaggerDriverContract
 
     public function __construct()
     {
-        $tmpDir = config('auto-doc.tmp_dir');
-
         $this->tempFilePath = ($token = ParallelTesting::token())
-            ? $tmpDir . "/temp_documentation_{$token}.json"
-            : $tmpDir . '/temp_documentation.json';
+            ? storage_path("/temp_documentation_{$token}.json")
+            : storage_path('/temp_documentation.json');
     }
 
     public function saveTmpData($data): void

diff --git a/src/Support/PHPUnit/EventSubscribers/ApplicationFinishedSubscriber.php b/src/Support/PHPUnit/EventSubscribers/ApplicationFinishedSubscriber.php
@@ -15,11 +15,11 @@ public function notify(Finished $event): void
     {
         $this->createApplication();
 
-        if ($token = ParallelTesting::token()) {
-            $this->mergeTempDocumentation($token);
-        } else {
-            app(SwaggerService::class)->saveProductionData();
+        if (ParallelTesting::token()) {
+            $this->mergeTempDocumentation();
         }
+
+        app(SwaggerService::class)->saveProductionData();
     }
 
     protected function createApplication(): void
@@ -32,9 +32,7 @@ protected function createApplication(): void
 
     protected function mergeTempDocumentation(): void
     {
-        $swaggerService = app(SwaggerService::class);
-
-        $lockHandle = fopen(config('auto-doc.tmp_dir') . '/lock.lock', 'c+');
+        $lockHandle = fopen(storage_path('/temp_documentation.json'), 'c+');
 
         $locked = false;
 
@@ -44,7 +42,12 @@ protected function mergeTempDocumentation(): void
             usleep(10);
         }
 
-        $swaggerService->saveProductionData();
+        $parallelToken = ParallelTesting::token();
+
+        $sharedDocContent = json_decode(stream_get_contents($lockHandle), true);
+        $workerDocContent = json_decode(file_get_contents(storage_path("/temp_documentation_{$parallelToken}.json")));
+
+        app(SwaggerService::class)->mergeOpenAPIDocs($sharedDocContent, $workerDocContent);
 
         flock($lockHandle, LOCK_UN);
     }