Making suggested changes;

Author: hans-thomas

src/Drivers/LocalDriver.php

@@ -7,45 +7,45 @@
 
 class LocalDriver extends BaseDriver
 {
-    protected ?string $baseFileName;
+    protected ?string $mainFilePath;
     private ?array $config;
 
     public function __construct()
     {
         parent::__construct();
+
         $this->config = config('auto-doc.drivers.local');
 
-        $directory = $this->config['directory'];
-        if (!str_ends_with($directory, DIRECTORY_SEPARATOR)) {
-            $directory .= DIRECTORY_SEPARATOR;
-        }
+        $directory = str_ends_with($this->config['directory'], DIRECTORY_SEPARATOR)
+            ? $this->config['directory']
+            : $this->config['directory'] . DIRECTORY_SEPARATOR;
 
-        $this->baseFileName = storage_path($directory.$this->config['base_file_name'].'.json');
+        $this->mainFilePath = storage_path("$directory{$this->config['base_file_name']}.json");
 
-        if (!preg_match('/\/[\w]+\.json/ms', $this->baseFileName)) {
+        if (!preg_match('/\/[\w]+\.json/ms', $this->mainFilePath)) {
             throw new MissedProductionFilePathException();
         }
     }
 
     public function saveData(): void
     {
-        $prodDir = storage_path($this->config['directory']);
-        if (!is_dir($prodDir)) {
-            mkdir($prodDir);
+        $documentationDirectory = storage_path($this->config['directory']);
+        if (!is_dir($documentationDirectory)) {
+            mkdir($documentationDirectory);
         }
 
-        file_put_contents($this->baseFileName, json_encode($this->getTmpData()));
+        file_put_contents($this->mainFilePath, json_encode($this->getTmpData()));
 
         $this->clearTmpData();
     }
 
     public function getDocumentation(): array
     {
-        if (!file_exists($this->baseFileName)) {
+        if (!file_exists($this->mainFilePath)) {
             throw new FileNotFoundException();
         }
 
-        $fileContent = file_get_contents($this->baseFileName);
+        $fileContent = file_get_contents($this->mainFilePath);
 
         return json_decode($fileContent, true);
     }

src/Drivers/StorageDriver.php

@@ -10,7 +10,7 @@
 class StorageDriver extends BaseDriver
 {
     protected Filesystem $disk;
-    protected ?string $baseFileName;
+    protected ?string $mainFilePath;
     protected array $config;
 
     public function __construct()
@@ -19,31 +19,32 @@ public function __construct()
 
         $this->config = config('auto-doc.drivers.storage');
         $this->disk = Storage::disk($this->config['disk']);
-        $directory = $this->config['directory'];
-        if (!str_ends_with($directory, DIRECTORY_SEPARATOR)) {
-            $directory .= DIRECTORY_SEPARATOR;
-        }
-        $this->baseFileName = $directory.$this->config['base_file_name'].'.json';
 
-        if (!preg_match('/\/[\w]+\.json/ms', $this->baseFileName)) {
+        $directory = str_ends_with($this->config['directory'], DIRECTORY_SEPARATOR)
+            ? $this->config['directory']
+            : $this->config['directory'] . DIRECTORY_SEPARATOR;
+
+        $this->mainFilePath = "$directory{$this->config['base_file_name']}.json";
+
+        if (!preg_match('/\/[\w]+\.json/ms', $this->mainFilePath)) {
             throw new MissedProductionFilePathException();
         }
     }
 
     public function saveData(): void
     {
-        $this->disk->put($this->baseFileName, json_encode($this->getTmpData()));
+        $this->disk->put($this->mainFilePath, json_encode($this->getTmpData()));
 
         $this->clearTmpData();
     }
 
     public function getDocumentation(): array
     {
-        if (!$this->disk->exists($this->baseFileName)) {
+        if (!$this->disk->exists($this->mainFilePath)) {
             throw new FileNotFoundException();
         }
 
-        $fileContent = $this->disk->get($this->baseFileName);
+        $fileContent = $this->disk->get($this->mainFilePath);
 
         return json_decode($fileContent, true);
     }

tests/AutoDocControllerTest.php

@@ -12,7 +12,6 @@ class AutoDocControllerTest extends TestCase
     use PHPMock;
 
     protected static array $documentation;
-    protected static string $baseFileName;
     protected static string $baseFile;
 
     public function setUp(): void
@@ -24,16 +23,16 @@ public function setUp(): void
             $documentationDirectory .= DIRECTORY_SEPARATOR;
         }
 
-        self::$baseFileName ??= 'documentation';
-        self::$baseFile ??= $documentationDirectory.self::$baseFileName.'.json';
+        self::$baseFile ??= $documentationDirectory.'documentation.json';
         self::$documentation ??= $this->getJsonFixture('tmp_data');
 
         if (!is_dir(storage_path($documentationDirectory))) {
             mkdir(storage_path($documentationDirectory));
         }
+
         file_put_contents(storage_path(self::$baseFile), json_encode(self::$documentation));
 
-        config(['auto-doc.drivers.local.base_file_name' => self::$baseFileName]);
+        config(['auto-doc.drivers.local.base_file_name' => 'documentation']);
     }
 
     public function tearDown(): void

tests/LocalDriverTest.php

@@ -24,7 +24,7 @@ public function setUp(): void
         }
 
         self::$baseFileName ??= 'documentation';
-        self::$baseFile ??= storage_path($documentationDirectory.self::$baseFileName.'.json');
+        self::$baseFile ??= storage_path($documentationDirectory . self::$baseFileName . '.json');
         self::$tmpDocumentationFilePath ??= storage_path('temp_documentation.json');
 
         self::$tmpData ??= $this->getJsonFixture('tmp_data');