Populate default values for filesystem

Author: valzargaming

run.php

@@ -10,9 +10,8 @@
 $server = new Server(
     new PersistentState(
         $envConfig['TOKEN'],
-        PersistentState::loadVerifyFile($envConfig['JSON_PATH'] ?? 'json/verify.json'),
         $envConfig['STORAGE_TYPE'] ?? 'filesystem',
-        $envConfig['JSON_PATH'] ?? 'verify.json',
+        $envConfig['JSON_PATH'] ?? 'json/verify.json',
     ),
     $envConfig['HOST_ADDR'] . ':' . $envConfig['HOST_PORT']
 );

src/VerifierServer/PersistentState.php

@@ -6,10 +6,10 @@
 
 class PersistentState {
     private \PDO $pdo;
+    private array $verifyList;
 
     public function __construct(
         private string $civToken,
-        private array $verifyList = [],
         private string $storageType = 'filesystem',
         private string $json_path = 'json/verify.json'
     ) {
@@ -83,7 +83,9 @@ private function initializeDatabase(): void
     public function getVerifyList(): array
     {
         if ($this->storageType === 'filesystem') {
-            return $this->verifyList;
+            return isset($this->verifyList)
+                ? $this->verifyList
+                : $this->verifyList = self::loadVerifyFile($this->json_path);
         }
         $stmt = $this->pdo->query("SELECT * FROM verify_list");
         if ($stmt === false) {

tests/PersistentStateTest.php

@@ -20,7 +20,6 @@ protected function setUp(): void
         $envConfig = PersistentState::loadEnvConfig();
         $this->state = new PersistentState(
             $envConfig['TOKEN'],
-            PersistentState::loadVerifyFile($envConfig['JSON_PATH'] ?? 'json/verify.json'),
             $envConfig['STORAGE_TYPE'] ?? 'filesystem'
         );
     }

tests/ServerTest.php

@@ -24,7 +24,7 @@ protected function setUp(): void
         $civToken = $envConfig['TOKEN'];
         $storageType = $envConfig['STORAGE_TYPE'] ?? 'filesystem';
         $jsonPath = $envConfig['JSON_PATH'] ?? 'json/verify.json';
-        $state = new PersistentState($civToken, [], $storageType, $jsonPath);
+        $state = new PersistentState($civToken, $storageType, $jsonPath);
         $this->server = new Server($state, $hostAddr);
     }
 

tests/VerifiedEndpointTest.php

@@ -19,7 +19,6 @@ protected function setUp(): void {
         $envConfig = PersistentState::loadEnvConfig();
         $this->state = new PersistentState(
             $envConfig['TOKEN'],
-            PersistentState::loadVerifyFile($envConfig['JSON_PATH'] ?? 'json/verify.json'),
             $envConfig['STORAGE_TYPE'] ?? 'filesystem'
         );