This PR is related to #23: all() method sometimes return null (#34)

* make sure to all() method are always return an array * Update ValuestoreTest.php Co-authored-by: Freek Van der Herten <freek@spatie.be>
spatie · Aug 21, 2020 · cd02862 · cd02862
1 parent 5177691
commit cd02862
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Valuestore.php b/src/Valuestore.php
@@ -176,7 +176,7 @@ public function all() : array
             return [];
         }
 
-        return json_decode(file_get_contents($this->fileName), true);
+        return json_decode(file_get_contents($this->fileName), true) ?? [];
     }
 
     /**

diff --git a/tests/ValuestoreTest.php b/tests/ValuestoreTest.php
@@ -438,4 +438,20 @@ public function it_will_delete_the_underlying_file_when_no_values_are_left_in_th
 
         $this->assertFileNotExists($this->storageFile);
     }
+
+    /** @test */
+    public function the_all_function_will_always_return_an_array()
+    {
+        $this->assertFileNotExists($this->storageFile);
+
+        touch($this->storageFile);
+
+        $this->assertStringEqualsFile($this->storageFile, '');
+
+        $this->assertIsArray($this->valuestore->all());
+
+        $this->valuestore->flush();
+
+        $this->assertFileNotExists($this->storageFile);
+    }
 }