tmp

RonasIT · Nov 28, 2024 · 6e75585 · 6e75585
1 parent a0c818f
commit 6e75585
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/src/Drivers/BaseDriver.php b/src/Drivers/BaseDriver.php
@@ -51,24 +51,17 @@ public function acquireLock($handle): void
         }
     }
 
-    public function callWithHandle(string $filePath, string $mode, callable $callback): void
+    public function callbackWithLock(string $filePath, string $mode, callable $callback): void
     {
-        $resultDocHandle = fopen($this->driver->getTempFilePath(), 'c+');
+        $handle = fopen($filePath, $mode);
 
         try {
-            $this->driver->acquireLock($resultDocHandle);
+            $this->acquireLock($handle);
 
-            $resultDocContent = json_decode(stream_get_contents($resultDocHandle), true)
-                ?? $this->generateEmptyData();
-
-            $currentDocContent = json_decode(file_get_contents($this->driver->getTempFilePath(ParallelTesting::token())), true);
-
-            $this->mergeOpenAPIDocs($resultDocContent, $currentDocContent);
-
-            $this->driver->rewriteJsonFile($resultDocHandle, $resultDocContent);
+            $callback($handle);
         } finally {
-            flock($resultDocHandle, LOCK_UN);
-            fclose($resultDocHandle);
+            flock($handle, LOCK_UN);
+            fclose($handle);
         }
     }
 

diff --git a/src/Services/SwaggerService.php b/src/Services/SwaggerService.php
@@ -1011,22 +1011,19 @@ public function mergeOpenAPIDocs(array &$documentation, array $additionalDocumen
 
     public function mergeTempDocumentation(): void
     {
-        $resultDocHandle = fopen($this->driver->getTempFilePath(), 'c+');
+        $this->driver->callbackWithLock(
+            filePath: $this->driver->getTempFilePath(),
+            mode: 'c+',
+            callback: function ($resultDocHandle) {
+                $resultDocContent = json_decode(stream_get_contents($resultDocHandle), true)
+                    ?? $this->generateEmptyData();
 
-        try {
-            $this->driver->acquireLock($resultDocHandle);
+                $currentDocContent = json_decode(file_get_contents($this->driver->getTempFilePath(ParallelTesting::token())), true);
 
-            $resultDocContent = json_decode(stream_get_contents($resultDocHandle), true)
-                ?? $this->generateEmptyData();
+                $this->mergeOpenAPIDocs($resultDocContent, $currentDocContent);
 
-            $currentDocContent = json_decode(file_get_contents($this->driver->getTempFilePath(ParallelTesting::token())), true);
-
-            $this->mergeOpenAPIDocs($resultDocContent, $currentDocContent);
-
-            $this->driver->rewriteJsonFile($resultDocHandle, $resultDocContent);
-        } finally {
-            flock($resultDocHandle, LOCK_UN);
-            fclose($resultDocHandle);
-        }
+                $this->driver->rewriteJsonFile($resultDocHandle, $resultDocContent);
+            },
+        );
     }
 }